solid-baseui 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/lib/server/toast/index.js

@@ -3,15 +3,15 @@ import { t as useRender } from "../useRender-CryVdCjs.js";
 import { getStateAttributesProps } from "../internals/getStateAttributesProps.js";
 import { n as resolveClass, t as resolveStyle } from "../resolveStyle-XCSFDHAL.js";
 import { transitionStatusMapping } from "../internals/stateAttributesMapping.js";
-import { composeEventHandlers } from "../internals/composeEventHandlers.js";
+import { composeEventHandlers, liveEventHandler } from "../internals/composeEventHandlers.js";
 import { t as runOnceAnimationsFinish } from "../runOnceAnimationsFinish-CYq38H8J.js";
-import { a as isElement, m as ownerWindow, n as contains, p as ownerDocument, r as getEventTarget, t as activeElement } from "../dom-Crg_2R-j.js";
-import { t as createAnchorPositioning } from "../createAnchorPositioning-B5Y0WEev.js";
-import { _ as ReactiveStore, g as FocusGuard, n as popupStateMapping, o as PopupPortal } from "../popupStateMapping-B2KsiiLb.js";
+import { h as ownerWindow, i as getEventTarget, m as ownerDocument, n as contains, o as isElement, t as activeElement } from "../dom-D8_aB1yy.js";
+import { t as createAnchorPositioning } from "../createAnchorPositioning-DrQYe7RS.js";
+import { _ as ReactiveStore, g as FocusGuard, n as popupStateMapping, o as PopupPortal } from "../popupStateMapping-VHqr6M4H.js";
 import { t as setRef } from "../setRef-Bt70sW7c.js";
 import { a as stopButtonInteraction, i as preventDisabledButtonKeyDown, n as handleNonNativeButtonKeyUp, r as preventButtonInteraction, t as handleNonNativeButtonKeyDown } from "../buttonSemantics-BSwDxJhh.js";
 import { n as useDirection } from "../DirectionContext-YORWLF08.js";
-import { a as getElementTransform, i as getDisplacement, n as LEGACY_SWIPE_IGNORE_SELECTOR, t as BASE_UI_SWIPE_IGNORE_SELECTOR } from "../constants-D7ciIzsV.js";
+import { a as getElementTransform, i as getDisplacement, n as LEGACY_SWIPE_IGNORE_SELECTOR, t as BASE_UI_SWIPE_IGNORE_SELECTOR } from "../constants-ByqXubhO.js";
 import { escape, memo, mergeProps, ssr, ssrElement, ssrHydrationKey, ssrStyle } from "@solidjs/web";
 import { For, Show, children, createContext, createEffect, createMemo, createSignal, createUniqueId, flush, omit, onCleanup, untrack, useContext } from "solid-js";
 //#region src/toast/utils/focusVisible.ts
