@ark-ui/solid 1.0.0-beta.3 → 1.0.0

package/cjs/index.js

@@ -3,8 +3,8 @@
 var web = require('solid-js/web');
 var solid = require('@zag-js/solid');
 var solidJs = require('solid-js');
-var accordion = require('@zag-js/accordion');
 var presence = require('@zag-js/presence');
+var accordion = require('@zag-js/accordion');
 var avatar = require('@zag-js/avatar');
 var carousel = require('@zag-js/carousel');
 var anatomy = require('@ark-ui/anatomy');
@@ -49,8 +49,8 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 
-var accordion__namespace = /*#__PURE__*/_interopNamespaceDefault(accordion);
 var presence__namespace = /*#__PURE__*/_interopNamespaceDefault(presence);
+var accordion__namespace = /*#__PURE__*/_interopNamespaceDefault(accordion);
 var avatar__namespace = /*#__PURE__*/_interopNamespaceDefault(avatar);
 var carousel__namespace = /*#__PURE__*/_interopNamespaceDefault(carousel);
 var checkbox__namespace = /*#__PURE__*/_interopNamespaceDefault(checkbox);
@@ -441,6 +441,49 @@ function jsxFactory() {
 }
 const ark = jsxFactory();
 
+function splitPresenceProps(props) {
+  return createSplitProps()(props, ['lazyMount', 'onExitComplete', 'present', 'unmountOnExit']);
+}
+
+const usePresence = props => {
+  const [localProps, machineProps] = solidJs.splitProps(props, ['lazyMount', 'unmountOnExit']);
+  const [wasEverPresent, setWasEverPresent] = solidJs.createSignal(false);
+  const [state, send] = solid.useMachine(presence__namespace.machine(machineProps), {
+    context: machineProps
+  });
+  const api = solidJs.createMemo(() => presence__namespace.connect(state, send, solid.normalizeProps));
+  solidJs.createEffect(() => {
+    const isPresent = api().isPresent;
+    if (isPresent) setWasEverPresent(true);
+  });
+  return solidJs.createMemo(() => ({
+    isUnmounted: !api().isPresent && !wasEverPresent() && localProps.lazyMount || localProps.unmountOnExit && !api().isPresent && wasEverPresent(),
+    isPresent: api().isPresent,
+    presenceProps: {
+      ref: api().setNode,
+      hidden: !api().isPresent,
+      'data-state': machineProps.present ? 'open' : 'closed'
+    }
+  }));
+};
+
+const Presence$1 = props => {
+  const [presenceProps, localProps] = splitPresenceProps(props);
+  const api = usePresence(presenceProps);
+  const mergedProps = solid.mergeProps(() => api().presenceProps, localProps);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !api().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+        "data-scope": "presence",
+        "data-part": "root"
+      }));
+    }
+  });
+};
+
 function getErrorMessage(hook, provider) {
   return `${hook} returned \`undefined\`. Seems you forgot to wrap component within ${provider}`;
 }
@@ -465,6 +508,20 @@ function createContext(options = {}) {
   return [Context.Provider, useContext, Context];
 }
 
+const [PresenceProvider, usePresenceContext] = createContext({
+  hookName: 'usePresenceContext',
+  providerName: '<PresenceProvider />'
+});
+
+const [PresencePropsProvider, usePresencePropsContext] = createContext({
+  hookName: 'usePresencePropsContext',
+  providerName: '<PresencePropsProvider />'
+});
+
+const Presence = Object.assign(Presence$1, {
+  Root: Presence$1
+});
+
 const [AccordionProvider, useAccordionContext] = createContext({
   hookName: 'useAccordionContext',
   providerName: '<AccordionProvider />'
@@ -476,7 +533,7 @@ const [EnvironmentProvider, useEnvironmentContext] = createContext({
   strict: false
 });
 
-const _tmpl$$m = /*#__PURE__*/web.template(`<span hidden>`);
+const _tmpl$$b = /*#__PURE__*/web.template(`<span hidden>`);
 const Environment$1 = props => {
   // eslint-disable-next-line prefer-const
   let spanRef = undefined;
@@ -487,7 +544,7 @@ const Environment$1 = props => {
     },
     get children() {
       return [web.memo(() => props.children), web.memo(() => web.memo(() => !!!props.value)() && (() => {
-        const _el$ = _tmpl$$m();
+        const _el$ = _tmpl$$b();
         const _ref$ = spanRef;
         typeof _ref$ === "function" ? web.use(_ref$, _el$) : spanRef = _el$;
         return _el$;
@@ -513,13 +570,19 @@ const useAccordion = props => {
 };
 
 const Accordion$1 = props => {
-  const [params, localProps] = createSplitProps()(props, ['collapsible', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'multiple', 'onFocusChange', 'onValueChange', 'orientation', 'value']);
-  const api = useAccordion(params);
-  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
+  const [presenceProps, accordionProps] = splitPresenceProps(props);
+  const [useAccordionProps, localProps] = createSplitProps()(accordionProps, ['collapsible', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'multiple', 'onFocusChange', 'onValueChange', 'orientation', 'value']);
+  const api = useAccordion(useAccordionProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(AccordionProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(PresencePropsProvider, {
+        value: presenceProps,
+        get children() {
+          return web.createComponent(ark.div, mergedProps);
+        }
+      });
     }
   });
 };
@@ -533,83 +596,44 @@ const [AccordionItemProvider, useAccordionItemContext] = createContext({
 });
 
 const AccordionItem = props => {
-  const [itemProps, restProps] = createSplitProps()(props, ['value', 'disabled']);
+  const [itemProps, localProps] = createSplitProps()(props, ['value', 'disabled']);
   const api = useAccordionContext();
-  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), restProps);
-  const accordionItem = solid.mergeProps(() => api().getItemState(itemProps), itemProps);
-  const getChildren = () => runIfFn(restProps.children, () => api().getItemState(itemProps));
+  const presenceProps = usePresencePropsContext();
+  const presenceApi = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().getItemState(itemProps).isOpen
+  })));
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
+  const getChildren = () => runIfFn(localProps.children, () => api().getItemState(itemProps));
   return web.createComponent(AccordionItemProvider, {
-    value: accordionItem,
+    value: itemProps,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+      return web.createComponent(PresenceProvider, {
+        value: presenceApi,
         get children() {
-          return getChildren();
+          return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+            get children() {
+              return getChildren();
+            }
+          }));
         }
-      }));
-    }
-  });
-};
-
-const usePresence = props => {
-  const [state, send] = solid.useMachine(presence__namespace.machine(props), {
-    context: props
-  });
-  return solidJs.createMemo(() => presence__namespace.connect(state, send, solid.normalizeProps));
-};
-
-const Presence$1 = props => {
-  const [presenceProps, localProps] = createSplitProps()(props, ['onExitComplete', 'present']);
-  const api = usePresence(presenceProps);
-  const [wasEverPresent, setWasEverPresent] = solidJs.createSignal(false);
-  const getChildren = solidJs.children(() => props.children);
-  solidJs.createEffect(() => {
-    const isPresent = api().isPresent;
-    if (isPresent) setWasEverPresent(true);
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      api().setNode(children);
-      web.spread(children, {
-        ['data-state']: presenceProps.present ? 'open' : 'closed',
-        hidden: !api().isPresent
       });
     }
   });
-  return web.memo((() => {
-    const _c$ = web.memo(() => !!(!api().isPresent && !wasEverPresent() && localProps.lazyMount || localProps.unmountOnExit && !api().isPresent && wasEverPresent()));
-    return () => _c$() ? localProps.fallback : getChildren();
-  })());
 };
 
