@astryxdesign/core 0.7.8 → 0.7.9-canary.0a64fdb
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AppShell/observeMainOverflow.d.ts.map +1 -1
- package/dist/AppShell/observeMainOverflow.js +9 -6
- package/dist/BottomSheet/BottomSheet.d.ts.map +1 -1
- package/dist/BottomSheet/BottomSheet.js +5 -0
- package/dist/Calendar/styles.d.ts +1 -1
- package/dist/CheckboxInput/CheckboxInput.d.ts.map +1 -1
- package/dist/CheckboxInput/CheckboxInput.js +54 -11
- package/dist/ClickableCard/ClickableCard.d.ts +1 -1
- package/dist/ClickableCard/ClickableCard.d.ts.map +1 -1
- package/dist/ClickableCard/ClickableCard.js +5 -1
- package/dist/DateInput/PickerWheel.d.ts.map +1 -1
- package/dist/DateInput/PickerWheel.js +7 -1
- package/dist/DateRangeInput/DateRangeInput.js +1 -1
- package/dist/Dialog/Dialog.d.ts +2 -1
- package/dist/Dialog/Dialog.d.ts.map +1 -1
- package/dist/Dialog/Dialog.js +12 -1
- package/dist/Drawer/useDrawerDialogPresence.d.ts +2 -1
- package/dist/Drawer/useDrawerDialogPresence.d.ts.map +1 -1
- package/dist/Drawer/useDrawerDialogPresence.js +11 -2
- package/dist/DropdownMenu/DropdownMenu.d.ts +9 -1
- package/dist/DropdownMenu/DropdownMenu.d.ts.map +1 -1
- package/dist/DropdownMenu/DropdownMenu.js +9 -4
- package/dist/DropdownMenu/DropdownMenuCheckboxItem.d.ts.map +1 -1
- package/dist/DropdownMenu/DropdownMenuCheckboxItem.js +3 -2
- package/dist/DropdownMenu/DropdownMenuItem.d.ts.map +1 -1
- package/dist/DropdownMenu/DropdownMenuItem.js +3 -2
- package/dist/DropdownMenu/DropdownMenuRadioItem.d.ts.map +1 -1
- package/dist/DropdownMenu/DropdownMenuRadioItem.js +3 -2
- package/dist/DropdownMenu/DropdownMenuSubMenu.d.ts.map +1 -1
- package/dist/DropdownMenu/DropdownMenuSubMenu.js +3 -2
- package/dist/Field/inputDisabledFocus.d.ts +4 -4
- package/dist/Field/inputStyles.stylex.d.ts +1 -1
- package/dist/FileInput/FileInput.d.ts.map +1 -1
- package/dist/FileInput/FileInput.js +16 -2
- package/dist/Icon/Icon.d.ts +1 -1
- package/dist/InfoTip/InfoTip.d.ts +1 -0
- package/dist/InfoTip/InfoTip.d.ts.map +1 -1
- package/dist/InfoTip/InfoTip.js +1 -0
- package/dist/InputGroup/InputGroup.d.ts +4 -3
- package/dist/InputGroup/InputGroup.d.ts.map +1 -1
- package/dist/InputGroup/InputGroup.js +2 -2
- package/dist/InputGroup/groupStyles.d.ts +1 -1
- package/dist/InputGroup/groupStyles.d.ts.map +1 -1
- package/dist/InputGroup/groupStyles.js +1 -1
- package/dist/Item/Item.d.ts +2 -1
- package/dist/Item/Item.d.ts.map +1 -1
- package/dist/Item/Item.js +29 -6
- package/dist/Layer/holdEntranceInput.d.ts +24 -0
- package/dist/Layer/holdEntranceInput.d.ts.map +1 -0
- package/dist/Layer/holdEntranceInput.js +65 -0
- package/dist/Layer/inputHold.d.ts +49 -0
- package/dist/Layer/inputHold.d.ts.map +1 -0
- package/dist/Layer/inputHold.js +636 -0
- package/dist/Layer/preserveAnimations.d.ts +1 -5
- package/dist/Layer/preserveAnimations.d.ts.map +1 -1
- package/dist/Layer/preserveAnimations.js +12 -214
- package/dist/Layout/LayoutContent.d.ts +3 -1
- package/dist/Layout/LayoutContent.d.ts.map +1 -1
- package/dist/Layout/LayoutContent.js +12 -4
- package/dist/Layout/LayoutPanel.d.ts +4 -1
- package/dist/Layout/LayoutPanel.d.ts.map +1 -1
- package/dist/Layout/LayoutPanel.js +13 -4
- package/dist/Lightbox/Lightbox.d.ts.map +1 -1
- package/dist/Lightbox/Lightbox.js +4 -0
- package/dist/MetadataList/MetadataList.js +1 -1
- package/dist/MobileNav/MobileNav.d.ts +11 -1
- package/dist/MobileNav/MobileNav.d.ts.map +1 -1
- package/dist/MobileNav/MobileNav.js +39 -1
- package/dist/MoreMenu/MoreMenu.d.ts +5 -3
- package/dist/MoreMenu/MoreMenu.d.ts.map +1 -1
- package/dist/RadioList/RadioListItem.d.ts.map +1 -1
- package/dist/RadioList/RadioListItem.js +22 -4
- package/dist/SelectableCard/SelectableCard.d.ts +1 -1
- package/dist/SelectableCard/SelectableCard.d.ts.map +1 -1
- package/dist/SelectableCard/SelectableCard.js +5 -1
- package/dist/Spinner/Spinner.d.ts.map +1 -1
- package/dist/Spinner/Spinner.js +12 -2
- package/dist/Stack/StackItem.d.ts +8 -4
- package/dist/Stack/StackItem.d.ts.map +1 -1
- package/dist/Stack/StackItem.js +17 -4
- package/dist/Table/plugins/sortable/useTableSortable.js +1 -1
- package/dist/Token/Token.d.ts.map +1 -1
- package/dist/Token/Token.js +9 -0
- package/dist/Token/TokenLink.d.ts +1 -1
- package/dist/Token/TokenLink.d.ts.map +1 -1
- package/dist/Token/TokenLink.js +4 -1
- package/dist/Tooltip/useTooltip.d.ts.map +1 -1
- package/dist/Tooltip/useTooltip.js +162 -59
- package/dist/TreeList/TreeListItem.d.ts +2 -1
- package/dist/TreeList/TreeListItem.d.ts.map +1 -1
- package/dist/TreeList/TreeListItem.js +27 -3
- package/dist/astryx.css +35 -8
- package/dist/gestures/GestureHost.d.ts +2 -2
- package/dist/gestures/GestureHost.d.ts.map +1 -1
- package/dist/gestures/GestureHost.js +21 -6
- package/dist/gestures/PanGestureRecognizer.d.ts +11 -1
- package/dist/gestures/PanGestureRecognizer.d.ts.map +1 -1
- package/dist/gestures/PanGestureRecognizer.js +15 -1
- package/dist/gestures/ScreenEdgePanGestureRecognizer.d.ts +6 -1
- package/dist/gestures/ScreenEdgePanGestureRecognizer.d.ts.map +1 -1
- package/dist/gestures/nativeScroll.d.ts +3 -6
- package/dist/gestures/nativeScroll.d.ts.map +1 -1
- package/dist/gestures/nativeScroll.js +7 -52
- package/dist/gestures/wheelSegmenter.d.ts +68 -1
- package/dist/gestures/wheelSegmenter.d.ts.map +1 -1
- package/dist/gestures/wheelSegmenter.js +199 -10
- package/dist/hooks/StackItemScrollRegion.d.ts +31 -0
- package/dist/hooks/StackItemScrollRegion.d.ts.map +1 -0
- package/dist/hooks/StackItemScrollRegion.js +40 -0
- package/dist/hooks/menuPressGesture.d.ts +133 -21
- package/dist/hooks/menuPressGesture.d.ts.map +1 -1
- package/dist/hooks/menuPressGesture.js +155 -30
- package/dist/hooks/menuPressValues.d.ts +16 -0
- package/dist/hooks/menuPressValues.d.ts.map +1 -0
- package/dist/hooks/menuPressValues.js +18 -0
- package/dist/hooks/useClickableContainer.d.ts +27 -5
- package/dist/hooks/useClickableContainer.d.ts.map +1 -1
- package/dist/hooks/useClickableContainer.js +41 -5
- package/dist/hooks/useFocusTrap.d.ts +10 -0
- package/dist/hooks/useFocusTrap.d.ts.map +1 -1
- package/dist/hooks/useFocusTrap.js +225 -132
- package/dist/hooks/useMenuPress.d.ts +34 -1
- package/dist/hooks/useMenuPress.d.ts.map +1 -1
- package/dist/hooks/useMenuPress.js +93 -5
- package/dist/hooks/usePressFeedback.d.ts +6 -6
- package/dist/hooks/usePressFeedback.js +6 -6
- package/dist/hooks/useScrollRegionProps.d.ts +35 -0
- package/dist/hooks/useScrollRegionProps.d.ts.map +1 -0
- package/dist/hooks/useScrollRegionProps.js +51 -0
- package/dist/i18n/generated-english/hooks/useScrollRegionProps.generated.d.ts +8 -0
- package/dist/i18n/generated-english/hooks/useScrollRegionProps.generated.d.ts.map +1 -0
- package/dist/i18n/generated-english/hooks/useScrollRegionProps.generated.js +12 -0
- package/dist/i18n/generated-locales/en.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/en.generated.js +1 -0
- package/dist/i18n/generated-locales/pseudo.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/pseudo.generated.js +1 -0
- package/dist/motion/carryAnimations.d.ts +58 -0
- package/dist/motion/carryAnimations.d.ts.map +1 -0
- package/dist/motion/carryAnimations.js +305 -0
- package/dist/motion/transientCopy.d.ts +4 -2
- package/dist/motion/transientCopy.d.ts.map +1 -1
- package/dist/motion/transientCopy.js +34 -5
- package/dist/motion/uikit/gestures.d.ts +41 -0
- package/dist/motion/uikit/gestures.d.ts.map +1 -1
- package/dist/motion/uikit/gestures.js +25 -0
- package/dist/motion/uikit/index.d.ts +1 -1
- package/dist/motion/uikit/index.d.ts.map +1 -1
- package/dist/motion/uikit/index.js +1 -1
- package/dist/privateAttributes/menuPressLit.stylex.d.ts +52 -0
- package/dist/privateAttributes/menuPressLit.stylex.d.ts.map +1 -0
- package/dist/privateAttributes/menuPressLit.stylex.js +99 -0
- package/dist/privateAttributes/press.stylex.d.ts +139 -0
- package/dist/privateAttributes/press.stylex.d.ts.map +1 -0
- package/dist/privateAttributes/press.stylex.js +98 -0
- package/dist/theme/tokens.stylex.d.ts +2 -2
- package/dist/theme/tokens.stylex.js +1 -1
- package/dist/utils/flatTree.d.ts +6 -3
- package/dist/utils/flatTree.d.ts.map +1 -1
- package/dist/utils/flatTree.js +13 -3
- package/dist/utils/hitArea.d.ts.map +1 -1
- package/dist/utils/hitArea.js +82 -5
- package/dist/utils/inputStream.d.ts +14 -1
- package/dist/utils/inputStream.d.ts.map +1 -1
- package/dist/utils/inputStream.js +40 -9
- package/dist/utils/interactionOverlay.stylex.d.ts +2 -1
- package/dist/utils/interactionOverlay.stylex.d.ts.map +1 -1
- package/dist/utils/interactionOverlay.stylex.js +7 -2
- package/dist/utils/pressFeedback.d.ts +7 -0
- package/dist/utils/pressFeedback.d.ts.map +1 -1
- package/dist/utils/pressFeedback.js +32 -7
- package/dist/utils/pressGesture.d.ts +6 -0
- package/dist/utils/pressGesture.d.ts.map +1 -1
- package/dist/utils/pressGesture.js +17 -0
- package/dist/utils/rowPressLayer.stylex.d.ts +14 -0
- package/dist/utils/rowPressLayer.stylex.d.ts.map +1 -0
- package/dist/utils/rowPressLayer.stylex.js +25 -0
- package/dist/utils/scrollView.d.ts +25 -0
- package/dist/utils/scrollView.d.ts.map +1 -0
- package/dist/utils/scrollView.js +108 -0
- package/dist/utils/selectionLock.d.ts.map +1 -1
- package/dist/utils/selectionLock.js +1 -10
- package/dist/utils/touchHitArea.stylex.d.ts +35 -0
- package/dist/utils/touchHitArea.stylex.d.ts.map +1 -0
- package/dist/utils/touchHitArea.stylex.js +32 -0
- package/dist/utils/triggerFocus.d.ts +5 -0
- package/dist/utils/triggerFocus.d.ts.map +1 -1
- package/dist/utils/triggerFocus.js +9 -2
- package/locales/en.json +4 -0
- package/locales/pseudo.json +3 -0
- package/package.json +5 -5
- package/src/AppShell/observeMainOverflow.ts +9 -6
- package/src/BottomSheet/BottomSheet.tsx +5 -0
- package/src/CheckboxInput/CheckboxInput.doc.mjs +3 -2
- package/src/CheckboxInput/CheckboxInput.tsx +71 -9
- package/src/ClickableCard/ClickableCard.tsx +8 -1
- package/src/DateInput/PickerWheel.tsx +7 -2
- package/src/DateRangeInput/DateRangeInput.tsx +1 -1
- package/src/Dialog/Dialog.doc.mjs +1 -1
- package/src/Dialog/Dialog.tsx +12 -1
- package/src/Drawer/Drawer.doc.mjs +1 -1
- package/src/Drawer/useDrawerDialogPresence.ts +9 -2
- package/src/DropdownMenu/DropdownMenu.doc.mjs +1 -2
- package/src/DropdownMenu/DropdownMenu.tsx +29 -5
- package/src/DropdownMenu/DropdownMenuCheckboxItem.tsx +5 -1
- package/src/DropdownMenu/DropdownMenuItem.tsx +8 -4
- package/src/DropdownMenu/DropdownMenuRadioItem.tsx +5 -1
- package/src/DropdownMenu/DropdownMenuSubMenu.tsx +5 -1
- package/src/FileInput/FileInput.tsx +16 -2
- package/src/InfoTip/InfoTip.doc.mjs +26 -2
- package/src/InfoTip/InfoTip.tsx +1 -0
- package/src/InputGroup/InputGroup.doc.mjs +4 -3
- package/src/InputGroup/InputGroup.tsx +4 -3
- package/src/InputGroup/groupStyles.ts +3 -1
- package/src/Item/Item.tsx +51 -9
- package/src/Layer/holdEntranceInput.ts +84 -0
- package/src/Layer/inputHold.ts +734 -0
- package/src/Layer/preserveAnimations.ts +12 -275
- package/src/Layout/LayoutContent.doc.mjs +6 -3
- package/src/Layout/LayoutContent.tsx +10 -4
- package/src/Layout/LayoutPanel.doc.mjs +6 -3
- package/src/Layout/LayoutPanel.tsx +11 -4
- package/src/Lightbox/Lightbox.tsx +4 -0
- package/src/MetadataList/MetadataList.tsx +1 -1
- package/src/MobileNav/MobileNav.doc.mjs +3 -3
- package/src/MobileNav/MobileNav.tsx +39 -1
- package/src/MoreMenu/MoreMenu.doc.mjs +2 -4
- package/src/MoreMenu/MoreMenu.tsx +5 -3
- package/src/RadioList/RadioListItem.doc.mjs +3 -2
- package/src/RadioList/RadioListItem.tsx +25 -7
- package/src/SelectableCard/SelectableCard.tsx +8 -1
- package/src/Spinner/Spinner.tsx +13 -3
- package/src/Stack/Stack.doc.mjs +1 -1
- package/src/Stack/StackItem.tsx +27 -13
- package/src/Table/plugins/sortable/useTableSortable.tsx +1 -1
- package/src/Token/Token.tsx +18 -1
- package/src/Token/TokenLink.tsx +7 -1
- package/src/Tooltip/useTooltip.tsx +175 -79
- package/src/TreeList/TreeListItem.tsx +36 -2
- package/src/gestures/GestureHost.ts +21 -5
- package/src/gestures/PanGestureRecognizer.ts +19 -2
- package/src/gestures/README.md +14 -5
- package/src/gestures/ScreenEdgePanGestureRecognizer.ts +6 -1
- package/src/gestures/nativeScroll.ts +12 -68
- package/src/gestures/wheelSegmenter.ts +243 -10
- package/src/hooks/StackItemScrollRegion.tsx +57 -0
- package/src/hooks/menuPressGesture.ts +244 -38
- package/src/hooks/menuPressValues.ts +18 -0
- package/src/hooks/useClickableContainer.doc.mjs +8 -2
- package/src/hooks/useClickableContainer.ts +72 -6
- package/src/hooks/useFocusTrap.ts +268 -151
- package/src/hooks/useMenuPress.ts +118 -11
- package/src/hooks/usePressFeedback.doc.mjs +3 -3
- package/src/hooks/usePressFeedback.ts +6 -6
- package/src/hooks/useScrollRegionProps.ts +76 -0
- package/src/i18n/generated-english/hooks/useScrollRegionProps.generated.ts +13 -0
- package/src/i18n/generated-locales/en.generated.ts +1 -0
- package/src/i18n/generated-locales/pseudo.generated.ts +1 -0
- package/src/motion/MEASUREMENTS.md +11 -0
- package/src/motion/carryAnimations.ts +389 -0
- package/src/motion/transientCopy.ts +45 -5
- package/src/motion/uikit/gestures.ts +22 -0
- package/src/motion/uikit/index.ts +1 -0
- package/src/privateAttributes/menuPressLit.stylex.ts +104 -0
- package/src/privateAttributes/press.stylex.ts +244 -0
- package/src/theme/tokens.stylex.ts +1 -1
- package/src/utils/flatTree.ts +15 -3
- package/src/utils/hitArea.ts +107 -5
- package/src/utils/inputStream.ts +47 -10
- package/src/utils/interactionOverlay.stylex.ts +7 -2
- package/src/utils/pressFeedback.ts +31 -6
- package/src/utils/pressGesture.ts +24 -1
- package/src/utils/rowPressLayer.stylex.ts +27 -0
- package/src/utils/scrollView.ts +135 -0
- package/src/utils/selectionLock.ts +5 -10
- package/src/utils/touchHitArea.stylex.ts +41 -0
- package/src/utils/triggerFocus.ts +17 -4
|
@@ -5,11 +5,13 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* @file useClickableContainer.ts
|
|
7
7
|
* @input Container ref, interactive element ref, click/href handlers
|
|
8
|
-
* @output onClick and
|
|
8
|
+
* @output onClick, onMouseUp and onPointerDown handlers for the container;
|
|
9
|
+
* INTERACTIVE_SELECTORS list;
|
|
9
10
|
* hasInteractiveAncestor and the shared innermostInteractive walk
|
|
10
11
|
* @position Core hook for clickable containers with nested interactive
|
|
11
12
|
* elements. A click on a nested button or link does not run the card's
|
|
12
|
-
* action
|
|
13
|
+
* action, and a finger press there shows no press on the card. Each navigation
|
|
14
|
+
* passes the rule in utils/safeUrl.ts first.
|
|
13
15
|
*
|
|
14
16
|
* SYNC: When modified, update:
|
|
15
17
|
* - /packages/core/src/hooks/index.ts (export)
|
|
@@ -17,6 +19,7 @@
|
|
|
17
19
|
import { useCallback, useEffect } from 'react';
|
|
18
20
|
import { isLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
19
21
|
import { isSafeUrl } from "../utils/safeUrl.js";
|
|
22
|
+
import { cancelPress } from "../utils/pressFeedback.js";
|
|
20
23
|
|
|
21
24
|
/**
|
|
22
25
|
* The attribute this hook sets on the container it makes clickable. A click
|
|
@@ -90,6 +93,24 @@ function belongsToSomethingElse(element) {
|
|
|
90
93
|
return matchesInteractiveSelectors(element) || isLayerSurface(element);
|
|
91
94
|
}
|
|
92
95
|
|
|
96
|
+
/**
|
|
97
|
+
* The touch half of a container's press rule: a finger press that starts on a nested interactive element
|
|
98
|
+
* other than the container's own action does not activate the container, so
|
|
99
|
+
* it ends the press controller's paint on `container`. A mouse or pen press,
|
|
100
|
+
* and a press on the container's surface or on `ownAction`, are left alone.
|
|
101
|
+
* Not part of the package's public API.
|
|
102
|
+
*/
|
|
103
|
+
export function cancelNestedTouchPress(event, container, ownAction) {
|
|
104
|
+
const target = event.target;
|
|
105
|
+
if (event.pointerType !== 'touch' || container == null || !(target instanceof Element) || target === event.currentTarget || !hasInteractiveAncestor(target, container) ||
|
|
106
|
+
// The container's own action, such as the control it delegates to: a
|
|
107
|
+
// press on it activates the container.
|
|
108
|
+
ownAction?.contains(target) === true) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
cancelPress(container);
|
|
112
|
+
}
|
|
113
|
+
|
|
93
114
|
/**
|
|
94
115
|
* Check if there's a text selection inside the node (don't navigate on text select)
|
|
95
116
|
*
|
|
@@ -123,12 +144,16 @@ export function hasTextSelection(node) {
|
|
|
123
144
|
* @example
|
|
124
145
|
* ```
|
|
125
146
|
* const containerRef = useRef<HTMLDivElement>(null);
|
|
126
|
-
* const { onClick, onMouseUp } = useClickableContainer({
|
|
147
|
+
* const { onClick, onMouseUp, onPointerDown } = useClickableContainer({
|
|
127
148
|
* containerRef,
|
|
128
149
|
* onClick: () => console.log('card clicked'),
|
|
129
150
|
* });
|
|
130
151
|
* return (
|
|
131
|
-
* <div
|
|
152
|
+
* <div
|
|
153
|
+
* ref={containerRef}
|
|
154
|
+
* onClick={onClick}
|
|
155
|
+
* onMouseUp={onMouseUp}
|
|
156
|
+
* onPointerDown={onPointerDown}>
|
|
132
157
|
* <p>Click anywhere on this card</p>
|
|
133
158
|
* <button onClick={() => alert('button')}>Nested button</button>
|
|
134
159
|
* </div>
|
|
@@ -226,8 +251,19 @@ export function useClickableContainer({
|
|
|
226
251
|
window.open(href, '_blank', 'noopener');
|
|
227
252
|
}
|
|
228
253
|
}, [containerRef, href, disabled]);
|
|
254
|
+
|
|
255
|
+
// The press-state counterpart of onClick's rule, for touch: a finger press
|
|
256
|
+
// that would not activate the container shows no press on it. A mouse or
|
|
257
|
+
// pen press keeps its `:active` paint.
|
|
258
|
+
const onPointerDown = useCallback(event => {
|
|
259
|
+
if (disabled) {
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
cancelNestedTouchPress(event, containerRef.current, interactiveRef?.current ?? null);
|
|
263
|
+
}, [containerRef, interactiveRef, disabled]);
|
|
229
264
|
return {
|
|
230
265
|
onClick,
|
|
231
|
-
onMouseUp
|
|
266
|
+
onMouseUp,
|
|
267
|
+
onPointerDown
|
|
232
268
|
};
|
|
233
269
|
}
|
|
@@ -24,6 +24,16 @@ export declare function useFocusTrapEscapeCompatibilitySignal(isActive: boolean)
|
|
|
24
24
|
* the trap does. Not re-exported from the package's `hooks` entry.
|
|
25
25
|
*/
|
|
26
26
|
export declare function getFocusableElements(container: HTMLElement): HTMLElement[];
|
|
27
|
+
/**
|
|
28
|
+
* Tab containment for a focus region: Tab and Shift+Tab pressed inside wrap at
|
|
29
|
+
* either end, and a Tab that starts outside is left to the page. When regions
|
|
30
|
+
* nest, the innermost one holding focus answers.
|
|
31
|
+
*
|
|
32
|
+
* `useFocusTrap` composes this. Dialog, BottomSheet and Lightbox call it
|
|
33
|
+
* directly, because their native lifecycle already owns focus entry and
|
|
34
|
+
* return. Internal: not re-exported from `hooks`.
|
|
35
|
+
*/
|
|
36
|
+
export declare function useFocusRegionContainment(containerRef: React.RefObject<HTMLElement | null>, isActive: boolean): void;
|
|
27
37
|
/**
|
|
28
38
|
* Configuration for focus trap behavior
|
|
29
39
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/hooks/useFocusTrap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useFocusTrap.d.ts","sourceRoot":"","sources":["../../src/hooks/useFocusTrap.ts"],"names":[],"mappings":"AAgCA;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAY7E;AAwDD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,WAAW,GAAG,WAAW,EAAE,CAI1E;AA8GD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EACjD,QAAQ,EAAE,OAAO,GAChB,IAAI,CAgLN;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACrE;;OAEG;IACH,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAExC;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,EAC9D,OAAO,EAAE,mBAAmB,GAC3B,kBAAkB,CAAC,CAAC,CAAC,CAEvB;AAED;;GAEG;AACH,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;CAC7C;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,EACtE,OAAO,EAAE,wBAAwB,GAChC,kBAAkB,CAAC,CAAC,CAAC,CAwHvB"}
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* @file useFocusTrap.ts
|
|
7
7
|
* @input Uses React useCallback, useEffect, useRef
|
|
8
|
-
* @output Exports useFocusTrap, the
|
|
8
|
+
* @output Exports useFocusTrap, the internal focus-region Tab containment it
|
|
9
|
+
* composes, the deprecated Escape-state shim, and an
|
|
9
10
|
* internal compatibility-signal hook
|
|
10
11
|
* @position Core hook; used by dialogs, modals, date pickers
|
|
11
12
|
*
|
|
@@ -61,6 +62,19 @@ export function useFocusTrapEscapeCompatibilitySignal(isActive) {
|
|
|
61
62
|
}, [isActive]);
|
|
62
63
|
}
|
|
63
64
|
|
|
65
|
+
/**
|
|
66
|
+
* Whether an element is shown as a popover. jsdom and browsers without the
|
|
67
|
+
* Popover API do not recognize `:popover-open`, and nothing is popover-open
|
|
68
|
+
* there.
|
|
69
|
+
*/
|
|
70
|
+
function isPopoverOpen(el) {
|
|
71
|
+
try {
|
|
72
|
+
return el.matches(':popover-open');
|
|
73
|
+
} catch {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
64
78
|
/**
|
|
65
79
|
* Whether an element is currently perceivable/focusable — excludes ones hidden
|
|
66
80
|
* via `display:none`/`visibility:hidden` or inside an `inert`/`hidden` subtree,
|
|
@@ -75,6 +89,14 @@ function isVisiblyFocusable(el) {
|
|
|
75
89
|
if (el.hidden || el.closest('[hidden]')) {
|
|
76
90
|
return false;
|
|
77
91
|
}
|
|
92
|
+
// A closed <dialog> renders nothing, so nothing inside it can take focus.
|
|
93
|
+
// A dialog shown with showPopover() (a non-modal sheet or drawer) never
|
|
94
|
+
// sets `open`, so it counts as shown while it is popover-open.
|
|
95
|
+
for (let dialog = el.closest('dialog'); dialog != null; dialog = dialog.parentElement?.closest('dialog') ?? null) {
|
|
96
|
+
if (!dialog.open && !isPopoverOpen(dialog)) {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
78
100
|
// closest() matches the element itself as well as any ancestor.
|
|
79
101
|
if (el.closest('[aria-hidden="true"]')) {
|
|
80
102
|
return false;
|
|
@@ -121,6 +143,13 @@ function isHTMLElement(node) {
|
|
|
121
143
|
return view != null && node instanceof view.HTMLElement;
|
|
122
144
|
}
|
|
123
145
|
|
|
146
|
+
/**
|
|
147
|
+
* Whether node `a` comes before node `b` in document order.
|
|
148
|
+
*/
|
|
149
|
+
function precedes(a, b) {
|
|
150
|
+
return (a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0;
|
|
151
|
+
}
|
|
152
|
+
|
|
124
153
|
/**
|
|
125
154
|
* Attempt to focus an element. Returns true if focus was successful.
|
|
126
155
|
*/
|
|
@@ -133,6 +162,18 @@ function attemptFocus(element) {
|
|
|
133
162
|
return element.ownerDocument.activeElement === element;
|
|
134
163
|
}
|
|
135
164
|
|
|
165
|
+
/**
|
|
166
|
+
* Wrap focus to `target` for a Tab press, and cancel the press only when the
|
|
167
|
+
* target took focus. A target the browser refuses (inert behind a modal
|
|
168
|
+
* layered over this region) leaves the press to the browser instead of
|
|
169
|
+
* stranding focus where it was.
|
|
170
|
+
*/
|
|
171
|
+
function wrapFocus(event, target) {
|
|
172
|
+
if (attemptFocus(target)) {
|
|
173
|
+
event.preventDefault();
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
|
|
136
177
|
/**
|
|
137
178
|
* Focus the first focusable descendant of a container.
|
|
138
179
|
* Returns true if a focusable element was found and focused.
|
|
@@ -161,6 +202,186 @@ function focusLastDescendant(container) {
|
|
|
161
202
|
return false;
|
|
162
203
|
}
|
|
163
204
|
|
|
205
|
+
// Containers of the focus regions currently active, in every document. A Tab
|
|
206
|
+
// is answered by the innermost region that holds focus, so regions that nest
|
|
207
|
+
// in the DOM never fight over one key press.
|
|
208
|
+
const activeRegionContainers = new Set();
|
|
209
|
+
function hasInnerRegionHolding(container, active) {
|
|
210
|
+
// An open <dialog> nested in the region that holds focus is its own focus
|
|
211
|
+
// context (a modal step over a covered sheet): it answers Tab, not us.
|
|
212
|
+
const dialog = active.closest('dialog[open]');
|
|
213
|
+
if (dialog != null && dialog !== container && container.contains(dialog)) {
|
|
214
|
+
return true;
|
|
215
|
+
}
|
|
216
|
+
for (const other of activeRegionContainers) {
|
|
217
|
+
if (other !== container && container.contains(other) && other.contains(active)) {
|
|
218
|
+
return true;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return false;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* Tab containment for a focus region: Tab and Shift+Tab pressed inside wrap at
|
|
226
|
+
* either end, and a Tab that starts outside is left to the page. When regions
|
|
227
|
+
* nest, the innermost one holding focus answers.
|
|
228
|
+
*
|
|
229
|
+
* `useFocusTrap` composes this. Dialog, BottomSheet and Lightbox call it
|
|
230
|
+
* directly, because their native lifecycle already owns focus entry and
|
|
231
|
+
* return. Internal: not re-exported from `hooks`.
|
|
232
|
+
*/
|
|
233
|
+
export function useFocusRegionContainment(containerRef, isActive) {
|
|
234
|
+
const lastFocusRef = useRef(null);
|
|
235
|
+
// Track if focus change was triggered by keyboard (Tab key)
|
|
236
|
+
const isKeyboardNavigationRef = useRef(false);
|
|
237
|
+
useEffect(() => {
|
|
238
|
+
const container = containerRef.current;
|
|
239
|
+
if (!isActive || container == null) {
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
activeRegionContainers.add(container);
|
|
243
|
+
return () => {
|
|
244
|
+
activeRegionContainers.delete(container);
|
|
245
|
+
};
|
|
246
|
+
}, [containerRef, isActive]);
|
|
247
|
+
|
|
248
|
+
/**
|
|
249
|
+
* Handle focus events - redirect focus back into container if it escapes.
|
|
250
|
+
* Only redirects for keyboard navigation, not mouse clicks.
|
|
251
|
+
*/
|
|
252
|
+
useEffect(() => {
|
|
253
|
+
if (!isActive) {
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
256
|
+
const doc = trapDocument(containerRef.current);
|
|
257
|
+
const handleFocus = event => {
|
|
258
|
+
const container = containerRef.current;
|
|
259
|
+
if (!container) {
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
const target = event.target;
|
|
263
|
+
if (container.contains(target)) {
|
|
264
|
+
// Focus is inside the container - track it
|
|
265
|
+
lastFocusRef.current = target;
|
|
266
|
+
} else if (isKeyboardNavigationRef.current) {
|
|
267
|
+
// Focus escaped via keyboard - redirect it back
|
|
268
|
+
const focusedFirst = focusFirstDescendant(container);
|
|
269
|
+
|
|
270
|
+
// If we're back at the same element (Shift+Tab from first element),
|
|
271
|
+
// try focusing the last element instead
|
|
272
|
+
if (focusedFirst && lastFocusRef.current === doc.activeElement) {
|
|
273
|
+
focusLastDescendant(container);
|
|
274
|
+
} else if (!focusedFirst && isHTMLElement(lastFocusRef.current) && container.contains(lastFocusRef.current)) {
|
|
275
|
+
// A modal surface may intentionally have no tabbable controls and
|
|
276
|
+
// place initial focus on a tabIndex={-1} heading or panel. Preserve
|
|
277
|
+
// that programmatic focus target instead of letting Tab escape.
|
|
278
|
+
attemptFocus(lastFocusRef.current);
|
|
279
|
+
}
|
|
280
|
+
lastFocusRef.current = doc.activeElement;
|
|
281
|
+
}
|
|
282
|
+
// If focus escaped via mouse click, don't redirect - let light dismiss handle it
|
|
283
|
+
|
|
284
|
+
// Reset keyboard navigation flag
|
|
285
|
+
isKeyboardNavigationRef.current = false;
|
|
286
|
+
};
|
|
287
|
+
|
|
288
|
+
// Use capture phase to intercept focus before it settles
|
|
289
|
+
doc.addEventListener('focus', handleFocus, true);
|
|
290
|
+
return () => {
|
|
291
|
+
doc.removeEventListener('focus', handleFocus, true);
|
|
292
|
+
};
|
|
293
|
+
}, [containerRef, isActive]);
|
|
294
|
+
|
|
295
|
+
/**
|
|
296
|
+
* Handle Tab key to wrap focus at boundaries. Also tracks that keyboard
|
|
297
|
+
* navigation is occurring.
|
|
298
|
+
*
|
|
299
|
+
* No Escape here, and no IME guard: the shared layer dismissal stack owns
|
|
300
|
+
* that press, and each surface that applies a region decides its own
|
|
301
|
+
* dismissal (`useFocusTrap` through its `onEscape`).
|
|
302
|
+
*/
|
|
303
|
+
useEffect(() => {
|
|
304
|
+
if (!isActive) {
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
const doc = trapDocument(containerRef.current);
|
|
308
|
+
const handleKeyDown = event => {
|
|
309
|
+
const container = containerRef.current;
|
|
310
|
+
if (!container) {
|
|
311
|
+
return;
|
|
312
|
+
}
|
|
313
|
+
if (event.key === 'Tab') {
|
|
314
|
+
if (event.defaultPrevented) {
|
|
315
|
+
// A control that handles Tab itself (an editor that indents) keeps
|
|
316
|
+
// focus where it is.
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
const active = doc.activeElement;
|
|
320
|
+
// Any focused node counts, not only HTML elements: an SVG control
|
|
321
|
+
// inside the container is still inside.
|
|
322
|
+
if (active == null || !container.contains(active)) {
|
|
323
|
+
// The trap contains focus that is inside it; it does not pull in a
|
|
324
|
+
// Tab pressed elsewhere on the page. A layer can be open while focus
|
|
325
|
+
// legitimately sits outside it — a listbox popup anchored to its own
|
|
326
|
+
// input, a non-modal popover beside the content it annotates — and
|
|
327
|
+
// capturing that Tab would take the rest of the page away from
|
|
328
|
+
// keyboard users.
|
|
329
|
+
return;
|
|
330
|
+
}
|
|
331
|
+
if (hasInnerRegionHolding(container, active)) {
|
|
332
|
+
// A region nested in this one (a Dialog opened from a Dialog, a
|
|
333
|
+
// Popover inside a Drawer) holds focus; that region answers Tab.
|
|
334
|
+
return;
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
// Mark that keyboard navigation is leaving from inside the trap, so a
|
|
338
|
+
// focus that lands outside is redirected back in.
|
|
339
|
+
isKeyboardNavigationRef.current = true;
|
|
340
|
+
const focusable = getFocusableElements(container);
|
|
341
|
+
if (focusable.length === 0) {
|
|
342
|
+
// There is nowhere to advance to. Keep focus on the current
|
|
343
|
+
// programmatic target (for example a dialog panel with tabIndex=-1)
|
|
344
|
+
// rather than allowing the browser to move into background content.
|
|
345
|
+
event.preventDefault();
|
|
346
|
+
lastFocusRef.current = active;
|
|
347
|
+
isKeyboardNavigationRef.current = false;
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
350
|
+
const first = focusable[0];
|
|
351
|
+
const last = focusable[focusable.length - 1];
|
|
352
|
+
if (doc.activeElement === container) {
|
|
353
|
+
// Programmatic initial focus can sit on the trap container itself
|
|
354
|
+
// (for example a dialog panel with no content controls). Move into
|
|
355
|
+
// the tabbable cycle instead of letting Tab escape to the page.
|
|
356
|
+
wrapFocus(event, event.shiftKey ? last : first);
|
|
357
|
+
return;
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
// Programmatic focus can also sit on an element that is not a Tab stop
|
|
361
|
+
// (a dialog title with tabIndex -1). Its place in document order
|
|
362
|
+
// decides the edge: nothing tabbable before it means Shift+Tab is
|
|
363
|
+
// leaving the region, nothing after it means Tab is.
|
|
364
|
+
const isProgrammaticStop = !focusable.includes(active);
|
|
365
|
+
if (event.shiftKey) {
|
|
366
|
+
// Shift+Tab: if on (or before) the first element, wrap to last
|
|
367
|
+
if (active === first || isProgrammaticStop && precedes(active, first)) {
|
|
368
|
+
wrapFocus(event, last);
|
|
369
|
+
}
|
|
370
|
+
} else {
|
|
371
|
+
// Tab: if on (or after) the last element, wrap to first
|
|
372
|
+
if (active === last || isProgrammaticStop && precedes(last, active)) {
|
|
373
|
+
wrapFocus(event, first);
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
};
|
|
378
|
+
doc.addEventListener('keydown', handleKeyDown);
|
|
379
|
+
return () => {
|
|
380
|
+
doc.removeEventListener('keydown', handleKeyDown);
|
|
381
|
+
};
|
|
382
|
+
}, [containerRef, isActive]);
|
|
383
|
+
}
|
|
384
|
+
|
|
164
385
|
/**
|
|
165
386
|
* Configuration for focus trap behavior
|
|
166
387
|
*/
|
|
@@ -218,9 +439,9 @@ export function useFocusTrapInternal(options) {
|
|
|
218
439
|
const getRestoreTargetRef = useRef(getRestoreTarget);
|
|
219
440
|
getRestoreTargetRef.current = getRestoreTarget;
|
|
220
441
|
const containerRef = useRef(null);
|
|
221
|
-
|
|
222
|
-
//
|
|
223
|
-
|
|
442
|
+
|
|
443
|
+
// Tab and Shift+Tab wrap inside the container while the trap is active.
|
|
444
|
+
useFocusRegionContainment(containerRef, isActive);
|
|
224
445
|
|
|
225
446
|
// Join the shared layer dismissal stack. The trap no longer listens for
|
|
226
447
|
// Escape itself: the stack owns one listener and routes each press to the
|
|
@@ -313,134 +534,6 @@ export function useFocusTrapInternal(options) {
|
|
|
313
534
|
}
|
|
314
535
|
};
|
|
315
536
|
}, [isActive]);
|
|
316
|
-
|
|
317
|
-
/**
|
|
318
|
-
* Handle focus events - redirect focus back into container if it escapes.
|
|
319
|
-
* Only redirects for keyboard navigation, not mouse clicks.
|
|
320
|
-
*/
|
|
321
|
-
useEffect(() => {
|
|
322
|
-
if (!isActive) {
|
|
323
|
-
return;
|
|
324
|
-
}
|
|
325
|
-
const doc = trapDocument(containerRef.current);
|
|
326
|
-
const handleFocus = event => {
|
|
327
|
-
const container = containerRef.current;
|
|
328
|
-
if (!container) {
|
|
329
|
-
return;
|
|
330
|
-
}
|
|
331
|
-
const target = event.target;
|
|
332
|
-
if (container.contains(target)) {
|
|
333
|
-
// Focus is inside the container - track it
|
|
334
|
-
lastFocusRef.current = target;
|
|
335
|
-
} else if (isKeyboardNavigationRef.current) {
|
|
336
|
-
// Focus escaped via keyboard - redirect it back
|
|
337
|
-
const focusedFirst = focusFirstDescendant(container);
|
|
338
|
-
|
|
339
|
-
// If we're back at the same element (Shift+Tab from first element),
|
|
340
|
-
// try focusing the last element instead
|
|
341
|
-
if (focusedFirst && lastFocusRef.current === doc.activeElement) {
|
|
342
|
-
focusLastDescendant(container);
|
|
343
|
-
} else if (!focusedFirst && isHTMLElement(lastFocusRef.current) && container.contains(lastFocusRef.current)) {
|
|
344
|
-
// A modal surface may intentionally have no tabbable controls and
|
|
345
|
-
// place initial focus on a tabIndex={-1} heading or panel. Preserve
|
|
346
|
-
// that programmatic focus target instead of letting Tab escape.
|
|
347
|
-
attemptFocus(lastFocusRef.current);
|
|
348
|
-
}
|
|
349
|
-
lastFocusRef.current = doc.activeElement;
|
|
350
|
-
}
|
|
351
|
-
// If focus escaped via mouse click, don't redirect - let light dismiss handle it
|
|
352
|
-
|
|
353
|
-
// Reset keyboard navigation flag
|
|
354
|
-
isKeyboardNavigationRef.current = false;
|
|
355
|
-
};
|
|
356
|
-
|
|
357
|
-
// Use capture phase to intercept focus before it settles
|
|
358
|
-
doc.addEventListener('focus', handleFocus, true);
|
|
359
|
-
return () => {
|
|
360
|
-
doc.removeEventListener('focus', handleFocus, true);
|
|
361
|
-
};
|
|
362
|
-
}, [isActive]);
|
|
363
|
-
|
|
364
|
-
/**
|
|
365
|
-
* Handle Tab key to wrap focus at boundaries. Also tracks that keyboard
|
|
366
|
-
* navigation is occurring.
|
|
367
|
-
*
|
|
368
|
-
* No Escape here, and no IME guard: the shared stack owns the press, claims
|
|
369
|
-
* a composing Escape so no close request follows, and dismisses the trap
|
|
370
|
-
* through `onEscape` above. The trap renders no element of its own, so it
|
|
371
|
-
* has no `cancel` to answer either.
|
|
372
|
-
*/
|
|
373
|
-
useEffect(() => {
|
|
374
|
-
if (!isActive) {
|
|
375
|
-
return;
|
|
376
|
-
}
|
|
377
|
-
const doc = trapDocument(containerRef.current);
|
|
378
|
-
const handleKeyDown = event => {
|
|
379
|
-
const container = containerRef.current;
|
|
380
|
-
if (!container) {
|
|
381
|
-
return;
|
|
382
|
-
}
|
|
383
|
-
if (event.key === 'Tab') {
|
|
384
|
-
const active = doc.activeElement;
|
|
385
|
-
// Any focused node counts, not only HTML elements: an SVG control
|
|
386
|
-
// inside the container is still inside.
|
|
387
|
-
if (active == null || !container.contains(active)) {
|
|
388
|
-
// The trap contains focus that is inside it; it does not pull in a
|
|
389
|
-
// Tab pressed elsewhere on the page. A layer can be open while focus
|
|
390
|
-
// legitimately sits outside it — a listbox popup anchored to its own
|
|
391
|
-
// input, a non-modal popover beside the content it annotates — and
|
|
392
|
-
// capturing that Tab would take the rest of the page away from
|
|
393
|
-
// keyboard users.
|
|
394
|
-
return;
|
|
395
|
-
}
|
|
396
|
-
|
|
397
|
-
// Mark that keyboard navigation is leaving from inside the trap, so a
|
|
398
|
-
// focus that lands outside is redirected back in.
|
|
399
|
-
isKeyboardNavigationRef.current = true;
|
|
400
|
-
const focusable = getFocusableElements(container);
|
|
401
|
-
if (focusable.length === 0) {
|
|
402
|
-
// There is nowhere to advance to. Keep focus on the current
|
|
403
|
-
// programmatic target (for example a dialog panel with tabIndex=-1)
|
|
404
|
-
// rather than allowing the browser to move into background content.
|
|
405
|
-
event.preventDefault();
|
|
406
|
-
lastFocusRef.current = active;
|
|
407
|
-
isKeyboardNavigationRef.current = false;
|
|
408
|
-
return;
|
|
409
|
-
}
|
|
410
|
-
const first = focusable[0];
|
|
411
|
-
const last = focusable[focusable.length - 1];
|
|
412
|
-
if (doc.activeElement === container) {
|
|
413
|
-
// Programmatic initial focus can sit on the trap container itself
|
|
414
|
-
// (for example a dialog panel with no content controls). Move into
|
|
415
|
-
// the tabbable cycle instead of letting Tab escape to the page.
|
|
416
|
-
event.preventDefault();
|
|
417
|
-
if (event.shiftKey) {
|
|
418
|
-
last.focus();
|
|
419
|
-
} else {
|
|
420
|
-
first.focus();
|
|
421
|
-
}
|
|
422
|
-
return;
|
|
423
|
-
}
|
|
424
|
-
if (event.shiftKey) {
|
|
425
|
-
// Shift+Tab: if on first element, wrap to last
|
|
426
|
-
if (doc.activeElement === first) {
|
|
427
|
-
event.preventDefault();
|
|
428
|
-
last.focus();
|
|
429
|
-
}
|
|
430
|
-
} else {
|
|
431
|
-
// Tab: if on last element, wrap to first
|
|
432
|
-
if (doc.activeElement === last) {
|
|
433
|
-
event.preventDefault();
|
|
434
|
-
first.focus();
|
|
435
|
-
}
|
|
436
|
-
}
|
|
437
|
-
}
|
|
438
|
-
};
|
|
439
|
-
doc.addEventListener('keydown', handleKeyDown);
|
|
440
|
-
return () => {
|
|
441
|
-
doc.removeEventListener('keydown', handleKeyDown);
|
|
442
|
-
};
|
|
443
|
-
}, [isActive, onEscape]);
|
|
444
537
|
return {
|
|
445
538
|
containerRef,
|
|
446
539
|
focusFirst
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* @file useMenuPress.ts
|
|
3
3
|
* @input The menu root, its trigger, the enabled-row selector, and callbacks
|
|
4
4
|
* for opening, highlighting, activating and dismissing
|
|
5
|
-
* @output useMenuPress, the marker attributes,
|
|
5
|
+
* @output useMenuPress, the marker attributes, the activation mark, and the
|
|
6
|
+
* internal useDropdownMenuPress entry with its touch model
|
|
6
7
|
* @position Core hook for DropdownMenu, ContextMenu, DropdownMenuSubMenu,
|
|
7
8
|
* Selector and MenuBottomSheetActionList. The transition table lives in
|
|
8
9
|
* menuPressGesture.ts.
|
|
@@ -119,6 +120,30 @@ export interface UseMenuPressReturn {
|
|
|
119
120
|
/** End the gesture in flight with nothing acting (the menu closed). */
|
|
120
121
|
cancel: () => void;
|
|
121
122
|
}
|
|
123
|
+
/**
|
|
124
|
+
* DropdownMenu's options for the press model: everything the public hook
|
|
125
|
+
* takes, plus its touch model. DropdownMenu reaches the touch model through
|
|
126
|
+
* its `presentation`, so the public hook has no such option.
|
|
127
|
+
*
|
|
128
|
+
* @internal
|
|
129
|
+
*/
|
|
130
|
+
export interface DropdownMenuPressOptions extends UseMenuPressOptions {
|
|
131
|
+
/**
|
|
132
|
+
* How the finger that opened the menu from the trigger picks.
|
|
133
|
+
* `'pointer'`: its opening press follows the settle rule. `'uikit'`: it
|
|
134
|
+
* picks only after UIMenu's handoff distance, so the row that appeared
|
|
135
|
+
* under it never acts on a still lift. A mouse is unaffected.
|
|
136
|
+
* @default 'pointer'
|
|
137
|
+
*/
|
|
138
|
+
touchModel?: 'pointer' | 'uikit';
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* What core's own menus get from {@link useDropdownMenuPress}: the public
|
|
142
|
+
* return. Not exported from the hooks entry point.
|
|
143
|
+
*
|
|
144
|
+
* @internal
|
|
145
|
+
*/
|
|
146
|
+
export type DropdownMenuPressReturn = UseMenuPressReturn;
|
|
122
147
|
/**
|
|
123
148
|
* The press model for a menu: the row under the release acts, the highlight
|
|
124
149
|
* follows a held pointer, and a mouse opens the menu on press.
|
|
@@ -155,4 +180,12 @@ export interface UseMenuPressReturn {
|
|
|
155
180
|
* ```
|
|
156
181
|
*/
|
|
157
182
|
export declare function useMenuPress(options: UseMenuPressOptions): UseMenuPressReturn;
|
|
183
|
+
/**
|
|
184
|
+
* The press model with DropdownMenu's touch model
|
|
185
|
+
* ({@link DropdownMenuPressOptions.touchModel}). Not exported from the hooks
|
|
186
|
+
* entry point.
|
|
187
|
+
*
|
|
188
|
+
* @internal
|
|
189
|
+
*/
|
|
190
|
+
export declare function useDropdownMenuPress(options: DropdownMenuPressOptions): DropdownMenuPressReturn;
|
|
158
191
|
//# sourceMappingURL=useMenuPress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuPress.d.ts","sourceRoot":"","sources":["../../src/hooks/useMenuPress.ts"],"names":[],"mappings":"AAIA
|
|
1
|
+
{"version":3,"file":"useMenuPress.d.ts","sourceRoot":"","sources":["../../src/hooks/useMenuPress.ts"],"names":[],"mappings":"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"}
|