@@ -567,16 +567,16 @@ function ToastViewport(props) {
 	const stateAttributes = createMemo(() => getStateAttributesProps(state()));
 	const showFocusGuard = createMemo(() => !isEmpty() && Boolean(prevFocusElement()));
 	const others = omit(allProps, "render", "children", "class", "onBlur", "onClick", "onFocus", "onKeyDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onPointerCancel", "onPointerDown", "onPointerUp", "ref", "style");
-	const onBlur = composeEventHandlers(() => internalProps.onBlur, () => handleBlur);
-	const onClick = composeEventHandlers(() => internalProps.onClick, () => handleFocus);
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => handleFocus);
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, () => handleKeyDown);
-	const onMouseEnter = composeEventHandlers(() => internalProps.onMouseEnter, () => handleMouseEnter);
-	const onMouseMove = composeEventHandlers(() => internalProps.onMouseMove, () => handleMouseEnter);
-	const onMouseLeave = composeEventHandlers(() => internalProps.onMouseLeave, () => handleMouseLeave);
-	const onPointerDown = composeEventHandlers(() => internalProps.onPointerDown, () => handlePointerDown);
-	const onPointerUp = composeEventHandlers(() => internalProps.onPointerUp, () => handlePointerEnd);
-	const onPointerCancel = composeEventHandlers(() => internalProps.onPointerCancel, () => handlePointerEnd);
+	const onBlur = composeEventHandlers(liveEventHandler(() => internalProps.onBlur), handleBlur);
+	const onClick = composeEventHandlers(liveEventHandler(() => internalProps.onClick), handleFocus);
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), handleFocus);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), handleKeyDown);
+	const onMouseEnter = composeEventHandlers(liveEventHandler(() => internalProps.onMouseEnter), handleMouseEnter);
+	const onMouseMove = composeEventHandlers(liveEventHandler(() => internalProps.onMouseMove), handleMouseEnter);
+	const onMouseLeave = composeEventHandlers(liveEventHandler(() => internalProps.onMouseLeave), handleMouseLeave);
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => internalProps.onPointerDown), handlePointerDown);
+	const onPointerUp = composeEventHandlers(liveEventHandler(() => internalProps.onPointerUp), handlePointerEnd);
+	const onPointerCancel = composeEventHandlers(liveEventHandler(() => internalProps.onPointerCancel), handlePointerEnd);
 	const Render = useRender(props, () => state(), (props) => ssrElement("div", props, void 0, true));
 	return [
 		Show({
@@ -1000,11 +1000,11 @@ function ToastRoot(props) {
 	}, resolveStyle(props.style, state())));
 	const stateAttributes = createMemo(() => getStateAttributesProps(state(), toastRootStateAttributesMapping));
 	const others = omit(allProps, "render", "class", "onKeyDown", "onPointerCancel", "onPointerDown", "onPointerMove", "onPointerUp", "ref", "style", "swipeDirection", "toast");
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, () => handleKeyDown);
-	const onPointerDown = composeEventHandlers(() => internalProps.onPointerDown, () => untrack(() => swipeEnabled() ? handlePointerDown : void 0));
-	const onPointerMove = composeEventHandlers(() => internalProps.onPointerMove, () => untrack(() => swipeEnabled() ? handlePointerMove : void 0));
-	const onPointerUp = composeEventHandlers(() => internalProps.onPointerUp, () => untrack(() => swipeEnabled() ? handleSwipeEnd : void 0));
-	const onPointerCancel = composeEventHandlers(() => internalProps.onPointerCancel, () => untrack(() => swipeEnabled() ? handleSwipeEnd : void 0));
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), handleKeyDown);
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => internalProps.onPointerDown), liveEventHandler(() => untrack(() => swipeEnabled() ? handlePointerDown : void 0)));
+	const onPointerMove = composeEventHandlers(liveEventHandler(() => internalProps.onPointerMove), liveEventHandler(() => untrack(() => swipeEnabled() ? handlePointerMove : void 0)));
+	const onPointerUp = composeEventHandlers(liveEventHandler(() => internalProps.onPointerUp), liveEventHandler(() => untrack(() => swipeEnabled() ? handleSwipeEnd : void 0)));
+	const onPointerCancel = composeEventHandlers(liveEventHandler(() => internalProps.onPointerCancel), liveEventHandler(() => untrack(() => swipeEnabled() ? handleSwipeEnd : void 0)));
 	const context = {
 		toast,
 		setTitleId,
@@ -1223,13 +1223,13 @@ function ToastClose(props) {
 	function handleClick() {
 		store.closeToast(context.toast().id);
 	}
-	const onClick = composeEventHandlers(() => untrack(() => disabled() ? preventButtonInteraction : void 0), () => internalProps.onClick, () => handleClick);
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => () => setHasFocus(true));
-	const onBlur = composeEventHandlers(() => internalProps.onBlur, () => () => setHasFocus(false));
-	const onPointerDown = composeEventHandlers(() => untrack(() => disabled() ? preventButtonInteraction : void 0), () => internalProps.onPointerDown);
-	const onMouseDown = composeEventHandlers(() => untrack(() => disabled() ? stopButtonInteraction : void 0), () => internalProps.onMouseDown);
-	const onKeyDown = composeEventHandlers(() => untrack(() => disabled() ? preventDisabledButtonKeyDown : void 0), () => internalProps.onKeyDown, () => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyDown));
-	const onKeyUp = composeEventHandlers(() => untrack(() => disabled() ? stopButtonInteraction : void 0), () => internalProps.onKeyUp, () => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyUp));
+	const onClick = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventButtonInteraction : void 0)), liveEventHandler(() => internalProps.onClick), handleClick);
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), () => setHasFocus(true));
+	const onBlur = composeEventHandlers(liveEventHandler(() => internalProps.onBlur), () => setHasFocus(false));
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventButtonInteraction : void 0)), liveEventHandler(() => internalProps.onPointerDown));
+	const onMouseDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopButtonInteraction : void 0)), liveEventHandler(() => internalProps.onMouseDown));
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventDisabledButtonKeyDown : void 0)), liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(() => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyDown)));
+	const onKeyUp = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopButtonInteraction : void 0)), liveEventHandler(() => internalProps.onKeyUp), liveEventHandler(() => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyUp)));
 	return useRender(props, () => state(), (props) => ssrElement("button", props, void 0, true))(mergeProps({
 		ref: [internalProps.ref],
 		get type() {
@@ -1292,11 +1292,11 @@ function ToastAction(props) {
 		if (!value) return;
 		return omit(value, "children", "onClick", "onKeyDown", "onKeyUp", "onMouseDown", "onPointerDown");
 	});
-	const onClick = composeEventHandlers(() => untrack(() => disabled() ? preventButtonInteraction : void 0), () => internalProps.onClick, () => actionProps()?.onClick);
-	const onPointerDown = composeEventHandlers(() => untrack(() => disabled() ? preventButtonInteraction : void 0), () => internalProps.onPointerDown, () => actionProps()?.onPointerDown);
-	const onMouseDown = composeEventHandlers(() => untrack(() => disabled() ? stopButtonInteraction : void 0), () => internalProps.onMouseDown, () => actionProps()?.onMouseDown);
-	const onKeyDown = composeEventHandlers(() => untrack(() => disabled() ? preventDisabledButtonKeyDown : void 0), () => internalProps.onKeyDown, () => actionProps()?.onKeyDown, () => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyDown));
-	const onKeyUp = composeEventHandlers(() => untrack(() => disabled() ? stopButtonInteraction : void 0), () => internalProps.onKeyUp, () => actionProps()?.onKeyUp, () => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyUp));
+	const onClick = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventButtonInteraction : void 0)), liveEventHandler(() => internalProps.onClick), liveEventHandler(() => actionProps()?.onClick));
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventButtonInteraction : void 0)), liveEventHandler(() => internalProps.onPointerDown), liveEventHandler(() => actionProps()?.onPointerDown));
+	const onMouseDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopButtonInteraction : void 0)), liveEventHandler(() => internalProps.onMouseDown), liveEventHandler(() => actionProps()?.onMouseDown));
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventDisabledButtonKeyDown : void 0)), liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(() => actionProps()?.onKeyDown), liveEventHandler(() => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyDown)));
+	const onKeyUp = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopButtonInteraction : void 0)), liveEventHandler(() => internalProps.onKeyUp), liveEventHandler(() => actionProps()?.onKeyUp), liveEventHandler(() => untrack(() => nativeButton() ? void 0 : handleNonNativeButtonKeyUp)));
 	const Render = useRender(props, () => state(), (props) => ssrElement("button", props, void 0, true));
 	return Show({
 		get when() {

package/dist/lib/server/toggle/index.js

@@ -3,7 +3,7 @@ import { getStateAttributesProps } from "../internals/getStateAttributesProps.js
 import { w as none } from "../internals/reasons.js";
 import { n as resolveClass, t as resolveStyle } from "../resolveStyle-XCSFDHAL.js";
 import { createChangeEventDetails } from "../internals/createBaseUIEventDetails.js";
-import { composeEventHandlers } from "../internals/composeEventHandlers.js";
+import { composeEventHandlers, liveEventHandler } from "../internals/composeEventHandlers.js";
 import { n as useToolbarItemOwnerContext } from "../ToolbarItemOwnerContext-L5dsZ_vS.js";
 import { n as useToggleGroupContext } from "../ToggleGroupContext-COor8gYc.js";
 import { mergeProps, ssrElement } from "@solidjs/web";
@@ -83,12 +83,12 @@ function Toggle(props) {
 	function handleGroupKeyUp(event) {
 		handleCompositeKeyUp(event, nativeButton());
 	}
-	const onClick = composeEventHandlers(() => untrack(() => disabled() ? preventInteraction : void 0), () => internalProps.onClick, () => handleClick);
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => handleFocus);
-	const onMouseDown = composeEventHandlers(() => untrack(() => disabled() ? stopInteraction : void 0), () => internalProps.onMouseDown);
-	const onPointerDown = composeEventHandlers(() => untrack(() => disabled() ? preventInteraction : void 0), () => internalProps.onPointerDown);
-	const onKeyDown = composeEventHandlers(() => untrack(() => disabled() ? group ? preventFocusableDisabledKeyDown : stopInteraction : void 0), () => internalProps.onKeyDown, () => untrack(() => group ? handleGroupKeyDown : nativeButton() ? void 0 : handleNonNativeKeyDown));
-	const onKeyUp = composeEventHandlers(() => untrack(() => disabled() ? stopInteraction : void 0), () => internalProps.onKeyUp, () => untrack(() => group ? handleGroupKeyUp : nativeButton() ? void 0 : handleNonNativeKeyUp));
+	const onClick = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventInteraction : void 0)), liveEventHandler(() => internalProps.onClick), handleClick);
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), handleFocus);
+	const onMouseDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopInteraction : void 0)), liveEventHandler(() => internalProps.onMouseDown));
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventInteraction : void 0)), liveEventHandler(() => internalProps.onPointerDown));
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? group ? preventFocusableDisabledKeyDown : stopInteraction : void 0)), liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(() => untrack(() => group ? handleGroupKeyDown : nativeButton() ? void 0 : handleNonNativeKeyDown)));
+	const onKeyUp = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopInteraction : void 0)), liveEventHandler(() => internalProps.onKeyUp), liveEventHandler(() => untrack(() => group ? handleGroupKeyUp : nativeButton() ? void 0 : handleNonNativeKeyUp)));
 	createEffect(() => ({
 		initialized: group?.isValueInitialized() ?? false,
 		missingValue: group !== void 0 && internalProps.value === void 0

package/dist/lib/server/toggle-group/index.js

@@ -1,7 +1,7 @@
 import { t as useRender } from "../useRender-CryVdCjs.js";
 import { getStateAttributesProps } from "../internals/getStateAttributesProps.js";
 import { n as resolveClass, t as resolveStyle } from "../resolveStyle-XCSFDHAL.js";
-import { composeEventHandlers } from "../internals/composeEventHandlers.js";
+import { composeEventHandlers, liveEventHandler } from "../internals/composeEventHandlers.js";
 import { n as useDirection } from "../DirectionContext-YORWLF08.js";
 import { n as useToolbarRootContext } from "../ToolbarRootContext-DD-qe7s8.js";
 import { n as useToolbarGroupContext } from "../ToolbarGroupContext-CzdHxijX.js";
@@ -147,7 +147,7 @@ function ToggleGroup(props) {
 		setActiveItem(nextItem);
 		queueMicrotask(() => nextItem.element()?.focus());
 	}
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, () => toolbar ? void 0 : handleKeyDown);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(() => toolbar ? void 0 : handleKeyDown));
 	const context = {
 		disabled,
 		isPressed,

package/dist/lib/server/toolbar/index.js

@@ -2,7 +2,7 @@ import { t as __exportAll } from "../rolldown-runtime-D7D4PA-g.js";
 import { t as useRender } from "../useRender-CryVdCjs.js";
 import { getStateAttributesProps } from "../internals/getStateAttributesProps.js";
 import { n as resolveClass, t as resolveStyle } from "../resolveStyle-XCSFDHAL.js";
-import { composeEventHandlers } from "../internals/composeEventHandlers.js";
+import { composeEventHandlers, liveEventHandler } from "../internals/composeEventHandlers.js";
 import { t as setRef } from "../setRef-Bt70sW7c.js";
 import { n as useDirection } from "../DirectionContext-YORWLF08.js";
 import { n as useToolbarRootContext, t as ToolbarRootContext } from "../ToolbarRootContext-DD-qe7s8.js";
@@ -118,8 +118,8 @@ function ToolbarRoot(props) {
 		scrollItemIntoView(rootElement(), nextItem.element(), direction(), orientation());
 		queueMicrotask(() => nextItem.element()?.focus());
 	}
-	const onFocusIn = composeEventHandlers(() => internalProps.onFocusIn, () => handleFocus);
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, () => handleKeyDown);
+	const onFocusIn = composeEventHandlers(liveEventHandler(() => internalProps.onFocusIn), handleFocus);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), handleKeyDown);
 	function onRootKeyDown(event) {
 		Reflect.deleteProperty(event, "baseUIHandlerPrevented");
 		Reflect.apply(onKeyDown, event.currentTarget, [event]);
@@ -433,12 +433,12 @@ function ToolbarButton(props) {
 			event.preventBaseUIHandler();
 		}
 	}