-function splitPresenceProps(props) {
-  return createSplitProps()(props, ['fallback', 'lazyMount', 'onExitComplete', 'present', 'unmountOnExit']);
-}
-
-const Presence = Object.assign(Presence$1, {
-  Root: Presence$1
-});
-
-const _tmpl$$l = /*#__PURE__*/web.template(`<div>`);
 const AccordionItemContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useAccordionContext();
   const accordionItem = useAccordionItemContext();
-  const mergedProps = solid.mergeProps(() => api().getItemContentProps(accordionItem), localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return accordionItem.isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$l();
-        web.spread(_el$, web.mergeProps(() => api().getItemContentProps(accordionItem)), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().getItemContentProps(accordionItem), () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const AccordionItemIndicator = props => {
@@ -622,7 +646,12 @@ const AccordionItemIndicator = props => {
 const AccordionItemTrigger = props => {
   const api = useAccordionContext();
   const item = useAccordionItemContext();
-  const mergedProps = solid.mergeProps(() => api().getItemTriggerProps(item), props);
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().getItemTriggerProps(item), () => ({
+    'aria-controls': presenceApi().isUnmounted && null
+  }), props);
+
+  // @ts-expect-error we want aria-controls to be null to remove them if the popover if lazy mounted
   return web.createComponent(ark.button, mergedProps);
 };
 
@@ -654,25 +683,25 @@ const useAvatar = props => {
 const Avatar$1 = props => {
   const [params, localProps] = createSplitProps()(props, ['dir', 'getRootNode', 'id', 'onLoadingStatusChange']);
   const api = useAvatar(params);
-  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(AvatarProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(ark.div, mergedProps);
     }
   });
 };
 
 const AvatarFallback = props => {
   const avatar = useAvatarContext();
-  const fallbackProps = solid.mergeProps(() => avatar().fallbackProps, props);
-  return web.createComponent(ark.span, fallbackProps);
+  const mergedProps = solid.mergeProps(() => avatar().fallbackProps, props);
+  return web.createComponent(ark.span, mergedProps);
 };
 
 const AvatarImage = props => {
   const avatar = useAvatarContext();
-  const imageProps = solid.mergeProps(() => avatar().imageProps, props);
-  return web.createComponent(ark.img, imageProps);
+  const mergedProps = solid.mergeProps(() => avatar().imageProps, props);
+  return web.createComponent(ark.img, mergedProps);
 };
 
 const Avatar = Object.assign(Avatar$1, {
@@ -700,12 +729,17 @@ const useCarousel = props => {
 
 const Carousel$1 = props => {
   const [useCarouselProps, localProps] = createSplitProps()(props, ['align', 'dir', 'getRootNode', 'id', 'ids', 'index', 'loop', 'onIndexChange', 'orientation', 'slidesPerView', 'spacing']);
-  const carousel = useCarousel(useCarouselProps);
-  const rootProps = solid.mergeProps(() => carousel().rootProps, localProps);
+  const api = useCarousel(useCarouselProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(CarouselProvider, {
-    value: carousel,
+    value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -805,12 +839,12 @@ const Checkbox$1 = props => {
   });
 };
 
-const _tmpl$$k = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$a = /*#__PURE__*/web.template(`<input>`);
 const CheckboxControl = props => {
   const api = useCheckboxContext();
   const mergedProps = solid.mergeProps(() => api().controlProps, props);
   return [web.createComponent(ark.div, mergedProps), (() => {
-    const _el$ = _tmpl$$k();
+    const _el$ = _tmpl$$a();
     web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
     return _el$;
   })()];
@@ -824,8 +858,8 @@ const CheckboxIndicator = props => {
 
 const CheckboxLabel = props => {
   const checkbox = useCheckboxContext();
-  const labelProps = solid.mergeProps(() => checkbox().labelProps, props);
-  return web.createComponent(ark.span, labelProps);
+  const mergedProps = solid.mergeProps(() => checkbox().labelProps, props);
+  return web.createComponent(ark.span, mergedProps);
 };
 
 const Checkbox = Object.assign(Checkbox$1, {
@@ -854,21 +888,30 @@ const useColorPicker = props => {
   return solidJs.createMemo(() => colorPicker__namespace.connect(state, send, solid.normalizeProps));
 };
 
-const _tmpl$$j = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$9 = /*#__PURE__*/web.template(`<input>`);
 const ColorPicker$1 = props => {
-  const [colorPickerProps, localProps] = createSplitProps()(props, ['autoFocus', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'name', 'name', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'onValueChangeEnd', 'open', 'positioning', 'readOnly', 'value']);
-  const api = useColorPicker(colorPickerProps);
+  const [presenceProps, colorPickerProps] = splitPresenceProps(props);
+  const [useColorPickerProps, localProps] = createSplitProps()(colorPickerProps, ['autoFocus', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'name', 'name', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'onValueChangeEnd', 'open', 'positioning', 'readOnly', 'value']);
+  const api = useColorPicker(useColorPickerProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(ColorPickerProvider, {
     value: api,
     get children() {
-      return [web.createComponent(ark.div, web.mergeProps(mergedProps, {
+      return [web.createComponent(PresenceProvider, {
+        value: apiPresence,
         get children() {
-          return getChildren();
+          return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+            get children() {
+              return getChildren();
+            }
+          }));
         }
-      })), (() => {
-        const _el$ = _tmpl$$j();
+      }), (() => {
+        const _el$ = _tmpl$$9();
         web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
@@ -945,27 +988,18 @@ const ColorPickerChannelSliderTrack = props => {
   return web.createComponent(ark.div, mergedProps);
 };
 
-const _tmpl$$i = /*#__PURE__*/web.template(`<div>`);
 const ColorPickerContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useColorPickerContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$i();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const ColorPickerControl = props => {
@@ -988,8 +1022,16 @@ const ColorPickerLabel = props => {
 
 const ColorPickerPositioner = props => {
   const api = useColorPickerContext();
+  const presenceApi = usePresenceContext();
   const mergedProps = solid.mergeProps(() => api().positionerProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const ColorPickerSwatch = props => {
@@ -1035,6 +1077,25 @@ const ColorPickerValueText = props => {
   }));
 };
 
+const ColorPickerView = props => {
+  const api = useColorPickerContext();
+  const mergedProps = solid.mergeProps(() => anatomy.colorPickerAnatomy.build().view.attrs, props);
+
+  // TODO @segunadebayo
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return api().format === props.format;
+    },
+    get children() {
+      return web.createComponent(ark.div, web.mergeProps({
+        get ["data-format"]() {
+          return props.format;
+        }
+      }, mergedProps));
+    }
+  });
+};
+
 const ColorPicker = Object.assign(ColorPicker$1, {
   Root: ColorPicker$1,
   Area: ColorPickerArea,
@@ -1054,7 +1115,8 @@ const ColorPicker = Object.assign(ColorPicker$1, {
   SwatchTrigger: ColorPickerSwatchTrigger,
   TransparencyGrid: ColorPickerTransparencyGrid,
   Trigger: ColorPickerTrigger,
-  ValueText: ColorPickerValueText
+  ValueText: ColorPickerValueText,
+  View: ColorPickerView
 });
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1079,18 +1141,27 @@ const useCombobox = props => {
 };
 
 const Combobox$1 = props => {
-  const [selectProps, localProps] = createSplitProps()(props, ['allowCustomValue', 'autoFocus', 'closeOnSelect', 'dir', 'disabled', 'form', 'getRootNode', 'highlightedValue', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isItemDisabled', 'items', 'itemToString', 'itemToValue', 'loop', 'multiple', 'name', 'onFocusOutside', 'onHighlightChange', 'onInputValueChange', 'onInteractOutside', 'onOpenChange', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectionBehavior', 'selectOnBlur', 'translations', 'value']);
-  const api = useCombobox(selectProps);
+  const [presenceProps, comboboxProps] = splitPresenceProps(props);
+  const [useComboboxProps, localProps] = createSplitProps()(comboboxProps, ['allowCustomValue', 'autoFocus', 'closeOnSelect', 'dir', 'disabled', 'form', 'getRootNode', 'highlightedValue', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isItemDisabled', 'items', 'itemToString', 'itemToValue', 'loop', 'multiple', 'name', 'onFocusOutside', 'onHighlightChange', 'onInputValueChange', 'onInteractOutside', 'onOpenChange', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectionBehavior', 'selectOnBlur', 'translations', 'value']);
+  const api = useCombobox(useComboboxProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(ComboboxProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
         get children() {
-          return getChildren();
+          return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+            get children() {
+              return getChildren();
+            }
+          }));
         }
-      }));
+      });
     }
   });
 };
@@ -1101,27 +1172,18 @@ const ComboboxClearTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$h = /*#__PURE__*/web.template(`<div>`);
 const ComboboxContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useComboboxContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$h();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const ComboboxControl = props => {
@@ -1195,9 +1257,17 @@ const ComboboxLabel = props => {
 };
 
 const ComboboxPositioner = props => {
-  const combobox = useComboboxContext();
-  const mergedProps = solid.mergeProps(() => combobox().positionerProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  const api = useComboboxContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const ComboboxTrigger = props => {
@@ -1243,18 +1313,27 @@ const useDatePicker = props => {
 };
 
 const DatePicker$1 = props => {
-  const [datePickerProps, localProps] = createSplitProps()(props, ['closeOnSelect', 'dir', 'disabled', 'fixedWeeks', 'focusedValue', 'format', 'getRootNode', 'id', 'ids', 'isDateUnavailable', 'isDateUnavailable', 'locale', 'max', 'messages', 'min', 'modal', 'name', 'numOfMonths', 'onFocusChange', 'onOpenChange', 'onValueChange', 'onViewChange', 'open', 'parse', 'positioning', 'readOnly', 'selectionMode', 'startOfWeek', 'timeZone', 'value', 'view']);
-  const api = useDatePicker(datePickerProps);
+  const [presenceProps, datePickerProps] = splitPresenceProps(props);
+  const [useDatePickerProps, localProps] = createSplitProps()(datePickerProps, ['closeOnSelect', 'dir', 'disabled', 'fixedWeeks', 'focusedValue', 'format', 'getRootNode', 'id', 'ids', 'isDateUnavailable', 'isDateUnavailable', 'locale', 'max', 'messages', 'min', 'modal', 'name', 'numOfMonths', 'onFocusChange', 'onOpenChange', 'onValueChange', 'onViewChange', 'open', 'parse', 'positioning', 'readOnly', 'selectionMode', 'startOfWeek', 'timeZone', 'value', 'view']);
+  const api = useDatePicker(useDatePickerProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(DatePickerProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
         get children() {
-          return getChildren();
+          return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+            get children() {
+              return getChildren();
+            }
+          }));
         }
-      }));
+      });
     }
   });
 };
@@ -1265,27 +1344,18 @@ const DatePickerClearTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$g = /*#__PURE__*/web.template(`<div>`);
 const DatePickerContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useDatePickerContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$g();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const DatePickerControl = props => {
@@ -1306,14 +1376,14 @@ const DatePickerLabel = props => {
   return web.createComponent(ark.label, mergedProps);
 };
 
-const _tmpl$$f = /*#__PURE__*/web.template(`<option>`);
+const _tmpl$$8 = /*#__PURE__*/web.template(`<option>`);
 const DatePickerMonthSelect = props => {
   const api = useDatePickerContext();
   const mergedProps = solid.mergeProps(() => api().monthSelectProps, props);
   return web.createComponent(ark.select, web.mergeProps(mergedProps, {
     get children() {
       return api().getMonths().map(month => (() => {
-        const _el$ = _tmpl$$f();
+        const _el$ = _tmpl$$8();
         web.insert(_el$, () => month.label);
         web.effect(() => _el$.value = month.value);
         return _el$;
@@ -1336,8 +1406,16 @@ const DatePickerNextTrigger = props => {
 
 const DatePickerPositioner = props => {
   const api = useDatePickerContext();
+  const presenceApi = usePresenceContext();
   const mergedProps = solid.mergeProps(() => api().positionerProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const DatePickerPrevTrigger = props => {
@@ -1488,7 +1566,7 @@ const DatePickerViewTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$e = /*#__PURE__*/web.template(`<option>`);
+const _tmpl$$7 = /*#__PURE__*/web.template(`<option>`);
 const DatePickerYearSelect = props => {
   const api = useDatePickerContext();
   const mergedProps = solid.mergeProps(() => api().yearSelectProps, props);
@@ -1498,7 +1576,7 @@ const DatePickerYearSelect = props => {
         from: 1_000,
         to: 4_000
       }).map(year => (() => {
-        const _el$ = _tmpl$$e();
+        const _el$ = _tmpl$$7();
         _el$.value = year;
         web.insert(_el$, year);
         return _el$;
@@ -1558,91 +1636,95 @@ const useDialog = props => {
 };
 
 const Dialog$1 = props => {
-  const [dialogParams, localProps] = createSplitProps()(props, ['aria-label', 'closeOnEscapeKeyDown', 'closeOnInteractOutside', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus']);
-  const api = useDialog(dialogParams);
+  const [presenceProps, dialogProps] = splitPresenceProps(props);
+  const [useDialogProps, localProps] = createSplitProps()(dialogProps, ['aria-label', 'closeOnEscapeKeyDown', 'closeOnInteractOutside', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus']);
+  const api = useDialog(useDialogProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(DialogProvider, {
     value: api,
     get children() {
-      return getChildren();
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
+        get children() {
+          return getChildren();
+        }
+      });
     }
   });
 };
 
-const _tmpl$$d = /*#__PURE__*/web.template(`<div>`);
 const DialogBackdrop = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useDialogContext();
-  const mergedProps = solid.mergeProps(() => api().backdropProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$d();
-        web.spread(_el$, web.mergeProps(() => api().backdropProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().backdropProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const DialogCloseTrigger = props => {
   const dialog = useDialogContext();
-  const triggerProps = solid.mergeProps(() => dialog().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => dialog().triggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$c = /*#__PURE__*/web.template(`<div>`);
 const DialogContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useDialogContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$c();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const DialogDescription = props => {
   const dialog = useDialogContext();
-  const descriptionProps = solid.mergeProps(() => dialog().descriptionProps, props);
-  return web.createComponent(ark.p, descriptionProps);
+  const mergedProps = solid.mergeProps(() => dialog().descriptionProps, props);
+  return web.createComponent(ark.p, mergedProps);
 };
 
 const DialogPositioner = props => {
-  const dialog = useDialogContext();
-  const mergedProps = solid.mergeProps(() => dialog().positionerProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  const api = useDialogContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const DialogTitle = props => {
   const dialog = useDialogContext();
-  const titleProps = solid.mergeProps(() => dialog().titleProps, props);
-  return web.createComponent(ark.h2, titleProps);
+  const mergedProps = solid.mergeProps(() => dialog().titleProps, props);
+  return web.createComponent(ark.h2, mergedProps);
 };
 
 const DialogTrigger = props => {
-  const dialog = useDialogContext();
-  const triggerProps = solid.mergeProps(() => dialog().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const api = useDialogContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().triggerProps, () => ({
+    'aria-controls': presenceApi().isUnmounted && null
+  }), props);
+
+  // @ts-expect-error we want aria-controls to be null to remove them if the popover if lazy mounted
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const Dialog = Object.assign(Dialog$1, {
@@ -1677,12 +1759,12 @@ const Editable$1 = props => {
   const [useEditableProps, restProps] = createSplitProps()(props, ['activationMode', 'autoResize', 'dir', 'disabled', 'finalFocusEl', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'maxLength', 'name', 'onEdit', 'onFocusOutside', 'onInteractOutside', 'onPointerDownOutside', 'onValueChange', 'onValueCommit', 'onValueRevert', 'placeholder', 'readOnly', 'selectOnFocus', 'startWithEditView', 'submitMode', 'translations', 'value']);
   const editable = useEditable(useEditableProps);
   const [childrenProps, localProps] = solidJs.splitProps(restProps, ['children']);
-  const rootProps = solid.mergeProps(() => editable().rootProps, localProps);
+  const mergedProps = solid.mergeProps(() => editable().rootProps, localProps);
   const getChildren = () => runIfFn(childrenProps.children, editable);
   return web.createComponent(EditableProvider, {
     value: editable,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(rootProps, {
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
         get children() {
           return getChildren();
         }
@@ -1693,50 +1775,50 @@ const Editable$1 = props => {
 
 const EditableArea = props => {
   const editable = useEditableContext();
-  const areaProps = solid.mergeProps(() => editable().areaProps, props);
-  return web.createComponent(ark.div, areaProps);
+  const mergedProps = solid.mergeProps(() => editable().areaProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const EditableCancelTrigger = props => {
   const editable = useEditableContext();
-  const triggerProps = solid.mergeProps(() => editable().cancelTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => editable().cancelTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const EditableControl = props => {
   const editable = useEditableContext();
-  const controlProps = solid.mergeProps(() => editable().controlProps, props);
-  return web.createComponent(ark.div, controlProps);
+  const mergedProps = solid.mergeProps(() => editable().controlProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const EditableEditTrigger = props => {
   const editable = useEditableContext();
-  const triggerProps = solid.mergeProps(() => editable().editTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => editable().editTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const EditableInput = props => {
   const editable = useEditableContext();
-  const inputProps = solid.mergeProps(() => editable().inputProps, props);
-  return web.createComponent(ark.input, inputProps);
+  const mergedProps = solid.mergeProps(() => editable().inputProps, props);
+  return web.createComponent(ark.input, mergedProps);
 };
 
 const EditableLabel = props => {
   const editable = useEditableContext();
-  const labelProps = solid.mergeProps(() => editable().labelProps, props);
-  return web.createComponent(ark.label, labelProps);
+  const mergedProps = solid.mergeProps(() => editable().labelProps, props);
+  return web.createComponent(ark.label, mergedProps);
 };
 
 const EditablePreview = props => {
   const editable = useEditableContext();
-  const previewProps = solid.mergeProps(() => editable().previewProps, props);
-  return web.createComponent(ark.span, previewProps);
+  const mergedProps = solid.mergeProps(() => editable().previewProps, props);
+  return web.createComponent(ark.span, mergedProps);
 };
 
 const EditableSubmitTrigger = props => {
   const dialog = useEditableContext();
-  const triggerProps = solid.mergeProps(() => dialog().submitTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => dialog().submitTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const Editable = Object.assign(Editable$1, {
@@ -1769,62 +1851,70 @@ const useHoverCard = props => {
 };
 
 const HoverCard$1 = props => {
-  const [hoverCardProps, localProps] = createSplitProps()(props, ['closeDelay', 'dir', 'getRootNode', 'id', 'ids', 'onOpenChange', 'open', 'openDelay', 'positioning']);
-  const api = useHoverCard(hoverCardProps);
+  const [presenceProps, hoverCardProps] = splitPresenceProps(props);
+  const [useHoverCardProps, localProps] = createSplitProps()(hoverCardProps, ['closeDelay', 'dir', 'getRootNode', 'id', 'ids', 'onOpenChange', 'open', 'openDelay', 'positioning']);
+  const api = useHoverCard(useHoverCardProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(HoverCardProvider, {
     value: api,
     get children() {
-      return getChildren();
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
+        get children() {
+          return getChildren();
+        }
+      });
     }
   });
 };
 
 const HoverCardArrow = props => {
   const hoverCard = useHoverCardContext();
-  const arrowProps = solid.mergeProps(() => hoverCard().arrowProps, props);
-  return web.createComponent(ark.div, arrowProps);
+  const mergedProps = solid.mergeProps(() => hoverCard().arrowProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const HoverCardArrowTip = props => {
   const hoverCard = useHoverCardContext();
-  const tipProps = solid.mergeProps(() => hoverCard().arrowTipProps, props);
-  return web.createComponent(ark.div, tipProps);
+  const mergedProps = solid.mergeProps(() => hoverCard().arrowTipProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
-const _tmpl$$b = /*#__PURE__*/web.template(`<div>`);
 const HoverCardContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useHoverCardContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$b();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const HoverCardPositioner = props => {
-  const hoverCard = useHoverCardContext();
-  const positionerProps = solid.mergeProps(() => hoverCard().positionerProps, props);
-  return web.createComponent(ark.div, positionerProps);
+  const api = useHoverCardContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const HoverCardTrigger = props => {
   const hoverCard = useHoverCardContext();
-  const triggerProps = solid.mergeProps(() => hoverCard().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => hoverCard().triggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const HoverCard = Object.assign(HoverCard$1, {
@@ -1868,25 +1958,22 @@ const useMenu = props => {
 };
 
 const Menu$1 = props => {
-  const [menuParams, restProps] = createSplitProps()(props, ['anchorPoint', 'aria-label', 'closeOnSelect', 'dir', 'getRootNode', 'highlightedId', 'id', 'ids', 'loop', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onSelect', 'onValueChange', 'positioning', 'value']);
+  const [presenceProps, menuProps] = splitPresenceProps(props);
+  const [useMenuProps, localProps] = createSplitProps()(menuProps, ['anchorPoint', 'aria-label', 'closeOnSelect', 'dir', 'getRootNode', 'highlightedId', 'id', 'ids', 'loop', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onSelect', 'onValueChange', 'open', 'positioning', 'value']);
   const parentMenu = useMenuContext();
   const parentMachine = useMenuMachineContext();
-  const menu = useMenu(menuParams);
+  const menu = useMenu(useMenuProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: menu().api().isOpen
+  })));
   solidJs.createEffect(() => {
     if (!parentMachine) return;
     parentMenu?.().setChild(menu().machine);
     menu().api().setParent(parentMachine());
   });
-  solidJs.createEffect(() => {
-    if (!restProps.isOpen) return;
-    restProps.isOpen?.() ? menu().api().open() : menu().api().close();
-  });
   const triggerItemContext = solidJs.createMemo(() => parentMenu?.().getTriggerItemProps(menu().api()));
   const machineContext = () => menu().machine;
-  const getChildren = () => runIfFn(restProps.children, () => ({
-    isOpen: menu?.().api().isOpen,
-    onClose: menu?.().api().close
-  }));
+  const getChildren = () => runIfFn(localProps.children, menu().api);
   return web.createComponent(MenuTriggerItemProvider, {
     value: triggerItemContext,
     get children() {
@@ -1898,7 +1985,12 @@ const Menu$1 = props => {
               return menu().api;
             },
             get children() {
-              return getChildren();
+              return web.createComponent(PresenceProvider, {
+                value: apiPresence,
+                get children() {
+                  return getChildren();
+                }
+              });
             }
           });
         }
@@ -1909,57 +2001,48 @@ const Menu$1 = props => {
 
 const MenuArrow = props => {
   const menu = useMenuContext();
-  const arrowProps = solid.mergeProps(() => menu?.().arrowProps, props);
-  return web.createComponent(ark.div, arrowProps);
+  const mergedProps = solid.mergeProps(() => menu?.().arrowProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const MenuArrowTip = props => {
   const menu = useMenuContext();
-  const arrowTipProps = solid.mergeProps(() => menu?.().arrowTipProps, props);
-  return web.createComponent(ark.div, arrowTipProps);
+  const mergedProps = solid.mergeProps(() => menu?.().arrowTipProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
-const _tmpl$$a = /*#__PURE__*/web.template(`<div>`);
 const MenuContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useMenuContext();
-  const mergedProps = solid.mergeProps(() => api?.().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api?.().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$a();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const MenuContextTrigger = props => {
   const menu = useMenuContext();
-  const triggerProps = solid.mergeProps(() => menu?.().contextTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => menu?.().contextTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const MenuItem = props => {
   const menu = useMenuContext();
   const [itemParams, restProps] = createSplitProps()(props, ['id', 'disabled', 'valueText', 'closeOnSelect']);
-  const itemProps = solid.mergeProps(() => menu?.().getItemProps(itemParams), restProps);
-  return web.createComponent(ark.div, itemProps);
+  const mergedProps = solid.mergeProps(() => menu?.().getItemProps(itemParams), restProps);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const MenuItemGroup = props => {
   const menu = useMenuContext();
   const [itemGroupProps, localProps] = createSplitProps()(props, ['id']);
-  const groupProps = solid.mergeProps(() => menu?.().getItemGroupProps(itemGroupProps), localProps);
-  return web.createComponent(ark.div, groupProps);
+  const mergedProps = solid.mergeProps(() => menu?.().getItemGroupProps(itemGroupProps), localProps);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const MenuItemGroupLabel = props => {
@@ -1974,10 +2057,10 @@ const MenuItemGroupLabel = props => {
 const MenuOptionItem = props => {
   const menu = useMenuContext();
   const [optionProps, localProps] = createSplitProps()(props, ['id', 'disabled', 'valueText', 'closeOnSelect', 'name', 'type', 'value', 'onCheckedChange']);
-  const itemProps = solid.mergeProps(() => menu().getOptionItemProps(optionProps), localProps);
+  const mergedProps = solid.mergeProps(() => menu().getOptionItemProps(optionProps), localProps);
   const itemState = solidJs.createMemo(() => menu().getOptionItemState(optionProps));
   const getChildren = () => runIfFn(localProps.children, itemState);
-  return web.createComponent(ark.div, web.mergeProps(itemProps, {
+  return web.createComponent(ark.div, web.mergeProps(mergedProps, {
     get children() {
       return getChildren();
     }
@@ -1985,27 +2068,35 @@ const MenuOptionItem = props => {
 };
 
 const MenuPositioner = props => {
-  const menu = useMenuContext();
-  const positionerProps = solid.mergeProps(() => menu?.().positionerProps, props);
-  return web.createComponent(ark.div, positionerProps);
+  const api = useMenuContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const MenuSeparator = props => {
   const menu = useMenuContext();
-  const separatorProps = solid.mergeProps(() => menu?.().separatorProps, props);
-  return web.createComponent(ark.hr, separatorProps);
+  const mergedProps = solid.mergeProps(() => menu?.().separatorProps, props);
+  return web.createComponent(ark.hr, mergedProps);
 };
 
 const MenuTrigger = props => {
   const menu = useMenuContext();
-  const triggerProps = solid.mergeProps(() => menu?.().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => menu?.().triggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const MenuTriggerItem = props => {
   const getTriggerItemProps = useMenuTriggerItemContext();
-  const triggerProps = solid.mergeProps(() => getTriggerItemProps?.(), props);
-  return web.createComponent(ark.div, triggerProps);
+  const mergedProps = solid.mergeProps(() => getTriggerItemProps?.(), props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const Menu = Object.assign(Menu$1, {
@@ -2044,49 +2135,49 @@ const useNumberInput = props => {
 const NumberInput$1 = props => {
   const [useNumberInputProps, localProps] = createSplitProps()(props, ['allowMouseWheel', 'allowOverflow', 'clampValueOnBlur', 'dir', 'disabled', 'focusInputOnChange', 'form', 'formatOptions', 'getRootNode', 'id', 'ids', 'inputMode', 'invalid', 'locale', 'max', 'min', 'name', 'onFocusChange', 'onValueChange', 'onValueInvalid', 'pattern', 'readOnly', 'spinOnPress', 'step', 'translations', 'value']);
   const api = useNumberInput(useNumberInputProps);
-  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(NumberInputProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(ark.div, mergedProps);
     }
   });
 };
 
 const NumberInputControl = props => {
   const api = useNumberInputContext();
-  const controlProps = solid.mergeProps(() => api().controlProps, props);
-  return web.createComponent(ark.div, controlProps);
+  const mergedProps = solid.mergeProps(() => api().controlProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const NumberInputDecrementTrigger = props => {
   const api = useNumberInputContext();
-  const triggerProps = solid.mergeProps(() => api().decrementTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().decrementTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const NumberInputInput = props => {
   const api = useNumberInputContext();
-  const inputProps = solid.mergeProps(() => api().inputProps, props);
-  return web.createComponent(ark.input, inputProps);
+  const mergedProps = solid.mergeProps(() => api().inputProps, props);
+  return web.createComponent(ark.input, mergedProps);
 };
 
 const NumberInputIncrementTrigger = props => {
   const api = useNumberInputContext();
-  const triggerProps = solid.mergeProps(() => api().incrementTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().incrementTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const NumberInputLabel = props => {
   const api = useNumberInputContext();
-  const labelProps = solid.mergeProps(() => api().labelProps, props);
-  return web.createComponent(ark.label, labelProps);
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(ark.label, mergedProps);
 };
 
 const NumberInputScrubber = props => {
   const api = useNumberInputContext();
-  const scrubberProps = solid.mergeProps(() => api().scrubberProps, props);
-  return web.createComponent(ark.div, scrubberProps);
+  const mergedProps = solid.mergeProps(() => api().scrubberProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const NumberInput = Object.assign(NumberInput$1, {
@@ -2121,11 +2212,11 @@ const Pagination$1 = props => {
   const [childrenProps, localProps] = solidJs.splitProps(restProps, ['children']);
   const api = usePagination(paginationParams);
   const getChildren = () => runIfFn(childrenProps.children, api);
-  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(PaginationProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.nav, web.mergeProps(rootProps, {
+      return web.createComponent(ark.nav, web.mergeProps(mergedProps, {
         get children() {
           return getChildren();
         }
@@ -2185,7 +2276,7 @@ const usePinInput = props => {
   return solidJs.createMemo(() => pinInput__namespace.connect(state, send, solid.normalizeProps));
 };
 
-const _tmpl$$9 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$6 = /*#__PURE__*/web.template(`<input>`);
 const PinInput$1 = props => {
   const [pinInputProps, localProps] = createSplitProps()(props, ['autoFocus', 'blurOnComplete', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'mask', 'name', 'onValueChange', 'onValueComplete', 'onValueInvalid', 'otp', 'pattern', 'placeholder', 'selectOnFocus', 'translations', 'type', 'value']);
   const api = usePinInput(pinInputProps);
@@ -2194,7 +2285,7 @@ const PinInput$1 = props => {
     value: api,
     get children() {
       return [web.createComponent(ark.div, mergedProps), (() => {
-        const _el$ = _tmpl$$9();
+        const _el$ = _tmpl$$6();
         web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
@@ -2211,14 +2302,14 @@ const PinInputControl = props => {
 const PinInputInput = props => {
   const [inputParams, localProps] = solidJs.splitProps(props, ['index']);
   const api = usePinInputContext();
-  const inputProps = solid.mergeProps(() => api().getInputProps(inputParams), localProps);
-  return web.createComponent(ark.input, inputProps);
+  const mergedProps = solid.mergeProps(() => api().getInputProps(inputParams), localProps);
+  return web.createComponent(ark.input, mergedProps);
 };
 
 const PinInputLabel = props => {
   const api = usePinInputContext();
-  const labelProps = solid.mergeProps(() => api().labelProps, props);
-  return web.createComponent(ark.label, labelProps);
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(ark.label, mergedProps);
 };
 
 const PinInput = Object.assign(PinInput$1, {
@@ -2246,67 +2337,68 @@ const usePopover = props => {
 };
 
 const Popover$1 = props => {
-  const [usePopoverProps, restProps] = createSplitProps()(props, ['autoFocus', 'closeOnEsc', 'closeOnInteractOutside', 'dir', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'open', 'portalled', 'positioning']);
+  const [presenceProps, popoverProps] = splitPresenceProps(props);
+  const [usePopoverProps, localProps] = createSplitProps()(popoverProps, ['autoFocus', 'closeOnEsc', 'closeOnInteractOutside', 'dir', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'open', 'portalled', 'positioning']);
   const api = usePopover(usePopoverProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
+  const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(PopoverProvider, {
     value: api,
     get children() {
-      return restProps.children;
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
+        get children() {
+          return getChildren();
+        }
+      });
     }
   });
 };
 
 const PopoverAnchor = props => {
   const api = usePopoverContext();
-  const anchorProps = solid.mergeProps(() => api().anchorProps, props);
-  return web.createComponent(ark.div, anchorProps);
+  const mergedProps = solid.mergeProps(() => api().anchorProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const PopoverArrow = props => {
   const popover = usePopoverContext();
-  const arrowProps = solid.mergeProps(() => popover().arrowProps, props);
-  return web.createComponent(ark.div, arrowProps);
+  const mergedProps = solid.mergeProps(() => popover().arrowProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const PopoverArrowTip = props => {
   const popover = usePopoverContext();
-  const arrowTipProps = solid.mergeProps(() => popover().arrowTipProps, props);
-  return web.createComponent(ark.div, arrowTipProps);
+  const mergedProps = solid.mergeProps(() => popover().arrowTipProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const PopoverCloseTrigger = props => {
   const api = usePopoverContext();
-  const triggerProps = solid.mergeProps(() => api().closeTriggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().closeTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$8 = /*#__PURE__*/web.template(`<div>`);
 const PopoverContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = usePopoverContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$8();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const PopoverDescription = props => {
   const api = usePopoverContext();
-  const descriptionProps = solid.mergeProps(() => api().descriptionProps, props);
-  return web.createComponent(ark.div, descriptionProps);
+  const mergedProps = solid.mergeProps(() => api().descriptionProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const PopoverIndicator = props => {
@@ -2317,20 +2409,33 @@ const PopoverIndicator = props => {
 
 const PopoverPositioner = props => {
   const api = usePopoverContext();
-  const positionerProps = solid.mergeProps(() => api().positionerProps, props);
-  return web.createComponent(ark.div, positionerProps);
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const PopoverTitle = props => {
   const api = usePopoverContext();
-  const titleProps = solid.mergeProps(() => api().titleProps, props);
-  return web.createComponent(ark.div, titleProps);
+  const mergedProps = solid.mergeProps(() => api().titleProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const PopoverTrigger = props => {
   const api = usePopoverContext();
-  const triggerProps = solid.mergeProps(() => api().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().triggerProps, () => ({
+    'aria-controls': presenceApi().isUnmounted && null
+  }), props);
+
+  // @ts-expect-error we want aria-controls to be null to remove them if the popover if lazy mounted
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const Popover = Object.assign(Popover$1, {
@@ -2399,13 +2504,13 @@ const RadioGroupItem = props => {
   });
 };
 
-const _tmpl$$7 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$5 = /*#__PURE__*/web.template(`<input>`);
 const RadioGroupItemControl = props => {
   const api = useRadioGroupContext();
   const itemProps = useRadioGroupItemContext();
   const mergedProps = solid.mergeProps(() => api().getItemControlProps(itemProps), props);
   return [web.createComponent(ark.div, mergedProps), (() => {
-    const _el$ = _tmpl$$7();
+    const _el$ = _tmpl$$5();
     web.spread(_el$, web.mergeProps(() => api().getItemHiddenInputProps(itemProps)), false, false);
     return _el$;
   })()];
@@ -2462,7 +2567,7 @@ const RatingGroup$1 = props => {
   });
 };
 
-const _tmpl$$6 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$4 = /*#__PURE__*/web.template(`<input>`);
 const RatingGroupControl = props => {
   const api = useRatingGroupContext();
   const getChildren = () => runIfFn(props.children, api);
@@ -2472,7 +2577,7 @@ const RatingGroupControl = props => {
       return getChildren();
     }
   })), (() => {
-    const _el$ = _tmpl$$6();
+    const _el$ = _tmpl$$4();
     web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
     return _el$;
   })()];
@@ -2484,11 +2589,11 @@ const [RatingGroupItemProvider, useRatingGroupItemContext] = createContext({
 });
 
 const RatingGroupItem = props => {
-  const [ratingParams, restProps] = createSplitProps()(props, ['index']);
+  const [itemProps, localProps] = createSplitProps()(props, ['index']);
   const api = useRatingGroupContext();
-  const itemState = api().getItemState(ratingParams);
-  const mergedProps = solid.mergeProps(() => api().getItemProps(ratingParams), restProps);
-  const getChildren = () => runIfFn(restProps.children, itemState);
+  const itemState = solidJs.createMemo(() => api().getItemState(itemProps));
+  const getChildren = () => runIfFn(localProps.children, itemState);
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
   return web.createComponent(RatingGroupItemProvider, {
     value: itemState,
     get children() {
@@ -2566,13 +2671,13 @@ const SegmentGroupItem = props => {
   });
 };
 
-const _tmpl$$5 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$3 = /*#__PURE__*/web.template(`<input>`);
 const SegmentGroupItemControl = props => {
   const api = useSegmentGroupContext();
   const itemProps = useSegmentGroupItemContext();
   const mergedProps = solid.mergeProps(() => api().getItemControlProps(itemProps), anatomy.segmentGroupAnatomy.build().itemControl.attrs, props);
   return [web.createComponent(ark.div, mergedProps), (() => {
-    const _el$ = _tmpl$$5();
+    const _el$ = _tmpl$$3();
     web.spread(_el$, web.mergeProps(() => api().getItemHiddenInputProps(itemProps)), false, false);
     return _el$;
   })()];
@@ -2622,18 +2727,27 @@ const useSelect = props => {
 };
 
 const Select$1 = props => {
-  const [selectProps, localProps] = createSplitProps()(props, ['closeOnSelect', 'dir', 'disabled', 'form', 'getRootNode', 'highlightedValue', 'id', 'ids', 'invalid', 'isItemDisabled', 'items', 'itemToString', 'itemToValue', 'loop', 'multiple', 'name', 'onFocusOutside', 'onHighlightChange', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'open', 'positioning', 'readOnly', 'selectOnBlur', 'value']);
-  const api = useSelect(selectProps);
+  const [presenceProps, selectProps] = splitPresenceProps(props);
+  const [useSelectProps, localProps] = createSplitProps()(selectProps, ['closeOnSelect', 'dir', 'disabled', 'form', 'getRootNode', 'highlightedValue', 'id', 'ids', 'invalid', 'isItemDisabled', 'items', 'itemToString', 'itemToValue', 'loop', 'multiple', 'name', 'onFocusOutside', 'onHighlightChange', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'open', 'positioning', 'readOnly', 'selectOnBlur', 'value']);
+  const api = useSelect(useSelectProps);
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(SelectProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
         get children() {
-          return getChildren();
+          return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+            get children() {
+              return getChildren();
+            }
+          }));
         }
-      }));
+      });
     }
   });
 };
@@ -2644,36 +2758,27 @@ const SelectClearTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$4 = /*#__PURE__*/web.template(`<div>`);
 const SelectContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useSelectContext();
-  const mergedProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$$4();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
       return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
-const _tmpl$$3 = /*#__PURE__*/web.template(`<select>`),
+const _tmpl$$2 = /*#__PURE__*/web.template(`<select>`),
   _tmpl$2 = /*#__PURE__*/web.template(`<option>`);
 const SelectControl = props => {
   const api = useSelectContext();
   const mergedProps = solid.mergeProps(() => api().controlProps, props);
   return [web.createComponent(ark.div, mergedProps), (() => {
-    const _el$ = _tmpl$$3();
+    const _el$ = _tmpl$$2();
     web.spread(_el$, web.mergeProps(() => api().hiddenSelectProps), false, true);
     web.insert(_el$, web.createComponent(solidJs.Index, {
       get each() {
@@ -2756,8 +2861,16 @@ const SelectLabel = props => {
 
 const SelectPositioner = props => {
   const api = useSelectContext();
+  const presenceApi = usePresenceContext();
   const mergedProps = solid.mergeProps(() => api().positionerProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const SelectTrigger = props => {
@@ -2861,8 +2974,8 @@ const SliderRange = props => {
 const SliderThumb = props => {
   const [thumbProps, localProps] = createSplitProps()(props, ['index']);
   const api = useSliderContext();
-  const mergePdrops = solid.mergeProps(() => api().getThumbProps(thumbProps), localProps);
-  return web.createComponent(ark.div, mergePdrops);
+  const mergedProps = solid.mergeProps(() => api().getThumbProps(thumbProps), localProps);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const SliderTrack = props => {
@@ -2873,11 +2986,11 @@ const SliderTrack = props => {
 
 const SliderValueText = props => {
   const api = useSliderContext();
-  const getChildren = () => runIfFn(props.children, api);
   const mergedProps = solid.mergeProps(() => api().valueTextProps, props);
+  const getChildren = solidJs.children(() => props.children);
   return web.createComponent(ark.div, web.mergeProps(mergedProps, {
     get children() {
-      return getChildren();
+      return getChildren() || api().value.join(',');
     }
   }));
 };
@@ -2915,11 +3028,11 @@ const Splitter$1 = props => {
   const [splitterParams, localProps] = createSplitProps()(props, ['dir', 'getRootNode', 'id', 'ids', 'onSizeChange', 'onSizeChangeEnd', 'onSizeChangeStart', 'orientation', 'size']);
   const api = useSplitter(splitterParams);
   const getChildren = () => runIfFn(localProps.children, api);
-  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(SplitterProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, web.mergeProps(rootProps, {
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
         get children() {
           return getChildren();
         }
@@ -2931,15 +3044,15 @@ const Splitter$1 = props => {
 const SplitterPanel = props => {
   const [panelParams, restProps] = createSplitProps()(props, ['id', 'snapSize']);
   const api = useSplitterContext();
-  const panelProps = solid.mergeProps(() => api().getPanelProps(panelParams), restProps);
-  return web.createComponent(ark.div, panelProps);
+  const mergedProps = solid.mergeProps(() => api().getPanelProps(panelParams), restProps);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const SplitterResizeTrigger = props => {
   const api = useSplitterContext();
   const [triggerParams, restProps] = createSplitProps()(props, ['disabled', 'id', 'step']);
-  const triggerProps = solid.mergeProps(() => api().getResizeTriggerProps(triggerParams), restProps);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().getResizeTriggerProps(triggerParams), restProps);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const Splitter = Object.assign(Splitter$1, {
@@ -2982,12 +3095,12 @@ const Switch$1 = props => {
   });
 };
 
-const _tmpl$$2 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$1 = /*#__PURE__*/web.template(`<input>`);
 const SwitchControl = props => {
   const api = useSwitchContext();
   const mergedProps = solid.mergeProps(() => api().controlProps, props);
   return [web.createComponent(ark.span, mergedProps), (() => {
-    const _el$ = _tmpl$$2();
+    const _el$ = _tmpl$$1();
     web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
     return _el$;
   })()];
@@ -2995,14 +3108,14 @@ const SwitchControl = props => {
 
 const SwitchLabel = props => {
   const checkbox = useSwitchContext();
-  const labelProps = solid.mergeProps(() => checkbox().labelProps, props);
-  return web.createComponent(ark.span, labelProps);
+  const mergedProps = solid.mergeProps(() => checkbox().labelProps, props);
+  return web.createComponent(ark.span, mergedProps);
 };
 
 const SwitchThumb = props => {
   const checkbox = useSwitchContext();
-  const thumbProps = solid.mergeProps(() => checkbox().thumbProps, props);
-  return web.createComponent(ark.span, thumbProps);
+  const mergedProps = solid.mergeProps(() => checkbox().thumbProps, props);
+  return web.createComponent(ark.span, mergedProps);
 };
 
 const Switch = Object.assign(Switch$1, {
@@ -3017,44 +3130,46 @@ const [TabsProvider, useTabsContext] = createContext({
   providerName: '<TabsProvider />'
 });
 
-const TabPresence = props => {
-  const api = useTabsContext();
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().value === props.value;
-    }
-  }, props));
-};
-
 const TabContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
-  const [getContentProps, restProps] = createSplitProps()(localProps, ['value']);
+  const [contentProps, localProps] = createSplitProps()(props, ['value']);
   const api = useTabsContext();
-  const contentProps = solid.mergeProps(() => api().getContentProps(getContentProps), restProps);
-  return web.createComponent(TabPresence, web.mergeProps(presenceProps, getContentProps, {
+  const presenceProps = usePresencePropsContext();
+  const presenceApi = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().value === contentProps.value
+  })));
+  const mergedProps = solid.mergeProps(() => api().getContentProps(contentProps), () => presenceApi().presenceProps, localProps);
+  return web.createComponent(PresenceProvider, {
+    value: presenceApi,
     get children() {
-      return web.createComponent(ark.div, contentProps);
+      return web.createComponent(solidJs.Show, {
+        get when() {
+          return !presenceApi().isUnmounted;
+        },
+        get children() {
+          return web.createComponent(ark.div, mergedProps);
+        }
+      });
     }
-  }));
+  });
 };
 
 const TabIndicator = props => {
   const api = useTabsContext();
-  const indicatorProps = solid.mergeProps(() => api().indicatorProps, props);
-  return web.createComponent(ark.div, indicatorProps);
+  const mergedProps = solid.mergeProps(() => api().indicatorProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const TabList = props => {
   const api = useTabsContext();
-  const tablistProps = solid.mergeProps(() => api().tablistProps, props);
-  return web.createComponent(ark.div, tablistProps);
+  const mergedProps = solid.mergeProps(() => api().tablistProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const TabTrigger = props => {
   const [tabParams, restProps] = createSplitProps()(props, ['disabled', 'value']);
   const api = useTabsContext();
-  const triggerProps = solid.mergeProps(() => api().getTriggerProps(tabParams), restProps);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().getTriggerProps(tabParams), restProps);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const useTabs = props => {
@@ -3070,13 +3185,19 @@ const useTabs = props => {
 };
 
 const Tabs$1 = props => {
-  const [tabsParams, restProps] = createSplitProps()(props, ['activationMode', 'dir', 'getRootNode', 'id', 'ids', 'loop', 'onFocusChange', 'onValueChange', 'orientation', 'translations', 'value']);
+  const [presenceProps, tabsProps] = splitPresenceProps(props);
+  const [tabsParams, restProps] = createSplitProps()(tabsProps, ['activationMode', 'dir', 'getRootNode', 'id', 'ids', 'loop', 'onFocusChange', 'onValueChange', 'orientation', 'translations', 'value']);
   const api = useTabs(tabsParams);
-  const rootProps = solid.mergeProps(() => api().rootProps, restProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, restProps);
   return web.createComponent(TabsProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(PresencePropsProvider, {
+        value: presenceProps,
+        get children() {
+          return web.createComponent(ark.div, mergedProps);
+        }
+      });
     }
   });
 };
@@ -3106,7 +3227,7 @@ const useTagsInput = props => {
   return solidJs.createMemo(() => tagsInput__namespace.connect(state, send, solid.normalizeProps));
 };
 
-const _tmpl$$1 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$ = /*#__PURE__*/web.template(`<input>`);
 const TagsInput$1 = props => {
   const [tagsInputParams, restProps] = createSplitProps()(props, ['addOnPaste', 'allowEditTag', 'allowOverflow', 'autoFocus', 'blurBehavior', 'delimiter', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'inputValue', 'invalid', 'max', 'maxLength', 'name', 'onFocusOutside', 'onHighlightChange', 'onInteractOutside', 'onPointerDownOutside', 'onValueChange', 'onValueInvalid', 'readOnly', 'translations', 'validate', 'value']);
   const api = useTagsInput(tagsInputParams);
@@ -3120,7 +3241,7 @@ const TagsInput$1 = props => {
           return getChildren();
         }
       })), (() => {
-        const _el$ = _tmpl$$1();
+        const _el$ = _tmpl$();
         web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
@@ -3316,11 +3437,11 @@ const useToggleGroup = props => {
 const ToggleGroup$1 = props => {
   const [groupParams, restProps] = createSplitProps()(props, ['dir', 'disabled', 'getRootNode', 'id', 'ids', 'loop', 'multiple', 'onValueChange', 'orientation', 'rovingFocus', 'value']);
   const api = useToggleGroup(groupParams);
-  const rootProps = solid.mergeProps(() => api().rootProps, restProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, restProps);
   return web.createComponent(ToggleGroupProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, rootProps);
+      return web.createComponent(ark.div, mergedProps);
     }
   });
 };
@@ -3355,58 +3476,70 @@ const useTooltip = props => {
 };
 
 const Tooltip$1 = props => {
-  const [useTooltipProps, restProps] = createSplitProps()(props, ['aria-label', 'closeDelay', 'closeOnEsc', 'closeOnPointerDown', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'interactive', 'onOpenChange', 'open', 'openDelay', 'positioning']);
+  const [presenceProps, tooltipProps] = splitPresenceProps(props);
+  const [useTooltipProps, localProps] = createSplitProps()(tooltipProps, ['aria-label', 'closeDelay', 'closeOnEsc', 'closeOnPointerDown', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'interactive', 'onOpenChange', 'open', 'openDelay', 'positioning']);
   const api = useTooltip(useTooltipProps);
-  return web.createComponent(TooltipProvider, web.mergeProps({
-    value: api
-  }, restProps));
+  const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
+  const getChildren = () => runIfFn(localProps.children, api);
+  return web.createComponent(TooltipProvider, {
+    value: api,
+    get children() {
+      return web.createComponent(PresenceProvider, {
+        value: apiPresence,
+        get children() {
+          return getChildren();
+        }
+      });
+    }
+  });
 };
 
 const TooltipArrow = props => {
   const tooltip = useTooltipContext();
-  const arrowProps = solid.mergeProps(() => tooltip().arrowProps, props);
-  return web.createComponent(ark.div, arrowProps);
+  const mergedProps = solid.mergeProps(() => tooltip().arrowProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
 const TooltipArrowTip = props => {
   const api = useTooltipContext();
-  const arrowTipProps = solid.mergeProps(() => api().arrowTipProps, props);
-  return web.createComponent(ark.div, arrowTipProps);
+  const mergedProps = solid.mergeProps(() => api().arrowTipProps, props);
+  return web.createComponent(ark.div, mergedProps);
 };
 
-const _tmpl$ = /*#__PURE__*/web.template(`<div>`);
 const TooltipContent = props => {
-  const [presenceProps, localProps] = splitPresenceProps(props);
   const api = useTooltipContext();
-  const contentProps = solid.mergeProps(() => api().contentProps, localProps);
-  return web.createComponent(Presence, web.mergeProps({
-    get present() {
-      return api().isOpen;
-    }
-  }, presenceProps, {
-    get fallback() {
-      return (() => {
-        const _el$ = _tmpl$();
-        web.spread(_el$, web.mergeProps(() => api().contentProps), false, false);
-        return _el$;
-      })();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().contentProps, () => presenceApi().presenceProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
     },
     get children() {
-      return web.createComponent(ark.div, contentProps);
+      return web.createComponent(ark.div, mergedProps);
     }
-  }));
+  });
 };
 
 const TooltipPositioner = props => {
   const api = useTooltipContext();
-  const positionerProps = solid.mergeProps(() => api().positionerProps, props);
-  return web.createComponent(ark.div, positionerProps);
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(solidJs.Show, {
+    get when() {
+      return !presenceApi().isUnmounted;
+    },
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const TooltipTrigger = props => {
   const api = useTooltipContext();
-  const triggerProps = solid.mergeProps(() => api().triggerProps, props);
-  return web.createComponent(ark.button, triggerProps);
+  const mergedProps = solid.mergeProps(() => api().triggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
 };
 
 const Tooltip = Object.assign(Tooltip$1, {
@@ -3559,6 +3692,8 @@ exports.PopoverPositioner = PopoverPositioner;
 exports.PopoverTitle = PopoverTitle;
 exports.PopoverTrigger = PopoverTrigger;
 exports.Presence = Presence;
+exports.PresencePropsProvider = PresencePropsProvider;
+exports.PresenceProvider = PresenceProvider;
 exports.RadioGroup = RadioGroup;
 exports.RadioGroupItem = RadioGroupItem;
 exports.RadioGroupItemControl = RadioGroupItemControl;
@@ -3655,6 +3790,9 @@ exports.useNumberInputContext = useNumberInputContext;
 exports.usePaginationContext = usePaginationContext;
 exports.usePinInputContext = usePinInputContext;
 exports.usePopoverContext = usePopoverContext;
+exports.usePresence = usePresence;
+exports.usePresenceContext = usePresenceContext;
+exports.usePresencePropsContext = usePresencePropsContext;
 exports.useRadioGroupContext = useRadioGroupContext;
 exports.useRadioGroupItemContext = useRadioGroupItemContext;
 exports.useRatingGroupContext = useRatingGroupContext;