@astryxdesign/core 0.7.6-canary.3bf6f43 → 0.7.6-canary.3d44c58
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/Collapsible/Collapsible.d.ts.map +1 -1
- package/dist/Collapsible/Collapsible.js +23 -3
- package/dist/Heading/Heading.d.ts +5 -3
- package/dist/Heading/Heading.d.ts.map +1 -1
- package/dist/Heading/Heading.js +5 -3
- package/dist/HoverCard/useHoverCard.d.ts.map +1 -1
- package/dist/HoverCard/useHoverCard.js +7 -0
- package/dist/Item/Item.d.ts.map +1 -1
- package/dist/Item/Item.js +6 -2
- package/dist/Layer/layerSurfacePress.d.ts +9 -0
- package/dist/Layer/layerSurfacePress.d.ts.map +1 -0
- package/dist/Layer/layerSurfacePress.js +39 -0
- package/dist/ProgressBar/ProgressBar.d.ts.map +1 -1
- package/dist/ProgressBar/ProgressBar.js +3 -1
- package/dist/SideNav/SideNav.d.ts.map +1 -1
- package/dist/SideNav/SideNav.js +9 -11
- package/dist/SideNav/SideNavHeading.js +6 -2
- package/dist/Token/Token.d.ts.map +1 -1
- package/dist/Token/Token.js +6 -1
- package/dist/Tooltip/useTooltip.d.ts.map +1 -1
- package/dist/Tooltip/useTooltip.js +11 -1
- package/dist/TopNav/TopNavHeading.d.ts.map +1 -1
- package/dist/TopNav/TopNavHeading.js +8 -2
- package/dist/hooks/ModalAnnounceProvider.d.ts +2 -2
- package/dist/hooks/ModalAnnounceProvider.d.ts.map +1 -1
- package/dist/hooks/ModalAnnounceProvider.js +9 -7
- package/dist/hooks/useClickableContainer.d.ts +3 -0
- package/dist/hooks/useClickableContainer.d.ts.map +1 -1
- package/dist/hooks/useClickableContainer.js +11 -1
- package/dist/hooks/useKeyboardHint.d.ts.map +1 -1
- package/dist/hooks/useKeyboardHint.js +7 -1
- package/dist/i18n/generated-locales/af-ZA.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/af-ZA.generated.js +2 -2
- package/dist/i18n/generated-locales/ar-SA.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ar-SA.generated.js +2 -2
- package/dist/i18n/generated-locales/ca-ES.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ca-ES.generated.js +2 -2
- package/dist/i18n/generated-locales/cs-CZ.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/cs-CZ.generated.js +2 -2
- package/dist/i18n/generated-locales/da-DK.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/da-DK.generated.js +2 -2
- package/dist/i18n/generated-locales/de-DE.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/de-DE.generated.js +2 -2
- package/dist/i18n/generated-locales/el-GR.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/el-GR.generated.js +2 -2
- package/dist/i18n/generated-locales/en.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/en.generated.js +2 -2
- package/dist/i18n/generated-locales/es-ES.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/es-ES.generated.js +2 -2
- package/dist/i18n/generated-locales/fi-FI.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/fi-FI.generated.js +2 -2
- package/dist/i18n/generated-locales/fr-FR.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/fr-FR.generated.js +2 -2
- package/dist/i18n/generated-locales/he-IL.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/he-IL.generated.js +2 -2
- package/dist/i18n/generated-locales/hu-HU.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/hu-HU.generated.js +2 -2
- package/dist/i18n/generated-locales/it-IT.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/it-IT.generated.js +2 -2
- package/dist/i18n/generated-locales/ja-JP.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ja-JP.generated.js +2 -2
- package/dist/i18n/generated-locales/ko-KR.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ko-KR.generated.js +2 -2
- package/dist/i18n/generated-locales/nl-NL.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/nl-NL.generated.js +2 -2
- package/dist/i18n/generated-locales/no-NO.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/no-NO.generated.js +2 -2
- package/dist/i18n/generated-locales/pl-PL.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/pl-PL.generated.js +2 -2
- package/dist/i18n/generated-locales/pseudo.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/pseudo.generated.js +2 -2
- package/dist/i18n/generated-locales/pt-BR.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/pt-BR.generated.js +2 -2
- package/dist/i18n/generated-locales/pt-PT.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/pt-PT.generated.js +2 -2
- package/dist/i18n/generated-locales/ro-RO.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ro-RO.generated.js +2 -2
- package/dist/i18n/generated-locales/ru-RU.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/ru-RU.generated.js +2 -2
- package/dist/i18n/generated-locales/sr-SP.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/sr-SP.generated.js +2 -2
- package/dist/i18n/generated-locales/sv-SE.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/sv-SE.generated.js +2 -2
- package/dist/i18n/generated-locales/tr-TR.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/tr-TR.generated.js +2 -2
- package/dist/i18n/generated-locales/uk-UA.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/uk-UA.generated.js +2 -2
- package/dist/i18n/generated-locales/vi-VN.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/vi-VN.generated.js +2 -2
- package/dist/i18n/generated-locales/zh-CN.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/zh-CN.generated.js +2 -2
- package/dist/i18n/generated-locales/zh-TW.generated.d.ts.map +1 -1
- package/dist/i18n/generated-locales/zh-TW.generated.js +2 -2
- package/dist/utils/sharedMutationObserver.d.ts +2 -2
- package/dist/utils/sharedMutationObserver.js +2 -2
- package/dist/utils/useFocusLeavingChange.d.ts +13 -0
- package/dist/utils/useFocusLeavingChange.d.ts.map +1 -0
- package/dist/utils/useFocusLeavingChange.js +48 -0
- package/locales/af-ZA.json +2 -2
- package/locales/ar-SA.json +2 -2
- package/locales/ca-ES.json +2 -2
- package/locales/cs-CZ.json +2 -2
- package/locales/da-DK.json +2 -2
- package/locales/de-DE.json +2 -2
- package/locales/el-GR.json +2 -2
- package/locales/en.json +4 -4
- package/locales/es-ES.json +2 -2
- package/locales/fi-FI.json +2 -2
- package/locales/fr-FR.json +2 -2
- package/locales/he-IL.json +2 -2
- package/locales/hu-HU.json +2 -2
- package/locales/it-IT.json +2 -2
- package/locales/ja-JP.json +2 -2
- package/locales/ko-KR.json +2 -2
- package/locales/nl-NL.json +2 -2
- package/locales/no-NO.json +2 -2
- package/locales/pl-PL.json +2 -2
- package/locales/pseudo.json +2 -2
- package/locales/pt-BR.json +2 -2
- package/locales/pt-PT.json +2 -2
- package/locales/ro-RO.json +2 -2
- package/locales/ru-RU.json +2 -2
- package/locales/sr-SP.json +2 -2
- package/locales/sv-SE.json +2 -2
- package/locales/tr-TR.json +2 -2
- package/locales/uk-UA.json +2 -2
- package/locales/vi-VN.json +2 -2
- package/locales/zh-CN.json +2 -2
- package/locales/zh-TW.json +2 -2
- package/package.json +4 -4
- package/src/Collapsible/Collapsible.tsx +33 -4
- package/src/Heading/Heading.tsx +5 -3
- package/src/HoverCard/useHoverCard.tsx +7 -0
- package/src/Item/Item.tsx +11 -2
- package/src/Layer/layerSurfacePress.ts +39 -0
- package/src/ProgressBar/ProgressBar.tsx +3 -1
- package/src/SideNav/SideNav.tsx +83 -78
- package/src/SideNav/SideNavHeading.tsx +2 -2
- package/src/Text/Heading.doc.mjs +49 -0
- package/src/Token/Token.tsx +8 -1
- package/src/Tooltip/useTooltip.tsx +10 -1
- package/src/TopNav/TopNavHeading.tsx +8 -2
- package/src/hooks/ModalAnnounceProvider.tsx +12 -9
- package/src/hooks/useClickableContainer.ts +11 -1
- package/src/hooks/useKeyboardHint.tsx +7 -1
- package/src/i18n/generated-locales/af-ZA.generated.ts +3 -2
- package/src/i18n/generated-locales/ar-SA.generated.ts +3 -2
- package/src/i18n/generated-locales/ca-ES.generated.ts +3 -2
- package/src/i18n/generated-locales/cs-CZ.generated.ts +3 -2
- package/src/i18n/generated-locales/da-DK.generated.ts +3 -2
- package/src/i18n/generated-locales/de-DE.generated.ts +3 -2
- package/src/i18n/generated-locales/el-GR.generated.ts +3 -2
- package/src/i18n/generated-locales/en.generated.ts +3 -2
- package/src/i18n/generated-locales/es-ES.generated.ts +3 -2
- package/src/i18n/generated-locales/fi-FI.generated.ts +3 -2
- package/src/i18n/generated-locales/fr-FR.generated.ts +3 -2
- package/src/i18n/generated-locales/he-IL.generated.ts +3 -2
- package/src/i18n/generated-locales/hu-HU.generated.ts +3 -2
- package/src/i18n/generated-locales/it-IT.generated.ts +3 -2
- package/src/i18n/generated-locales/ja-JP.generated.ts +3 -2
- package/src/i18n/generated-locales/ko-KR.generated.ts +3 -2
- package/src/i18n/generated-locales/nl-NL.generated.ts +3 -2
- package/src/i18n/generated-locales/no-NO.generated.ts +3 -2
- package/src/i18n/generated-locales/pl-PL.generated.ts +3 -2
- package/src/i18n/generated-locales/pseudo.generated.ts +3 -2
- package/src/i18n/generated-locales/pt-BR.generated.ts +3 -2
- package/src/i18n/generated-locales/pt-PT.generated.ts +3 -2
- package/src/i18n/generated-locales/ro-RO.generated.ts +3 -2
- package/src/i18n/generated-locales/ru-RU.generated.ts +3 -2
- package/src/i18n/generated-locales/sr-SP.generated.ts +3 -2
- package/src/i18n/generated-locales/sv-SE.generated.ts +3 -2
- package/src/i18n/generated-locales/tr-TR.generated.ts +3 -2
- package/src/i18n/generated-locales/uk-UA.generated.ts +3 -2
- package/src/i18n/generated-locales/vi-VN.generated.ts +3 -2
- package/src/i18n/generated-locales/zh-CN.generated.ts +3 -2
- package/src/i18n/generated-locales/zh-TW.generated.ts +3 -2
- package/src/utils/sharedMutationObserver.ts +2 -2
- package/src/utils/useFocusLeavingChange.ts +53 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Collapsible.d.ts","sourceRoot":"","sources":["../../src/Collapsible/Collapsible.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Collapsible.d.ts","sourceRoot":"","sources":["../../src/Collapsible/Collapsible.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAuBf,OAAO,EAML,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,2BAA2B,CAAC;AAG1E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AA0J5C,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC;;;OAGG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC;;;;OAIG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;;;;;;;;;;;OAYG;IACH,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAE7C;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,MAAM,EAAE,gBAAgB,EACxB,UAAkB,EAClB,YAAY,EACZ,eAAe,EACf,KAAK,EACL,cAAc,EACd,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,gBAAgB,+BAwPlB;yBAvQe,WAAW"}
|
|
@@ -32,6 +32,10 @@ import "../theme/tokens.stylex.js";
|
|
|
32
32
|
import { borderVars, colorVars, typographyVars, fontWeightVars, spacingVars, typeScaleVars, durationVars, easeVars } from "../theme/tokens.stylex.js";
|
|
33
33
|
import { useCollapsible } from "./useCollapsible.js";
|
|
34
34
|
import { LayoutChangeSnapshot } from "../motion/LayoutChangeSnapshot.js";
|
|
35
|
+
import { moveFocusLeftBehind, noteFocusWithin } from "../utils/focusReturn.js";
|
|
36
|
+
import { useInteractionModalityTracking } from "../utils/interactionModality.js";
|
|
37
|
+
import { useFocusLeavingChange } from "../utils/useFocusLeavingChange.js";
|
|
38
|
+
import { useMergedRefs } from "../hooks/useMergedRefs.js";
|
|
35
39
|
import { applyLayoutChangeTransition, holdLayoutExit, playLayoutChange, releaseLayoutExit, reportLayoutChange } from "../motion/animatedLayout.js";
|
|
36
40
|
import { CollapsibleGroupPresentationContext } from "./CollapsibleGroupContext.js";
|
|
37
41
|
import { Icon } from "../Icon/index.js";
|
|
@@ -303,6 +307,22 @@ export function Collapsible({
|
|
|
303
307
|
}
|
|
304
308
|
}, [isOpen, isExiting]);
|
|
305
309
|
|
|
310
|
+
// Focus inside the content when it closes would be lost to the page once
|
|
311
|
+
// the content hides. It moves to the trigger that closes it (AR4); focus
|
|
312
|
+
// anywhere else is not moved. The shared sequence notes it in the commit
|
|
313
|
+
// before the DOM changes and moves it once the close has committed.
|
|
314
|
+
// The trigger's own document's last input decides the moved focus's ring.
|
|
315
|
+
const {
|
|
316
|
+
ref: modalityRef
|
|
317
|
+
} = useInteractionModalityTracking();
|
|
318
|
+
const mergedTriggerRef = useMergedRefs(triggerRef, modalityRef);
|
|
319
|
+
const noteClosingFocus = useFocusLeavingChange(isOpen, wasOpen => wasOpen ? noteFocusWithin(contentRef.current) : null, focus => moveFocusLeftBehind(focus, triggerRef.current, contentRef.current));
|
|
320
|
+
const beforeOpenChange = useCallback(wasOpen => {
|
|
321
|
+
noteClosingFocus(wasOpen);
|
|
322
|
+
if (animatedLayout != null) {
|
|
323
|
+
measureChange();
|
|
324
|
+
}
|
|
325
|
+
}, [animatedLayout, measureChange, noteClosingFocus]);
|
|
306
326
|
// Activation is blocked by this guard rather than the native `disabled`
|
|
307
327
|
// attribute, so the trigger keeps `aria-disabled` semantics and stays
|
|
308
328
|
// discoverable. A native `disabled` button would silently swallow events
|
|
@@ -349,7 +369,7 @@ export function Collapsible({
|
|
|
349
369
|
}), stylex.props(styles.root, isDivided && styles.divided, xstyle), className, style),
|
|
350
370
|
...props,
|
|
351
371
|
children: [/*#__PURE__*/_jsxs("button", {
|
|
352
|
-
ref:
|
|
372
|
+
ref: mergedTriggerRef,
|
|
353
373
|
type: "button",
|
|
354
374
|
onClick: handleToggle,
|
|
355
375
|
"aria-disabled": isDisabled || undefined,
|
|
@@ -379,9 +399,9 @@ export function Collapsible({
|
|
|
379
399
|
},
|
|
380
400
|
children: trigger
|
|
381
401
|
}), !isChevronAtStart && chevron]
|
|
382
|
-
}),
|
|
402
|
+
}), /*#__PURE__*/_jsx(LayoutChangeSnapshot, {
|
|
383
403
|
value: isOpen,
|
|
384
|
-
onBeforeChange:
|
|
404
|
+
onBeforeChange: beforeOpenChange
|
|
385
405
|
}), /*#__PURE__*/_jsx("div", {
|
|
386
406
|
ref: contentRef,
|
|
387
407
|
id: contentId,
|
|
@@ -5,10 +5,12 @@
|
|
|
5
5
|
* @position Core implementation; lives in own Heading/ dir, re-exported by Text/
|
|
6
6
|
*
|
|
7
7
|
* SYNC: When modified, update these files to stay in sync:
|
|
8
|
-
* - /packages/core/src/Text/
|
|
8
|
+
* - /packages/core/src/Text/Heading.doc.mjs (props table, theming target)
|
|
9
|
+
* - /packages/core/src/Text/Text.doc.mjs (shared truncation and tooltip guidance)
|
|
9
10
|
* - /packages/core/src/Heading/Heading.test.tsx (tests for new/changed behavior)
|
|
10
|
-
* - /packages/core/src/
|
|
11
|
-
* - /
|
|
11
|
+
* - /packages/core/src/Heading/index.ts (exports if types change)
|
|
12
|
+
* - /packages/core/src/Text/index.ts (re-exports if types change)
|
|
13
|
+
* - /apps/storybook/stories/Heading.stories.tsx (storybook stories)
|
|
12
14
|
* - /packages/cli/assets/templates/blocks/components/Heading/ (showcase blocks)
|
|
13
15
|
* - /packages/cli/assets/templates/blocks/components/Text/ (showcase blocks)
|
|
14
16
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Heading.d.ts","sourceRoot":"","sources":["../../src/Heading/Heading.tsx"],"names":[],"mappings":"AAIA
|
|
1
|
+
{"version":3,"file":"Heading.d.ts","sourceRoot":"","sources":["../../src/Heading/Heading.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAyB,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAE7D,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,WAAW,EACX,SAAS,EACT,QAAQ,EACR,UAAU,EACX,MAAM,gBAAgB,CAAC;AAkBxB,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AAG7C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AAM5C;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAEjD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC;AAQ/C,MAAM,WAAW,YAAa,SAAQ,IAAI,CACxC,SAAS,CAAC,kBAAkB,CAAC,EAC7B,UAAU,CACX;IACC,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACpC;;;OAGG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;;;;;;;;;;;;OAaG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC;IAElC;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IAE9C;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,QAAQ,EAAE,SAAS,CAAC;CACrB;AAWD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CAAC,EACtB,KAAK,EACL,IAAI,EACJ,MAAM,EACN,kBAAkB,EAClB,KAAiB,EACjB,OAAiB,EACjB,QAAY,EACZ,kBAAyB,EACzB,SAAS,EACT,QAAQ,EACR,OAAiB,EACjB,UAAkB,EAClB,gBAAwB,EACxB,MAAM,EACN,SAAS,EACT,KAAK,EACL,QAAQ,EACR,GAAG,EACH,GAAG,KAAK,EACT,EAAE,YAAY,+BAsGd;yBA1He,OAAO"}
|
package/dist/Heading/Heading.js
CHANGED
|
@@ -9,10 +9,12 @@
|
|
|
9
9
|
* @position Core implementation; lives in own Heading/ dir, re-exported by Text/
|
|
10
10
|
*
|
|
11
11
|
* SYNC: When modified, update these files to stay in sync:
|
|
12
|
-
* - /packages/core/src/Text/
|
|
12
|
+
* - /packages/core/src/Text/Heading.doc.mjs (props table, theming target)
|
|
13
|
+
* - /packages/core/src/Text/Text.doc.mjs (shared truncation and tooltip guidance)
|
|
13
14
|
* - /packages/core/src/Heading/Heading.test.tsx (tests for new/changed behavior)
|
|
14
|
-
* - /packages/core/src/
|
|
15
|
-
* - /
|
|
15
|
+
* - /packages/core/src/Heading/index.ts (exports if types change)
|
|
16
|
+
* - /packages/core/src/Text/index.ts (re-exports if types change)
|
|
17
|
+
* - /apps/storybook/stories/Heading.stories.tsx (storybook stories)
|
|
16
18
|
* - /packages/cli/assets/templates/blocks/components/Heading/ (showcase blocks)
|
|
17
19
|
* - /packages/cli/assets/templates/blocks/components/Text/ (showcase blocks)
|
|
18
20
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHoverCard.d.ts","sourceRoot":"","sources":["../../src/HoverCard/useHoverCard.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"useHoverCard.d.ts","sourceRoot":"","sources":["../../src/HoverCard/useHoverCard.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;AA8BlC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEhE;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;IAErC;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;IAErC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAE9B;;;OAGG;IACH,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAEtC;;;;OAIG;IACH,cAAc,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAEzC;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;;OAOG;IACH,eAAe,EAAE,CACf,QAAQ,EAAE,SAAS,EACnB,KAAK,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,KAC5C,SAAS,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAyBD;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAAgB,YAAY,CAAC,OAAO,GAAE,gBAAqB,GAAG,eAAe,CA8c5E"}
|
|
@@ -16,6 +16,7 @@ import * as stylex from '@stylexjs/stylex';
|
|
|
16
16
|
import { useLayer } from "../Layer/useLayer.js";
|
|
17
17
|
import { useTouchTrigger } from "../Layer/useTouchTrigger.js";
|
|
18
18
|
import { layerAnimations } from "../Layer/layerAnimations.stylex.js";
|
|
19
|
+
import { registerLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
19
20
|
import { useLayerDismissal } from "../Layer/useLayerDismissal.js";
|
|
20
21
|
import "../theme/tokens.stylex.js";
|
|
21
22
|
import { colorVars, shadowVars, radiusVars, spacingVars } from "../theme/tokens.stylex.js";
|
|
@@ -78,6 +79,7 @@ function isFocusable(element) {
|
|
|
78
79
|
* {hoverCard.renderHoverCard(<ProfileCard user={user} />)}
|
|
79
80
|
* ```
|
|
80
81
|
*/
|
|
82
|
+
|
|
81
83
|
export function useHoverCard(options = {}) {
|
|
82
84
|
const {
|
|
83
85
|
placement = 'above',
|
|
@@ -406,6 +408,11 @@ export function useHoverCard(options = {}) {
|
|
|
406
408
|
as: 'div'
|
|
407
409
|
};
|
|
408
410
|
return renderLayer(/*#__PURE__*/_jsx("div", {
|
|
411
|
+
// FR11: a press inside the card acts only within the card. A
|
|
412
|
+
// registered surface counts as something else in the shared
|
|
413
|
+
// interactive-ancestor walk, so a clickable container around the
|
|
414
|
+
// trigger leaves it alone; document listeners still see it.
|
|
415
|
+
ref: registerLayerSurface,
|
|
409
416
|
...{
|
|
410
417
|
className: "x1lliihq x1vlblms xvmdzux x126nfab x1t818jl"
|
|
411
418
|
},
|
package/dist/Item/Item.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../src/Item/Item.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAOL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAUf,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../src/Item/Item.tsx"],"names":[],"mappings":"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"}
|
package/dist/Item/Item.js
CHANGED
|
@@ -32,6 +32,7 @@ import { lazy, Suspense, use, useCallback, useId, useRef } from 'react';
|
|
|
32
32
|
import * as stylex from '@stylexjs/stylex';
|
|
33
33
|
import "../theme/tokens.stylex.js";
|
|
34
34
|
import { colorVars, radiusVars, spacingVars, durationVars, easeVars, typeScaleVars } from "../theme/tokens.stylex.js";
|
|
35
|
+
import { isLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
35
36
|
import { isRenderable } from "../utils/isRenderable.js";
|
|
36
37
|
import { mergeProps } from "../utils/mergeProps.js";
|
|
37
38
|
import { useFocusAcrossSwap } from "../utils/useFocusAcrossSwap.js";
|
|
@@ -40,7 +41,7 @@ import { ItemMarkerColumnsContext } from "./ItemMarkerColumnsContext.js";
|
|
|
40
41
|
import { useMergedRefs } from "../hooks/useMergedRefs.js";
|
|
41
42
|
import { computeTargetAndRel } from "../Link/computeTargetAndRel.js";
|
|
42
43
|
import { useLinkComponent } from "../Link/useLinkComponent.js";
|
|
43
|
-
import { useClickableContainer } from "../hooks/useClickableContainer.js";
|
|
44
|
+
import { innermostInteractive, useClickableContainer } from "../hooks/useClickableContainer.js";
|
|
44
45
|
import { useDevWarning } from "../hooks/useDevWarning.js";
|
|
45
46
|
import { themeProps } from "../utils/themeProps.js";
|
|
46
47
|
import { focusOutlineProps } from "../utils/focusOutline.stylex.js";
|
|
@@ -370,7 +371,10 @@ export function Item({
|
|
|
370
371
|
return;
|
|
371
372
|
}
|
|
372
373
|
const target = e.target;
|
|
373
|
-
if (target.closest('button, a, input, select, textarea')
|
|
374
|
+
if (target.closest('button, a, input, select, textarea') ||
|
|
375
|
+
// A press inside an open Tooltip or HoverCard belongs to it
|
|
376
|
+
// (component:Tooltip FR11, component:HoverCard FR11).
|
|
377
|
+
innermostInteractive(target, e.currentTarget, isLayerSurface) != null) {
|
|
374
378
|
return;
|
|
375
379
|
}
|
|
376
380
|
onClick?.(e);
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Ref callback for a layer surface's content element. The layer root around
|
|
3
|
+
* it is registered too: a caller's `style`, `xstyle` or `className` (padding,
|
|
4
|
+
* for instance) lands there, so a press on that edge is still the surface's.
|
|
5
|
+
*/
|
|
6
|
+
export declare function registerLayerSurface(element: Element | null): void;
|
|
7
|
+
/** Whether this element is a registered layer surface. */
|
|
8
|
+
export declare function isLayerSurface(element: Element): boolean;
|
|
9
|
+
//# sourceMappingURL=layerSurfacePress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"layerSurfacePress.d.ts","sourceRoot":"","sources":["../../src/Layer/layerSurfacePress.ts"],"names":[],"mappings":"AAmBA;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CASlE;AAED,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAExD"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
// Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @file layerSurfacePress.ts
|
|
5
|
+
* @input The content element of an open Tooltip or HoverCard surface.
|
|
6
|
+
* @output A registry of those elements, so the shared "does this press belong
|
|
7
|
+
* to something else" walk (hasInteractiveAncestor) treats a press inside one
|
|
8
|
+
* as not the container's.
|
|
9
|
+
* @position component:Tooltip FR11 and component:HoverCard FR11. The surfaces
|
|
10
|
+
* register their content element; every clickable container that asks
|
|
11
|
+
* hasInteractiveAncestor (useClickableContainer, TreeListItem, Table row
|
|
12
|
+
* plugins), or walks with isLayerSurface (Item, Token), leaves the press
|
|
13
|
+
* alone. The event
|
|
14
|
+
* keeps propagating, so document and window listeners still see it. Not
|
|
15
|
+
* exported from the package.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
const surfaces = new WeakSet();
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Ref callback for a layer surface's content element. The layer root around
|
|
22
|
+
* it is registered too: a caller's `style`, `xstyle` or `className` (padding,
|
|
23
|
+
* for instance) lands there, so a press on that edge is still the surface's.
|
|
24
|
+
*/
|
|
25
|
+
export function registerLayerSurface(element) {
|
|
26
|
+
if (element == null) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
surfaces.add(element);
|
|
30
|
+
const root = element.parentElement;
|
|
31
|
+
if (root?.hasAttribute('popover')) {
|
|
32
|
+
surfaces.add(root);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** Whether this element is a registered layer surface. */
|
|
37
|
+
export function isLayerSurface(element) {
|
|
38
|
+
return surfaces.has(element);
|
|
39
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProgressBar.d.ts","sourceRoot":"","sources":["../../src/ProgressBar/ProgressBar.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAG5C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAUnD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC;AAE7D;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS,CAAC,cAAc,CAAC;IACjE,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1D;;;OAGG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACvC;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAqSD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,WAAW,CAAC,EAC1B,KAAS,EACT,GAAS,EACT,KAAK,EACL,aAAqB,EACrB,aAAqB,EACrB,gBAA0C,EAC1C,OAAkB,EAClB,eAAuB,EACvB,UAAkB,EAClB,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,UAAU,EACzB,GAAG,EACH,GAAG,IAAI,EACR,EAAE,gBAAgB,+
|
|
1
|
+
{"version":3,"file":"ProgressBar.d.ts","sourceRoot":"","sources":["../../src/ProgressBar/ProgressBar.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAG5C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAUnD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC;AAE7D;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS,CAAC,cAAc,CAAC;IACjE,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1D;;;OAGG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACvC;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAqSD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,WAAW,CAAC,EAC1B,KAAS,EACT,GAAS,EACT,KAAK,EACL,aAAqB,EACrB,aAAqB,EACrB,gBAA0C,EAC1C,OAAkB,EAClB,eAAuB,EACvB,UAAkB,EAClB,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,UAAU,EACzB,GAAG,EACH,GAAG,IAAI,EACR,EAAE,gBAAgB,+BA8JlB;yBA/Ke,WAAW"}
|
|
@@ -370,7 +370,7 @@ export function ProgressBar({
|
|
|
370
370
|
}), resolvedMarks.map(mark => {
|
|
371
371
|
// The tick element. It is both the Tooltip's anchor and the Suspense
|
|
372
372
|
// fallback shown while the lazy Tooltip chunk loads, so the tick is
|
|
373
|
-
// always visible and the
|
|
373
|
+
// always visible and the tooltip attaches once ready. The list `key`
|
|
374
374
|
// lives on the mapped <Suspense>, not here.
|
|
375
375
|
//
|
|
376
376
|
// `placement` is reflected as `data-placement` (and a class) so a
|
|
@@ -378,6 +378,8 @@ export function ProgressBar({
|
|
|
378
378
|
// `progress-bar-mark` target; `variant` mirrors the fill's variant
|
|
379
379
|
// for the same reason.
|
|
380
380
|
const markEl = /*#__PURE__*/_jsx("span", {
|
|
381
|
+
role: "img",
|
|
382
|
+
"aria-label": mark.label,
|
|
381
383
|
tabIndex: 0,
|
|
382
384
|
...mergeProps(themeProps('progress-bar-mark', {
|
|
383
385
|
variant: fillVariant,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SideNav.d.ts","sourceRoot":"","sources":["../../src/SideNav/SideNav.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,+BAA+B,EACrC,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"SideNav.d.ts","sourceRoot":"","sources":["../../src/SideNav/SideNav.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,+BAA+B,EACrC,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AA4Q/D,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,WAAW,CAAC;IAC1D,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE7B;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAEvD;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB;;OAEG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IAEtC;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC;CAClD;AAmBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,OAAO,CAAC,EACtB,MAAM,EACN,UAAU,EACV,QAAQ,EACR,MAAM,EACN,WAAW,EACX,WAAmB,EACnB,SAAiB,EACjB,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,MAAM,EACrB,GAAG,EACH,SAAS,EACT,GAAG,KAAK,EACT,EAAE,YAAY,+BAmdd;yBAlee,OAAO"}
|
package/dist/SideNav/SideNav.js
CHANGED
|
@@ -39,6 +39,7 @@ import { useTranslator } from "../i18n/index.js";
|
|
|
39
39
|
import { useMergedRefs } from "../hooks/useMergedRefs.js";
|
|
40
40
|
import { LayoutChangeSnapshot } from "../motion/LayoutChangeSnapshot.js";
|
|
41
41
|
import { getFocusableElements } from "../hooks/useFocusTrap.js";
|
|
42
|
+
import { useFocusLeavingChange } from "../utils/useFocusLeavingChange.js";
|
|
42
43
|
import { readAccessibleName } from "../utils/accessibleName.js";
|
|
43
44
|
import { moveFocusLeftBehind, noteFocusWithin } from "../utils/focusReturn.js";
|
|
44
45
|
import { useInteractionModalityTracking } from "../utils/interactionModality.js";
|
|
@@ -141,6 +142,8 @@ const FOOTER_ICON_SIZE = 'sm';
|
|
|
141
142
|
// Component
|
|
142
143
|
// =============================================================================
|
|
143
144
|
|
|
145
|
+
/** Where focus was before a collapse, as the move after it needs it. */
|
|
146
|
+
|
|
144
147
|
/**
|
|
145
148
|
* Sidebar navigation container for application pages.
|
|
146
149
|
*
|
|
@@ -298,15 +301,13 @@ export function SideNav({
|
|
|
298
301
|
}
|
|
299
302
|
}), []);
|
|
300
303
|
const resizeWrapperRef = useRef(null);
|
|
301
|
-
const
|
|
302
|
-
const noteRailFocus = useCallback(wasCollapsed => {
|
|
303
|
-
pendingFocusRef.current = null;
|
|
304
|
+
const noteRailFocus = useFocusLeavingChange(collapsed, wasCollapsed => {
|
|
304
305
|
const nav = navRef.current;
|
|
305
306
|
// The resize handle sits beside the nav, in the resize wrapper, and goes
|
|
306
307
|
// with a collapse its Enter starts.
|
|
307
308
|
const focus = wasCollapsed ? null : noteFocusWithin(nav) ?? noteFocusWithin(resizeWrapperRef.current);
|
|
308
309
|
if (focus == null || nav == null) {
|
|
309
|
-
return;
|
|
310
|
+
return null;
|
|
310
311
|
}
|
|
311
312
|
const rows = railRows(nav, rowsRef.current);
|
|
312
313
|
// The innermost row holding focus, the last in document order: a nested
|
|
@@ -325,19 +326,16 @@ export function SideNav({
|
|
|
325
326
|
name: controlName(controls[at])
|
|
326
327
|
};
|
|
327
328
|
}
|
|
328
|
-
|
|
329
|
+
return {
|
|
329
330
|
focus,
|
|
330
331
|
outside,
|
|
331
332
|
wasOnToggle: [...togglesRef.current].some(toggle => toggle.contains(focus.element)),
|
|
332
333
|
isRowKept: index >= 0 && rowsRef.current.get(rows[index]) === true,
|
|
333
334
|
keptBefore: rows.slice(0, Math.max(index, 0)).filter(row => rowsRef.current.get(row) === true).length
|
|
334
335
|
};
|
|
335
|
-
},
|
|
336
|
-
useLayoutEffect(() => {
|
|
337
|
-
const pending = pendingFocusRef.current;
|
|
338
|
-
pendingFocusRef.current = null;
|
|
336
|
+
}, (pending, isCollapsed) => {
|
|
339
337
|
const nav = navRef.current;
|
|
340
|
-
if (
|
|
338
|
+
if (!isCollapsed || nav == null) {
|
|
341
339
|
return;
|
|
342
340
|
}
|
|
343
341
|
// Collapsed, every row the nav renders is one the rail keeps, in order.
|
|
@@ -353,7 +351,7 @@ export function SideNav({
|
|
|
353
351
|
}
|
|
354
352
|
const target = pending.isRowKept ? controlOf(kept[pending.keptBefore]) : sameOutside ?? toggle ?? controlOf(kept[pending.keptBefore - 1]) ?? controlOf(kept[pending.keptBefore]);
|
|
355
353
|
moveFocusLeftBehind(pending.focus, target);
|
|
356
|
-
}
|
|
354
|
+
});
|
|
357
355
|
const beforeRailChange = useCallback(wasCollapsed => {
|
|
358
356
|
noteRailFocus(wasCollapsed);
|
|
359
357
|
measureRail(wasCollapsed);
|
|
@@ -579,7 +579,9 @@ export function SideNavHeading({
|
|
|
579
579
|
}), renderTextContent(/*#__PURE__*/_jsx("button", {
|
|
580
580
|
ref: setTriggerEl,
|
|
581
581
|
type: "button",
|
|
582
|
-
"aria-label": t('@astryx.sideNav.heading.openMenu'
|
|
582
|
+
"aria-label": t('@astryx.sideNav.heading.openMenu', {
|
|
583
|
+
heading
|
|
584
|
+
}),
|
|
583
585
|
onClick: e => {
|
|
584
586
|
e.stopPropagation();
|
|
585
587
|
triggerProps.onClick();
|
|
@@ -642,7 +644,9 @@ export function SideNavHeading({
|
|
|
642
644
|
})), renderTextContent(showChevron ? /*#__PURE__*/_jsx("button", {
|
|
643
645
|
ref: setTriggerEl,
|
|
644
646
|
type: "button",
|
|
645
|
-
"aria-label": t('@astryx.sideNav.heading.openMenu'
|
|
647
|
+
"aria-label": t('@astryx.sideNav.heading.openMenu', {
|
|
648
|
+
heading
|
|
649
|
+
}),
|
|
646
650
|
onClick: e => {
|
|
647
651
|
e.stopPropagation();
|
|
648
652
|
triggerProps.onClick();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../src/Token/Token.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAiBrC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Token.d.ts","sourceRoot":"","sources":["../../src/Token/Token.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAiBrC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAQ5C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAO3C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAE3C,MAAM,WAAW,UAAW,SAAQ,SAAS,CAAC,WAAW,CAAC;IACxD,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IACxC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AA2JD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,KAAK,CAAC,EACpB,KAAK,EACL,IAAW,EACX,KAAiB,EACjB,IAAI,EACJ,UAAkB,EAClB,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,WAAW,EACX,UAAU,EACV,aAAqB,EACrB,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,cAAc,EACjC,kBAAkB,EAAE,eAAe,EACnC,GAAG,EACH,GAAG,IAAI,EACR,EAAE,UAAU,+BA6QZ;yBAjSe,KAAK"}
|
package/dist/Token/Token.js
CHANGED
|
@@ -27,7 +27,9 @@ import { TokenLink } from "./TokenLink.js";
|
|
|
27
27
|
import { themeProps } from "../utils/themeProps.js";
|
|
28
28
|
import { focusOutlineProps } from "../utils/focusOutline.stylex.js";
|
|
29
29
|
import { interactionOverlayStyles } from "../utils/interactionOverlay.stylex.js";
|
|
30
|
+
import { innermostInteractive } from "../hooks/useClickableContainer.js";
|
|
30
31
|
import { usePressFeedback } from "../hooks/usePressFeedback.js";
|
|
32
|
+
import { isLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
31
33
|
import { useTranslator } from "../i18n/index.js";
|
|
32
34
|
import { disabledInteractionProps } from "../utils/disabledInteraction.js";
|
|
33
35
|
|
|
@@ -375,7 +377,10 @@ export function Token({
|
|
|
375
377
|
if (effectiveOnClick != null) {
|
|
376
378
|
const handleContainerClick = e => {
|
|
377
379
|
const target = e.target;
|
|
378
|
-
if (target.closest('button, a')
|
|
380
|
+
if (target.closest('button, a') ||
|
|
381
|
+
// A press inside an open Tooltip or HoverCard belongs to it
|
|
382
|
+
// (component:Tooltip FR11, component:HoverCard FR11).
|
|
383
|
+
innermostInteractive(target, e.currentTarget, isLayerSurface) != null) {
|
|
379
384
|
return;
|
|
380
385
|
}
|
|
381
386
|
effectiveOnClick(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTooltip.d.ts","sourceRoot":"","sources":["../../src/Tooltip/useTooltip.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"useTooltip.d.ts","sourceRoot":"","sources":["../../src/Tooltip/useTooltip.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;AA4ClC;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAEnC;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAEnC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAE9B;;;OAGG;IACH,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAEtC;;;;OAIG;IACH,cAAc,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAEzC;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,aAAa,EAAE,CACb,QAAQ,EAAE,SAAS,EACnB,KAAK,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,KAC5C,SAAS,CAAC;CAChB;AAyBD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,wBAAgB,UAAU,CAAC,OAAO,GAAE,cAAmB,GAAG,aAAa,CAiZtE"}
|
|
@@ -16,6 +16,7 @@ import * as stylex from '@stylexjs/stylex';
|
|
|
16
16
|
import { useLayerInternal } from "../Layer/useLayer.js";
|
|
17
17
|
import { useTouchTrigger } from "../Layer/useTouchTrigger.js";
|
|
18
18
|
import { layerAnimations } from "../Layer/layerAnimations.stylex.js";
|
|
19
|
+
import { registerLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
19
20
|
import { useLayerDismissal } from "../Layer/useLayerDismissal.js";
|
|
20
21
|
import { themeProps } from "../utils/themeProps.js";
|
|
21
22
|
import "../theme/tokens.stylex.js";
|
|
@@ -94,6 +95,7 @@ function isFocusable(element) {
|
|
|
94
95
|
* {tooltip.renderTooltip('Helpful tooltip text')}
|
|
95
96
|
* ```
|
|
96
97
|
*/
|
|
98
|
+
|
|
97
99
|
export function useTooltip(options = {}) {
|
|
98
100
|
const {
|
|
99
101
|
placement = 'above',
|
|
@@ -415,7 +417,15 @@ export function useTooltip(options = {}) {
|
|
|
415
417
|
onMouseEnter: cancelHide,
|
|
416
418
|
onMouseLeave: scheduleHide
|
|
417
419
|
};
|
|
418
|
-
return renderLayer(
|
|
420
|
+
return renderLayer(
|
|
421
|
+
/*#__PURE__*/
|
|
422
|
+
// FR11: React bubbles a press on the surface to the trigger's
|
|
423
|
+
// ancestors, portaled or not. A registered surface counts as
|
|
424
|
+
// something else in the shared interactive-ancestor walk, so a
|
|
425
|
+
// clickable container around the trigger leaves the press alone while
|
|
426
|
+
// document listeners still see it.
|
|
427
|
+
_jsx("div", {
|
|
428
|
+
ref: registerLayerSurface,
|
|
419
429
|
...{
|
|
420
430
|
className: "xfsso4q xy143xn x12gdq22 x1djylfy xw5ewwj x13faqbe"
|
|
421
431
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopNavHeading.d.ts","sourceRoot":"","sources":["../../src/TopNav/TopNavHeading.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAkB,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAatD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAgM5C,MAAM,WAAW,kBAAmB,SAAQ,SAAS,CAAC,WAAW,CAAC;IAChE,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7B;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,EAAE,CAAC,EAAE,iBAAiB,CAAC;CACxB;AAMD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,EAC5B,EAAE,EACF,IAAI,EACJ,SAAS,EACT,OAAO,EACP,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,IAAI,EACJ,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,MAAM,EACrB,GAAG,EACH,GAAG,KAAK,EACT,EAAE,kBAAkB,+
|
|
1
|
+
{"version":3,"file":"TopNavHeading.d.ts","sourceRoot":"","sources":["../../src/TopNav/TopNavHeading.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAkB,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAatD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAgM5C,MAAM,WAAW,kBAAmB,SAAQ,SAAS,CAAC,WAAW,CAAC;IAChE,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7B;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,EAAE,CAAC,EAAE,iBAAiB,CAAC;CACxB;AAMD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,EAC5B,EAAE,EACF,IAAI,EACJ,SAAS,EACT,OAAO,EACP,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,IAAI,EACJ,MAAM,EACN,SAAS,EACT,KAAK,EACL,aAAa,EAAE,MAAM,EACrB,GAAG,EACH,GAAG,KAAK,EACT,EAAE,kBAAkB,+BA2apB;yBA7be,aAAa"}
|
|
@@ -343,7 +343,10 @@ export function TopNavHeading({
|
|
|
343
343
|
_jsx("button", {
|
|
344
344
|
ref: setTriggerEl,
|
|
345
345
|
type: "button",
|
|
346
|
-
"aria-label": t('@astryx.topNav.heading.openMenu'
|
|
346
|
+
"aria-label": t('@astryx.topNav.heading.openMenu', {
|
|
347
|
+
heading: heading ?? '',
|
|
348
|
+
hasHeading: heading ? 'true' : 'false'
|
|
349
|
+
}),
|
|
347
350
|
onClick: e => {
|
|
348
351
|
e.stopPropagation();
|
|
349
352
|
triggerProps.onClick();
|
|
@@ -414,7 +417,10 @@ export function TopNavHeading({
|
|
|
414
417
|
_jsx("button", {
|
|
415
418
|
ref: setTriggerEl,
|
|
416
419
|
type: "button",
|
|
417
|
-
"aria-label": t('@astryx.topNav.heading.openMenu'
|
|
420
|
+
"aria-label": t('@astryx.topNav.heading.openMenu', {
|
|
421
|
+
heading: heading ?? '',
|
|
422
|
+
hasHeading: heading ? 'true' : 'false'
|
|
423
|
+
}),
|
|
418
424
|
onClick: e => {
|
|
419
425
|
e.stopPropagation();
|
|
420
426
|
triggerProps.onClick();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @file ModalAnnounceProvider.tsx
|
|
3
|
-
* @input Uses React context, effects
|
|
4
|
-
*
|
|
3
|
+
* @input Uses React context, effects, the exposure and delivery internals of
|
|
4
|
+
* useAnnounce, and the shared MutationObserver
|
|
5
5
|
* @output Exports ModalAnnounceProvider, the element every Astryx component
|
|
6
6
|
* that owns a native <dialog> renders around its content
|
|
7
7
|
* @position Core a11y internal (spec:AST-086 FR14). Its own module so only
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalAnnounceProvider.d.ts","sourceRoot":"","sources":["../../src/hooks/ModalAnnounceProvider.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AAEH,OAAO,EAKL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ModalAnnounceProvider.d.ts","sourceRoot":"","sources":["../../src/hooks/ModalAnnounceProvider.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AAEH,OAAO,EAKL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAYf;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EACT,MAAM,EACN,QAAQ,GACT,EAAE;IACD,SAAS,EAAE,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC/C;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB,GAAG,SAAS,CA2FZ"}
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* @file ModalAnnounceProvider.tsx
|
|
7
|
-
* @input Uses React context, effects
|
|
8
|
-
*
|
|
7
|
+
* @input Uses React context, effects, the exposure and delivery internals of
|
|
8
|
+
* useAnnounce, and the shared MutationObserver
|
|
9
9
|
* @output Exports ModalAnnounceProvider, the element every Astryx component
|
|
10
10
|
* that owns a native <dialog> renders around its content
|
|
11
11
|
* @position Core a11y internal (spec:AST-086 FR14). Its own module so only
|
|
@@ -18,6 +18,7 @@ import { use, useEffect, useMemo, useRef } from 'react';
|
|
|
18
18
|
import { forgetPresented, handOffUnexposed, isExposed, notePresented, releaseAllHeld } from "./modalAnnounce.js";
|
|
19
19
|
import { ModalAnnounceContext } from "./useAnnounce.js";
|
|
20
20
|
import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect.js";
|
|
21
|
+
import { observeMutations } from "../utils/sharedMutationObserver.js";
|
|
21
22
|
|
|
22
23
|
/**
|
|
23
24
|
* Rendered by every Astryx component that owns a native `<dialog>` (Dialog,
|
|
@@ -72,11 +73,11 @@ export function ModalAnnounceProvider({
|
|
|
72
73
|
notePresented(dialog);
|
|
73
74
|
let wasOpen = dialog.open;
|
|
74
75
|
const end = () => {
|
|
75
|
-
|
|
76
|
+
stop();
|
|
76
77
|
forgetPresented(dialog);
|
|
77
78
|
sessionRef.current = null;
|
|
78
79
|
};
|
|
79
|
-
const stop = () =>
|
|
80
|
+
const stop = () => unobserve();
|
|
80
81
|
const onPresentationChange = () => {
|
|
81
82
|
// The order is the top-layer order: only `open` being set moves a
|
|
82
83
|
// dialog up it. A dialog turning inert or aria-hidden for its exit
|
|
@@ -101,11 +102,12 @@ export function ModalAnnounceProvider({
|
|
|
101
102
|
end();
|
|
102
103
|
}
|
|
103
104
|
};
|
|
104
|
-
|
|
105
|
-
|
|
105
|
+
// Core's shared observer watches every open modal's presentation: one
|
|
106
|
+
// observer for all of them, not one per open modal.
|
|
107
|
+
const unobserve = observeMutations(dialog, {
|
|
106
108
|
attributes: true,
|
|
107
109
|
attributeFilter: ['open', 'inert', 'aria-hidden']
|
|
108
|
-
});
|
|
110
|
+
}, onPresentationChange);
|
|
109
111
|
sessionRef.current = {
|
|
110
112
|
dialog,
|
|
111
113
|
stop
|
|
@@ -58,6 +58,9 @@ export declare function innermostInteractive(el: Element, rootEl: Element | null
|
|
|
58
58
|
* instance, has no ref to hand the hook but needs the identical rule. Sharing
|
|
59
59
|
* the walk keeps one definition of "this click belongs to something else"
|
|
60
60
|
* instead of a short hand-rolled selector list per caller.
|
|
61
|
+
*
|
|
62
|
+
* A press inside an open Tooltip or HoverCard surface also answers true: it
|
|
63
|
+
* belongs to that surface, not the container around its trigger.
|
|
61
64
|
*/
|
|
62
65
|
export declare function hasInteractiveAncestor(el: Element, rootEl: Element): boolean;
|
|
63
66
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useClickableContainer.d.ts","sourceRoot":"","sources":["../../src/hooks/useClickableContainer.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAyB,KAAK,SAAS,EAAE,KAAK,UAAU,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useClickableContainer.d.ts","sourceRoot":"","sources":["../../src/hooks/useClickableContainer.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAyB,KAAK,SAAS,EAAE,KAAK,UAAU,EAAC,MAAM,OAAO,CAAC;AAI9E;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,6BAA6B,CAAC;AAExE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,QAmBvB,CAAC;AAIZ;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,OAAO,GAAG,IAAI,EACtB,aAAa,GAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAqC,GACzE,OAAO,GAAG,IAAI,CAShB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAE5E;AAQD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CASvD;AAED,MAAM,WAAW,4BAA4B;IAC3C,yCAAyC;IACzC,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5C,mEAAmE;IACnE,cAAc,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC/C,oBAAoB;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAClD,SAAS,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,YAAY,EACZ,cAAc,EACd,OAAO,EAAE,WAAW,EACpB,IAAI,EACJ,MAAM,EACN,QAAgB,GACjB,EAAE,4BAA4B,GAAG,wBAAwB,CAmHzD"}
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
* - /packages/core/src/hooks/index.ts (export)
|
|
22
22
|
*/
|
|
23
23
|
import { useCallback, useEffect } from 'react';
|
|
24
|
+
import { isLayerSurface } from "../Layer/layerSurfacePress.js";
|
|
24
25
|
import { isSafeUrl } from "../utils/safeUrl.js";
|
|
25
26
|
|
|
26
27
|
/**
|
|
@@ -80,9 +81,18 @@ export function innermostInteractive(el, rootEl, isInteractive = matchesInteract
|
|
|
80
81
|
* instance, has no ref to hand the hook but needs the identical rule. Sharing
|
|
81
82
|
* the walk keeps one definition of "this click belongs to something else"
|
|
82
83
|
* instead of a short hand-rolled selector list per caller.
|
|
84
|
+
*
|
|
85
|
+
* A press inside an open Tooltip or HoverCard surface also answers true: it
|
|
86
|
+
* belongs to that surface, not the container around its trigger.
|
|
83
87
|
*/
|
|
84
88
|
export function hasInteractiveAncestor(el, rootEl) {
|
|
85
|
-
return innermostInteractive(el, rootEl) != null;
|
|
89
|
+
return innermostInteractive(el, rootEl, belongsToSomethingElse) != null;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
// A press inside an open Tooltip or HoverCard surface belongs to that surface
|
|
93
|
+
// (component:Tooltip FR11, component:HoverCard FR11).
|
|
94
|
+
function belongsToSomethingElse(element) {
|
|
95
|
+
return matchesInteractiveSelectors(element) || isLayerSurface(element);
|
|
86
96
|
}
|
|
87
97
|
|
|
88
98
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useKeyboardHint.d.ts","sourceRoot":"","sources":["../../src/hooks/useKeyboardHint.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,EAAiC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAiB5E,MAAM,MAAM,uBAAuB,GAAG,YAAY,GAAG,UAAU,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAEtC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,WAAW,EAAE,SAAS,CAAC;IAEvB;;;OAGG;IACH,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IAEtC;;;OAGG;IACH,SAAS,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC;CAC7C;AAmED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,GAAE,sBAA2B,GACnC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"useKeyboardHint.d.ts","sourceRoot":"","sources":["../../src/hooks/useKeyboardHint.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,EAAiC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAiB5E,MAAM,MAAM,uBAAuB,GAAG,YAAY,GAAG,UAAU,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAEtC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,WAAW,EAAE,SAAS,CAAC;IAEvB;;;OAGG;IACH,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC;IAEtC;;;OAGG;IACH,SAAS,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC;CAC7C;AAmED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,GAAE,sBAA2B,GACnC,qBAAqB,CAsKvB"}
|