-	const onClick = composeEventHandlers(() => untrack(() => disabled() ? preventInteraction : void 0), () => internalProps.onClick);
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => handleFocus);
-	const onKeyDown = composeEventHandlers(() => untrack(() => disabled() ? preventDisabledKeyDefault : void 0), () => untrack(() => disabled() ? void 0 : internalProps.onKeyDown), () => untrack(() => disabled() ? void 0 : handleKeyDown));
-	const onKeyUp = composeEventHandlers(() => untrack(() => disabled() ? stopInteraction : void 0), () => untrack(() => disabled() ? void 0 : internalProps.onKeyUp), () => untrack(() => disabled() ? void 0 : handleKeyUp));
-	const onMouseDown = composeEventHandlers(() => untrack(() => disabled() ? stopInteraction : void 0), () => untrack(() => disabled() ? void 0 : internalProps.onMouseDown));
-	const onPointerDown = composeEventHandlers(() => untrack(() => disabled() ? preventInteraction : void 0), () => internalProps.onPointerDown);
+	const onClick = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventInteraction : void 0)), liveEventHandler(() => internalProps.onClick));
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), handleFocus);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventDisabledKeyDefault : void 0)), liveEventHandler(() => untrack(() => disabled() ? void 0 : internalProps.onKeyDown)), liveEventHandler(() => untrack(() => disabled() ? void 0 : handleKeyDown)));
+	const onKeyUp = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopInteraction : void 0)), liveEventHandler(() => untrack(() => disabled() ? void 0 : internalProps.onKeyUp)), liveEventHandler(() => untrack(() => disabled() ? void 0 : handleKeyUp)));
+	const onMouseDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? stopInteraction : void 0)), liveEventHandler(() => untrack(() => disabled() ? void 0 : internalProps.onMouseDown)));
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventInteraction : void 0)), liveEventHandler(() => internalProps.onPointerDown));
 	onSettled(() => {
 		item.element();
 	});
