@zag-js/tooltip 0.10.5 → 0.11.0

package/src/tooltip.machine.ts

@@ -1,4 +1,4 @@
-import { createMachine, subscribe } from "@zag-js/core"
+import { createMachine, subscribe, guards } from "@zag-js/core"
 import { addDomEvent } from "@zag-js/dom-event"
 import { getScrollParents, isHTMLElement, isSafari } from "@zag-js/dom-query"
 import { getPlacement } from "@zag-js/popper"
@@ -7,6 +7,8 @@ import { dom } from "./tooltip.dom"
 import { store } from "./tooltip.store"
 import type { MachineContext, MachineState, UserDefinedContext } from "./tooltip.types"
 
+const { and, not } = guards
+
 export function machine(userContext: UserDefinedContext) {
   const ctx = compact(userContext)
   return createMachine<MachineContext, MachineState>(
@@ -22,6 +24,7 @@ export function machine(userContext: UserDefinedContext) {
         interactive: true,
         currentPlacement: undefined,
         ...ctx,
+        hasPointerMoveOpened: false,
         positioning: {
           placement: "bottom",
           ...ctx.positioning,
@@ -48,12 +51,19 @@ export function machine(userContext: UserDefinedContext) {
           entry: ["clearGlobalId", "invokeOnClose"],
           on: {
             FOCUS: "open",
-            POINTER_ENTER: [
+            POINTER_LEAVE: {
+              actions: ["clearPointerMoveOpened"],
+            },
+            POINTER_MOVE: [
               {
-                guard: "noVisibleTooltip",
+                guard: and("noVisibleTooltip", not("hasPointerMoveOpened")),
                 target: "opening",
               },
-              { target: "open" },
+              {
+                guard: not("hasPointerMoveOpened"),
+                target: "open",
+                actions: ["setPointerMoveOpened"],
+              },
             ],
           },
         },
@@ -62,10 +72,16 @@ export function machine(userContext: UserDefinedContext) {
           tags: ["closed"],
           activities: ["trackScroll", "trackPointerlockChange"],
           after: {
-            OPEN_DELAY: "open",
+            OPEN_DELAY: {
+              target: "open",
+              actions: ["setPointerMoveOpened"],
+            },
           },
           on: {
-            POINTER_LEAVE: "closed",
+            POINTER_LEAVE: {
+              target: "closed",
+              actions: ["clearPointerMoveOpened"],
+            },
             BLUR: "closed",
             SCROLL: "closed",
             POINTER_LOCK_CHANGE: "closed",
@@ -91,14 +107,18 @@ export function machine(userContext: UserDefinedContext) {
               {
                 guard: "isVisible",
                 target: "closing",
+                actions: ["clearPointerMoveOpened"],
+              },
+              {
+                target: "closed",
+                actions: ["clearPointerMoveOpened"],
               },
-              { target: "closed" },
             ],
             BLUR: "closed",
             ESCAPE: "closed",
             SCROLL: "closed",
             POINTER_LOCK_CHANGE: "closed",
-            TOOLTIP_POINTER_LEAVE: {
+            "CONTENT.POINTER_LEAVE": {
               guard: "isInteractive",
               target: "closing",
             },
@@ -121,8 +141,11 @@ export function machine(userContext: UserDefinedContext) {
           },
           on: {
             FORCE_CLOSE: "closed",
-            POINTER_ENTER: "open",
-            TOOLTIP_POINTER_ENTER: {
+            POINTER_MOVE: {
+              target: "open",
+              actions: ["setPointerMoveOpened"],
+            },
+            "CONTENT.POINTER_MOVE": {
               guard: "isInteractive",
               target: "open",
             },
@@ -197,7 +220,7 @@ export function machine(userContext: UserDefinedContext) {
           }
         },
         invokeOnOpen(ctx, evt) {
-          const omit = ["TOOLTIP_POINTER_ENTER", "POINTER_ENTER"]
+          const omit = ["CONTENT.POINTER_MOVE", "POINTER_MOVE"]
           if (!omit.includes(evt.type)) {
             ctx.onOpen?.()
           }
@@ -206,9 +229,8 @@ export function machine(userContext: UserDefinedContext) {
           ctx.onClose?.()
         },
         closeIfDisabled(ctx, _evt, { send }) {
-          if (ctx.disabled) {
-            send("CLOSE")
-          }
+          if (!ctx.disabled) return
+          send("CLOSE")
         },
         setPositioning(ctx, evt) {
           const getPositionerEl = () => dom.getPositionerEl(ctx)
@@ -222,12 +244,19 @@ export function machine(userContext: UserDefinedContext) {
         toggleVisibility(ctx, _evt, { send }) {
           send({ type: ctx.open ? "OPEN" : "CLOSE", src: "controlled" })
         },
+        setPointerMoveOpened(ctx) {
+          ctx.hasPointerMoveOpened = true
+        },
+        clearPointerMoveOpened(ctx) {
+          ctx.hasPointerMoveOpened = false
+        },
       },
       guards: {
         closeOnPointerDown: (ctx) => ctx.closeOnPointerDown,
         noVisibleTooltip: () => store.id === null,
         isVisible: (ctx) => ctx.id === store.id,
         isInteractive: (ctx) => ctx.interactive,
+        hasPointerMoveOpened: (ctx) => !!ctx.hasPointerMoveOpened,
       },
       delays: {
         OPEN_DELAY: (ctx) => ctx.openDelay,

package/src/tooltip.types.ts

@@ -81,6 +81,11 @@ type PrivateContext = RootProperties & {
    * The computed placement of the tooltip.
    */
   currentPlacement?: Placement
+  /**
+   * @internal
+   * Whether the pointermove already opened the tooltip.
+   */
+  hasPointerMoveOpened?: boolean
 }
 
 export type MachineContext = PublicContext & ComputedContext & PrivateContext

package/dist/tooltip.anatomy.d.ts

@@ -1,3 +0,0 @@
-import type { AnatomyInstance, AnatomyPart } from '@zag-js/anatomy';
-export declare const anatomy: AnatomyInstance<"content" | "label" | "trigger" | "arrow" | "arrowTip" | "positioner">;
-export declare const parts: Record<"content" | "label" | "trigger" | "arrow" | "arrowTip" | "positioner", AnatomyPart>;

package/dist/tooltip.anatomy.js

@@ -1,11 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-
-const anatomy$1 = require('@zag-js/anatomy');
-
-const anatomy = anatomy$1.createAnatomy("tooltip").parts("trigger", "arrow", "arrowTip", "positioner", "content", "label");
-const parts = anatomy.build();
-
-exports.anatomy = anatomy;
-exports.parts = parts;

package/dist/tooltip.anatomy.mjs

@@ -1,6 +0,0 @@
-import { createAnatomy } from '@zag-js/anatomy';
-
-const anatomy = createAnatomy("tooltip").parts("trigger", "arrow", "arrowTip", "positioner", "content", "label");
-const parts = anatomy.build();
-
-export { anatomy, parts };

package/dist/tooltip.connect.d.ts

@@ -1,34 +0,0 @@
-import { PositioningOptions } from "@zag-js/popper";
-import type { NormalizeProps, PropTypes } from "@zag-js/types";
-import type { Send, State } from "./tooltip.types";
-export declare function connect<T extends PropTypes>(state: State, send: Send, normalize: NormalizeProps<T>): {
-    /**
-     * Whether the tooltip is open.
-     */
-    isOpen: boolean;
-    /**
-     * Function to open the tooltip.
-     */
-    open(): void;
-    /**
-     * Function to close the tooltip.
-     */
-    close(): void;
-    /**
-     * Returns the animation state of the tooltip.
-     */
-    getAnimationState(): {
-        enter: boolean;
-        exit: boolean;
-    };
-    /**
-     * Function to reposition the popover
-     */
-    setPositioning(options?: Partial<PositioningOptions>): void;
-    triggerProps: T["button"];
-    arrowProps: T["element"];
-    arrowTipProps: T["element"];
-    positionerProps: T["element"];
-    contentProps: T["element"];
-    labelProps: T["element"];
-};

package/dist/tooltip.connect.js

@@ -1,133 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-
-const domQuery = require('@zag-js/dom-query');
-const popper = require('@zag-js/popper');
-const visuallyHidden = require('@zag-js/visually-hidden');
-const tooltip_anatomy = require('./tooltip.anatomy.js');
-const tooltip_dom = require('./tooltip.dom.js');
-const tooltip_store = require('./tooltip.store.js');
-
-function connect(state, send, normalize) {
-  const id = state.context.id;
-  const hasAriaLabel = state.context.hasAriaLabel;
-  const isOpen = state.hasTag("open");
-  const triggerId = tooltip_dom.dom.getTriggerId(state.context);
-  const contentId = tooltip_dom.dom.getContentId(state.context);
-  const isDisabled = state.context.disabled;
-  const popperStyles = popper.getPlacementStyles({
-    placement: state.context.currentPlacement
-  });
-  return {
-    /**
-     * Whether the tooltip is open.
-     */
-    isOpen,
-    /**
-     * Function to open the tooltip.
-     */
-    open() {
-      send("OPEN");
-    },
-    /**
-     * Function to close the tooltip.
-     */
-    close() {
-      send("CLOSE");
-    },
-    /**
-     * Returns the animation state of the tooltip.
-     */
-    getAnimationState() {
-      return {
-        enter: tooltip_store.store.prevId === null && id === tooltip_store.store.id,
-        exit: tooltip_store.store.id === null
-      };
-    },
-    /**
-     * Function to reposition the popover
-     */
-    setPositioning(options = {}) {
-      send({ type: "SET_POSITIONING", options });
-    },
-    triggerProps: normalize.button({
-      ...tooltip_anatomy.parts.trigger.attrs,
-      id: triggerId,
-      "data-expanded": domQuery.dataAttr(isOpen),
-      "aria-describedby": isOpen ? contentId : void 0,
-      onClick() {
-        send("CLICK");
-      },
-      onFocus() {
-        send("FOCUS");
-      },
-      onBlur() {
-        if (id === tooltip_store.store.id) {
-          send("BLUR");
-        }
-      },
-      onPointerDown() {
-        if (isDisabled)
-          return;
-        if (id === tooltip_store.store.id) {
-          send("POINTER_DOWN");
-        }
-      },
-      onPointerMove() {
-        if (isDisabled)
-          return;
-        send("POINTER_ENTER");
-      },
-      onPointerLeave() {
-        if (isDisabled)
-          return;
-        send("POINTER_LEAVE");
-      },
-      onPointerCancel() {
-        if (isDisabled)
-          return;
-        send("POINTER_LEAVE");
-      }
-    }),
-    arrowProps: normalize.element({
-      id: tooltip_dom.dom.getArrowId(state.context),
-      ...tooltip_anatomy.parts.arrow.attrs,
-      style: popperStyles.arrow
-    }),
-    arrowTipProps: normalize.element({
-      ...tooltip_anatomy.parts.arrowTip.attrs,
-      style: popperStyles.arrowTip
-    }),
-    positionerProps: normalize.element({
-      id: tooltip_dom.dom.getPositionerId(state.context),
-      ...tooltip_anatomy.parts.positioner.attrs,
-      style: popperStyles.floating
-    }),
-    contentProps: normalize.element({
-      ...tooltip_anatomy.parts.content.attrs,
-      hidden: !isOpen,
-      role: hasAriaLabel ? void 0 : "tooltip",
-      id: hasAriaLabel ? void 0 : contentId,
-      "data-placement": state.context.currentPlacement,
-      onPointerEnter() {
-        send("TOOLTIP_POINTER_ENTER");
-      },
-      onPointerLeave() {
-        send("TOOLTIP_POINTER_LEAVE");
-      },
-      style: {
-        pointerEvents: state.context.interactive ? "auto" : "none"
-      }
-    }),
-    labelProps: normalize.element({
-      ...tooltip_anatomy.parts.label.attrs,
-      id: contentId,
-      role: "tooltip",
-      style: visuallyHidden.visuallyHiddenStyle,
-      children: state.context["aria-label"]
-    })
-  };
-}
-
-exports.connect = connect;

package/dist/tooltip.connect.mjs

@@ -1,129 +0,0 @@
-import { dataAttr } from '@zag-js/dom-query';
-import { getPlacementStyles } from '@zag-js/popper';
-import { visuallyHiddenStyle } from '@zag-js/visually-hidden';
-import { parts } from './tooltip.anatomy.mjs';
-import { dom } from './tooltip.dom.mjs';
-import { store } from './tooltip.store.mjs';
-
-function connect(state, send, normalize) {
-  const id = state.context.id;
-  const hasAriaLabel = state.context.hasAriaLabel;
-  const isOpen = state.hasTag("open");
-  const triggerId = dom.getTriggerId(state.context);
-  const contentId = dom.getContentId(state.context);
-  const isDisabled = state.context.disabled;
-  const popperStyles = getPlacementStyles({
-    placement: state.context.currentPlacement
-  });
-  return {
-    /**
-     * Whether the tooltip is open.
-     */
-    isOpen,
-    /**
-     * Function to open the tooltip.
-     */
-    open() {
-      send("OPEN");
-    },
-    /**
-     * Function to close the tooltip.
-     */
-    close() {
-      send("CLOSE");
-    },
-    /**
-     * Returns the animation state of the tooltip.
-     */
-    getAnimationState() {
-      return {
-        enter: store.prevId === null && id === store.id,
-        exit: store.id === null
-      };
-    },
-    /**
-     * Function to reposition the popover
-     */
-    setPositioning(options = {}) {
-      send({ type: "SET_POSITIONING", options });
-    },
-    triggerProps: normalize.button({
-      ...parts.trigger.attrs,
-      id: triggerId,
-      "data-expanded": dataAttr(isOpen),
-      "aria-describedby": isOpen ? contentId : void 0,
-      onClick() {
-        send("CLICK");
-      },
-      onFocus() {
-        send("FOCUS");
-      },
-      onBlur() {
-        if (id === store.id) {
-          send("BLUR");
-        }
-      },
-      onPointerDown() {
-        if (isDisabled)
-          return;
-        if (id === store.id) {
-          send("POINTER_DOWN");
-        }
-      },
-      onPointerMove() {
-        if (isDisabled)
-          return;
-        send("POINTER_ENTER");
-      },
-      onPointerLeave() {
-        if (isDisabled)
-          return;
-        send("POINTER_LEAVE");
-      },
-      onPointerCancel() {
-        if (isDisabled)
-          return;
-        send("POINTER_LEAVE");
-      }
-    }),
-    arrowProps: normalize.element({
-      id: dom.getArrowId(state.context),
-      ...parts.arrow.attrs,
-      style: popperStyles.arrow
-    }),
-    arrowTipProps: normalize.element({
-      ...parts.arrowTip.attrs,
-      style: popperStyles.arrowTip
-    }),
-    positionerProps: normalize.element({
-      id: dom.getPositionerId(state.context),
-      ...parts.positioner.attrs,
-      style: popperStyles.floating
-    }),
-    contentProps: normalize.element({
-      ...parts.content.attrs,
-      hidden: !isOpen,
-      role: hasAriaLabel ? void 0 : "tooltip",
-      id: hasAriaLabel ? void 0 : contentId,
-      "data-placement": state.context.currentPlacement,
-      onPointerEnter() {
-        send("TOOLTIP_POINTER_ENTER");
-      },
-      onPointerLeave() {
-        send("TOOLTIP_POINTER_LEAVE");
-      },
-      style: {
-        pointerEvents: state.context.interactive ? "auto" : "none"
-      }
-    }),
-    labelProps: normalize.element({
-      ...parts.label.attrs,
-      id: contentId,
-      role: "tooltip",
-      style: visuallyHiddenStyle,
-      children: state.context["aria-label"]
-    })
-  };
-}
-
-export { connect };

package/dist/tooltip.dom.d.ts

@@ -1,31 +0,0 @@
-import type { MachineContext as Ctx } from "./tooltip.types";
-export declare const dom: {
-    getRootNode: (ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }) => ShadowRoot | Document;
-    getDoc: (ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }) => Document;
-    getWin: (ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }) => Window & typeof globalThis;
-    getActiveElement: (ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }) => HTMLElement | null;
-    getById: <T extends HTMLElement = HTMLElement>(ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }, id: string) => T | null;
-    queryById: <T_1 extends HTMLElement = HTMLElement>(ctx: {
-        getRootNode?: (() => Node | ShadowRoot | Document) | undefined;
-    }, id: string) => T_1;
-} & {
-    getTriggerId: (ctx: Ctx) => string;
-    getContentId: (ctx: Ctx) => string;
-    getArrowId: (ctx: Ctx) => string;
-    getPositionerId: (ctx: Ctx) => string;
-    getTriggerEl: (ctx: Ctx) => HTMLElement | null;
-    getContentEl: (ctx: Ctx) => HTMLElement | null;
-    getPositionerEl: (ctx: Ctx) => HTMLElement | null;
-    getArrowEl: (ctx: Ctx) => HTMLElement | null;
-    getScrollParent: (ctx: Ctx) => HTMLElement;
-};

package/dist/tooltip.dom.js

@@ -1,19 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-
-const domQuery = require('@zag-js/dom-query');
-
-const dom = domQuery.createScope({
-  getTriggerId: (ctx) => ctx.ids?.trigger ?? `tooltip:${ctx.id}:trigger`,
-  getContentId: (ctx) => ctx.ids?.content ?? `tooltip:${ctx.id}:content`,
-  getArrowId: (ctx) => ctx.ids?.arrow ?? `tooltip:${ctx.id}:arrow`,
-  getPositionerId: (ctx) => ctx.ids?.positioner ?? `tooltip:${ctx.id}:popper`,
-  getTriggerEl: (ctx) => dom.getById(ctx, dom.getTriggerId(ctx)),
-  getContentEl: (ctx) => dom.getById(ctx, dom.getContentId(ctx)),
-  getPositionerEl: (ctx) => dom.getById(ctx, dom.getPositionerId(ctx)),
-  getArrowEl: (ctx) => dom.getById(ctx, dom.getArrowId(ctx)),
-  getScrollParent: (ctx) => domQuery.getScrollParent(dom.getTriggerEl(ctx))
-});
-
-exports.dom = dom;

package/dist/tooltip.dom.mjs

@@ -1,15 +0,0 @@
-import { createScope, getScrollParent } from '@zag-js/dom-query';
-
-const dom = createScope({
-  getTriggerId: (ctx) => ctx.ids?.trigger ?? `tooltip:${ctx.id}:trigger`,
-  getContentId: (ctx) => ctx.ids?.content ?? `tooltip:${ctx.id}:content`,
-  getArrowId: (ctx) => ctx.ids?.arrow ?? `tooltip:${ctx.id}:arrow`,
-  getPositionerId: (ctx) => ctx.ids?.positioner ?? `tooltip:${ctx.id}:popper`,
-  getTriggerEl: (ctx) => dom.getById(ctx, dom.getTriggerId(ctx)),
-  getContentEl: (ctx) => dom.getById(ctx, dom.getContentId(ctx)),
-  getPositionerEl: (ctx) => dom.getById(ctx, dom.getPositionerId(ctx)),
-  getArrowEl: (ctx) => dom.getById(ctx, dom.getArrowId(ctx)),
-  getScrollParent: (ctx) => getScrollParent(dom.getTriggerEl(ctx))
-});
-
-export { dom };

package/dist/tooltip.machine.d.ts

@@ -1,3 +0,0 @@
-import type { Machine, StateMachine } from '@zag-js/core';
-import type { MachineContext, MachineState, UserDefinedContext } from "./tooltip.types";
-export declare function machine(userContext: UserDefinedContext): Machine<MachineContext, MachineState, StateMachine.AnyEventObject>;