fix: remove 'latest-active' variant from RestoreFocusType

VKCOM · Nov 7, 2024 · c07f29c · c07f29c
1 parent 8ef9261
commit c07f29c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/vkui/src/lib/floating/types/component.ts b/packages/vkui/src/lib/floating/types/component.ts
@@ -1,10 +1,10 @@
 import type * as React from 'react';
 import type { UseFloatingMiddlewaresBootstrapOptions } from '../useFloatingMiddlewaresBootstrap';
 import type {
+  RestoreFocusType,
   UseFloatingWithInteractionsProps,
   UseFloatingWithInteractionsReturn,
 } from '../useFloatingWithInteractions';
-import { type RestoreFocusType } from '../useFloatingWithInteractions/types';
 import type { OnPlacementChange } from './common';
 
 /**

diff --git a/packages/vkui/src/lib/floating/useFloatingWithInteractions/index.ts b/packages/vkui/src/lib/floating/useFloatingWithInteractions/index.ts
@@ -6,4 +6,6 @@ export type {
   UseFloatingWithInteractionsReturn,
 } from './types';
 
+export { type RestoreFocusType } from './types';
+
 export { DEFAULT_TRIGGER } from './constants';
diff --git a/packages/vkui/src/lib/floating/useFloatingWithInteractions/types.ts b/packages/vkui/src/lib/floating/useFloatingWithInteractions/types.ts
@@ -11,7 +11,7 @@ export type ManualTriggerType = 'manual';
 
 export type TriggerType = ManualTriggerType | InteractiveTriggerType | InteractiveTriggerType[];
 
-export type RestoreFocusType = boolean | 'latest-active' | 'anchor-element' | HTMLElement;
+export type RestoreFocusType = boolean | 'anchor-element' | HTMLElement;
 
 export type ShownChangeReason =
   | 'click-outside'

diff --git a/packages/vkui/src/lib/floating/useFloatingWithInteractions/useFloatingWithInteractions.ts b/packages/vkui/src/lib/floating/useFloatingWithInteractions/useFloatingWithInteractions.ts
@@ -234,7 +234,7 @@ export const useFloatingWithInteractions = <T extends HTMLElement = HTMLElement>
       if (!restoreFocus) {
         return false;
       }
-      if (restoreFocus === true || restoreFocus === 'latest-active') {
+      if (restoreFocus === true) {
         return triggerOnFocus ? blockFocusRef.current : true;
       } else if (restoreFocus === 'anchor-element') {
         return refs.reference.current as HTMLElement;