@expcat/tigercat-react 2.1.1 → 2.1.3

package/dist/components/Message.mjs

@@ -1,22 +1,22 @@
 import {
   MessageContainer
-} from "../chunk-OTBXERJD.mjs";
-import "../chunk-FLYJVZED.mjs";
-import {
-  getGlobalTigerLocale
-} from "../chunk-TGXBCKOU.mjs";
+} from "../chunk-YLXEMZVI.mjs";
+import "../chunk-ED7QR6PJ.mjs";
+import "../chunk-NPGU6VYD.mjs";
+import "../chunk-RUIFGSVN.mjs";
 
 // src/components/Message.tsx
-import { useEffect, useState } from "react";
+import { useSyncExternalStore } from "react";
 import { flushSync } from "react-dom";
 import { createRoot } from "react-dom/client";
 import {
-  createInstanceCounter,
+  createImperativeHost,
+  createToastQueue,
   isBrowser,
-  normalizeStringOption
+  normalizeStringOption,
+  resolveMessageDuration
 } from "@expcat/tigercat-core";
 import { Fragment, jsx } from "react/jsx-runtime";
-var MESSAGE_CONTAINER_ID = "tiger-message-container";
 var MESSAGE_POSITIONS = [
   "top",
   "top-left",
@@ -25,33 +25,31 @@ var MESSAGE_POSITIONS = [
   "bottom-left",
   "bottom-right"
 ];
-var messageInstances = [];
-var containerRoot = null;
-var updateCallback = null;
-var getNextInstanceId = null;
-function getMessageInstanceId() {
-  getNextInstanceId ??= createInstanceCounter();
-  return getNextInstanceId();
-}
-function getDefaultMessageCloseAriaLabel() {
-  const locale = getGlobalTigerLocale();
-  const closeText = locale?.common?.closeText;
-  if (!closeText) return void 0;
-  const localeCode = locale.locale?.toLowerCase() ?? "";
-  if (localeCode.startsWith("zh")) return `${closeText}\u6D88\u606F`;
-  if (localeCode.startsWith("en")) return `${closeText} message`;
-  return closeText;
-}
-var MessageHost = () => {
-  const [messages, setMessages] = useState(() => [...messageInstances]);
-  useEffect(() => {
-    updateCallback = () => {
-      setMessages([...messageInstances]);
-    };
-    return () => {
-      updateCallback = null;
-    };
-  }, []);
+var messageQueue = createToastQueue();
+var host = createImperativeHost({
+  mount(element) {
+    const root = createRoot(element);
+    flushSync(() => {
+      root.render(/* @__PURE__ */ jsx(MessageHost, {}));
+    });
+    return root;
+  },
+  unmount(root) {
+    root.unmount();
+  }
+});
+messageQueue.subscribe(() => {
+  if (messageQueue.getSnapshot().length > 0) return;
+  queueMicrotask(() => {
+    if (messageQueue.getSnapshot().length === 0) host.teardown();
+  });
+});
+function MessageHost() {
+  const messages = useSyncExternalStore(
+    messageQueue.subscribe,
+    messageQueue.getSnapshot,
+    messageQueue.getServerSnapshot
+  );
   return /* @__PURE__ */ jsx(Fragment, { children: MESSAGE_POSITIONS.map((position) => {
     const positionedMessages = messages.filter((message) => message.position === position);
     if (positionedMessages.length === 0) return null;
@@ -59,119 +57,56 @@ var MessageHost = () => {
       MessageContainer,
       {
         position,
-        messages: positionedMessages,
-        onClose: removeMessage
+        messages: [...positionedMessages],
+        onClose: (id) => messageQueue.remove(id),
+        portal: false
       },
       position
     );
   }) });
-};
-function ensureContainer() {
-  if (!isBrowser()) {
-    return;
-  }
-  const rootId = `${MESSAGE_CONTAINER_ID}-root`;
-  const existingRootEl = document.getElementById(rootId);
-  if (containerRoot && !existingRootEl) {
-    containerRoot = null;
-    updateCallback = null;
-  }
-  if (containerRoot) {
-    return;
-  }
-  let rootEl = existingRootEl;
-  if (!rootEl) {
-    rootEl = document.createElement("div");
-    rootEl.id = rootId;
-    document.body.appendChild(rootEl);
-  }
-  containerRoot = createRoot(rootEl);
-  flushSync(() => {
-    containerRoot?.render(/* @__PURE__ */ jsx(MessageHost, {}));
-  });
 }
 function addMessage(config) {
-  const id = getMessageInstanceId();
-  const instance = {
-    id,
-    type: config.type || "info",
+  if (!isBrowser()) return () => void 0;
+  const type = config.type || "info";
+  const instance = messageQueue.add({
+    type,
     content: config.content,
-    duration: config.duration !== void 0 ? config.duration : 3e3,
+    duration: resolveMessageDuration(type, config.duration),
     closable: config.closable || false,
     onClose: config.onClose,
     icon: config.icon,
     className: config.className,
-    closeAriaLabel: config.closeAriaLabel ?? getDefaultMessageCloseAriaLabel(),
+    closeAriaLabel: config.closeAriaLabel,
     position: config.position ?? "top"
-  };
-  messageInstances.push(instance);
-  const rootId = `${MESSAGE_CONTAINER_ID}-root`;
-  const shouldUpdateExistingContainer = isBrowser() && containerRoot !== null && document.getElementById(rootId) !== null;
-  ensureContainer();
-  if (shouldUpdateExistingContainer && updateCallback) {
-    updateCallback();
-  }
-  if (instance.duration > 0) {
-    setTimeout(() => {
-      removeMessage(id);
-    }, instance.duration);
-  }
-  return () => removeMessage(id);
-}
-function removeMessage(id) {
-  const index = messageInstances.findIndex((msg) => msg.id === id);
-  if (index !== -1) {
-    const instance = messageInstances[index];
-    messageInstances.splice(index, 1);
-    instance.onClose?.();
-    updateCallback?.();
-  }
-}
-function clearAll() {
-  messageInstances.forEach((instance) => {
-    instance.onClose?.();
   });
-  messageInstances = [];
-  updateCallback?.();
-  if (containerRoot) {
-    containerRoot.unmount();
-    containerRoot = null;
-  }
-  updateCallback = null;
-  const rootId = `${MESSAGE_CONTAINER_ID}-root`;
-  if (isBrowser()) {
-    const rootEl = document.getElementById(rootId);
-    if (rootEl?.parentNode) {
-      rootEl.parentNode.removeChild(rootEl);
-    }
-  }
+  if (!instance) return () => void 0;
+  host.ensure();
+  return () => {
+    messageQueue.remove(instance.id);
+  };
 }
 function normalizeOptions(options) {
   return normalizeStringOption(options, "content");
 }
 var Message = {
   info(options) {
-    const config = normalizeOptions(options);
-    return addMessage({ ...config, type: "info" });
+    return addMessage({ ...normalizeOptions(options), type: "info" });
   },
   success(options) {
-    const config = normalizeOptions(options);
-    return addMessage({ ...config, type: "success" });
+    return addMessage({ ...normalizeOptions(options), type: "success" });
   },
   warning(options) {
-    const config = normalizeOptions(options);
-    return addMessage({ ...config, type: "warning" });
+    return addMessage({ ...normalizeOptions(options), type: "warning" });
   },
   error(options) {
-    const config = normalizeOptions(options);
-    return addMessage({ ...config, type: "error" });
+    return addMessage({ ...normalizeOptions(options), type: "error" });
   },
   loading(options) {
-    const config = normalizeOptions(options);
-    return addMessage({ ...config, type: "loading", duration: 0 });
+    return addMessage({ ...normalizeOptions(options), type: "loading" });
   },
   clear() {
-    clearAll();
+    messageQueue.clear();
+    host.teardown();
   }
 };
 var Message_default = Message;

package/dist/components/MessageContainer.d.mts

@@ -5,6 +5,12 @@ interface MessageContainerProps {
     position?: MessagePosition;
     messages?: MessageInstance[];
     onClose?: (id: string | number) => void;
+    /**
+     * Portal through the overlay-host chain. Imperative hosts pass `false`
+     * because they are already mounted on that target.
+     * @default true
+     */
+    portal?: boolean;
 }
 declare const MessageContainer: React__default.FC<MessageContainerProps>;
 

package/dist/components/MessageContainer.mjs

@@ -1,8 +1,10 @@
 import {
   MessageContainer,
   MessageContainer_default
-} from "../chunk-OTBXERJD.mjs";
-import "../chunk-FLYJVZED.mjs";
+} from "../chunk-YLXEMZVI.mjs";
+import "../chunk-ED7QR6PJ.mjs";
+import "../chunk-NPGU6VYD.mjs";
+import "../chunk-RUIFGSVN.mjs";
 export {
   MessageContainer,
   MessageContainer_default as default

package/dist/components/MessageRoot.d.mts

@@ -1,9 +1,9 @@
 import { MessageType, MessageOptions } from '@expcat/tigercat-core';
+export { MessageOptions, MessageProps } from '@expcat/tigercat-core';
 
-type MessageProps = MessageOptions;
 type MessageClose = () => void;
 declare const Message: Record<MessageType, (options: MessageOptions) => MessageClose> & {
     clear: () => void;
 };
 
-export { Message, type MessageProps };
+export { Message };

package/dist/components/MessageRoot.mjs

@@ -1,6 +1,6 @@
 import {
   Message
-} from "../chunk-Y3SGFGN6.mjs";
+} from "../chunk-XJHC6JEC.mjs";
 export {
   Message
 };

package/dist/components/Modal.d.mts

@@ -11,9 +11,13 @@ interface ModalProps extends ModalProps$1, Omit<React__default.HTMLAttributes<HT
      */
     titleContent?: React__default.ReactNode;
     /**
-     * Modal footer content
+     * Modal footer content, or a render function that receives `{ ok, cancel }`.
+     * Default OK always closes.
      */
-    footer?: React__default.ReactNode;
+    footer?: React__default.ReactNode | ((actions: {
+        ok: () => void;
+        cancel: () => void;
+    }) => React__default.ReactNode);
     /**
      * Callback when modal visibility changes
      */
@@ -34,27 +38,7 @@ interface ModalProps extends ModalProps$1, Omit<React__default.HTMLAttributes<HT
      * Callback when OK button is clicked
      */
     onOk?: () => void;
-    /**
-     * Close button aria-label
-     * @default 'Close'
-     */
-    closeAriaLabel?: string;
-    /**
-     * Whether to render a default footer when no `footer` prop is provided
-     * @default false
-     */
-    showDefaultFooter?: boolean;
-    /**
-     * Default OK button text (used in default footer)
-     * @default '确定'
-     */
-    okText?: string;
-    /**
-     * Default Cancel button text (used in default footer)
-     * @default '取消'
-     */
-    cancelText?: string;
 }
-declare const Modal: React__default.FC<ModalProps>;
+declare const Modal: React__default.ForwardRefExoticComponent<ModalProps & React__default.RefAttributes<HTMLDivElement>>;
 
 export { Modal, type ModalProps };

package/dist/components/Modal.mjs

@@ -1,11 +1,11 @@
 import {
   Modal
-} from "../chunk-54HN5BXW.mjs";
-import "../chunk-5TE7KLE5.mjs";
-import "../chunk-ZJWUBR2X.mjs";
-import "../chunk-HKAZXG74.mjs";
-import "../chunk-YSIXURBW.mjs";
-import "../chunk-TGXBCKOU.mjs";
+} from "../chunk-OES5DL3S.mjs";
+import "../chunk-WWZZRB7H.mjs";
+import "../chunk-WFLXJOFU.mjs";
+import "../chunk-G5NPND2T.mjs";
+import "../chunk-NPGU6VYD.mjs";
+import "../chunk-RUIFGSVN.mjs";
 export {
   Modal
 };

package/dist/components/NavigationMenu.d.mts

@@ -3,6 +3,8 @@ import { NavigationMenuProps as NavigationMenuProps$1, FloatingPlacement, Naviga
 
 interface NavigationMenuContextValue {
     value: NavigationMenuValue | null;
+    tabStopValue: NavigationMenuValue | null;
+    setTabStopValue: (next: NavigationMenuValue | null) => void;
     setValue: (next: NavigationMenuValue | null, options?: {
         restoreFocus?: boolean;
     }) => void;
@@ -10,6 +12,7 @@ interface NavigationMenuContextValue {
     scheduleClose: (itemValue: NavigationMenuValue) => void;
     cancelClose: () => void;
     closeOnClick: boolean;
+    openOnHover: boolean;
     handleItemClick: () => void;
     handleFocusLeave: (event: React__default.FocusEvent<HTMLElement>) => void;
     portal: boolean;
@@ -17,20 +20,21 @@ interface NavigationMenuContextValue {
     offset: number;
     placement: FloatingPlacement;
     showArrow: boolean;
+    rootRef: React__default.RefObject<HTMLElement | null>;
     menubarRef: React__default.RefObject<HTMLElement | null>;
-    isFocusOpenSuppressed: () => boolean;
 }
 interface NavigationMenuItemContextValue {
     value: NavigationMenuValue;
     isOpen: boolean;
     disabled: boolean;
     hasPanel: boolean;
-    setHasPanel: (next: boolean) => void;
     triggerRef: React__default.RefObject<HTMLElement | null>;
     contentRef: React__default.RefObject<HTMLElement | null>;
     contentId: string;
     open: (focusPanel?: boolean) => void;
-    close: () => void;
+    close: (options?: {
+        restoreFocus?: boolean;
+    }) => void;
     scheduleOpen: () => void;
     scheduleClose: () => void;
     cancelClose: () => void;
@@ -42,19 +46,19 @@ interface NavigationMenuContentContextValue {
 declare const NavigationMenuContext: React__default.Context<NavigationMenuContextValue | null>;
 declare const NavigationMenuItemContext: React__default.Context<NavigationMenuItemContextValue | null>;
 declare const NavigationMenuContentContext: React__default.Context<NavigationMenuContentContextValue | null>;
-interface NavigationMenuLinkProps extends Omit<NavigationMenuLinkProps$1, 'className' | 'style'> {
+interface NavigationMenuLinkProps extends Omit<NavigationMenuLinkProps$1, 'className' | 'style'>, Omit<React__default.AnchorHTMLAttributes<HTMLElement>, 'href' | 'target' | 'rel' | 'className' | 'style' | 'onClick'> {
     className?: string;
     style?: React__default.CSSProperties;
     onClick?: (event: React__default.MouseEvent<HTMLElement>) => void;
     children?: React__default.ReactNode;
 }
-declare const NavigationMenuLink: React__default.FC<NavigationMenuLinkProps>;
-interface NavigationMenuTriggerProps extends Omit<NavigationMenuTriggerProps$1, 'className' | 'style'> {
+declare const NavigationMenuLink: React__default.ForwardRefExoticComponent<NavigationMenuLinkProps & React__default.RefAttributes<HTMLElement>>;
+interface NavigationMenuTriggerProps extends Omit<NavigationMenuTriggerProps$1, 'className' | 'style'>, Omit<React__default.ButtonHTMLAttributes<HTMLButtonElement>, 'disabled' | 'className' | 'style'> {
     className?: string;
     style?: React__default.CSSProperties;
     children?: React__default.ReactNode;
 }
-declare const NavigationMenuTrigger: React__default.FC<NavigationMenuTriggerProps>;
+declare const NavigationMenuTrigger: React__default.ForwardRefExoticComponent<NavigationMenuTriggerProps & React__default.RefAttributes<HTMLButtonElement>>;
 interface NavigationMenuContentProps extends Omit<NavigationMenuContentProps$1, 'style'>, Omit<React__default.HTMLAttributes<HTMLDivElement>, 'style'> {
     style?: React__default.CSSProperties;
     children?: React__default.ReactNode;

package/dist/components/NavigationMenu.mjs

@@ -8,8 +8,9 @@ import {
   NavigationMenuLink,
   NavigationMenuList,
   NavigationMenuTrigger
-} from "../chunk-2YOP55OF.mjs";
-import "../chunk-HKAZXG74.mjs";
+} from "../chunk-5QTYD4XG.mjs";
+import "../chunk-WWZZRB7H.mjs";
+import "../chunk-NPGU6VYD.mjs";
 export {
   NavigationMenu,
   NavigationMenuContent,

package/dist/components/Notification.d.mts

@@ -2,7 +2,6 @@ import { NotificationOptions, NotificationPosition } from '@expcat/tigercat-core
 export { NotificationContainer, NotificationContainerProps } from './NotificationContainer.mjs';
 import 'react';
 
-type NotificationProps = NotificationOptions;
 declare const notification: {
     info(options: NotificationOptions): () => void;
     success(options: NotificationOptions): () => void;
@@ -11,4 +10,4 @@ declare const notification: {
     clear(position?: NotificationPosition): void;
 };
 
-export { type NotificationProps, notification as default, notification };
+export { notification as default, notification };