@navikt/ds-react 7.37.0 → 7.38.0

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.
Files changed (106) hide show
  1. package/cjs/date/Date.Dialog.js +5 -1
  2. package/cjs/date/Date.Dialog.js.map +1 -1
  3. package/cjs/dialog/index.d.ts +1 -1
  4. package/cjs/dialog/index.js +4 -1
  5. package/cjs/dialog/index.js.map +1 -1
  6. package/cjs/dialog/popup/DialogPopup.js +6 -1
  7. package/cjs/dialog/popup/DialogPopup.js.map +1 -1
  8. package/cjs/dialog/root/DialogRoot.d.ts +5 -5
  9. package/cjs/dialog/root/DialogRoot.js +12 -11
  10. package/cjs/dialog/root/DialogRoot.js.map +1 -1
  11. package/cjs/form/combobox/Combobox.d.ts +1 -1
  12. package/cjs/form/combobox/Input/InputController.d.ts +1 -1
  13. package/cjs/form/file-upload/useFileUpload.d.ts +1 -1
  14. package/cjs/layout/base/PrimitiveAsChildProps.d.ts +1 -4
  15. package/cjs/modal/Modal.js +9 -2
  16. package/cjs/modal/Modal.js.map +1 -1
  17. package/cjs/overlays/action-menu/ActionMenu.js +3 -1
  18. package/cjs/overlays/action-menu/ActionMenu.js.map +1 -1
  19. package/cjs/overlays/dismissablelayer/DismissableLayer.d.ts +1 -0
  20. package/cjs/overlays/dismissablelayer/DismissableLayer.js +33 -14
  21. package/cjs/overlays/dismissablelayer/DismissableLayer.js.map +1 -1
  22. package/cjs/overlays/dismissablelayer/util/useEscapeKeydown.js +7 -2
  23. package/cjs/overlays/dismissablelayer/util/useEscapeKeydown.js.map +1 -1
  24. package/cjs/provider/Provider.d.ts +1 -5
  25. package/cjs/provider/Provider.js +0 -2
  26. package/cjs/provider/Provider.js.map +1 -1
  27. package/cjs/slot/Slot.js +12 -5
  28. package/cjs/slot/Slot.js.map +1 -1
  29. package/cjs/tabs/Tabs.context.d.ts +1 -1
  30. package/cjs/tabs/parts/tab/useTab.d.ts +1 -1
  31. package/cjs/tabs/parts/tab/useTab.js +2 -1
  32. package/cjs/tabs/parts/tab/useTab.js.map +1 -1
  33. package/cjs/toggle-group/ToggleGroup.context.d.ts +1 -1
  34. package/cjs/toggle-group/parts/useToggleItem.d.ts +1 -1
  35. package/cjs/toggle-group/parts/useToggleItem.js +2 -1
  36. package/cjs/toggle-group/parts/useToggleItem.js.map +1 -1
  37. package/cjs/util/hooks/descendants/useDescendant.d.ts +1 -1
  38. package/cjs/util/hooks/descendants/useDescendant.js +2 -1
  39. package/cjs/util/hooks/descendants/useDescendant.js.map +1 -1
  40. package/cjs/util/hooks/useMergeRefs.d.ts +15 -9
  41. package/cjs/util/hooks/useMergeRefs.js +94 -29
  42. package/cjs/util/hooks/useMergeRefs.js.map +1 -1
  43. package/cjs/util/types/AsChildProps.d.ts +0 -4
  44. package/cjs/util/virtualfocus/Context.d.ts +1 -1
  45. package/esm/date/Date.Dialog.js +5 -1
  46. package/esm/date/Date.Dialog.js.map +1 -1
  47. package/esm/dialog/index.d.ts +1 -1
  48. package/esm/dialog/index.js +1 -1
  49. package/esm/dialog/index.js.map +1 -1
  50. package/esm/dialog/popup/DialogPopup.js +6 -1
  51. package/esm/dialog/popup/DialogPopup.js.map +1 -1
  52. package/esm/dialog/root/DialogRoot.d.ts +5 -5
  53. package/esm/dialog/root/DialogRoot.js +5 -5
  54. package/esm/dialog/root/DialogRoot.js.map +1 -1
  55. package/esm/form/combobox/Combobox.d.ts +1 -1
  56. package/esm/form/combobox/Input/InputController.d.ts +1 -1
  57. package/esm/form/file-upload/useFileUpload.d.ts +1 -1
  58. package/esm/layout/base/PrimitiveAsChildProps.d.ts +1 -4
  59. package/esm/modal/Modal.js +9 -2
  60. package/esm/modal/Modal.js.map +1 -1
  61. package/esm/overlays/action-menu/ActionMenu.js +3 -1
  62. package/esm/overlays/action-menu/ActionMenu.js.map +1 -1
  63. package/esm/overlays/dismissablelayer/DismissableLayer.d.ts +1 -0
  64. package/esm/overlays/dismissablelayer/DismissableLayer.js +34 -15
  65. package/esm/overlays/dismissablelayer/DismissableLayer.js.map +1 -1
  66. package/esm/overlays/dismissablelayer/util/useEscapeKeydown.js +7 -2
  67. package/esm/overlays/dismissablelayer/util/useEscapeKeydown.js.map +1 -1
  68. package/esm/provider/Provider.d.ts +1 -5
  69. package/esm/provider/Provider.js +0 -2
  70. package/esm/provider/Provider.js.map +1 -1
  71. package/esm/slot/Slot.js +12 -5
  72. package/esm/slot/Slot.js.map +1 -1
  73. package/esm/tabs/Tabs.context.d.ts +1 -1
  74. package/esm/tabs/parts/tab/useTab.d.ts +1 -1
  75. package/esm/tabs/parts/tab/useTab.js +3 -2
  76. package/esm/tabs/parts/tab/useTab.js.map +1 -1
  77. package/esm/toggle-group/ToggleGroup.context.d.ts +1 -1
  78. package/esm/toggle-group/parts/useToggleItem.d.ts +1 -1
  79. package/esm/toggle-group/parts/useToggleItem.js +3 -2
  80. package/esm/toggle-group/parts/useToggleItem.js.map +1 -1
  81. package/esm/util/hooks/descendants/useDescendant.d.ts +1 -1
  82. package/esm/util/hooks/descendants/useDescendant.js +3 -2
  83. package/esm/util/hooks/descendants/useDescendant.js.map +1 -1
  84. package/esm/util/hooks/useMergeRefs.d.ts +15 -9
  85. package/esm/util/hooks/useMergeRefs.js +93 -25
  86. package/esm/util/hooks/useMergeRefs.js.map +1 -1
  87. package/esm/util/types/AsChildProps.d.ts +0 -4
  88. package/esm/util/virtualfocus/Context.d.ts +1 -1
  89. package/package.json +3 -3
  90. package/src/date/Date.Dialog.tsx +6 -1
  91. package/src/dialog/index.ts +1 -1
  92. package/src/dialog/popup/DialogPopup.tsx +7 -1
  93. package/src/dialog/root/DialogRoot.tsx +5 -5
  94. package/src/layout/base/PrimitiveAsChildProps.ts +1 -4
  95. package/src/modal/Modal.tsx +9 -1
  96. package/src/overlays/action-menu/ActionMenu.tsx +3 -2
  97. package/src/overlays/dismissablelayer/DismissableLayer.tsx +52 -16
  98. package/src/overlays/dismissablelayer/util/useEscapeKeydown.ts +7 -2
  99. package/src/provider/Provider.tsx +1 -5
  100. package/src/slot/Slot.tsx +14 -9
  101. package/src/tabs/parts/tab/useTab.ts +4 -2
  102. package/src/toggle-group/parts/useToggleItem.ts +4 -2
  103. package/src/util/__tests__/useMergeRefs.test.ts +92 -0
  104. package/src/util/hooks/descendants/useDescendant.tsx +4 -2
  105. package/src/util/hooks/useMergeRefs.ts +147 -24
  106. package/src/util/types/AsChildProps.ts +0 -4
