@cognitap/radiant 0.0.78 → 0.0.79
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/CHANGELOG.md +11 -0
- package/README.md +6 -3
- package/RELEASE_POLICY.md +8 -19
- package/dist/library/charts/Charts.js +1 -1
- package/dist/library/charts/Charts.js.map +1 -1
- package/dist/library/components/Accordion/Accordion.js +1 -1
- package/dist/library/components/Accordion/Accordion.js.map +1 -1
- package/dist/library/components/Alert/Alert.js +1 -1
- package/dist/library/components/Alert/Alert.js.map +1 -1
- package/dist/library/components/AppShell/AppShell.js +1 -1
- package/dist/library/components/AppShell/AppShell.js.map +1 -1
- package/dist/library/components/AspectRatio/AspectRatio.js +1 -1
- package/dist/library/components/AspectRatio/AspectRatio.js.map +1 -1
- package/dist/library/components/Avatar/Avatar.js +1 -1
- package/dist/library/components/Avatar/Avatar.js.map +1 -1
- package/dist/library/components/Badge/Badge.js +1 -1
- package/dist/library/components/Badge/Badge.js.map +1 -1
- package/dist/library/components/Breadcrumb/Breadcrumb.js +1 -1
- package/dist/library/components/Breadcrumb/Breadcrumb.js.map +1 -1
- package/dist/library/components/Button/Button.js +1 -1
- package/dist/library/components/Button/Button.js.map +1 -1
- package/dist/library/components/ButtonGroup/ButtonGroup.js +1 -1
- package/dist/library/components/ButtonGroup/ButtonGroup.js.map +1 -1
- package/dist/library/components/Card/Card.js +1 -1
- package/dist/library/components/Card/Card.js.map +1 -1
- package/dist/library/components/Carousel/Carousel.js +6 -6
- package/dist/library/components/Carousel/Carousel.js.map +1 -1
- package/dist/library/components/Checkbox/Checkbox.js +1 -1
- package/dist/library/components/Checkbox/Checkbox.js.map +1 -1
- package/dist/library/components/CheckboxGroup/CheckboxGroup.js +1 -1
- package/dist/library/components/CheckboxGroup/CheckboxGroup.js.map +1 -1
- package/dist/library/components/CodeBlock/CodeBlock.js +1 -1
- package/dist/library/components/CodeBlock/CodeBlock.js.map +1 -1
- package/dist/library/components/Collapsible/Collapsible.js +1 -1
- package/dist/library/components/Collapsible/Collapsible.js.map +1 -1
- package/dist/library/components/Combobox/Combobox.js +1 -1
- package/dist/library/components/Combobox/Combobox.js.map +1 -1
- package/dist/library/components/Command/Command.js +1 -1
- package/dist/library/components/Command/Command.js.map +1 -1
- package/dist/library/components/ContextMenu/ContextMenu.js +1 -1
- package/dist/library/components/ContextMenu/ContextMenu.js.map +1 -1
- package/dist/library/components/Dialog/Dialog.js +1 -1
- package/dist/library/components/Dialog/Dialog.js.map +1 -1
- package/dist/library/components/Drawer/Drawer.js +1 -1
- package/dist/library/components/Drawer/Drawer.js.map +1 -1
- package/dist/library/components/EmptyState/EmptyState.js +1 -1
- package/dist/library/components/EmptyState/EmptyState.js.map +1 -1
- package/dist/library/components/Field/Field.js +1 -1
- package/dist/library/components/Field/Field.js.map +1 -1
- package/dist/library/components/Fieldset/Fieldset.js +1 -1
- package/dist/library/components/Fieldset/Fieldset.js.map +1 -1
- package/dist/library/components/FileInput/FileInput.js +1 -1
- package/dist/library/components/FileInput/FileInput.js.map +1 -1
- package/dist/library/components/Form/Form.js +4 -4
- package/dist/library/components/Form/Form.js.map +1 -1
- package/dist/library/components/HoverCard/HoverCard.js +1 -1
- package/dist/library/components/HoverCard/HoverCard.js.map +1 -1
- package/dist/library/components/InlineCode/InlineCode.js +1 -1
- package/dist/library/components/InlineCode/InlineCode.js.map +1 -1
- package/dist/library/components/Input/Input.js +1 -1
- package/dist/library/components/Input/Input.js.map +1 -1
- package/dist/library/components/InputGroup/InputGroup.js +1 -1
- package/dist/library/components/InputGroup/InputGroup.js.map +1 -1
- package/dist/library/components/Kbd/Kbd.js +1 -1
- package/dist/library/components/Kbd/Kbd.js.map +1 -1
- package/dist/library/components/Link/Link.js +1 -1
- package/dist/library/components/Link/Link.js.map +1 -1
- package/dist/library/components/Menu/Menu.js +1 -1
- package/dist/library/components/Menu/Menu.js.map +1 -1
- package/dist/library/components/Menubar/Menubar.js +1 -1
- package/dist/library/components/Menubar/Menubar.js.map +1 -1
- package/dist/library/components/Meter/Meter.js +1 -1
- package/dist/library/components/Meter/Meter.js.map +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.js +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.js.map +1 -1
- package/dist/library/components/NavLink/NavLink.js +1 -1
- package/dist/library/components/NavLink/NavLink.js.map +1 -1
- package/dist/library/components/NavigationMenu/NavigationMenu.js +1 -1
- package/dist/library/components/NavigationMenu/NavigationMenu.js.map +1 -1
- package/dist/library/components/NumberField/NumberField.js +1 -1
- package/dist/library/components/NumberField/NumberField.js.map +1 -1
- package/dist/library/components/OTPField/OTPField.js +1 -1
- package/dist/library/components/OTPField/OTPField.js.map +1 -1
- package/dist/library/components/Pagination/Pagination.js +1 -1
- package/dist/library/components/Pagination/Pagination.js.map +1 -1
- package/dist/library/components/PasswordInput/PasswordInput.js +1 -1
- package/dist/library/components/PasswordInput/PasswordInput.js.map +1 -1
- package/dist/library/components/Popover/Popover.js +1 -1
- package/dist/library/components/Popover/Popover.js.map +1 -1
- package/dist/library/components/Progress/Progress.js +1 -1
- package/dist/library/components/Progress/Progress.js.map +1 -1
- package/dist/library/components/RadioGroup/RadioGroup.js +1 -1
- package/dist/library/components/RadioGroup/RadioGroup.js.map +1 -1
- package/dist/library/components/Resizable/Resizable.js +1 -1
- package/dist/library/components/Resizable/Resizable.js.map +1 -1
- package/dist/library/components/ScrollArea/ScrollArea.js +1 -1
- package/dist/library/components/ScrollArea/ScrollArea.js.map +1 -1
- package/dist/library/components/Select/Select.js +1 -1
- package/dist/library/components/Select/Select.js.map +1 -1
- package/dist/library/components/Separator/Separator.js +1 -1
- package/dist/library/components/Separator/Separator.js.map +1 -1
- package/dist/library/components/Skeleton/Skeleton.js +1 -1
- package/dist/library/components/Skeleton/Skeleton.js.map +1 -1
- package/dist/library/components/Slider/Slider.js +1 -1
- package/dist/library/components/Slider/Slider.js.map +1 -1
- package/dist/library/components/Spinner/Spinner.js +1 -1
- package/dist/library/components/Spinner/Spinner.js.map +1 -1
- package/dist/library/components/Switch/Switch.js +1 -1
- package/dist/library/components/Switch/Switch.js.map +1 -1
- package/dist/library/components/Table/Table.js +1 -1
- package/dist/library/components/Table/Table.js.map +1 -1
- package/dist/library/components/Tabs/Tabs.js +1 -1
- package/dist/library/components/Tabs/Tabs.js.map +1 -1
- package/dist/library/components/Tag/Tag.js +1 -1
- package/dist/library/components/Tag/Tag.js.map +1 -1
- package/dist/library/components/TagsInput/TagsInput.js +1 -1
- package/dist/library/components/TagsInput/TagsInput.js.map +1 -1
- package/dist/library/components/Textarea/Textarea.js +1 -1
- package/dist/library/components/Textarea/Textarea.js.map +1 -1
- package/dist/library/components/ThemeScope/ThemeScope.js +1 -1
- package/dist/library/components/ThemeScope/ThemeScope.js.map +1 -1
- package/dist/library/components/Toast/Toast.js +1 -1
- package/dist/library/components/Toast/Toast.js.map +1 -1
- package/dist/library/components/ToggleGroup/ToggleGroup.js +3 -1
- package/dist/library/components/ToggleGroup/ToggleGroup.js.map +1 -1
- package/dist/library/components/Toolbar/Toolbar.js +1 -1
- package/dist/library/components/Toolbar/Toolbar.js.map +1 -1
- package/dist/library/components/Tooltip/Tooltip.js +1 -1
- package/dist/library/components/Tooltip/Tooltip.js.map +1 -1
- package/dist/library/motion/MotionLink.js +1 -1
- package/dist/library/motion/MotionLink.js.map +1 -1
- package/dist/library/react/useComboboxPopup.d.ts.map +1 -1
- package/dist/library/react/useComboboxPopup.js +45 -6
- package/dist/library/react/useComboboxPopup.js.map +1 -1
- package/dist/library/react/useRovingFocus.d.ts.map +1 -1
- package/dist/library/react/useRovingFocus.js +76 -11
- package/dist/library/react/useRovingFocus.js.map +1 -1
- package/dist/library/react/useToastTimer.d.ts.map +1 -1
- package/dist/library/react/useToastTimer.js +28 -9
- package/dist/library/react/useToastTimer.js.map +1 -1
- package/dist/library/styles.css +1 -1
- package/docs/accessibility.md +23 -111
- package/docs/architecture.md +48 -242
- package/docs/motion.md +65 -130
- package/docs/theming.md +51 -427
- package/package.json +21 -13
- package/src/charts/Charts.tsx +1 -1
- package/src/components/Accordion/Accordion.tsx +1 -1
- package/src/components/Alert/Alert.tsx +1 -1
- package/src/components/AppShell/AppShell.tsx +1 -1
- package/src/components/AspectRatio/AspectRatio.tsx +1 -1
- package/src/components/Avatar/Avatar.tsx +1 -1
- package/src/components/Badge/Badge.tsx +1 -1
- package/src/components/Breadcrumb/Breadcrumb.tsx +1 -1
- package/src/components/Button/Button.tsx +1 -1
- package/src/components/ButtonGroup/ButtonGroup.tsx +1 -1
- package/src/components/Card/Card.tsx +1 -1
- package/src/components/Carousel/Carousel.tsx +6 -6
- package/src/components/Checkbox/Checkbox.tsx +1 -1
- package/src/components/CheckboxGroup/CheckboxGroup.tsx +1 -1
- package/src/components/CodeBlock/CodeBlock.tsx +1 -1
- package/src/components/Collapsible/Collapsible.tsx +1 -1
- package/src/components/Combobox/Combobox.tsx +1 -1
- package/src/components/Command/Command.tsx +1 -1
- package/src/components/ContextMenu/ContextMenu.tsx +1 -1
- package/src/components/Dialog/Dialog.tsx +1 -1
- package/src/components/Drawer/Drawer.tsx +1 -1
- package/src/components/EmptyState/EmptyState.tsx +1 -1
- package/src/components/Field/Field.tsx +1 -1
- package/src/components/Fieldset/Fieldset.tsx +1 -1
- package/src/components/FileInput/FileInput.tsx +1 -1
- package/src/components/Form/Form.tsx +4 -4
- package/src/components/HoverCard/HoverCard.tsx +1 -1
- package/src/components/InlineCode/InlineCode.tsx +1 -1
- package/src/components/Input/Input.tsx +1 -1
- package/src/components/InputGroup/InputGroup.tsx +1 -1
- package/src/components/Kbd/Kbd.tsx +1 -1
- package/src/components/Link/Link.tsx +1 -1
- package/src/components/Menu/Menu.tsx +1 -1
- package/src/components/Menubar/Menubar.tsx +1 -1
- package/src/components/Meter/Meter.tsx +1 -1
- package/src/components/NativeSelect/NativeSelect.tsx +1 -1
- package/src/components/NavLink/NavLink.tsx +1 -1
- package/src/components/NavigationMenu/NavigationMenu.tsx +1 -1
- package/src/components/NumberField/NumberField.tsx +1 -1
- package/src/components/OTPField/OTPField.tsx +1 -1
- package/src/components/Pagination/Pagination.tsx +1 -1
- package/src/components/PasswordInput/PasswordInput.tsx +1 -1
- package/src/components/Popover/Popover.tsx +1 -1
- package/src/components/Progress/Progress.tsx +1 -1
- package/src/components/RadioGroup/RadioGroup.tsx +1 -1
- package/src/components/Resizable/Resizable.tsx +1 -1
- package/src/components/ScrollArea/ScrollArea.tsx +1 -1
- package/src/components/Select/Select.tsx +1 -1
- package/src/components/Separator/Separator.tsx +1 -1
- package/src/components/Skeleton/Skeleton.tsx +1 -1
- package/src/components/Slider/Slider.tsx +1 -1
- package/src/components/Spinner/Spinner.tsx +1 -1
- package/src/components/Switch/Switch.tsx +1 -1
- package/src/components/Table/Table.tsx +1 -1
- package/src/components/Tabs/Tabs.tsx +1 -1
- package/src/components/Tag/Tag.tsx +1 -1
- package/src/components/TagsInput/TagsInput.tsx +1 -1
- package/src/components/Textarea/Textarea.tsx +1 -1
- package/src/components/ThemeScope/ThemeScope.tsx +1 -1
- package/src/components/Toast/Toast.tsx +1 -1
- package/src/components/ToggleGroup/ToggleGroup.tsx +3 -1
- package/src/components/Toolbar/Toolbar.tsx +1 -1
- package/src/components/Tooltip/Tooltip.tsx +1 -1
- package/src/css.d.ts +2 -0
- package/src/motion/MotionLink.tsx +1 -1
- package/src/react/useComboboxPopup.ts +38 -6
- package/src/react/useRovingFocus.ts +73 -8
- package/src/react/useToastTimer.ts +24 -9
- package/src/styles.d.ts +1 -0
- package/src/themes/baseline.css +1 -1
- package/src/typography.css +17 -12
- package/dist/library/cn.d.ts +0 -3
- package/dist/library/cn.d.ts.map +0 -1
- package/dist/library/cn.js +0 -370
- package/dist/library/cn.js.map +0 -1
- package/src/cn.ts +0 -372
|
@@ -1,18 +1,57 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import { useLayoutEffect, useRef } from 'react';
|
|
2
|
+
import { useLayoutEffect, useRef, useState } from 'react';
|
|
3
3
|
import { positionSelect } from '../internal/select.js';
|
|
4
4
|
/** Local top-layer popup: preserve theme/modal ancestry and place before its first paint. */
|
|
5
5
|
export function useComboboxPopup(nodeRef, input, open, dismiss, sideOffset, collisionPadding) {
|
|
6
|
-
const latest = useRef(dismiss);
|
|
6
|
+
const latest = useRef({ dismiss, open });
|
|
7
7
|
const reposition = useRef(() => { });
|
|
8
|
+
const [generation, setGeneration] = useState(0);
|
|
8
9
|
useLayoutEffect(() => {
|
|
9
|
-
latest.current = dismiss;
|
|
10
|
+
latest.current = { dismiss, open };
|
|
10
11
|
});
|
|
12
|
+
// A manual popup stays in the top layer after an ancestor dialog or popover closes.
|
|
11
13
|
useLayoutEffect(() => {
|
|
12
14
|
const node = nodeRef.current;
|
|
13
15
|
if (!node || !input)
|
|
14
16
|
return;
|
|
15
|
-
|
|
17
|
+
const ancestors = [];
|
|
18
|
+
for (let parent = input.parentElement; parent; parent = parent.parentElement) {
|
|
19
|
+
if (parent.matches('dialog, [popover]'))
|
|
20
|
+
ancestors.push(parent);
|
|
21
|
+
}
|
|
22
|
+
const reconcile = () => {
|
|
23
|
+
if (!latest.current.open)
|
|
24
|
+
return;
|
|
25
|
+
const visible = input.checkVisibility();
|
|
26
|
+
if (!visible && node.matches(':popover-open')) {
|
|
27
|
+
latest.current.dismiss();
|
|
28
|
+
node.hidePopover();
|
|
29
|
+
setGeneration(value => value + 1);
|
|
30
|
+
}
|
|
31
|
+
else if (visible && !node.matches(':popover-open'))
|
|
32
|
+
setGeneration(value => value + 1);
|
|
33
|
+
};
|
|
34
|
+
const toggle = (event) => {
|
|
35
|
+
if (event.target === event.currentTarget)
|
|
36
|
+
reconcile();
|
|
37
|
+
};
|
|
38
|
+
const view = input.ownerDocument.defaultView;
|
|
39
|
+
const observer = new view.MutationObserver(reconcile);
|
|
40
|
+
for (const ancestor of ancestors) {
|
|
41
|
+
observer.observe(ancestor, { attributes: true, attributeFilter: ['open', 'data-state'] });
|
|
42
|
+
ancestor.addEventListener('toggle', toggle);
|
|
43
|
+
}
|
|
44
|
+
return () => {
|
|
45
|
+
observer.disconnect();
|
|
46
|
+
for (const ancestor of ancestors)
|
|
47
|
+
ancestor.removeEventListener('toggle', toggle);
|
|
48
|
+
};
|
|
49
|
+
}, [nodeRef, input]);
|
|
50
|
+
useLayoutEffect(() => {
|
|
51
|
+
const node = nodeRef.current;
|
|
52
|
+
if (!node || !input)
|
|
53
|
+
return;
|
|
54
|
+
if (!open || !input.checkVisibility()) {
|
|
16
55
|
if (node.matches(':popover-open'))
|
|
17
56
|
node.hidePopover();
|
|
18
57
|
return;
|
|
@@ -89,7 +128,7 @@ export function useComboboxPopup(nodeRef, input, open, dismiss, sideOffset, coll
|
|
|
89
128
|
if (target instanceof win.Node &&
|
|
90
129
|
!node.contains(target) &&
|
|
91
130
|
!input.parentElement?.contains(target))
|
|
92
|
-
latest.current();
|
|
131
|
+
latest.current.dismiss();
|
|
93
132
|
};
|
|
94
133
|
const observer = new win.ResizeObserver(schedule);
|
|
95
134
|
const mutations = new win.MutationObserver(schedule);
|
|
@@ -116,7 +155,7 @@ export function useComboboxPopup(nodeRef, input, open, dismiss, sideOffset, coll
|
|
|
116
155
|
if (node.matches(':popover-open'))
|
|
117
156
|
node.hidePopover();
|
|
118
157
|
};
|
|
119
|
-
}, [nodeRef, input, open, sideOffset, collisionPadding]);
|
|
158
|
+
}, [nodeRef, input, open, sideOffset, collisionPadding, generation]);
|
|
120
159
|
// Selected tags can move an unchanged-size input without a resize event.
|
|
121
160
|
useLayoutEffect(() => {
|
|
122
161
|
reposition.current();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useComboboxPopup.js","sourceRoot":"","sources":["../../../src/react/useComboboxPopup.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,eAAe,EAAE,MAAM,EAAkB,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"useComboboxPopup.js","sourceRoot":"","sources":["../../../src/react/useComboboxPopup.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,6FAA6F;AAC7F,MAAM,UAAU,gBAAgB,CAC9B,OAAyC,EACzC,KAA8B,EAC9B,IAAa,EACb,OAAmB,EACnB,UAAkB,EAClB,gBAAwB;IAExB,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACxC,MAAM,UAAU,GAAG,MAAM,CAAa,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;IAC/C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC/C,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IACF,oFAAoF;IACpF,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAA;QAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAM;QAC3B,MAAM,SAAS,GAAkB,EAAE,CAAA;QACnC,KAAK,IAAI,MAAM,GAAG,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;YAC7E,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;gBAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjE,CAAC;QACD,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;gBAAE,OAAM;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,EAAE,CAAA;YACvC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC9C,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;gBACxB,IAAI,CAAC,WAAW,EAAE,CAAA;gBAClB,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;YACnC,CAAC;iBAAM,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;gBAAE,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QACzF,CAAC,CAAA;QACD,MAAM,MAAM,GAAG,CAAC,KAAY,EAAE,EAAE;YAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,aAAa;gBAAE,SAAS,EAAE,CAAA;QACvD,CAAC,CAAA;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,WAAY,CAAA;QAC7C,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;QACrD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,CAAA;YACzF,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC7C,CAAC;QACD,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,UAAU,EAAE,CAAA;YACrB,KAAK,MAAM,QAAQ,IAAI,SAAS;gBAAE,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAClF,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACpB,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAA;QAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAM;QAC3B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAA;YACrD,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,KAAK,CAAC,aAAa,CAAA;QAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,WAAY,CAAA;QAC5B,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,MAAM,SAAS,GACb,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAA;YACnF,IAAI,CAAC,KAAK,CAAC,WAAW,CACpB,uBAAuB,EACvB,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAC7E,CAAA;QACH,CAAC,CAAA;QACD,SAAS,EAAE,CAAA;QACX,IAAI,CAAC,WAAW,EAAE,CAAA;QAClB,MAAM,KAAK,GAAG,GAAG,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;gBAAE,OAAM;YAC/D,SAAS,EAAE,CAAA;YACX,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAA;YACnC,MAAM,GAAG,GAAG,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACtC,MAAM,MAAM,GAAG,KAAK,CAAC,qBAAqB,EAAE,CAAA;YAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAA;YAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAc,iCAAiC,CAAC,CAAA;YAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAc,gCAAgC,CAAC,CAAA;YAChF,MAAM,aAAa,GACjB,CAAC,IAAI,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;gBACzC,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC,CAAC;gBAC3B,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC1B,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC;gBAC7B,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC9B,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;YACnC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,EAAE,SAAS,IAAI,CAAC,CAAC,GAAG,OAAO,GAAG,UAAU,CAAA;YAC5E,MAAM,KAAK,GACT,CAAC,QAAQ,EAAE,SAAS,IAAI,CAAC,CAAC;gBAC1B,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC;gBACrC,MAAM,CAAC,MAAM;gBACb,OAAO;gBACP,UAAU,CAAA;YACZ,MAAM,IAAI,GAAG,cAAc,CAAC;gBAC1B,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,KAAK;gBACzC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC1D,cAAc,EAAE,CAAC;gBACjB,QAAQ,EAAE;oBACR,GAAG,EAAE,QAAQ,EAAE,SAAS,IAAI,CAAC;oBAC7B,IAAI,EAAE,QAAQ,EAAE,UAAU,IAAI,CAAC;oBAC/B,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,GAAG,CAAC,UAAU;oBACxC,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAC,WAAW;iBAC5C;gBACD,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,CAAC;gBACtC,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,KAAK;gBACd,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,SAAS,KAAK,KAAK;aACrD,CAAC,CAAA;YACF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC;gBACxC,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,YAAY,EAAE,IAAI,CAAC,SAAS;aAC7B,CAAC,EAAE,CAAC;gBACH,MAAM,QAAQ,GAAG,mBAAmB,GAAG,EAAE,CAAA;gBACzC,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,IAAI;oBACxD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC,CAAA;YAClD,CAAC;QACH,CAAC,CAAA;QACD,UAAU,CAAC,OAAO,GAAG,KAAK,CAAA;QAC1B,KAAK,EAAE,CAAA;QACP,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,IAAI,CAAC,KAAK;gBACR,KAAK,GAAG,GAAG,CAAC,qBAAqB,CAAC,GAAG,EAAE;oBACrC,KAAK,GAAG,CAAC,CAAA;oBACT,KAAK,EAAE,CAAA;gBACT,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QACD,MAAM,OAAO,GAAG,CAAC,KAAgC,EAAE,EAAE;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC3B,IACE,MAAM,YAAY,GAAG,CAAC,IAAI;gBAC1B,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtB,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC;gBAEtC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC,CAAA;QACD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QACjD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QACpD,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtB,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;QAChF,GAAG,CAAC,gBAAgB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAClD,GAAG,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QACxC,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC9C,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACxC,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACxD,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACxD,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;YAC7B,QAAQ,CAAC,UAAU,EAAE,CAAA;YACrB,SAAS,CAAC,UAAU,EAAE,CAAA;YACtB,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC/B,GAAG,CAAC,mBAAmB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;YACrD,GAAG,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YAC3C,GAAG,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;YACjD,GAAG,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAC3C,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAC3D,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAA;QACvD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAA;IACpE,yEAAyE;IACzE,eAAe,CAAC,GAAG,EAAE;QACnB,UAAU,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRovingFocus.d.ts","sourceRoot":"","sources":["../../../src/react/useRovingFocus.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"useRovingFocus.d.ts","sourceRoot":"","sources":["../../../src/react/useRovingFocus.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAEd,2EAA2E;AAC3E,eAAO,MAAM,qBAAqB,wCAAqC,CAAA;AAEvE,KAAK,OAAO,CAAC,IAAI,SAAS,WAAW,IAAI;IACvC,IAAI,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,YAAY,GAAG,UAAU,CAAA;IACtC,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,uFAAuF;AACvF,wBAAgB,cAAc,CAAC,IAAI,SAAS,WAAW,EAAE,EACvD,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,SAAS,EACT,WAAW,EACX,IAAI,EACJ,MAAa,EACb,OAAO,EACP,mBAA2B,EAC5B,EAAE,OAAO,CAAC,IAAI,CAAC;kBA6BS,IAAI;mBA8HV,UAAU,CAAC,IAAI,CAAC;kBASjB,UAAU,CAAC,IAAI,CAAC;qBAIb,aAAa,CAAC,IAAI,CAAC;EAiCvC"}
|
|
@@ -1,10 +1,24 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import { createContext, useLayoutEffect } from 'react';
|
|
2
|
+
import { createContext, useLayoutEffect, useRef } from 'react';
|
|
3
3
|
/** A surrounding composite may own all of its nested groups' tab stops. */
|
|
4
4
|
export const CompositeFocusContext = createContext(null);
|
|
5
5
|
/** Native hosts and DOM order stay authoritative, including dynamic disabled items. */
|
|
6
6
|
export function useRovingFocus({ host, selector, scope, preferred, orientation, loop, active = true, deferTo, includeAriaDisabled = false }) {
|
|
7
|
+
const latest = useRef({
|
|
8
|
+
selector,
|
|
9
|
+
scope,
|
|
10
|
+
preferred,
|
|
11
|
+
orientation,
|
|
12
|
+
loop,
|
|
13
|
+
active,
|
|
14
|
+
deferTo,
|
|
15
|
+
includeAriaDisabled
|
|
16
|
+
});
|
|
17
|
+
const appliedTo = useRef(null);
|
|
18
|
+
const settleRef = useRef(() => { });
|
|
19
|
+
const binding = useRef(null);
|
|
7
20
|
const ownsFocus = (node) => {
|
|
21
|
+
const { active, deferTo } = latest.current;
|
|
8
22
|
if (!active)
|
|
9
23
|
return false;
|
|
10
24
|
const parent = deferTo ? node.parentElement?.closest(deferTo) : null;
|
|
@@ -12,11 +26,15 @@ export function useRovingFocus({ host, selector, scope, preferred, orientation,
|
|
|
12
26
|
// React context crosses portals; native focus ownership stops at a new surface.
|
|
13
27
|
return !parent || !!(surface && parent.contains(surface));
|
|
14
28
|
};
|
|
15
|
-
const items = (node) =>
|
|
16
|
-
const
|
|
17
|
-
return
|
|
18
|
-
|
|
29
|
+
const items = (node) => {
|
|
30
|
+
const { selector, scope } = latest.current;
|
|
31
|
+
return Array.from(node.querySelectorAll(selector)).filter(item => {
|
|
32
|
+
const surface = item.closest('[popover], dialog');
|
|
33
|
+
return item.closest(scope) === node && (!surface || !node.contains(surface));
|
|
34
|
+
});
|
|
35
|
+
};
|
|
19
36
|
const enabled = (node) => {
|
|
37
|
+
const { includeAriaDisabled } = latest.current;
|
|
20
38
|
const view = node.ownerDocument.defaultView;
|
|
21
39
|
return items(node).filter(item => !item.matches(':disabled') &&
|
|
22
40
|
(includeAriaDisabled || item.getAttribute('aria-disabled') !== 'true') &&
|
|
@@ -25,6 +43,7 @@ export function useRovingFocus({ host, selector, scope, preferred, orientation,
|
|
|
25
43
|
!['hidden', 'collapse'].includes(view.getComputedStyle(item).visibility));
|
|
26
44
|
};
|
|
27
45
|
const sync = (node, preferFocus = true) => {
|
|
46
|
+
const { preferred } = latest.current;
|
|
28
47
|
const all = items(node), available = enabled(node);
|
|
29
48
|
const focused = node.ownerDocument.activeElement;
|
|
30
49
|
const surface = focused?.closest('[popover], dialog');
|
|
@@ -42,14 +61,51 @@ export function useRovingFocus({ host, selector, scope, preferred, orientation,
|
|
|
42
61
|
item.tabIndex = index;
|
|
43
62
|
}
|
|
44
63
|
};
|
|
64
|
+
useLayoutEffect(() => {
|
|
65
|
+
latest.current = {
|
|
66
|
+
selector,
|
|
67
|
+
scope,
|
|
68
|
+
preferred,
|
|
69
|
+
orientation,
|
|
70
|
+
loop,
|
|
71
|
+
active,
|
|
72
|
+
deferTo,
|
|
73
|
+
includeAriaDisabled
|
|
74
|
+
};
|
|
75
|
+
settleRef.current = (node) => {
|
|
76
|
+
if (!ownsFocus(node)) {
|
|
77
|
+
if (appliedTo.current !== node)
|
|
78
|
+
return;
|
|
79
|
+
for (const item of items(node))
|
|
80
|
+
if (item.tabIndex !== 0)
|
|
81
|
+
item.tabIndex = 0;
|
|
82
|
+
appliedTo.current = null;
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
sync(node);
|
|
86
|
+
appliedTo.current = node;
|
|
87
|
+
};
|
|
88
|
+
});
|
|
89
|
+
useLayoutEffect(() => {
|
|
90
|
+
const node = host.current;
|
|
91
|
+
if (node)
|
|
92
|
+
settleRef.current(node);
|
|
93
|
+
}, [host, selector, scope, preferred, active, deferTo, includeAriaDisabled]);
|
|
45
94
|
useLayoutEffect(() => {
|
|
46
95
|
const node = host.current;
|
|
47
|
-
if (!node ||
|
|
96
|
+
if (!node || binding.current?.node === node) {
|
|
97
|
+
if (!node && binding.current) {
|
|
98
|
+
binding.current.cleanup();
|
|
99
|
+
binding.current = null;
|
|
100
|
+
}
|
|
48
101
|
return;
|
|
102
|
+
}
|
|
103
|
+
binding.current?.cleanup();
|
|
104
|
+
binding.current = null;
|
|
49
105
|
const view = node.ownerDocument.defaultView;
|
|
50
|
-
const reconcile = () =>
|
|
51
|
-
reconcile();
|
|
106
|
+
const reconcile = () => settleRef.current(node);
|
|
52
107
|
const observer = new view.MutationObserver(records => {
|
|
108
|
+
const selector = latest.current.selector;
|
|
53
109
|
if (records.some(record => record.type === 'childList' ||
|
|
54
110
|
record.target === node ||
|
|
55
111
|
(record.target instanceof view.Element &&
|
|
@@ -79,11 +135,19 @@ export function useRovingFocus({ host, selector, scope, preferred, orientation,
|
|
|
79
135
|
});
|
|
80
136
|
const resize = new view.ResizeObserver(reconcile);
|
|
81
137
|
resize.observe(node);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
138
|
+
binding.current = {
|
|
139
|
+
node,
|
|
140
|
+
cleanup: () => {
|
|
141
|
+
observer.disconnect();
|
|
142
|
+
resize.disconnect();
|
|
143
|
+
}
|
|
85
144
|
};
|
|
145
|
+
settleRef.current(node);
|
|
86
146
|
});
|
|
147
|
+
useLayoutEffect(() => () => {
|
|
148
|
+
binding.current?.cleanup();
|
|
149
|
+
binding.current = null;
|
|
150
|
+
}, []);
|
|
87
151
|
return {
|
|
88
152
|
items: enabled,
|
|
89
153
|
onFocus(event) {
|
|
@@ -103,6 +167,7 @@ export function useRovingFocus({ host, selector, scope, preferred, orientation,
|
|
|
103
167
|
event.metaKey ||
|
|
104
168
|
event.nativeEvent.isComposing)
|
|
105
169
|
return;
|
|
170
|
+
const { selector, orientation, loop } = latest.current;
|
|
106
171
|
const node = event.currentTarget, available = enabled(node), current = event.target.closest(selector), index = available.findIndex(item => item === current);
|
|
107
172
|
if (index < 0)
|
|
108
173
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRovingFocus.js","sourceRoot":"","sources":["../../../src/react/useRovingFocus.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EACL,aAAa,EACb,eAAe,
|
|
1
|
+
{"version":3,"file":"useRovingFocus.js","sourceRoot":"","sources":["../../../src/react/useRovingFocus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useToastTimer.d.ts","sourceRoot":"","sources":["../../../src/react/useToastTimer.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAG/D,wBAAgB,aAAa,CAC3B,GAAG,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"useToastTimer.d.ts","sourceRoot":"","sources":["../../../src/react/useToastTimer.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAG/D,wBAAgB,aAAa,CAC3B,GAAG,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,IAAI,QAsEpB"}
|
|
@@ -18,8 +18,9 @@ export function useToastTimer(ref, visible, duration, elapsed) {
|
|
|
18
18
|
clear: id => win.clearTimeout(id)
|
|
19
19
|
}, () => latest.current());
|
|
20
20
|
let hovering = node.matches(':hover');
|
|
21
|
+
let touching = false;
|
|
21
22
|
const sync = () => {
|
|
22
|
-
const paused = hovering || node.contains(doc.activeElement) || doc.hidden;
|
|
23
|
+
const paused = hovering || touching || node.contains(doc.activeElement) || doc.hidden;
|
|
23
24
|
node.toggleAttribute('data-paused', paused);
|
|
24
25
|
if (paused)
|
|
25
26
|
timer.pause();
|
|
@@ -27,29 +28,47 @@ export function useToastTimer(ref, visible, duration, elapsed) {
|
|
|
27
28
|
timer.resume();
|
|
28
29
|
};
|
|
29
30
|
const enter = (event) => {
|
|
30
|
-
if (event.pointerType
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
if (event.pointerType === 'touch')
|
|
32
|
+
return;
|
|
33
|
+
hovering = true;
|
|
34
|
+
sync();
|
|
34
35
|
};
|
|
35
36
|
const leave = (event) => {
|
|
36
|
-
if (event.pointerType
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
if (event.pointerType === 'touch')
|
|
38
|
+
return;
|
|
39
|
+
hovering = false;
|
|
40
|
+
sync();
|
|
41
|
+
};
|
|
42
|
+
const press = (event) => {
|
|
43
|
+
if (event.pointerType !== 'touch')
|
|
44
|
+
return;
|
|
45
|
+
touching = true;
|
|
46
|
+
sync();
|
|
47
|
+
};
|
|
48
|
+
const release = (event) => {
|
|
49
|
+
if (event.pointerType !== 'touch' || !touching)
|
|
50
|
+
return;
|
|
51
|
+
touching = false;
|
|
52
|
+
sync();
|
|
40
53
|
};
|
|
41
54
|
node.addEventListener('pointerenter', enter);
|
|
42
55
|
node.addEventListener('pointerleave', leave);
|
|
56
|
+
node.addEventListener('pointerdown', press);
|
|
43
57
|
node.addEventListener('focusin', sync);
|
|
44
58
|
node.addEventListener('focusout', sync);
|
|
59
|
+
doc.addEventListener('pointerup', release);
|
|
60
|
+
doc.addEventListener('pointercancel', release);
|
|
45
61
|
doc.addEventListener('visibilitychange', sync);
|
|
46
62
|
sync();
|
|
47
63
|
return () => {
|
|
48
64
|
timer.destroy();
|
|
49
65
|
node.removeEventListener('pointerenter', enter);
|
|
50
66
|
node.removeEventListener('pointerleave', leave);
|
|
67
|
+
node.removeEventListener('pointerdown', press);
|
|
51
68
|
node.removeEventListener('focusin', sync);
|
|
52
69
|
node.removeEventListener('focusout', sync);
|
|
70
|
+
doc.removeEventListener('pointerup', release);
|
|
71
|
+
doc.removeEventListener('pointercancel', release);
|
|
53
72
|
doc.removeEventListener('visibilitychange', sync);
|
|
54
73
|
delete node.dataset.paused;
|
|
55
74
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useToastTimer.js","sourceRoot":"","sources":["../../../src/react/useToastTimer.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,eAAe,EAAE,MAAM,EAAkB,MAAM,OAAO,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,UAAU,aAAa,CAC3B,GAAkC,EAClC,OAAgB,EAChB,QAAgB,EAChB,OAAmB;IAEnB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;IAC9B,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAA;QACxB,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,OAAM;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAA;QAC9B,MAAM,GAAG,GAAG,GAAG,CAAC,WAAY,CAAA;QAC5B,MAAM,KAAK,GAAG,gBAAgB,CAC5B,QAAQ,EACR;YACE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE;YAChC,GAAG,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC;YAC7C,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;SAClC,EACD,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CACvB,CAAA;QACD,IAAI,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACrC,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,MAAM,MAAM,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"useToastTimer.js","sourceRoot":"","sources":["../../../src/react/useToastTimer.ts"],"names":[],"mappings":"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"}
|