@solid2-aria/components 0.0.1 → 0.1.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.
- package/README.md +6 -0
- package/dist/NOTICE.txt +33 -11
- package/dist/browser/collection-dnd.js +37 -40
- package/dist/browser/collection-dnd.js.map +1 -1
- package/dist/browser/color-field.js +12 -6
- package/dist/browser/color-field.js.map +1 -1
- package/dist/browser/drop-zone.js +6 -3
- package/dist/browser/drop-zone.js.map +1 -1
- package/dist/browser/grid-list.d.ts +2 -2
- package/dist/browser/grid-list.js +8 -7
- package/dist/browser/grid-list.js.map +1 -1
- package/dist/browser/list-box.js +31 -37
- package/dist/browser/list-box.js.map +1 -1
- package/dist/browser/menu.js +16 -19
- package/dist/browser/menu.js.map +1 -1
- package/dist/browser/modal.js +28 -31
- package/dist/browser/modal.js.map +1 -1
- package/dist/browser/number-field.js +5 -4
- package/dist/browser/number-field.js.map +1 -1
- package/dist/browser/popover.js +26 -29
- package/dist/browser/popover.js.map +1 -1
- package/dist/browser/shared-element-transition.js +19 -22
- package/dist/browser/shared-element-transition.js.map +1 -1
- package/dist/browser/sheet.d.ts +1 -1
- package/dist/browser/sheet.js +82 -7
- package/dist/browser/sheet.js.map +1 -1
- package/dist/browser/table.d.ts +2 -2
- package/dist/browser/table.js +5 -2
- package/dist/browser/table.js.map +1 -1
- package/dist/browser/tabs.d.ts +1 -1
- package/dist/browser/tabs.js +65 -26
- package/dist/browser/tabs.js.map +1 -1
- package/dist/browser/toast.js +43 -46
- package/dist/browser/toast.js.map +1 -1
- package/dist/browser/token-field.js +0 -1
- package/dist/browser/token-field.js.map +1 -1
- package/dist/browser/tooltip.js +22 -25
- package/dist/browser/tooltip.js.map +1 -1
- package/dist/browser/tree.js +21 -10
- package/dist/browser/tree.js.map +1 -1
- package/dist/server/calendar.js +3 -1
- package/dist/server/calendar.js.map +1 -1
- package/dist/server/checkbox.js +3 -1
- package/dist/server/checkbox.js.map +1 -1
- package/dist/server/collection-dnd.js +8 -36
- package/dist/server/collection-dnd.js.map +1 -1
- package/dist/server/color-field.js +7 -2
- package/dist/server/color-field.js.map +1 -1
- package/dist/server/color-thumb.js +6 -2
- package/dist/server/color-thumb.js.map +1 -1
- package/dist/server/drop-zone.js +12 -5
- package/dist/server/drop-zone.js.map +1 -1
- package/dist/server/grid-list.js +16 -32
- package/dist/server/grid-list.js.map +1 -1
- package/dist/server/hidden-date-input.js +3 -1
- package/dist/server/hidden-date-input.js.map +1 -1
- package/dist/server/list-box.js +25 -69
- package/dist/server/list-box.js.map +1 -1
- package/dist/server/menu.js +10 -31
- package/dist/server/menu.js.map +1 -1
- package/dist/server/modal.js +35 -67
- package/dist/server/modal.js.map +1 -1
- package/dist/server/popover.js +71 -98
- package/dist/server/popover.js.map +1 -1
- package/dist/server/radio-group.js +3 -1
- package/dist/server/radio-group.js.map +1 -1
- package/dist/server/shared-element-transition.js +13 -42
- package/dist/server/shared-element-transition.js.map +1 -1
- package/dist/server/sheet.js +135 -60
- package/dist/server/sheet.js.map +1 -1
- package/dist/server/slider.js +3 -1
- package/dist/server/slider.js.map +1 -1
- package/dist/server/switch.js +3 -1
- package/dist/server/switch.js.map +1 -1
- package/dist/server/table.js +8 -3
- package/dist/server/table.js.map +1 -1
- package/dist/server/tabs.js +180 -169
- package/dist/server/tabs.js.map +1 -1
- package/dist/server/toast.js +68 -101
- package/dist/server/toast.js.map +1 -1
- package/dist/server/token-field.js +2 -2
- package/dist/server/tooltip.js +34 -61
- package/dist/server/tooltip.js.map +1 -1
- package/dist/server/tree.js +156 -130
- package/dist/server/tree.js.map +1 -1
- package/dist/server/virtualizer.js +3 -1
- package/dist/server/virtualizer.js.map +1 -1
- package/package.json +12 -11
package/dist/server/modal.js
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { assignRef, createContextProps, createRenderProps, dom } from "./utils.js";
|
|
18
18
|
import { OverlayTriggerStateContext } from "./overlay-contexts.js";
|
|
19
19
|
import { mergeProps } from "@solid2-aria/core/utils/merge-props";
|
|
20
|
-
import {
|
|
20
|
+
import { createContext, createSignal, merge, omit, onSettled, untrack, useContext } from "solid-js";
|
|
21
21
|
import { memo, mergeProps as mergeProps$1 } from "@solidjs/web";
|
|
22
22
|
import { requireValue } from "@solid2-aria/core/utils/require-value";
|
|
23
23
|
import { filterDOMProps } from "@solid2-aria/core/utils/filter-dom-props";
|
|
@@ -171,112 +171,76 @@ function _P$5(_p7, _p8, _p9, _p0, _p1, _p10, _p11, _p12) {
|
|
|
171
171
|
_P$5.prototype = Object.prototype;
|
|
172
172
|
var _d$10 = {
|
|
173
173
|
get() {
|
|
174
|
-
|
|
175
|
-
const exiting = this[_m$2];
|
|
176
|
-
const props = this[_m$3];
|
|
177
|
-
return state.isOpen || exiting() || props.isExiting;
|
|
178
|
-
},
|
|
179
|
-
enumerable: true,
|
|
180
|
-
configurable: true
|
|
181
|
-
};
|
|
182
|
-
var _d$11 = {
|
|
183
|
-
get() {
|
|
184
|
-
const props = this[_m$3];
|
|
185
|
-
const exiting = this[_m$2];
|
|
186
|
-
const overlayRef = this[_m$4];
|
|
187
|
-
const setOverlayRef = this[_m$5];
|
|
188
|
-
const modalRef = this[_m$6];
|
|
189
|
-
const setModalRef = this[_m$7];
|
|
190
|
-
const state = this[_m$];
|
|
191
|
-
return Overlay(new _P$5(props, exiting, overlayRef, setOverlayRef, modalRef, setModalRef, state, true));
|
|
174
|
+
return this[_m$].children;
|
|
192
175
|
},
|
|
193
176
|
enumerable: true,
|
|
194
177
|
configurable: true
|
|
195
178
|
};
|
|
196
|
-
function _P$6(_p13, _p14
|
|
179
|
+
function _P$6(_p13, _p14) {
|
|
197
180
|
this[_m$] = _p13;
|
|
198
|
-
this
|
|
199
|
-
this
|
|
200
|
-
this[_m$4] = _p16;
|
|
201
|
-
this[_m$5] = _p17;
|
|
202
|
-
this[_m$6] = _p18;
|
|
203
|
-
this[_m$7] = _p19;
|
|
204
|
-
Object.defineProperty(this, "when", _d$10);
|
|
205
|
-
Object.defineProperty(this, "children", _d$11);
|
|
181
|
+
this.value = _p14;
|
|
182
|
+
Object.defineProperty(this, "children", _d$10);
|
|
206
183
|
}
|
|
207
184
|
_P$6.prototype = Object.prototype;
|
|
208
|
-
var _d$
|
|
209
|
-
get() {
|
|
210
|
-
return this[_m$].children;
|
|
211
|
-
},
|
|
212
|
-
enumerable: true,
|
|
213
|
-
configurable: true
|
|
214
|
-
};
|
|
215
|
-
function _P$7(_p20, _p21) {
|
|
216
|
-
this[_m$] = _p20;
|
|
217
|
-
this.value = _p21;
|
|
218
|
-
Object.defineProperty(this, "children", _d$12);
|
|
219
|
-
}
|
|
220
|
-
_P$7.prototype = Object.prototype;
|
|
221
|
-
var _d$13 = {
|
|
185
|
+
var _d$11 = {
|
|
222
186
|
get() {
|
|
223
187
|
return this[_m$].state;
|
|
224
188
|
},
|
|
225
189
|
enumerable: true,
|
|
226
190
|
configurable: true
|
|
227
191
|
};
|
|
228
|
-
var _d$
|
|
192
|
+
var _d$12 = {
|
|
229
193
|
get() {
|
|
230
194
|
const render = this[_m$2];
|
|
231
195
|
const internal = this[_m$3];
|
|
232
|
-
return InternalModalContext(new _P$
|
|
196
|
+
return InternalModalContext(new _P$6(render, internal));
|
|
233
197
|
},
|
|
234
198
|
enumerable: true,
|
|
235
199
|
configurable: true
|
|
236
200
|
};
|
|
237
|
-
function _P$
|
|
238
|
-
this[_m$] =
|
|
239
|
-
this[_m$2] =
|
|
240
|
-
this[_m$3] =
|
|
241
|
-
Object.defineProperty(this, "value", _d$
|
|
242
|
-
Object.defineProperty(this, "children", _d$
|
|
201
|
+
function _P$7(_p15, _p16, _p17) {
|
|
202
|
+
this[_m$] = _p15;
|
|
203
|
+
this[_m$2] = _p16;
|
|
204
|
+
this[_m$3] = _p17;
|
|
205
|
+
Object.defineProperty(this, "value", _d$11);
|
|
206
|
+
Object.defineProperty(this, "children", _d$12);
|
|
243
207
|
}
|
|
244
|
-
_P$
|
|
245
|
-
var _d$
|
|
208
|
+
_P$7.prototype = Object.prototype;
|
|
209
|
+
var _d$13 = {
|
|
246
210
|
get() {
|
|
247
211
|
return this[_m$].isEntering || void 0;
|
|
248
212
|
},
|
|
249
213
|
enumerable: true,
|
|
250
214
|
configurable: true
|
|
251
215
|
};
|
|
252
|
-
var _d$
|
|
216
|
+
var _d$14 = {
|
|
253
217
|
get() {
|
|
254
218
|
return this[_m$].isExiting || void 0;
|
|
255
219
|
},
|
|
256
220
|
enumerable: true,
|
|
257
221
|
configurable: true
|
|
258
222
|
};
|
|
259
|
-
var _d$
|
|
223
|
+
var _d$15 = {
|
|
260
224
|
get() {
|
|
261
225
|
const args = this[_m$2];
|
|
262
226
|
const render = this[_m$3];
|
|
263
227
|
const internal = this[_m$4];
|
|
264
|
-
return OverlayTriggerStateContext(new _P$
|
|
228
|
+
return OverlayTriggerStateContext(new _P$7(args, render, internal));
|
|
265
229
|
},
|
|
266
230
|
enumerable: true,
|
|
267
231
|
configurable: true
|
|
268
232
|
};
|
|
269
|
-
function _P$
|
|
270
|
-
this[_m$] =
|
|
271
|
-
this[_m$2] =
|
|
272
|
-
this[_m$3] =
|
|
273
|
-
this[_m$4] =
|
|
274
|
-
this.ref =
|
|
275
|
-
Object.defineProperty(this, "data-entering", _d$
|
|
276
|
-
Object.defineProperty(this, "data-exiting", _d$
|
|
277
|
-
Object.defineProperty(this, "children", _d$
|
|
233
|
+
function _P$8(_p18, _p19, _p20, _p21, _p22) {
|
|
234
|
+
this[_m$] = _p18;
|
|
235
|
+
this[_m$2] = _p19;
|
|
236
|
+
this[_m$3] = _p20;
|
|
237
|
+
this[_m$4] = _p21;
|
|
238
|
+
this.ref = _p22;
|
|
239
|
+
Object.defineProperty(this, "data-entering", _d$13);
|
|
240
|
+
Object.defineProperty(this, "data-exiting", _d$14);
|
|
241
|
+
Object.defineProperty(this, "children", _d$15);
|
|
278
242
|
}
|
|
279
|
-
_P$
|
|
243
|
+
_P$8.prototype = Object.prototype;
|
|
280
244
|
const ModalContext = createContext(null);
|
|
281
245
|
const InternalModalContext = createContext(null);
|
|
282
246
|
function Modal(input) {
|
|
@@ -309,7 +273,11 @@ function ModalOverlay(input) {
|
|
|
309
273
|
const state = untrack(() => props.isOpen !== void 0 || props.defaultOpen !== void 0 || !context) ? local : requireValue(context, "Expected context");
|
|
310
274
|
const [modalRef, setModalRef] = createSignal(null, { ownedWrite: true });
|
|
311
275
|
const exiting = createExitAnimation(modalRef, () => state.isOpen, (element) => untrack(() => props.onExit)?.(element));
|
|
312
|
-
return
|
|
276
|
+
return memo(() => {
|
|
277
|
+
return memo(() => {
|
|
278
|
+
return !!(state.isOpen || exiting() || props.isExiting);
|
|
279
|
+
})() ? Overlay(new _P$5(props, exiting, overlayRef, setOverlayRef, modalRef, setModalRef, state, true)) : void 0;
|
|
280
|
+
});
|
|
313
281
|
}
|
|
314
282
|
function ModalOverlayInner(args) {
|
|
315
283
|
onSettled(() => () => {
|
|
@@ -351,7 +319,7 @@ function ModalOverlayInner(args) {
|
|
|
351
319
|
};
|
|
352
320
|
return dom.div(mergeProps$1(() => {
|
|
353
321
|
return mergeProps(filterDOMProps(args.props, { global: true }), merge(() => aria.underlayProps ?? {}), render);
|
|
354
|
-
}, new _P$
|
|
322
|
+
}, new _P$8(values, args, render, internal, (element) => {
|
|
355
323
|
args.setOverlayRef(element);
|
|
356
324
|
})));
|
|
357
325
|
}
|
package/dist/server/modal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal.js","names":["{context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}","{render.children}","setOverlayRef={(element: HTMLDivElement) => {\n setOverlayRef(element);\n }}","setModalRef={(element: HTMLDivElement | null) => {\n setModalRef(element);\n }}","<ModalOverlay\n {\n // oxlint-disable solid/reactivity -- Keep prop filtering in the renderer's lazy evaluation.\n ...omit(input, \"children\", \"ref\", \"class\", \"style\", \"render\")\n // oxlint-enable solid/reactivity\n }\n >\n <ModalContent {...input} />\n </ModalOverlay>","dom.div","<dom.div\n {...mergeProps(\n filterDOMProps(props, { global: true }),\n merge(() => context.modalProps ?? {}),\n render\n )}\n ref={[\n (element: HTMLDivElement) => {\n context.setModalRef(element);\n },\n (element: HTMLDivElement) => {\n assignRef(\n untrack(() => props.ref),\n element\n );\n },\n ]}\n data-entering={context.values.isEntering || undefined}\n data-exiting={context.values.isExiting || undefined}\n >\n {context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}\n {render.children}\n <DismissButton onDismiss={context.values.state.close} />\n </dom.div>","<dom.div\n {...mergeProps(\n filterDOMProps(args.props, { global: true }),\n merge(() => aria.underlayProps ?? {}),\n render\n )}\n ref={(element: HTMLDivElement) => {\n args.setOverlayRef(element);\n }}\n data-entering={values.isEntering || undefined}\n data-exiting={values.isExiting || undefined}\n >\n <OverlayTriggerStateContext value={args.state}>\n <InternalModalContext value={internal}>\n {render.children}\n </InternalModalContext>\n </OverlayTriggerStateContext>\n </dom.div>","_$memo","_$mergeProps"],"sources":["../../src/modal.tsx"],"sourcesContent":["/*\n * Copyright 2022 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n/*\n * Derived from Adobe React Spectrum: packages/react-aria-components/src/Modal.tsx.\n * Modified for Solid Aria: adapted components, contexts, refs, and reactive properties for Solid 2; release detached modal refs so each opening animates its mounted content; uses Solid class props.\n * Licensed under Apache-2.0. See LICENSES/Apache-2.0.txt and NOTICE.txt at the repository root.\n */\n\nimport { createModalOverlay } from \"@solid2-aria/core/overlays/create-modal-overlay\";\nimport type { AriaModalOverlayProps } from \"@solid2-aria/core/overlays/create-modal-overlay\";\nimport { DismissButton } from \"@solid2-aria/core/overlays/dismiss-button\";\nimport { Overlay } from \"@solid2-aria/core/overlays/overlay\";\nimport {\n createEnterAnimation,\n createExitAnimation,\n} from \"@solid2-aria/core/utils/animation\";\nimport { filterDOMProps } from \"@solid2-aria/core/utils/filter-dom-props\";\nimport { mergeProps } from \"@solid2-aria/core/utils/merge-props\";\nimport { requireValue } from \"@solid2-aria/core/utils/require-value\";\nimport { createOverlayTriggerState } from \"@solid2-aria/stately/overlays/create-overlay-trigger-state\";\nimport type {\n OverlayTriggerProps,\n OverlayTriggerState,\n} from \"@solid2-aria/stately/overlays/create-overlay-trigger-state\";\nimport type { JSX } from \"@solidjs/web\";\nimport {\n merge,\n createSignal,\n createContext,\n Show,\n useContext,\n untrack,\n omit,\n onSettled,\n} from \"solid-js\";\nimport type { Accessor } from \"solid-js\";\n\nimport { OverlayTriggerStateContext } from \"./dialog\";\nimport { assignRef, dom, createContextProps, createRenderProps } from \"./utils\";\nimport type { ContextValue, Ref, RenderProps, SlotProps } from \"./utils\";\n\nexport interface ModalRenderProps {\n isEntering: boolean;\n isExiting: boolean;\n state: OverlayTriggerState;\n}\n\nexport interface ModalOverlayProps\n extends\n AriaModalOverlayProps,\n OverlayTriggerProps,\n RenderProps<ModalRenderProps>,\n SlotProps {\n ref?: Ref<HTMLDivElement>;\n isEntering?: boolean;\n isExiting?: boolean;\n onEnter?: (element: HTMLElement) => void | Promise<void>;\n onExit?: (element: HTMLElement) => void | Promise<void>;\n UNSTABLE_portalContainer?: Element;\n UNSTABLE_deferUntilEntered?: boolean;\n}\n\nexport const ModalContext =\n createContext<ContextValue<ModalOverlayProps, HTMLDivElement>>(null);\n\ninterface InternalModalContextValue {\n modalProps: JSX.HTMLAttributes<HTMLElement>;\n modalRef: Accessor<HTMLDivElement | null>;\n setModalRef: (element: HTMLDivElement | null) => void;\n values: ModalRenderProps;\n isDismissable?: boolean;\n}\n\nexport const InternalModalContext =\n createContext<InternalModalContextValue | null>(null);\n\nexport function Modal(input: ModalOverlayProps): JSX.Element {\n const context = useContext(InternalModalContext);\n\n if (context) {\n // oxlint-disable-next-line solid/components-return-once -- Static collection traversal and context registration are fixed when the owner is created.\n return <ModalContent {...input} />;\n }\n\n return (\n <ModalOverlay\n {\n // oxlint-disable solid/reactivity -- Keep prop filtering in the renderer's lazy evaluation.\n ...omit(input, \"children\", \"ref\", \"class\", \"style\", \"render\")\n // oxlint-enable solid/reactivity\n }\n >\n <ModalContent {...input} />\n </ModalOverlay>\n );\n}\n\nfunction ModalContent(props: ModalOverlayProps): JSX.Element {\n const context = useContext(InternalModalContext);\n\n if (!context) {\n throw new Error(\"Modal requires ModalOverlay\");\n }\n\n const render = createRenderProps(\n mergeProps(props, {\n defaultClass: \"solid2-aria-Modal\",\n get values() {\n return context.values;\n },\n })\n );\n\n return (\n <dom.div\n {...mergeProps(\n filterDOMProps(props, { global: true }),\n merge(() => context.modalProps ?? {}),\n render\n )}\n ref={[\n (element: HTMLDivElement) => {\n context.setModalRef(element);\n },\n (element: HTMLDivElement) => {\n assignRef(\n untrack(() => props.ref),\n element\n );\n },\n ]}\n data-entering={context.values.isEntering || undefined}\n data-exiting={context.values.isExiting || undefined}\n >\n {context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}\n {render.children}\n <DismissButton onDismiss={context.values.state.close} />\n </dom.div>\n );\n}\n\nexport function ModalOverlay(input: ModalOverlayProps): JSX.Element {\n const [props, overlayRef, setOverlayRef] = createContextProps(\n input,\n untrack(() => input.ref),\n ModalContext\n );\n\n const context = useContext(OverlayTriggerStateContext);\n const local = createOverlayTriggerState(props);\n\n const state = untrack(\n () =>\n props.isOpen !== undefined || props.defaultOpen !== undefined || !context\n )\n ? local\n : requireValue(context, \"Expected context\");\n\n const [modalRef, setModalRef] = createSignal<HTMLDivElement | null>(null, {\n ownedWrite: true,\n });\n\n const exiting = createExitAnimation(\n modalRef,\n () => state.isOpen,\n (element): void | Promise<void> => untrack(() => props.onExit)?.(element)\n );\n\n return (\n <Show when={state.isOpen || exiting() || props.isExiting}>\n <Overlay\n portalContainer={props.UNSTABLE_portalContainer}\n isExiting={exiting() || props.isExiting}\n shouldContainFocus\n >\n <ModalOverlayInner\n props={props}\n overlayRef={overlayRef}\n setOverlayRef={(element: HTMLDivElement) => {\n setOverlayRef(element);\n }}\n modalRef={modalRef}\n setModalRef={(element: HTMLDivElement | null) => {\n setModalRef(element);\n }}\n state={state}\n exiting={exiting}\n />\n </Overlay>\n </Show>\n );\n}\n\nfunction ModalOverlayInner(args: {\n props: ModalOverlayProps;\n overlayRef: Accessor<HTMLDivElement | null>;\n setOverlayRef: (element: HTMLDivElement) => void;\n modalRef: Accessor<HTMLDivElement | null>;\n setModalRef: (element: HTMLDivElement | null) => void;\n state: OverlayTriggerState;\n exiting: () => boolean;\n}): JSX.Element {\n onSettled(() => () => {\n args.setModalRef(null);\n });\n\n const entering = createEnterAnimation(\n untrack(() => args.modalRef),\n true,\n (element): void | Promise<void> =>\n untrack(() => args.props.onEnter)?.(element)\n );\n\n const values: ModalRenderProps = {\n get isEntering() {\n return args.props.isEntering === true || entering();\n },\n get isExiting() {\n return args.props.isExiting === true || args.exiting();\n },\n get state() {\n return args.state;\n },\n };\n\n const aria = createModalOverlay(\n mergeProps(\n merge(() => args.props ?? {}),\n {\n get isEntering() {\n return values.isEntering;\n },\n }\n ),\n untrack(() => args.state),\n untrack(() => args.modalRef)\n );\n\n const render = createRenderProps(\n mergeProps(\n merge(() => args.props ?? {}),\n {\n defaultClass: \"solid2-aria-ModalOverlay\",\n values,\n }\n )\n );\n\n const internal = {\n get isDismissable() {\n return args.props.isDismissable;\n },\n get modalProps() {\n return aria.modalProps;\n },\n get modalRef() {\n return args.modalRef;\n },\n get setModalRef() {\n return args.setModalRef;\n },\n values,\n };\n\n return (\n <dom.div\n {...mergeProps(\n filterDOMProps(args.props, { global: true }),\n merge(() => aria.underlayProps ?? {}),\n render\n )}\n ref={(element: HTMLDivElement) => {\n args.setOverlayRef(element);\n }}\n data-entering={values.isEntering || undefined}\n data-exiting={values.isExiting || undefined}\n >\n <OverlayTriggerStateContext value={args.state}>\n <InternalModalContext value={internal}>\n {render.children}\n </InternalModalContext>\n </OverlayTriggerStateContext>\n </dom.div>\n );\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modal.js","names":["{context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}","{render.children}","setOverlayRef={(element: HTMLDivElement) => {\n setOverlayRef(element);\n }}","setModalRef={(element: HTMLDivElement | null) => {\n setModalRef(element);\n }}","<ModalOverlay\n {\n // oxlint-disable solid/reactivity -- Keep prop filtering in the renderer's lazy evaluation.\n ...omit(input, \"children\", \"ref\", \"class\", \"style\", \"render\")\n // oxlint-enable solid/reactivity\n }\n >\n <ModalContent {...input} />\n </ModalOverlay>","dom.div","<dom.div\n {...mergeProps(\n filterDOMProps(props, { global: true }),\n merge(() => context.modalProps ?? {}),\n render\n )}\n ref={[\n (element: HTMLDivElement) => {\n context.setModalRef(element);\n },\n (element: HTMLDivElement) => {\n assignRef(\n untrack(() => props.ref),\n element\n );\n },\n ]}\n data-entering={context.values.isEntering || undefined}\n data-exiting={context.values.isExiting || undefined}\n >\n {context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}\n {render.children}\n <DismissButton onDismiss={context.values.state.close} />\n </dom.div>","<Show when={state.isOpen || exiting() || props.isExiting}>\n <Overlay\n portalContainer={props.UNSTABLE_portalContainer}\n isExiting={exiting() || props.isExiting}\n shouldContainFocus\n >\n <ModalOverlayInner\n props={props}\n overlayRef={overlayRef}\n setOverlayRef={(element: HTMLDivElement) => {\n setOverlayRef(element);\n }}\n modalRef={modalRef}\n setModalRef={(element: HTMLDivElement | null) => {\n setModalRef(element);\n }}\n state={state}\n exiting={exiting}\n />\n </Overlay>\n </Show>","<dom.div\n {...mergeProps(\n filterDOMProps(args.props, { global: true }),\n merge(() => aria.underlayProps ?? {}),\n render\n )}\n ref={(element: HTMLDivElement) => {\n args.setOverlayRef(element);\n }}\n data-entering={values.isEntering || undefined}\n data-exiting={values.isExiting || undefined}\n >\n <OverlayTriggerStateContext value={args.state}>\n <InternalModalContext value={internal}>\n {render.children}\n </InternalModalContext>\n </OverlayTriggerStateContext>\n </dom.div>","_$memo","_$mergeProps"],"sources":["../../src/modal.tsx"],"sourcesContent":["/*\n * Copyright 2022 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n/*\n * Derived from Adobe React Spectrum: packages/react-aria-components/src/Modal.tsx.\n * Modified for Solid Aria: adapted components, contexts, refs, and reactive properties for Solid 2; release detached modal refs so each opening animates its mounted content; uses Solid class props.\n * Licensed under Apache-2.0. See LICENSES/Apache-2.0.txt and NOTICE.txt at the repository root.\n */\n\nimport { createModalOverlay } from \"@solid2-aria/core/overlays/create-modal-overlay\";\nimport type { AriaModalOverlayProps } from \"@solid2-aria/core/overlays/create-modal-overlay\";\nimport { DismissButton } from \"@solid2-aria/core/overlays/dismiss-button\";\nimport { Overlay } from \"@solid2-aria/core/overlays/overlay\";\nimport {\n createEnterAnimation,\n createExitAnimation,\n} from \"@solid2-aria/core/utils/animation\";\nimport { filterDOMProps } from \"@solid2-aria/core/utils/filter-dom-props\";\nimport { mergeProps } from \"@solid2-aria/core/utils/merge-props\";\nimport { requireValue } from \"@solid2-aria/core/utils/require-value\";\nimport { createOverlayTriggerState } from \"@solid2-aria/stately/overlays/create-overlay-trigger-state\";\nimport type {\n OverlayTriggerProps,\n OverlayTriggerState,\n} from \"@solid2-aria/stately/overlays/create-overlay-trigger-state\";\nimport type { JSX } from \"@solidjs/web\";\nimport {\n merge,\n createSignal,\n createContext,\n Show,\n useContext,\n untrack,\n omit,\n onSettled,\n} from \"solid-js\";\nimport type { Accessor } from \"solid-js\";\n\nimport { OverlayTriggerStateContext } from \"./dialog\";\nimport { assignRef, dom, createContextProps, createRenderProps } from \"./utils\";\nimport type { ContextValue, Ref, RenderProps, SlotProps } from \"./utils\";\n\nexport interface ModalRenderProps {\n isEntering: boolean;\n isExiting: boolean;\n state: OverlayTriggerState;\n}\n\nexport interface ModalOverlayProps\n extends\n AriaModalOverlayProps,\n OverlayTriggerProps,\n RenderProps<ModalRenderProps>,\n SlotProps {\n ref?: Ref<HTMLDivElement>;\n isEntering?: boolean;\n isExiting?: boolean;\n onEnter?: (element: HTMLElement) => void | Promise<void>;\n onExit?: (element: HTMLElement) => void | Promise<void>;\n UNSTABLE_portalContainer?: Element;\n UNSTABLE_deferUntilEntered?: boolean;\n}\n\nexport const ModalContext =\n createContext<ContextValue<ModalOverlayProps, HTMLDivElement>>(null);\n\ninterface InternalModalContextValue {\n modalProps: JSX.HTMLAttributes<HTMLElement>;\n modalRef: Accessor<HTMLDivElement | null>;\n setModalRef: (element: HTMLDivElement | null) => void;\n values: ModalRenderProps;\n isDismissable?: boolean;\n}\n\nexport const InternalModalContext =\n createContext<InternalModalContextValue | null>(null);\n\nexport function Modal(input: ModalOverlayProps): JSX.Element {\n const context = useContext(InternalModalContext);\n\n if (context) {\n // oxlint-disable-next-line solid/components-return-once -- Static collection traversal and context registration are fixed when the owner is created.\n return <ModalContent {...input} />;\n }\n\n return (\n <ModalOverlay\n {\n // oxlint-disable solid/reactivity -- Keep prop filtering in the renderer's lazy evaluation.\n ...omit(input, \"children\", \"ref\", \"class\", \"style\", \"render\")\n // oxlint-enable solid/reactivity\n }\n >\n <ModalContent {...input} />\n </ModalOverlay>\n );\n}\n\nfunction ModalContent(props: ModalOverlayProps): JSX.Element {\n const context = useContext(InternalModalContext);\n\n if (!context) {\n throw new Error(\"Modal requires ModalOverlay\");\n }\n\n const render = createRenderProps(\n mergeProps(props, {\n defaultClass: \"solid2-aria-Modal\",\n get values() {\n return context.values;\n },\n })\n );\n\n return (\n <dom.div\n {...mergeProps(\n filterDOMProps(props, { global: true }),\n merge(() => context.modalProps ?? {}),\n render\n )}\n ref={[\n (element: HTMLDivElement) => {\n context.setModalRef(element);\n },\n (element: HTMLDivElement) => {\n assignRef(\n untrack(() => props.ref),\n element\n );\n },\n ]}\n data-entering={context.values.isEntering || undefined}\n data-exiting={context.values.isExiting || undefined}\n >\n {context.isDismissable === true && (\n <DismissButton onDismiss={context.values.state.close} />\n )}\n {render.children}\n <DismissButton onDismiss={context.values.state.close} />\n </dom.div>\n );\n}\n\nexport function ModalOverlay(input: ModalOverlayProps): JSX.Element {\n const [props, overlayRef, setOverlayRef] = createContextProps(\n input,\n untrack(() => input.ref),\n ModalContext\n );\n\n const context = useContext(OverlayTriggerStateContext);\n const local = createOverlayTriggerState(props);\n\n const state = untrack(\n () =>\n props.isOpen !== undefined || props.defaultOpen !== undefined || !context\n )\n ? local\n : requireValue(context, \"Expected context\");\n\n const [modalRef, setModalRef] = createSignal<HTMLDivElement | null>(null, {\n ownedWrite: true,\n });\n\n const exiting = createExitAnimation(\n modalRef,\n () => state.isOpen,\n (element): void | Promise<void> => untrack(() => props.onExit)?.(element)\n );\n\n return (\n <Show when={state.isOpen || exiting() || props.isExiting}>\n <Overlay\n portalContainer={props.UNSTABLE_portalContainer}\n isExiting={exiting() || props.isExiting}\n shouldContainFocus\n >\n <ModalOverlayInner\n props={props}\n overlayRef={overlayRef}\n setOverlayRef={(element: HTMLDivElement) => {\n setOverlayRef(element);\n }}\n modalRef={modalRef}\n setModalRef={(element: HTMLDivElement | null) => {\n setModalRef(element);\n }}\n state={state}\n exiting={exiting}\n />\n </Overlay>\n </Show>\n );\n}\n\nfunction ModalOverlayInner(args: {\n props: ModalOverlayProps;\n overlayRef: Accessor<HTMLDivElement | null>;\n setOverlayRef: (element: HTMLDivElement) => void;\n modalRef: Accessor<HTMLDivElement | null>;\n setModalRef: (element: HTMLDivElement | null) => void;\n state: OverlayTriggerState;\n exiting: () => boolean;\n}): JSX.Element {\n onSettled(() => () => {\n args.setModalRef(null);\n });\n\n const entering = createEnterAnimation(\n untrack(() => args.modalRef),\n true,\n (element): void | Promise<void> =>\n untrack(() => args.props.onEnter)?.(element)\n );\n\n const values: ModalRenderProps = {\n get isEntering() {\n return args.props.isEntering === true || entering();\n },\n get isExiting() {\n return args.props.isExiting === true || args.exiting();\n },\n get state() {\n return args.state;\n },\n };\n\n const aria = createModalOverlay(\n mergeProps(\n merge(() => args.props ?? {}),\n {\n get isEntering() {\n return values.isEntering;\n },\n }\n ),\n untrack(() => args.state),\n untrack(() => args.modalRef)\n );\n\n const render = createRenderProps(\n mergeProps(\n merge(() => args.props ?? {}),\n {\n defaultClass: \"solid2-aria-ModalOverlay\",\n values,\n }\n )\n );\n\n const internal = {\n get isDismissable() {\n return args.props.isDismissable;\n },\n get modalProps() {\n return aria.modalProps;\n },\n get modalRef() {\n return args.modalRef;\n },\n get setModalRef() {\n return args.setModalRef;\n },\n values,\n };\n\n return (\n <dom.div\n {...mergeProps(\n filterDOMProps(args.props, { global: true }),\n merge(() => aria.underlayProps ?? {}),\n render\n )}\n ref={(element: HTMLDivElement) => {\n args.setOverlayRef(element);\n }}\n data-entering={values.isEntering || undefined}\n data-exiting={values.isExiting || undefined}\n >\n <OverlayTriggerStateContext value={args.state}>\n <InternalModalContext value={internal}>\n {render.children}\n </InternalModalContext>\n </OverlayTriggerStateContext>\n </dom.div>\n );\n}\n"],"mappings":"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"}
|
package/dist/server/popover.js
CHANGED
|
@@ -18,7 +18,7 @@ import { createContextProps, createRenderProps, dom } from "./utils.js";
|
|
|
18
18
|
import { OverlayTriggerStateContext } from "./overlay-contexts.js";
|
|
19
19
|
import { OverlayArrowContext } from "./overlay-arrow.js";
|
|
20
20
|
import { mergeProps } from "@solid2-aria/core/utils/merge-props";
|
|
21
|
-
import {
|
|
21
|
+
import { createContext, createEffect, createSignal, merge, onSettled, untrack, useContext } from "solid-js";
|
|
22
22
|
import { memo, mergeProps as mergeProps$1 } from "@solidjs/web";
|
|
23
23
|
import { requireValue } from "@solid2-aria/core/utils/require-value";
|
|
24
24
|
import { filterDOMProps } from "@solid2-aria/core/utils/filter-dom-props";
|
|
@@ -95,48 +95,17 @@ function _P$(_p, _p2, _p3, _p4, _p5) {
|
|
|
95
95
|
_P$.prototype = Object.prototype;
|
|
96
96
|
var _d$5 = {
|
|
97
97
|
get() {
|
|
98
|
-
|
|
99
|
-
const exiting = this[_m$2];
|
|
100
|
-
return state.isOpen || exiting();
|
|
101
|
-
},
|
|
102
|
-
enumerable: true,
|
|
103
|
-
configurable: true
|
|
104
|
-
};
|
|
105
|
-
var _d$6 = {
|
|
106
|
-
get() {
|
|
107
|
-
const props = this[_m$3];
|
|
108
|
-
const exiting = this[_m$2];
|
|
109
|
-
const ref = this[_m$4];
|
|
110
|
-
const setRef = this[_m$5];
|
|
111
|
-
const state = this[_m$];
|
|
112
|
-
return Overlay(new _P$(props, exiting, ref, setRef, state));
|
|
98
|
+
return this[_m$].state.close;
|
|
113
99
|
},
|
|
114
100
|
enumerable: true,
|
|
115
101
|
configurable: true
|
|
116
102
|
};
|
|
117
|
-
function _P$2(_p6
|
|
103
|
+
function _P$2(_p6) {
|
|
118
104
|
this[_m$] = _p6;
|
|
119
|
-
this
|
|
120
|
-
this[_m$3] = _p8;
|
|
121
|
-
this[_m$4] = _p9;
|
|
122
|
-
this[_m$5] = _p0;
|
|
123
|
-
Object.defineProperty(this, "when", _d$5);
|
|
124
|
-
Object.defineProperty(this, "children", _d$6);
|
|
105
|
+
Object.defineProperty(this, "onDismiss", _d$5);
|
|
125
106
|
}
|
|
126
107
|
_P$2.prototype = Object.prototype;
|
|
127
|
-
var _d$
|
|
128
|
-
get() {
|
|
129
|
-
return this[_m$].state.close;
|
|
130
|
-
},
|
|
131
|
-
enumerable: true,
|
|
132
|
-
configurable: true
|
|
133
|
-
};
|
|
134
|
-
function _P$3(_p1) {
|
|
135
|
-
this[_m$] = _p1;
|
|
136
|
-
Object.defineProperty(this, "onDismiss", _d$7);
|
|
137
|
-
}
|
|
138
|
-
_P$3.prototype = Object.prototype;
|
|
139
|
-
var _d$8 = {
|
|
108
|
+
var _d$6 = {
|
|
140
109
|
get() {
|
|
141
110
|
const args = this[_m$];
|
|
142
111
|
return [PopoverContext, ...args.props.clearContexts ?? []];
|
|
@@ -144,33 +113,33 @@ var _d$8 = {
|
|
|
144
113
|
enumerable: true,
|
|
145
114
|
configurable: true
|
|
146
115
|
};
|
|
147
|
-
var _d$
|
|
116
|
+
var _d$7 = {
|
|
148
117
|
get() {
|
|
149
118
|
return this[_m$2].children;
|
|
150
119
|
},
|
|
151
120
|
enumerable: true,
|
|
152
121
|
configurable: true
|
|
153
122
|
};
|
|
154
|
-
function _P$
|
|
155
|
-
this[_m$] =
|
|
156
|
-
this[_m$2] =
|
|
157
|
-
Object.defineProperty(this, "contexts", _d$
|
|
158
|
-
Object.defineProperty(this, "children", _d$
|
|
123
|
+
function _P$3(_p7, _p8) {
|
|
124
|
+
this[_m$] = _p7;
|
|
125
|
+
this[_m$2] = _p8;
|
|
126
|
+
Object.defineProperty(this, "contexts", _d$6);
|
|
127
|
+
Object.defineProperty(this, "children", _d$7);
|
|
159
128
|
}
|
|
160
|
-
_P$
|
|
161
|
-
var _d$
|
|
129
|
+
_P$3.prototype = Object.prototype;
|
|
130
|
+
var _d$8 = {
|
|
162
131
|
get() {
|
|
163
132
|
return this[_m$].state.close;
|
|
164
133
|
},
|
|
165
134
|
enumerable: true,
|
|
166
135
|
configurable: true
|
|
167
136
|
};
|
|
168
|
-
function _P$
|
|
169
|
-
this[_m$] =
|
|
170
|
-
Object.defineProperty(this, "onDismiss", _d$
|
|
137
|
+
function _P$4(_p9) {
|
|
138
|
+
this[_m$] = _p9;
|
|
139
|
+
Object.defineProperty(this, "onDismiss", _d$8);
|
|
171
140
|
}
|
|
172
|
-
_P$
|
|
173
|
-
var _d$
|
|
141
|
+
_P$4.prototype = Object.prototype;
|
|
142
|
+
var _d$9 = {
|
|
174
143
|
get() {
|
|
175
144
|
const aria = this[_m$];
|
|
176
145
|
const setArrowRef = this[_m$2];
|
|
@@ -186,7 +155,7 @@ var _d$11 = {
|
|
|
186
155
|
enumerable: true,
|
|
187
156
|
configurable: true
|
|
188
157
|
};
|
|
189
|
-
var _d$
|
|
158
|
+
var _d$10 = {
|
|
190
159
|
get() {
|
|
191
160
|
const args = this[_m$3];
|
|
192
161
|
const render = this[_m$4];
|
|
@@ -194,25 +163,25 @@ var _d$12 = {
|
|
|
194
163
|
memo(() => {
|
|
195
164
|
return memo(() => {
|
|
196
165
|
return !(args.props.isNonModal === true);
|
|
197
|
-
})() && DismissButton(new _P$
|
|
166
|
+
})() && DismissButton(new _P$2(args));
|
|
198
167
|
}),
|
|
199
|
-
ClearContexts(new _P$
|
|
200
|
-
DismissButton(new _P$
|
|
168
|
+
ClearContexts(new _P$3(args, render)),
|
|
169
|
+
DismissButton(new _P$4(args))
|
|
201
170
|
];
|
|
202
171
|
},
|
|
203
172
|
enumerable: true,
|
|
204
173
|
configurable: true
|
|
205
174
|
};
|
|
206
|
-
function _P$
|
|
207
|
-
this[_m$] =
|
|
208
|
-
this[_m$2] =
|
|
209
|
-
this[_m$3] =
|
|
210
|
-
this[_m$4] =
|
|
211
|
-
Object.defineProperty(this, "value", _d$
|
|
212
|
-
Object.defineProperty(this, "children", _d$
|
|
175
|
+
function _P$5(_p0, _p1, _p10, _p11) {
|
|
176
|
+
this[_m$] = _p0;
|
|
177
|
+
this[_m$2] = _p1;
|
|
178
|
+
this[_m$3] = _p10;
|
|
179
|
+
this[_m$4] = _p11;
|
|
180
|
+
Object.defineProperty(this, "value", _d$9);
|
|
181
|
+
Object.defineProperty(this, "children", _d$10);
|
|
213
182
|
}
|
|
214
|
-
_P$
|
|
215
|
-
var _d$
|
|
183
|
+
_P$5.prototype = Object.prototype;
|
|
184
|
+
var _d$11 = {
|
|
216
185
|
get() {
|
|
217
186
|
const isDialog = this[_m$];
|
|
218
187
|
const args = this[_m$2];
|
|
@@ -223,7 +192,7 @@ var _d$13 = {
|
|
|
223
192
|
enumerable: true,
|
|
224
193
|
configurable: true
|
|
225
194
|
};
|
|
226
|
-
var _d$
|
|
195
|
+
var _d$12 = {
|
|
227
196
|
get() {
|
|
228
197
|
const isDialog = this[_m$];
|
|
229
198
|
return isDialog() ? "dialog" : void 0;
|
|
@@ -231,7 +200,7 @@ var _d$14 = {
|
|
|
231
200
|
enumerable: true,
|
|
232
201
|
configurable: true
|
|
233
202
|
};
|
|
234
|
-
var _d$
|
|
203
|
+
var _d$13 = {
|
|
235
204
|
get() {
|
|
236
205
|
const isDialog = this[_m$];
|
|
237
206
|
return isDialog() ? -1 : void 0;
|
|
@@ -239,21 +208,21 @@ var _d$15 = {
|
|
|
239
208
|
enumerable: true,
|
|
240
209
|
configurable: true
|
|
241
210
|
};
|
|
242
|
-
var _d$
|
|
211
|
+
var _d$14 = {
|
|
243
212
|
get() {
|
|
244
213
|
return this[_m$2].props["aria-label"];
|
|
245
214
|
},
|
|
246
215
|
enumerable: true,
|
|
247
216
|
configurable: true
|
|
248
217
|
};
|
|
249
|
-
var _d$
|
|
218
|
+
var _d$15 = {
|
|
250
219
|
get() {
|
|
251
220
|
return this[_m$2].props["aria-labelledby"];
|
|
252
221
|
},
|
|
253
222
|
enumerable: true,
|
|
254
223
|
configurable: true
|
|
255
224
|
};
|
|
256
|
-
var _d$
|
|
225
|
+
var _d$16 = {
|
|
257
226
|
get() {
|
|
258
227
|
const args = this[_m$2];
|
|
259
228
|
return memo(() => {
|
|
@@ -263,7 +232,7 @@ var _d$18 = {
|
|
|
263
232
|
enumerable: true,
|
|
264
233
|
configurable: true
|
|
265
234
|
};
|
|
266
|
-
var _d$
|
|
235
|
+
var _d$17 = {
|
|
267
236
|
get() {
|
|
268
237
|
const aria = this[_m$3];
|
|
269
238
|
const triggerWidth = this[_m$4];
|
|
@@ -278,68 +247,68 @@ var _d$19 = {
|
|
|
278
247
|
enumerable: true,
|
|
279
248
|
configurable: true
|
|
280
249
|
};
|
|
281
|
-
var _d$
|
|
250
|
+
var _d$18 = {
|
|
282
251
|
get() {
|
|
283
252
|
return this[_m$6].trigger;
|
|
284
253
|
},
|
|
285
254
|
enumerable: true,
|
|
286
255
|
configurable: true
|
|
287
256
|
};
|
|
288
|
-
var _d$
|
|
257
|
+
var _d$19 = {
|
|
289
258
|
get() {
|
|
290
259
|
return this[_m$6].placement;
|
|
291
260
|
},
|
|
292
261
|
enumerable: true,
|
|
293
262
|
configurable: true
|
|
294
263
|
};
|
|
295
|
-
var _d$
|
|
264
|
+
var _d$20 = {
|
|
296
265
|
get() {
|
|
297
266
|
return this[_m$6].isEntering || void 0;
|
|
298
267
|
},
|
|
299
268
|
enumerable: true,
|
|
300
269
|
configurable: true
|
|
301
270
|
};
|
|
302
|
-
var _d$
|
|
271
|
+
var _d$21 = {
|
|
303
272
|
get() {
|
|
304
273
|
return this[_m$6].isExiting || void 0;
|
|
305
274
|
},
|
|
306
275
|
enumerable: true,
|
|
307
276
|
configurable: true
|
|
308
277
|
};
|
|
309
|
-
var _d$
|
|
278
|
+
var _d$22 = {
|
|
310
279
|
get() {
|
|
311
280
|
const aria = this[_m$3];
|
|
312
281
|
const setArrowRef = this[_m$7];
|
|
313
282
|
const args = this[_m$2];
|
|
314
283
|
const render = this[_m$5];
|
|
315
|
-
return OverlayArrowContext(new _P$
|
|
284
|
+
return OverlayArrowContext(new _P$5(aria, setArrowRef, args, render));
|
|
316
285
|
},
|
|
317
286
|
enumerable: true,
|
|
318
287
|
configurable: true
|
|
319
288
|
};
|
|
320
|
-
function _P$
|
|
321
|
-
this[_m$] =
|
|
322
|
-
this[_m$2] =
|
|
323
|
-
this[_m$3] =
|
|
324
|
-
this[_m$4] =
|
|
325
|
-
this[_m$5] =
|
|
326
|
-
this[_m$6] =
|
|
327
|
-
this[_m$7] =
|
|
328
|
-
this.ref =
|
|
329
|
-
Object.defineProperty(this, "id", _d$
|
|
330
|
-
Object.defineProperty(this, "role", _d$
|
|
331
|
-
Object.defineProperty(this, "tabindex", _d$
|
|
332
|
-
Object.defineProperty(this, "aria-label", _d$
|
|
333
|
-
Object.defineProperty(this, "aria-labelledby", _d$
|
|
334
|
-
Object.defineProperty(this, "slot", _d$
|
|
335
|
-
Object.defineProperty(this, "style", _d$
|
|
336
|
-
Object.defineProperty(this, "data-trigger", _d$
|
|
337
|
-
Object.defineProperty(this, "data-placement", _d$
|
|
338
|
-
Object.defineProperty(this, "data-entering", _d$
|
|
339
|
-
Object.defineProperty(this, "data-exiting", _d$
|
|
340
|
-
Object.defineProperty(this, "children", _d$
|
|
289
|
+
function _P$6(_p12, _p13, _p14, _p15, _p16, _p17, _p18, _p19) {
|
|
290
|
+
this[_m$] = _p12;
|
|
291
|
+
this[_m$2] = _p13;
|
|
292
|
+
this[_m$3] = _p14;
|
|
293
|
+
this[_m$4] = _p15;
|
|
294
|
+
this[_m$5] = _p16;
|
|
295
|
+
this[_m$6] = _p17;
|
|
296
|
+
this[_m$7] = _p18;
|
|
297
|
+
this.ref = _p19;
|
|
298
|
+
Object.defineProperty(this, "id", _d$11);
|
|
299
|
+
Object.defineProperty(this, "role", _d$12);
|
|
300
|
+
Object.defineProperty(this, "tabindex", _d$13);
|
|
301
|
+
Object.defineProperty(this, "aria-label", _d$14);
|
|
302
|
+
Object.defineProperty(this, "aria-labelledby", _d$15);
|
|
303
|
+
Object.defineProperty(this, "slot", _d$16);
|
|
304
|
+
Object.defineProperty(this, "style", _d$17);
|
|
305
|
+
Object.defineProperty(this, "data-trigger", _d$18);
|
|
306
|
+
Object.defineProperty(this, "data-placement", _d$19);
|
|
307
|
+
Object.defineProperty(this, "data-entering", _d$20);
|
|
308
|
+
Object.defineProperty(this, "data-exiting", _d$21);
|
|
309
|
+
Object.defineProperty(this, "children", _d$22);
|
|
341
310
|
}
|
|
342
|
-
_P$
|
|
311
|
+
_P$6.prototype = Object.prototype;
|
|
343
312
|
const fallbackTrigger = () => null;
|
|
344
313
|
const PopoverContext = createContext(null);
|
|
345
314
|
function Popover(input) {
|
|
@@ -352,7 +321,11 @@ function Popover(input) {
|
|
|
352
321
|
const state = untrack(() => props.isOpen !== void 0 || props.defaultOpen !== void 0 || !context) ? local : requireValue(context, "Expected context");
|
|
353
322
|
const exitAnimation = createExitAnimation(ref, () => state.isOpen, (element) => untrack(() => props.onExit)?.(element));
|
|
354
323
|
const exiting = () => props.isExiting === true || props.shouldSkipAnimation !== true && exitAnimation();
|
|
355
|
-
return
|
|
324
|
+
return memo(() => {
|
|
325
|
+
return memo(() => {
|
|
326
|
+
return !!(state.isOpen || exiting());
|
|
327
|
+
})() ? Overlay(new _P$(props, exiting, ref, setRef, state)) : void 0;
|
|
328
|
+
});
|
|
356
329
|
}
|
|
357
330
|
function PopoverInner(args) {
|
|
358
331
|
onSettled(() => () => {
|
|
@@ -433,7 +406,7 @@ function PopoverInner(args) {
|
|
|
433
406
|
}));
|
|
434
407
|
}), dom.div(mergeProps$1(() => {
|
|
435
408
|
return mergeProps(filterDOMProps(args.props, { global: true }), merge(() => aria.popoverProps ?? {}), render);
|
|
436
|
-
}, new _P$
|
|
409
|
+
}, new _P$6(isDialog, args, aria, triggerWidth, render, values, setArrowRef, (element) => {
|
|
437
410
|
args.setPopoverRef(element);
|
|
438
411
|
})))];
|
|
439
412
|
}
|