@@ -15,8 +15,9 @@ function useTab({ value, disabled = false, onFocus: _onFocus, onClick }, ref) {
15
15
  setFocusedValue(value);
16
16
  selectionFollowsFocus && setSelectedValue(value);
17
17
  };
18
+ const refs = (0, useMergeRefs_1.useMergeRefs)(register, ref);
18
19
  return {
19
- ref: (0, useMergeRefs_1.mergeRefs)([register, ref]),
20
+ ref: refs,
20
21
  isSelected,
21
22
  isFocused: focusedValue === value,
22
23
  id: makeTabId(id, value),
@@ -1 +1 @@
1
- {"version":3,"file":"useTab.js","sourceRoot":"","sources":["../../../../src/tabs/parts/tab/useTab.ts"],"names":[],"mappings":";;AAeA,wBAoCC;AAnDD,6EAA0E;AAC1E,mEAA6D;AAC7D,qDAAuE;AAavE,SAAgB,MAAM,CACpB,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAK,EAC1D,GAA0C;IAE1C,MAAM,EACJ,EAAE,EACF,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,cAAc,GACf,GAAG,IAAA,6BAAc,GAAE,CAAC;IAErB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAiB,EAAC;QACrC,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,KAAK,KAAK,aAAa,CAAC;IAE3C,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,eAAe,CAAC,KAAK,CAAC,CAAC;QACvB,qBAAqB,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,IAAA,wBAAS,EAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/B,UAAU;QACV,SAAS,EAAE,YAAY,KAAK,KAAK;QACjC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC;QACxB,UAAU,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC;QACrC,OAAO,EAAE,IAAA,2CAAoB,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACrE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,2CAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC;KACxE,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"useTab.js","sourceRoot":"","sources":["../../../../src/tabs/parts/tab/useTab.ts"],"names":[],"mappings":";;AAeA,wBAsCC;AArDD,6EAA0E;AAC1E,mEAAgE;AAChE,qDAAuE;AAavE,SAAgB,MAAM,CACpB,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAK,EAC1D,GAA0C;IAE1C,MAAM,EACJ,EAAE,EACF,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,cAAc,GACf,GAAG,IAAA,6BAAc,GAAE,CAAC;IAErB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAiB,EAAC;QACrC,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,KAAK,KAAK,aAAa,CAAC;IAE3C,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,eAAe,CAAC,KAAK,CAAC,CAAC;QACvB,qBAAqB,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,2BAAY,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEzC,OAAO;QACL,GAAG,EAAE,IAAI;QACT,UAAU;QACV,SAAS,EAAE,YAAY,KAAK,KAAK;QACjC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC;QACxB,UAAU,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC;QACrC,OAAO,EAAE,IAAA,2CAAoB,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACrE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,2CAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC;KACxE,CAAC;AACJ,CAAC"}
@@ -20,7 +20,7 @@ export declare const ToggleGroupDescendantsProvider: import("react").Provider<im
20
20
  }>;
21
21
  index: number;
22
22
  enabledIndex: number;
23
- register: (instance: HTMLButtonElement | null) => void;
23
+ register: ((instance: HTMLButtonElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
24
24
  };
25
25
  type ToggleGroupProviderProps = ReturnType<typeof useToggleGroup> & Pick<ToggleGroupProps, "size">;
26
26
  export declare const ToggleGroupProvider: import("react").FC<{
@@ -10,7 +10,7 @@ export interface UseToggleItemProps {
10
10
  value: string;
11
11
  }
12
12
  export declare function useToggleItem<P extends UseToggleItemProps>({ value, disabled, onFocus: _onFocus, onClick, onKeyDown: _onKeyDown, }: P, ref: React.ForwardedRef<HTMLButtonElement>): {
13
- ref: (instance: HTMLButtonElement | null) => void;
13
+ ref: ((instance: HTMLButtonElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
14
14
  isSelected: boolean;
15
15
  isFocused: boolean;
16
16
  onClick: (event: import("react").MouseEvent<Element, MouseEvent>) => void;
@@ -64,8 +64,9 @@ function useToggleItem({ value, disabled = false, onFocus: _onFocus, onClick, on
64
64
  selectedValue && setTimeout(() => setFocusedValue(selectedValue));
65
65
  }
66
66
  }, [descendants, focusedValue, selectedValue, setFocusedValue]);
67
+ const refs = (0, useMergeRefs_1.useMergeRefs)(register, ref);
67
68
  return {
68
- ref: (0, useMergeRefs_1.mergeRefs)([register, ref]),
69
+ ref: refs,
69
70
  isSelected,
70
71
  isFocused: focusedValue === value,
71
72
  onClick: (0, composeEventHandlers_1.composeEventHandlers)(onClick, () => selectedValue !== value && setSelectedValue(value)),
@@ -1 +1 @@
1
- {"version":3,"file":"useToggleItem.js","sourceRoot":"","sources":["../../../src/toggle-group/parts/useToggleItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useToggleItem.js","sourceRoot":"","sources":["../../../src/toggle-group/parts/useToggleItem.ts"],"names":[],"mappings":"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"}
@@ -10,5 +10,5 @@ export declare function createDescendantContext<T extends HTMLElement = HTMLElem
10
10
  descendants: DescendantsManager<T, K>;
11
11
  index: number;
12
12
  enabledIndex: number;
13
- register: (instance: T | null) => void;
13
+ register: ((instance: T | null) => void | React.DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof React.DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
14
14
  }];
@@ -84,11 +84,12 @@ function createDescendantContext() {
84
84
  const refCallback = options
85
85
  ? (0, utils_1.cast)(descendants.register(options))
86
86
  : (0, utils_1.cast)(descendants.register);
87
+ const refs = (0, useMergeRefs_1.useMergeRefs)(refCallback, ref);
87
88
  return {
88
89
  descendants,
89
90
  index,
90
91
  enabledIndex: descendants.enabledIndexOf(ref.current),
91
- register: (0, useMergeRefs_1.mergeRefs)([refCallback, ref]),
92
+ register: refs,
92
93
  };
93
94
  }
94
95
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"useDescendant.js","sourceRoot":"","sources":["../../../../src/util/hooks/descendants/useDescendant.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,0DAmFC;AAhGD;;GAEG;AACH,+CAAgD;AAChD,uEAAkE;AAClE,oEAAiE;AACjE,kDAA4C;AAC5C,6CAAqE;AACrE,mCAA+B;AAE/B;;GAEG;AACH,SAAgB,uBAAuB;IAIrC,MAAM,EACJ,QAAQ,EAAE,0BAA0B,EACpC,UAAU,EAAE,qBAAqB,GAClC,GAAG,IAAA,2CAAmB,EAAoC;QACzD,IAAI,EAAE,qBAAqB;QAC3B,YAAY,EACV,+DAA+D;KAClE,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAA,YAAI,EAC1B,CAAC,KAAK,EAAE,EAAE,CAAC,CACT,8BAAC,0BAA0B,oBAAK,KAAK,CAAC,KAAK,GACxC,KAAK,CAAC,QAAQ,CACY,CAC9B,CACF,CAAC;IAEF;;;;;;OAMG;IACH,SAAS,aAAa,CAAC,OAA8B;QACnD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,IAAA,cAAM,EAAI,IAAI,CAAC,CAAC;QAE5B,IAAA,6CAAqB,EAAC,GAAG,EAAE;YACzB,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,OAAO;oBAAE,OAAO;gBACzB,uDAAuD;gBACvD,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC,CAAC;YACF,uDAAuD;QACzD,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,uDAAuD;QACvD,IAAA,6CAAqB,EAAC,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;gBACpD,QAAQ,CAAC,SAAS,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO;YACzB,CAAC,CAAC,IAAA,YAAI,EAAuB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,IAAA,YAAI,EAAuB,WAAW,CAAC,QAAQ,CAAC,CAAC;QAErD,OAAO;YACL,WAAW;YACX,KAAK;YACL,YAAY,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YACrD,QAAQ,EAAE,IAAA,wBAAS,EAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;SACxC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,SAAS,cAAc;QACrB,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,IAAI,+BAAkB,EAAQ,CAAC,CAAC,OAAO,CAAC;QAEnE,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO;QACL,mBAAmB;QACnB,eAAe;QACf,+CAA+C;QAC/C,qBAAqB;QACrB,8EAA8E;QAC9E,cAAc;QACd,+BAA+B;QAC/B,aAAa;KACL,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"useDescendant.js","sourceRoot":"","sources":["../../../../src/util/hooks/descendants/useDescendant.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,0DAqFC;AAlGD;;GAEG;AACH,+CAAgD;AAChD,uEAAkE;AAClE,oEAAiE;AACjE,kDAA+C;AAC/C,6CAAqE;AACrE,mCAA+B;AAE/B;;GAEG;AACH,SAAgB,uBAAuB;IAIrC,MAAM,EACJ,QAAQ,EAAE,0BAA0B,EACpC,UAAU,EAAE,qBAAqB,GAClC,GAAG,IAAA,2CAAmB,EAAoC;QACzD,IAAI,EAAE,qBAAqB;QAC3B,YAAY,EACV,+DAA+D;KAClE,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAA,YAAI,EAC1B,CAAC,KAAK,EAAE,EAAE,CAAC,CACT,8BAAC,0BAA0B,oBAAK,KAAK,CAAC,KAAK,GACxC,KAAK,CAAC,QAAQ,CACY,CAC9B,CACF,CAAC;IAEF;;;;;;OAMG;IACH,SAAS,aAAa,CAAC,OAA8B;QACnD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,IAAA,cAAM,EAAI,IAAI,CAAC,CAAC;QAE5B,IAAA,6CAAqB,EAAC,GAAG,EAAE;YACzB,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,OAAO;oBAAE,OAAO;gBACzB,uDAAuD;gBACvD,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC,CAAC;YACF,uDAAuD;QACzD,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,uDAAuD;QACvD,IAAA,6CAAqB,EAAC,GAAG,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;gBACpD,QAAQ,CAAC,SAAS,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO;YACzB,CAAC,CAAC,IAAA,YAAI,EAAuB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,IAAA,YAAI,EAAuB,WAAW,CAAC,QAAQ,CAAC,CAAC;QAErD,MAAM,IAAI,GAAG,IAAA,2BAAY,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAE5C,OAAO;YACL,WAAW;YACX,KAAK;YACL,YAAY,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YACrD,QAAQ,EAAE,IAAI;SACf,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,SAAS,cAAc;QACrB,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,IAAI,+BAAkB,EAAQ,CAAC,CAAC,OAAO,CAAC;QAEnE,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO;QACL,mBAAmB;QACnB,eAAe;QACf,+CAA+C;QAC/C,qBAAqB;QACrB,8EAA8E;QAC9E,cAAc;QACd,+BAA+B;QAC/B,aAAa;KACL,CAAC;AACb,CAAC"}
@@ -1,15 +1,21 @@
1
1
  import React from "react";
2
- type PossibleRef<T> = React.Ref<T> | undefined;
2
+ type Empty = null | undefined;
3
+ type InputRef<I> = React.Ref<I> | Empty;
4
+ type Result<I> = React.RefCallback<I> | null;
3
5
  /**
4
- * Use `useMergeRefs`
5
- * @internal
6
+ * Merges refs into a single memoized callback ref or `null`.
7
+ * This makes sure multiple refs are updated together and have the same value.
8
+ *
9
+ * This function accepts up to four refs. If you need to merge more, or have an unspecified number of refs to merge,
10
+ * use `useMergeRefsN` instead.
6
11
  */
7
- export declare function mergeRefs<T>(refs: PossibleRef<T>[]): (instance: T | null) => void;
12
+ export declare function useMergeRefs<I>(a: InputRef<I>, b: InputRef<I>): Result<I>;
13
+ export declare function useMergeRefs<I>(a: InputRef<I>, b: InputRef<I>, c: InputRef<I>): Result<I>;
14
+ export declare function useMergeRefs<I>(a: InputRef<I>, b: InputRef<I>, c: InputRef<I>, d: InputRef<I>): Result<I>;
8
15
  /**
9
- * Merges refs within useCallback
10
- * @internal
11
- * @param ...refs: React.Ref<T> | undefined
12
- * @returns React.useCallback(mergeRefs(refs), refs)
16
+ * Merges an array of refs into a single memoized callback ref or `null`.
17
+ *
18
+ * If you need to merge a fixed number (up to four) of refs, use `useMergeRefs` instead for better performance.
13
19
  */
14
- export declare function useMergeRefs<T>(...refs: PossibleRef<T>[]): (instance: T | null) => void;
20
+ export declare function useMergeRefsN<I>(refs: InputRef<I>[]): Result<I>;
15
21
  export {};
@@ -1,38 +1,103 @@
1
1
  "use strict";
2
- /* eslint-disable react-hooks/exhaustive-deps */
3
- var __importDefault = (this && this.__importDefault) || function (mod) {
4
- return (mod && mod.__esModule) ? mod : { "default": mod };
5
- };
6
2
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.mergeRefs = mergeRefs;
8
3
  exports.useMergeRefs = useMergeRefs;
9
- /* https://github.com/radix-ui/primitives/blob/main/packages/react/compose-refs/src/composeRefs.tsx */
10
- const react_1 = __importDefault(require("react"));
11
- // https://github.com/gregberge/react-merge-refs
4
+ exports.useMergeRefsN = useMergeRefsN;
5
+ const useRefWithInit_1 = require("./useRefWithInit");
6
+ function useMergeRefs(a, b, c, d) {
7
+ const forkRef = (0, useRefWithInit_1.useRefWithInit)((createForkRef)).current;
8
+ if (didChange(forkRef, a, b, c, d)) {
9
+ update(forkRef, [a, b, c, d]);
10
+ }
11
+ return forkRef.callback;
12
+ }
12
13
  /**
13
- * Use `useMergeRefs`
14
- * @internal
14
+ * Merges an array of refs into a single memoized callback ref or `null`.
15
+ *
16
+ * If you need to merge a fixed number (up to four) of refs, use `useMergeRefs` instead for better performance.
15
17
  */
16
- function mergeRefs(refs) {
17
- return (instance) => {
18
- refs.forEach((ref) => {
19
- if (typeof ref === "function") {
20
- ref(instance);
21
- }
22
- else if (ref !== null && ref !== undefined) {
23
- ref.current = instance;
24
- }
25
- });
18
+ function useMergeRefsN(refs) {
19
+ const forkRef = (0, useRefWithInit_1.useRefWithInit)((createForkRef)).current;
20
+ if (didChangeN(forkRef, refs)) {
21
+ update(forkRef, refs);
22
+ }
23
+ return forkRef.callback;
24
+ }
25
+ function createForkRef() {
26
+ return {
27
+ callback: null,
28
+ cleanup: null,
29
+ refs: [],
26
30
  };
27
31
  }
28
- /**
29
- * Merges refs within useCallback
30
- * @internal
31
- * @param ...refs: React.Ref<T> | undefined
32
- * @returns React.useCallback(mergeRefs(refs), refs)
33
- */
34
- function useMergeRefs(...refs) {
35
- // biome-ignore lint/correctness/useExhaustiveDependencies: we want to only update if refs change
36
- return react_1.default.useCallback(mergeRefs(refs), refs);
32
+ function didChange(forkRef, a, b, c, d) {
33
+ return (forkRef.refs[0] !== a ||
34
+ forkRef.refs[1] !== b ||
35
+ forkRef.refs[2] !== c ||
36
+ forkRef.refs[3] !== d);
37
+ }
38
+ function didChangeN(forkRef, newRefs) {
39
+ return (forkRef.refs.length !== newRefs.length ||
40
+ forkRef.refs.some((ref, index) => ref !== newRefs[index]));
41
+ }
42
+ function update(forkRef, refs) {
43
+ forkRef.refs = refs;
44
+ if (refs.every((ref) => ref == null)) {
45
+ forkRef.callback = null;
46
+ return;
47
+ }
48
+ forkRef.callback = (instance) => {
49
+ if (forkRef.cleanup) {
50
+ forkRef.cleanup();
51
+ forkRef.cleanup = null;
52
+ }
53
+ if (instance != null) {
54
+ const cleanupCallbacks = Array(refs.length).fill(null);
55
+ for (let i = 0; i < refs.length; i += 1) {
56
+ const ref = refs[i];
57
+ if (ref == null) {
58
+ continue;
59
+ }
60
+ switch (typeof ref) {
61
+ case "function": {
62
+ const refCleanup = ref(instance);
63
+ if (typeof refCleanup === "function") {
64
+ cleanupCallbacks[i] = refCleanup;
65
+ }
66
+ break;
67
+ }
68
+ case "object": {
69
+ ref.current = instance;
70
+ break;
71
+ }
72
+ default:
73
+ }
74
+ }
75
+ forkRef.cleanup = () => {
76
+ for (let i = 0; i < refs.length; i += 1) {
77
+ const ref = refs[i];
78
+ if (ref == null) {
79
+ continue;
80
+ }
81
+ switch (typeof ref) {
82
+ case "function": {
83
+ const cleanupCallback = cleanupCallbacks[i];
84
+ if (typeof cleanupCallback === "function") {
85
+ cleanupCallback();
86
+ }
87
+ else {
88
+ ref(null);
89
+ }
90
+ break;
91
+ }
92
+ case "object": {
93
+ ref.current = null;
94
+ break;
95
+ }
96
+ default:
97
+ }
98
+ }
99
+ };
100
+ }
101
+ };
37
102
  }
38
103
  //# sourceMappingURL=useMergeRefs.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMergeRefs.js","sourceRoot":"","sources":["../../../src/util/hooks/useMergeRefs.ts"],"names":[],"mappings":";AAAA,gDAAgD;;;;;AAYhD,8BAUC;AAQD,oCAGC;AA/BD,sGAAsG;AACtG,kDAA0B;AAI1B,gDAAgD;AAChD;;;GAGG;AACH,SAAgB,SAAS,CAAI,IAAsB;IACjD,OAAO,CAAC,QAAkB,EAAE,EAAE;QAC5B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;gBAC9B,GAAG,CAAC,QAAQ,CAAC,CAAC;YAChB,CAAC;iBAAM,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC5C,GAAwC,CAAC,OAAO,GAAG,QAAQ,CAAC;YAC/D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAI,GAAG,IAAsB;IACvD,iGAAiG;IACjG,OAAO,eAAK,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC"}
1
+ {"version":3,"file":"useMergeRefs.js","sourceRoot":"","sources":["../../../src/util/hooks/useMergeRefs.ts"],"names":[],"mappings":"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"}
@@ -5,14 +5,12 @@ export type AsChildProps = {
5
5
  * merging the props of the component with the props of the child.
6
6
  *
7
7
  * @example
8
- * ```
9
8
  * <Component asChild data-prop>
10
9
  * <ChildComponent data-child />
11
10
  * </Component>
12
11
  *
13
12
  * Out:
14
13
  * <MergedComponent data-prop data-child />
15
- * ```
16
14
  */
17
15
  asChild: true;
18
16
  as?: never;
@@ -23,14 +21,12 @@ export type AsChildProps = {
23
21
  * merging the props of the component with the props of the child.
24
22
  *
25
23
  * @example
26
- * ```
27
24
  * <Component asChild data-prop>
28
25
  * <ChildComponent data-child />
29
26
  * </Component>
30
27
  *
31
28
  * Out:
32
29
  * <MergedComponent data-prop data-child />
33
- * ```
34
30
  */
35
31
  asChild?: false;
36
32
  };
@@ -21,7 +21,7 @@ export declare const VirtualFocusDescendantsProvider: import("react").Provider<i
21
21
  }>;
22
22
  index: number;
23
23
  enabledIndex: number;
24
- register: (instance: HTMLDivElement | null) => void;
24
+ register: ((instance: HTMLDivElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
25
25
  };
26
26
  export declare const VirtualFocusInternalContextProvider: import("react").FC<{
27
27
  virtualFocusIdx: number;
@@ -1,5 +1,6 @@
1
1
  import React, { useRef } from "react";
2
2
  import { Button } from "../button/index.js";
3
+ import { useDialogContext } from "../dialog/root/DialogRoot.context.js";
3
4
  import { Modal } from "../modal/index.js";
4
5
  import { useModalContext } from "../modal/Modal.context.js";
5
6
  import { Popover } from "../popover/index.js";
@@ -18,7 +19,10 @@ const DateDialog = ({ open, children, onClose, anchor, locale, translate, varian
18
19
  const { cn } = useRenameCSS();
19
20
  const modalRef = useRef(null);
20
21
  const isInModal = useModalContext(false) !== undefined;
21
- const hideModal = useMedia("screen and (min-width: 768px)", true) && !isInModal;
22
+ const isInDialog = useDialogContext(false) !== undefined;
23
+ const hideModal = useMedia("screen and (min-width: 768px)", true) &&
24
+ !isInModal &&
25
+ !isInDialog;
22
26
  if (!open) {
23
27
  return null;
24
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,iBAAiB;IACxB,KAAK,EAAE,aAAa;CACZ,CAAC;AAiBX,MAAM,UAAU,GAAG,CAAC,EAClB,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;IACvD,MAAM,SAAS,GACb,QAAQ,CAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,oBAAC,OAAO,kBACN,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,cAAc,EACxB,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,YAAY,EAAE,OAAO,KAAK,OAAO;aAClC,CAAC,IACE,YAAY,GAEf,QAAQ,CACD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC,gBACW,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,SAAS,EAAE,EAAE,CAAC,mBAAmB,EAAE;YACjC,0BAA0B,EAAE,SAAS;YACrC,YAAY,EAAE,OAAO,KAAK,OAAO;SAClC,CAAC,EACF,oBAAoB,QACpB,SAAS,EAAC,KAAK;QAEf,6BAAK,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC;YACzC,QAAQ;YACT,oBAAC,MAAM,IACL,OAAO,EAAC,UAAU,EAClB,OAAO,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA,EAAA,EACzC,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,IAEZ,eAAe,CAAC,OAAO,CAAC,CAClB,CACL,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,CAAC"}
1
+ {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- export { Dialog } from "./root/DialogRoot.js";
1
+ export { default as Dialog } from "./root/DialogRoot.js";
2
2
  export type { DialogProps } from "./root/DialogRoot.js";
3
3
  export { DialogTrigger } from "./trigger/DialogTrigger.js";
4
4
  export type { DialogTriggerProps } from "./trigger/DialogTrigger.js";
@@ -1,5 +1,5 @@
1
1
  "use client";
2
- export { Dialog } from "./root/DialogRoot.js";
2
+ export { default as Dialog } from "./root/DialogRoot.js";
3
3
  export { DialogTrigger } from "./trigger/DialogTrigger.js";
4
4
  export { DialogPopup } from "./popup/DialogPopup.js";
5
5
  export { DialogCloseTrigger } from "./close-trigger/DialogCloseTrigger.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dialog/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dialog/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC"}
@@ -10,6 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
10
10
  return t;
11
11
  };
12
12
  import React, { forwardRef } from "react";
13
+ import { useModalContext } from "../../modal/Modal.context.js";
13
14
  import { Portal } from "../../portal/index.js";
14
15
  import { DialogBackdropInternal } from "../backdrop/DialogBackdropInternal.js";
15
16
  import { useDialogContext } from "../root/DialogRoot.context.js";
@@ -26,8 +27,12 @@ import { DialogPopupInternal, } from "./DialogPopupInternal.js";
26
27
  * ```
27
28
  */
28
29
  const DialogPopup = forwardRef((_a, forwardedRef) => {
29
- var { modal = true, withBackdrop = modal === true, rootElement, position } = _a, restProps = __rest(_a, ["modal", "withBackdrop", "rootElement", "position"]);
30
+ var { modal = true, withBackdrop = modal === true, rootElement: rootElementProp, position } = _a, restProps = __rest(_a, ["modal", "withBackdrop", "rootElement", "position"]);
30
31
  const { mounted, nested } = useDialogContext();
32
+ const modalContext = useModalContext(false);
33
+ const rootElement = modalContext
34
+ ? modalContext.modalRef.current
35
+ : rootElementProp;
31
36
  if (!mounted) {
32
37
  return null;
33
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DialogPopup.js","sourceRoot":"","sources":["../../../src/dialog/popup/DialogPopup.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAoB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,mBAAmB,GAEpB,MAAM,uBAAuB,CAAC;AAO/B;;;;;;;;;;GAUG;AACH,MAAM,WAAW,GAAG,UAAU,CAC5B,CACE,EAMC,EACD,YAAY,EACZ,EAAE;QARF,EACE,KAAK,GAAG,IAAI,EACZ,YAAY,GAAG,KAAK,KAAK,IAAI,EAC7B,WAAW,EACX,QAAQ,OAET,EADI,SAAS,cALd,oDAMC,CADa;IAId,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAE/C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,oBAAC,MAAM,IAAC,WAAW,EAAE,WAAW;QAC7B,YAAY,IAAI,QAAQ,KAAK,YAAY,IAAI,CAAC,MAAM,IAAI,CACvD,oBAAC,sBAAsB,OAAG,CAC3B;QACD,oBAAC,mBAAmB,kBAClB,GAAG,EAAE,YAAY,IACb,SAAS,IACb,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,IAAI,QAAQ,KAAK,YAAY,EACvD,KAAK,EAAE,KAAK,IACZ,CACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"DialogPopup.js","sourceRoot":"","sources":["../../../src/dialog/popup/DialogPopup.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAoB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,mBAAmB,GAEpB,MAAM,uBAAuB,CAAC;AAO/B;;;;;;;;;;GAUG;AACH,MAAM,WAAW,GAAG,UAAU,CAC5B,CACE,EAMC,EACD,YAAY,EACZ,EAAE;QARF,EACE,KAAK,GAAG,IAAI,EACZ,YAAY,GAAG,KAAK,KAAK,IAAI,EAC7B,WAAW,EAAE,eAAe,EAC5B,QAAQ,OAET,EADI,SAAS,cALd,oDAMC,CADa;IAId,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAE/C,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,YAAY;QAC9B,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO;QAC/B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,oBAAC,MAAM,IAAC,WAAW,EAAE,WAAW;QAC7B,YAAY,IAAI,QAAQ,KAAK,YAAY,IAAI,CAAC,MAAM,IAAI,CACvD,oBAAC,sBAAsB,OAAG,CAC3B;QACD,oBAAC,mBAAmB,kBAClB,GAAG,EAAE,YAAY,IACb,SAAS,IACb,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,IAAI,QAAQ,KAAK,YAAY,EACvD,KAAK,EAAE,KAAK,IACZ,CACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
@@ -166,14 +166,14 @@ interface DialogComponent extends React.FC<DialogProps> {
166
166
  * Dialog body content
167
167
  * </Dialog.Body>
168
168
  * <Dialog.Footer>
169
- *. <Dialog.CloseTrigger>
170
- *. <Button>Close dialog</Button>
171
- *. </Dialog.CloseTrigger>
169
+ * <Dialog.CloseTrigger>
170
+ * <Button>Close dialog</Button>
171
+ * </Dialog.CloseTrigger>
172
172
  * </Dialog.Footer>
173
173
  * </Dialog.Popup>
174
174
  * </Dialog>
175
175
  * ```
176
176
  */
177
- declare const Dialog: DialogComponent;
178
- export { Dialog };
177
+ export declare const Dialog: DialogComponent;
178
+ export default Dialog;
179
179
  export type { DialogProps };
@@ -31,15 +31,15 @@ import { DialogContextProvider, useDialogContext } from "./DialogRoot.context.js
31
31
  * Dialog body content
32
32
  * </Dialog.Body>
33
33
  * <Dialog.Footer>
34
- *. <Dialog.CloseTrigger>
35
- *. <Button>Close dialog</Button>
36
- *. </Dialog.CloseTrigger>
34
+ * <Dialog.CloseTrigger>
35
+ * <Button>Close dialog</Button>
36
+ * </Dialog.CloseTrigger>
37
37
  * </Dialog.Footer>
38
38
  * </Dialog.Popup>
39
39
  * </Dialog>
40
40
  * ```
41
41
  */
42
- const Dialog = (props) => {
42
+ export const Dialog = (props) => {
43
43
  var _a;
44
44
  const { children, defaultOpen = false, open: openParam, onOpenChange, onOpenChangeComplete, size = "medium", } = props;
45
45
  const [open, setOpenStateInternal] = useControllableState({
@@ -93,5 +93,5 @@ Dialog.Description = DialogDescription;
93
93
  Dialog.Body = DialogBody;
94
94
  Dialog.Footer = DialogFooter;
95
95
  Dialog.Popup = DialogPopup;
96
- export { Dialog };
96
+ export default Dialog;
97
97
  //# sourceMappingURL=DialogRoot.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DialogRoot.js","sourceRoot":"","sources":["../../../src/dialog/root/DialogRoot.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DialogRoot.js","sourceRoot":"","sources":["../../../src/dialog/root/DialogRoot.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  import React from "react";
2
2
  import { ComboboxProps } from "./types.js";
3
- export declare const Combobox: React.ForwardRefExoticComponent<Omit<ComboboxProps, "onChange" | "value" | "size" | "disabled" | "options" | "onClear"> & React.RefAttributes<HTMLInputElement>>;
3
+ export declare const Combobox: React.ForwardRefExoticComponent<Omit<ComboboxProps, "value" | "onChange" | "size" | "disabled" | "options" | "onClear"> & React.RefAttributes<HTMLInputElement>>;
4
4
  export default Combobox;
@@ -1,3 +1,3 @@
1
1
  import React from "react";
2
2
  import { ComboboxProps } from "../types.js";
3
- export declare const InputController: React.ForwardRefExoticComponent<Omit<ComboboxProps, "onChange" | "value" | "label" | "size" | "disabled" | "options" | "hideLabel" | "description" | "onClear"> & React.RefAttributes<HTMLInputElement>>;
3
+ export declare const InputController: React.ForwardRefExoticComponent<Omit<ComboboxProps, "value" | "onChange" | "label" | "size" | "disabled" | "options" | "hideLabel" | "description" | "onClear"> & React.RefAttributes<HTMLInputElement>>;
@@ -7,5 +7,5 @@ export declare const useFileUpload: ({ ref, accept, onSelect, validator, maxSize
7
7
  upload: (fileList: FileList) => void;
8
8
  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
9
9
  inputRef: import("react").MutableRefObject<HTMLInputElement | null>;
10
- mergedRef: (instance: HTMLInputElement | null) => void;
10
+ mergedRef: ((instance: HTMLInputElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | null;
11
11
  };
@@ -3,15 +3,14 @@ export type PrimitiveAsChildProps = {
3
3
  /**
4
4
  * Renders the component and its child as a single element,
5
5
  * merging the props of the component with the props of the child.
6
+ *
6
7
  * @example
7
- * ```tsx
8
8
  * <Component asChild data-prop>
9
9
  * <ChildComponent data-child />
10
10
  * </Component>
11
11
  *
12
12
  * // Renders
13
13
  * <div data-prop data-child />
14
- * ```
15
14
  */
16
15
  asChild: true;
17
16
  /**
@@ -27,14 +26,12 @@ export type PrimitiveAsChildProps = {
27
26
  * merging the props of the component with the props of the child.
28
27
  *
29
28
  * @example
30
- * ```tsx
31
29
  * <Component asChild data-prop>
32
30
  * <ChildComponent data-child />
33
31
  * </Component>
34
32
  *
35
33
  * // Renders
36
34
  * <div data-prop data-child />
37
- * ```
38
35
  */
39
36
  asChild?: false;
40
37
  };
@@ -171,12 +171,19 @@ export const Modal = forwardRef((_a, ref) => {
171
171
  ? ariaLabelId
172
172
  : ariaLabelledby;
173
173
  const component = (
174
- // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
174
+ // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
175
175
  React.createElement("dialog", Object.assign({}, rest, { ref: mergedRef, className: mergedClassName, style: mergedStyle, onCancel: composeEventHandlers(onCancel, handleModalCancel), onClick: shouldHandleModalClick
176
176
  ? composeEventHandlers(onClick, handleModalClick)
177
177
  : onClick, onMouseDown: shouldHandleModalClick
178
178
  ? composeEventHandlers(onMouseDown, handleModalMouseDown)
179
- : onMouseDown, "aria-labelledby": mergedAriaLabelledBy }),
179
+ : onMouseDown, "aria-labelledby": mergedAriaLabelledBy, onKeyDown: (e) => {
180
+ /**
181
+ * Stops propagation of Escape key to prevent closing parent modals/dialogs
182
+ */
183
+ if (e.key === "Escape") {
184
+ e.stopPropagation();
185
+ }
186
+ } }),
180
187
  React.createElement(ModalContextProvider, { closeHandler: getCloseHandler(modalRef, header, onBeforeClose), modalRef: modalRef },
181
188
  header && (React.createElement(ModalHeader, null,
182
189
  header.label && (React.createElement(Detail, { className: cn("navds-modal__label") }, header.label)),
@@ -1 +1 @@
1
- {"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../src/modal/Modal.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Modal.js","sourceRoot":"","sources":["../../src/modal/Modal.tsx"],"names":[],"mappings":"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"}
@@ -78,7 +78,9 @@ export const ActionMenuContent = forwardRef((_a, ref) => {
78
78
  const context = useActionMenuContext();
79
79
  const { cn } = useRenameCSS();
80
80
  return (React.createElement(Menu.Portal, { rootElement: context.rootElement },
81
- React.createElement(Menu.Content, Object.assign({ ref: ref, id: context.contentId, "aria-labelledby": context.triggerId, className: cn("navds-action-menu__content", className) }, rest, { align: align, sideOffset: 4, collisionPadding: 10, returnFocus: context.triggerRef, safeZone: { anchor: context.triggerRef.current }, style: Object.assign(Object.assign({}, style), {
81
+ React.createElement(Menu.Content, Object.assign({ ref: ref, id: context.contentId, "aria-labelledby": context.triggerId, className: cn("navds-action-menu__content", className) }, rest, { align: align, sideOffset: 4, collisionPadding: 10, returnFocus: context.triggerRef, safeZone: {
82
+ anchor: context.triggerRef.current,
83
+ }, style: Object.assign(Object.assign({}, style), {
82
84
  "--__ac-action-menu-content-transform-origin": "var(--ac-floating-transform-origin)",
83
85
  "--__ac-action-menu-content-available-height": "var(--ac-floating-available-height)",
84
86
  }) }),