Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): restore modal focus once its target leaves inert

Hampusfbbc5a9de0e2
diff --git a/fluxer_app/src/features/ui/state/KeyboardMode.tsx b/fluxer_app/src/features/ui/state/KeyboardMode.tsx
index 6d3013827..724c4e55f 100644
--- a/fluxer_app/src/features/ui/state/KeyboardMode.tsx
+++ b/fluxer_app/src/features/ui/state/KeyboardMode.tsx
@@ -1,8 +1,12 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
+import {isDateOfBirthStepOpen} from '@app/features/auth/state/DateOfBirthStep';
import {Logger} from '@app/features/platform/utils/AppLogger';
import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
-import {registerKeyboardModeRestoreCallback, registerKeyboardModeStateResolver} from '@app/features/ui/state/Modal';
+import ModalState, {
+ registerKeyboardModeRestoreCallback,
+ registerKeyboardModeStateResolver,
+} from '@app/features/ui/state/Modal';
import {makeSyncedField} from '@app/features/user/state/SyncedField';
import {KeyboardModeIntroStateSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
import {makeAutoObservable, runInAction} from 'mobx';
@@ -35,7 +39,7 @@ class KeyboardMode {
runInAction(() => {
this.keyboardModeEnabled = true;
});
- if (showIntro && !this.introSeen) {
+ if (showIntro && !this.introSeen && !ModalState.hasModalOpen() && !isDateOfBirthStepOpen()) {
this.introSeen = true;
void Promise.all([
import('@app/features/ui/commands/ModalCommands'),
diff --git a/fluxer_app/src/features/ui/state/Modal.ts b/fluxer_app/src/features/ui/state/Modal.ts
index d6f25e035..75111ee66 100644
--- a/fluxer_app/src/features/ui/state/Modal.ts
+++ b/fluxer_app/src/features/ui/state/Modal.ts
@@ -15,6 +15,7 @@ const HAVING_FUN_DESCRIPTOR = msg({
comment: 'Friendly tagline shown on a Fluxer-branded button or upsell.',
});
const logger = new Logger('Modal');
+const MAX_INERT_FOCUS_RETRY_FRAMES = 30;
type KeyboardModeStateResolver = () => boolean;
type KeyboardModeRestoreCallback = (showIntro: boolean) => void;
@@ -30,13 +31,6 @@ export function registerKeyboardModeRestoreCallback(callback: KeyboardModeRestor
keyboardModeRestoreCallback = callback;
}
-const BASE_Z_INDEX = 10000;
-const Z_INDEX_INCREMENT = 2;
-
-export function getZIndexForStack(stackIndex: number): number {
- return BASE_Z_INDEX + stackIndex * Z_INDEX_INCREMENT;
-}
-
interface ModalEntry {
modal: ModalRender;
modalType: ModalType | undefined;
@@ -282,23 +276,39 @@ class ModalState {
private scheduleFocus(target: HTMLElement | null, keyboardModeEnabled: boolean): void {
logger.debug(`Modal.scheduleFocus target=${target ? target.tagName : 'null'} keyboardMode=${keyboardModeEnabled}`);
if (!target) return;
- queueMicrotask(() => {
- if (!target.isConnected) {
- logger.debug('Modal.scheduleFocus aborted: target disconnected');
- return;
- }
- try {
- target.focus({preventScroll: true});
- logger.debug('Modal.scheduleFocus applied focus to target');
- } catch (error) {
- logger.error('Modal.scheduleFocus failed to focus target', error as Error);
+ queueMicrotask(() => this.restoreFocus(target, keyboardModeEnabled, 0));
+ }
+
+ private restoreFocus(target: HTMLElement, keyboardModeEnabled: boolean, frame: number): void {
+ if (!target.isConnected) {
+ logger.debug('Modal.scheduleFocus aborted: target disconnected');
+ return;
+ }
+ if (target.closest('[inert]') != null) {
+ if (frame >= MAX_INERT_FOCUS_RETRY_FRAMES) {
+ logger.debug('Modal.scheduleFocus aborted: target stayed inert');
return;
}
- if (keyboardModeEnabled && keyboardModeRestoreCallback) {
- logger.debug('Modal.scheduleFocus re-entering keyboard mode');
- keyboardModeRestoreCallback(false);
- }
- });
+ const view = target.ownerDocument.defaultView ?? window;
+ view.requestAnimationFrame(() => this.restoreFocus(target, keyboardModeEnabled, frame + 1));
+ return;
+ }
+ const active = target.ownerDocument.activeElement;
+ if (frame > 0 && active != null && active !== target.ownerDocument.body && active !== target) {
+ logger.debug('Modal.scheduleFocus skipped: focus already moved');
+ return;
+ }
+ try {
+ target.focus({preventScroll: true});
+ logger.debug('Modal.scheduleFocus applied focus to target');
+ } catch (error) {
+ logger.error('Modal.scheduleFocus failed to focus target', error as Error);
+ return;
+ }
+ if (keyboardModeEnabled && keyboardModeRestoreCallback) {
+ logger.debug('Modal.scheduleFocus re-entering keyboard mode');
+ keyboardModeRestoreCallback(false);
+ }
}
}
diff --git a/fluxer_app/src/features/ui/utils/ModalUtils.ts b/fluxer_app/src/features/ui/utils/ModalUtils.ts
index 492aacc28..6b87dcead 100644
--- a/fluxer_app/src/features/ui/utils/ModalUtils.ts
+++ b/fluxer_app/src/features/ui/utils/ModalUtils.ts
@@ -86,6 +86,8 @@ type LabelSource = 'header' | 'screen-reader';
export type ModalTransitionPreset = 'default' | 'instant' | 'quick' | 'profile-slide';
+export type ModalBackdropTone = 'default' | 'strong';
+
export interface ModalProps {
children: ReactNode;
className?: string;
@@ -95,6 +97,7 @@ export interface ModalProps {
onClose?: () => void;
onAnimationComplete?: () => void;
backdropSlot?: ReactNode;
+ backdropTone?: ModalBackdropTone;
transitionPreset?: ModalTransitionPreset;
disableHistoryManagement?: boolean;
}