@@ -545,7 +545,7 @@ function ToolbarLink(props) {
 	const classValue = createMemo(() => resolveClass(props.class, state()));
 	const styleValue = createMemo(() => resolveStyle(props.style, state()));
 	const stateAttributes = createMemo(() => getStateAttributesProps(state()));
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => () => item.root.setActiveItem(item.registration));
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), () => item.root.setActiveItem(item.registration));
 	return useRender(props, () => state(), (props) => ssrElement("a", props, void 0, true))(mergeProps({
 		ref: (element) => {
 			item.setElement(element);
@@ -590,10 +590,10 @@ function ToolbarInput(props) {
 	function handleFocus() {
 		item.root.setActiveItem(item.registration);
 	}
-	const onClick = composeEventHandlers(() => internalProps.onClick, () => untrack(() => disabled() ? preventDefault : void 0));
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => handleFocus);
-	const onKeyDown = composeEventHandlers(() => untrack(() => disabled() ? preventNonTabDefault : void 0), () => internalProps.onKeyDown);
-	const onPointerDown = composeEventHandlers(() => internalProps.onPointerDown, () => untrack(() => disabled() ? preventDefault : void 0));
+	const onClick = composeEventHandlers(liveEventHandler(() => internalProps.onClick), liveEventHandler(() => untrack(() => disabled() ? preventDefault : void 0)));
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), handleFocus);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => untrack(() => disabled() ? preventNonTabDefault : void 0)), liveEventHandler(() => internalProps.onKeyDown));
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => internalProps.onPointerDown), liveEventHandler(() => untrack(() => disabled() ? preventDefault : void 0)));
 	function setElement(element) {
 		removeOwnedListeners?.();
 		item.setElement(element);

package/dist/lib/server/tooltip/index.js

@@ -5,16 +5,16 @@ import { M as triggerHover, N as triggerPress, d as imperativeAction, s as disab
 import { n as resolveClass, t as resolveStyle } from "../resolveStyle-XCSFDHAL.js";
 import { createChangeEventDetails } from "../internals/createBaseUIEventDetails.js";
 import { transitionStatusMapping } from "../internals/stateAttributesMapping.js";
-import { composeEventHandlers } from "../internals/composeEventHandlers.js";
-import { a as isElement, m as ownerWindow, n as contains, r as getEventTarget } from "../dom-Crg_2R-j.js";
-import { t as PopupViewport } from "../PopupViewport-DftN5VUp.js";
-import { t as createAnchorPositioning } from "../createAnchorPositioning-B5Y0WEev.js";
+import { composeEventHandlers, liveEventHandler } from "../internals/composeEventHandlers.js";
+import { h as ownerWindow, i as getEventTarget, n as contains, o as isElement } from "../dom-D8_aB1yy.js";
+import { t as PopupViewport } from "../PopupViewport-BDttjORN.js";
+import { t as createAnchorPositioning } from "../createAnchorPositioning-DrQYe7RS.js";
 import { c as useFloatingTree, i as createFloatingNode, n as FloatingTreeContext, r as FloatingTreeStore, s as useFloatingParentNodeId, t as FloatingParentNodeContext } from "../FloatingTree-z1JPD1dR.js";
-import { a as createPopupPresence, n as createTriggerRegistration, o as createDismiss, t as PopupStore } from "../PopupStore-kHjFPiQ5.js";
-import { t as createFocusInteraction } from "../createFocusInteraction-DMyKsniI.js";
-import { n as createInitialPositioning, r as createHoverInteraction, t as safePolygon } from "../safePolygon-C1GNJbKR.js";
-import { a as triggerOpenStateMapping, o as PopupPortal } from "../popupStateMapping-B2KsiiLb.js";
-import { i as createPopupHandleStore, n as DetachedPopupStore, r as attachPopupHandle, t as BasePopupHandle } from "../PopupHandle-Ct6wywmP.js";
+import { a as createPopupPresence, n as createTriggerRegistration, o as createDismiss, t as PopupStore } from "../PopupStore-evylvVnN.js";
+import { t as createFocusInteraction } from "../createFocusInteraction-DFKr4G7a.js";
+import { n as createInitialPositioning, r as createHoverInteraction, t as safePolygon } from "../safePolygon-B8QtiIZ3.js";
+import { a as triggerOpenStateMapping, o as PopupPortal } from "../popupStateMapping-VHqr6M4H.js";
+import { i as createPopupHandleStore, n as DetachedPopupStore, r as attachPopupHandle, t as BasePopupHandle } from "../PopupHandle-QNj4mED2.js";
 import { t as setRef } from "../setRef-Bt70sW7c.js";
 import { n as useDirection } from "../DirectionContext-YORWLF08.js";
 import { escape, memo, mergeProps, ssrElement } from "@solidjs/web";
@@ -51,7 +51,7 @@ function createClientPoint(options) {
 		else if (suspended) return;
 		x = event.clientX;
 		y = event.clientY;
-		const reference = options.context.state.domReferenceElement;
+		const reference = directReferenceEvent && isElement(event.currentTarget) ? event.currentTarget : options.context.state.domReferenceElement;
 		if (!reference) return;
 		const virtual = {
 			contextElement: reference,
@@ -86,11 +86,11 @@ function createClientPoint(options) {
 	}), (state) => {
 		removeWindowListener?.();
 		removeWindowListener = void 0;
-		if (!state.enabled || state.axis === "none" || !state.reference) {
+		if (!state.enabled || state.axis === "none") {
 			resetReference();
 			return;
 		}
-		if (!state.open) return;
+		if (!state.open || !state.reference) return;
 		if (!state.openEvent || ![
 			"mouseenter",
 			"mousemove",
@@ -437,9 +437,12 @@ function TooltipRoot(props) {
 	if (provider) {
 		let groupActive = true;
 		const closeForDelayGroup = () => {
-			if (!store.open()) return;
+			if (!store.open() && !presence.mounted()) return;
 			queueMicrotask(() => {
-				if (groupActive && provider.group.currentId() !== delayGroupId && store.open()) store.setOpen(false, createChangeEventDetails(none));
+				if (groupActive && provider.group.currentId() !== delayGroupId) {
+					if (store.open()) store.setOpen(false, createChangeEventDetails(none));
+					else if (presence.mounted() && !store.state.preventUnmountingOnClose) presence.forceUnmount();
+				}
 			});
 		};
 		const unsubscribe = provider.group.subscribe(delayGroupId, closeForDelayGroup, (instant) => store.setInstantPhase(instant));
@@ -614,7 +617,8 @@ function TooltipTrigger(props) {
 	}
 	function handleNestedTriggerHover(event) {
 		const wasNested = nestedTriggerHovered;
-		const target = getEventTarget(event);
+		const eventTarget = getEventTarget(event);
+		const target = isElement(eventTarget) ? eventTarget : event.target;
 		nestedTriggerHovered = isElement(target) && isEnabledNestedTriggerTarget(target);
 		if (nestedTriggerHovered) {
 			hoverControls?.cancelPendingOpen();
@@ -643,6 +647,7 @@ function TooltipTrigger(props) {
 	function handleTriggerPress(event) {
 		const current = store();
 		if (!(internalProps.closeOnClick ?? true)) return;
+		clearTimeout(nestedOpenTimer);
 		if (current.open()) current.setOpen(false, createChangeEventDetails(triggerPress, event, element() ?? void 0));
 		else {
 			current.cancelPendingOpen(event);
@@ -668,20 +673,20 @@ function TooltipTrigger(props) {
 	function getRootMouseMoveHandler() {
 		return getRootHandler("onMouseMove");
 	}
-	const onBlur = composeEventHandlers(() => internalProps.onBlur, () => (event) => focusHandlers?.onBlur(event));
-	const onClick = composeEventHandlers(() => internalProps.onClick, () => handleTriggerPress);
-	const onFocus = composeEventHandlers(() => internalProps.onFocus, () => handleFocus);
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, getRootKeyDownHandler);
-	const onMouseLeave = composeEventHandlers(() => internalProps.onMouseLeave, () => () => {
+	const onBlur = composeEventHandlers(liveEventHandler(() => internalProps.onBlur), (event) => focusHandlers?.onBlur(event));
+	const onClick = composeEventHandlers(liveEventHandler(() => internalProps.onClick), handleTriggerPress);
+	const onFocus = composeEventHandlers(liveEventHandler(() => internalProps.onFocus), handleFocus);
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(getRootKeyDownHandler));
+	const onMouseLeave = composeEventHandlers(liveEventHandler(() => internalProps.onMouseLeave), () => {
 		nestedTriggerHovered = false;
 		pointerType = "";
 		clearTimeout(nestedOpenTimer);
 		focusHandlers?.onPointerLeave();
 	});
-	const onMouseMove = composeEventHandlers(() => internalProps.onMouseMove, getRootMouseMoveHandler);
-	const onMouseOver = composeEventHandlers(() => internalProps.onMouseOver, () => handleNestedTriggerHover);
-	const onPointerDown = composeEventHandlers(() => internalProps.onPointerDown, () => handlePointerDown);
-	const onPointerEnter = composeEventHandlers(() => internalProps.onPointerEnter, () => handlePointerEnter);
+	const onMouseMove = composeEventHandlers(liveEventHandler(() => internalProps.onMouseMove), liveEventHandler(getRootMouseMoveHandler));
+	const onMouseOver = composeEventHandlers(liveEventHandler(() => internalProps.onMouseOver), handleNestedTriggerHover);
+	const onPointerDown = composeEventHandlers(liveEventHandler(() => internalProps.onPointerDown), handlePointerDown);
+	const onPointerEnter = composeEventHandlers(liveEventHandler(() => internalProps.onPointerEnter), handlePointerEnter);
 	onCleanup(() => clearTimeout(nestedOpenTimer));
 	return Render(mergeProps({
 		ref: [((value) => setElement(value)), internalProps.ref],
@@ -839,8 +844,8 @@ function useTooltipPositionerContext() {
 //#region src/tooltip/positioner/TooltipPositioner.tsx
 /** Positions the tooltip against its active trigger. */
 function TooltipPositioner(props) {
-	useTooltipPortalContext();
 	const context = useTooltipRootContext();
+	useTooltipPortalContext();
 	const direction = useDirection();
 	const internalProps = props;
 	const allProps = props;
@@ -940,10 +945,10 @@ function TooltipPopup(props) {
 	const styleValue = createMemo(() => resolveStyle(props.style, state()));
 	const stateAttributes = createMemo(() => getStateAttributesProps(state(), tooltipPopupStateMapping));
 	const others = omit(allProps, "render", "class", "onKeyDown", "ref", "style");
-	const onKeyDown = composeEventHandlers(() => internalProps.onKeyDown, () => {
+	const onKeyDown = composeEventHandlers(liveEventHandler(() => internalProps.onKeyDown), liveEventHandler(() => {
 		const handler = context.store.state.popupProps.onKeyDown;
 		return typeof handler === "function" ? handler : void 0;
-	});
+	}));
 	let popupElement = null;
 	onCleanup(() => {
 		if (context.store.state.popupElement === popupElement) context.store.setPopupElement(null);