@expcat/tigercat-react 0.3.0 → 0.3.69

package/dist/{chunk-OVWCTDAL.js → chunk-IRH2ZVD3.js}

@@ -1,24 +1,14 @@
 'use strict';
 
-var chunkGJKT2B56_js = require('./chunk-GJKT2B56.js');
-var chunkGY6D4XS3_js = require('./chunk-GY6D4XS3.js');
-var chunkPBJ2J2B3_js = require('./chunk-PBJ2J2B3.js');
-var chunk4TWHENPT_js = require('./chunk-4TWHENPT.js');
-var chunkEQWQXURG_js = require('./chunk-EQWQXURG.js');
-var chunkCIL2AC3F_js = require('./chunk-CIL2AC3F.js');
-var chunkA3DJSVTE_js = require('./chunk-A3DJSVTE.js');
+var chunkZTVATZB6_js = require('./chunk-ZTVATZB6.js');
+var chunkTDRINUMH_js = require('./chunk-TDRINUMH.js');
+var chunk3GW3UAKB_js = require('./chunk-3GW3UAKB.js');
+var chunkOYCMGKQ7_js = require('./chunk-OYCMGKQ7.js');
+var chunkF24IF2QL_js = require('./chunk-F24IF2QL.js');
 var react = require('react');
 var tigercatCore = require('@expcat/tigercat-core');
 var jsxRuntime = require('react/jsx-runtime');
 
-var resolveFilterLabel = (filter, value) => {
-  const option = filter.options.find((item) => item.value === value);
-  if (option) return `${filter.label}: ${option.label}`;
-  if (value !== null && value !== void 0 && value !== "") {
-    return `${filter.label}: ${String(value)}`;
-  }
-  return filter.placeholder ?? filter.label;
-};
 var DataTableWithToolbar = ({
   toolbar,
   onSearchChange,
@@ -115,11 +105,11 @@ var DataTableWithToolbar = ({
   };
   const renderToolbar = () => {
     if (!hasSearch && !hasFilters && !hasBulkActions) return null;
-    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "tiger-data-table-toolbar flex flex-wrap items-center gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 flex-wrap", children: [
-        hasSearch ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
+    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "tiger-data-table-toolbar flex flex-wrap items-center gap-2 pb-3", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 flex-wrap flex-1 min-w-0", children: [
+        hasSearch ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 w-full sm:w-auto sm:min-w-[200px] sm:max-w-[320px]", children: [
           /* @__PURE__ */ jsxRuntime.jsx(
-            chunkCIL2AC3F_js.Input,
+            chunkOYCMGKQ7_js.Input,
             {
               type: "search",
               size: "sm",
@@ -134,11 +124,11 @@ var DataTableWithToolbar = ({
             }
           ),
           toolbar?.showSearchButton ?? true ? /* @__PURE__ */ jsxRuntime.jsx(
-            chunkA3DJSVTE_js.Button,
+            chunkF24IF2QL_js.Button,
             {
               size: "sm",
               variant: "primary",
-              className: "whitespace-nowrap",
+              className: "whitespace-nowrap shrink-0",
               onClick: handleSearchSubmit,
               disabled: !onSearch && !toolbar?.onSearch,
               children: toolbar?.searchButtonText ?? "\u641C\u7D22"
@@ -147,35 +137,33 @@ var DataTableWithToolbar = ({
         ] }) : null,
         hasFilters ? toolbar?.filters?.map((filter) => {
           const currentValue = resolvedFilters[filter.key];
-          const triggerLabel = resolveFilterLabel(filter, currentValue);
           const clearable = filter.clearable !== false;
-          const clearLabel = filter.clearLabel ?? "\u5168\u90E8";
-          const isActive = currentValue !== null && currentValue !== void 0 && currentValue !== "";
-          return /* @__PURE__ */ jsxRuntime.jsxs(chunk4TWHENPT_js.Dropdown, { trigger: "click", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              chunkA3DJSVTE_js.Button,
-              {
-                size: "sm",
-                variant: isActive ? "secondary" : "outline",
-                className: "whitespace-nowrap",
-                children: triggerLabel
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsxs(chunkEQWQXURG_js.DropdownMenu, { children: [
-              clearable ? /* @__PURE__ */ jsxRuntime.jsx(chunkPBJ2J2B3_js.DropdownItem, { onClick: () => handleFilterSelect(filter, null), children: clearLabel }) : null,
-              filter.options.map((option) => /* @__PURE__ */ jsxRuntime.jsx(
-                chunkPBJ2J2B3_js.DropdownItem,
+          return /* @__PURE__ */ jsxRuntime.jsx(
+            "div",
+            {
+              className: "w-full sm:w-auto sm:min-w-[120px] sm:max-w-[180px]",
+              children: /* @__PURE__ */ jsxRuntime.jsx(
+                chunkTDRINUMH_js.Select,
                 {
-                  onClick: () => handleFilterSelect(filter, option.value),
-                  children: option.label
-                },
-                String(option.value)
-              ))
-            ] })
-          ] }, filter.key);
+                  size: "sm",
+                  options: filter.options.map((opt) => ({
+                    label: opt.label,
+                    value: opt.value
+                  })),
+                  value: currentValue ?? void 0,
+                  placeholder: filter.placeholder ?? filter.label,
+                  clearable,
+                  onChange: (value) => {
+                    handleFilterSelect(filter, value ?? null);
+                  }
+                }
+              )
+            },
+            filter.key
+          );
         }) : null
       ] }),
-      hasBulkActions ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "ml-auto flex items-center gap-2 flex-wrap", children: [
+      hasBulkActions ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 flex-wrap ml-auto shrink-0", children: [
         selectedCount > 0 ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-sm text-[var(--tiger-text-muted,#6b7280)]", children: [
           bulkLabel,
           " ",
@@ -183,7 +171,7 @@ var DataTableWithToolbar = ({
           " \u9879"
         ] }) : null,
         toolbar?.bulkActions?.map((action) => /* @__PURE__ */ jsxRuntime.jsx(
-          chunkA3DJSVTE_js.Button,
+          chunkF24IF2QL_js.Button,
           {
             size: "sm",
             variant: action.variant ?? "outline",
@@ -199,8 +187,8 @@ var DataTableWithToolbar = ({
   const showPagination = pagination && typeof pagination === "object";
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: wrapperClasses, "data-tiger-data-table-with-toolbar": true, children: [
     renderToolbar(),
-    /* @__PURE__ */ jsxRuntime.jsx(chunkGJKT2B56_js.Table, { ...tableProps, pagination: false, className: tableClassName }),
-    showPagination ? /* @__PURE__ */ jsxRuntime.jsx(chunkGY6D4XS3_js.Pagination, { ...pagination, onChange: onPageChange, onPageSizeChange }) : null
+    /* @__PURE__ */ jsxRuntime.jsx(chunkZTVATZB6_js.Table, { ...tableProps, pagination: false, className: tableClassName }),
+    showPagination ? /* @__PURE__ */ jsxRuntime.jsx(chunk3GW3UAKB_js.Pagination, { ...pagination, onChange: onPageChange, onPageSizeChange }) : null
   ] });
 };
 var DataTableWithToolbar_default = DataTableWithToolbar;

package/dist/chunk-IVGKPD2L.mjs

@@ -0,0 +1,39 @@
+import { RowContext } from './chunk-QAO5KANE.mjs';
+import { useContext, useMemo } from 'react';
+import { classNames, getSpanClasses, getOffsetClasses, getOrderClasses, getFlexClasses, getColMergedStyleVars, getGutterStyles } from '@expcat/tigercat-core';
+import { jsx } from 'react/jsx-runtime';
+
+var Col = ({
+  span = 24,
+  offset = 0,
+  order,
+  flex,
+  children,
+  className,
+  style,
+  ...divProps
+}) => {
+  const { gutter } = useContext(RowContext);
+  const isFlexSpanMode = flex !== void 0 && span === 0;
+  const colClasses = useMemo(
+    () => classNames(
+      isFlexSpanMode ? "" : getSpanClasses(span),
+      getOffsetClasses(offset),
+      getOrderClasses(order),
+      getFlexClasses(flex),
+      className
+    ),
+    [isFlexSpanMode, span, offset, order, flex, className]
+  );
+  const mergedStyle = useMemo(
+    () => ({
+      ...getGutterStyles(gutter || 0).colStyle,
+      ...getColMergedStyleVars(isFlexSpanMode ? void 0 : span, offset, order, flex),
+      ...style
+    }),
+    [gutter, isFlexSpanMode, span, offset, order, flex, style]
+  );
+  return /* @__PURE__ */ jsx("div", { className: colClasses, style: mergedStyle, ...divProps, children });
+};
+
+export { Col };

package/dist/{chunk-CJJ56NVL.mjs → chunk-IXJMMM26.mjs}

@@ -1,10 +1,10 @@
+import { StatusIconWithLoading, StatusIcon } from './chunk-FLYJVZED.mjs';
 import { useState, useEffect, useCallback } from 'react';
 import { createRoot } from 'react-dom/client';
 import { flushSync } from 'react-dom';
-import { classNames, messageContainerBaseClasses, messagePositionClasses, getMessageTypeClasses, defaultMessageThemeColors, messageBaseClasses, getMessageIconPath, messageIconClasses, ANIMATION_DURATION_MS, messageContentClasses, messageCloseButtonClasses, messageCloseIconPath, isBrowser, messageLoadingSpinnerClasses, icon24StrokeWidth, icon24ViewBox, icon24PathStrokeLinejoin, icon24PathStrokeLinecap } from '@expcat/tigercat-core';
+import { classNames, messageContainerBaseClasses, messagePositionClasses, getMessageTypeClasses, defaultMessageThemeColors, messageBaseClasses, getMessageIconPath, messageIconClasses, ANIMATION_DURATION_MS, messageLoadingSpinnerClasses, messageContentClasses, messageCloseButtonClasses, messageCloseIconPath, isBrowser, normalizeStringOption } from '@expcat/tigercat-core';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
-// src/components/Message.tsx
 var MESSAGE_CONTAINER_ID = "tiger-message-container";
 var MESSAGE_CLOSE_ARIA_LABEL = "Close message";
 var messageInstances = [];
@@ -14,32 +14,11 @@ var updateCallback = null;
 function getNextInstanceId() {
   return ++instanceIdCounter;
 }
-var Icon = ({ path, className, isLoading = false }) => {
-  const iconClass = classNames(className, isLoading ? messageLoadingSpinnerClasses : "");
-  return /* @__PURE__ */ jsx(
-    "svg",
-    {
-      className: iconClass,
-      xmlns: "http://www.w3.org/2000/svg",
-      fill: "none",
-      viewBox: icon24ViewBox,
-      stroke: "currentColor",
-      strokeWidth: icon24StrokeWidth,
-      children: /* @__PURE__ */ jsx(
-        "path",
-        {
-          strokeLinecap: icon24PathStrokeLinecap,
-          strokeLinejoin: icon24PathStrokeLinejoin,
-          d: path
-        }
-      )
-    }
-  );
-};
 var MessageItem = ({ message, onClose }) => {
   const [isVisible, setIsVisible] = useState(false);
   useEffect(() => {
-    setTimeout(() => setIsVisible(true), 10);
+    const timer = setTimeout(() => setIsVisible(true), 10);
+    return () => clearTimeout(timer);
   }, []);
   const colorScheme = getMessageTypeClasses(message.type, defaultMessageThemeColors);
   const messageClasses = classNames(
@@ -70,7 +49,15 @@ var MessageItem = ({ message, onClose }) => {
       "data-tiger-message-type": message.type,
       "data-tiger-message-id": String(message.id),
       children: [
-        /* @__PURE__ */ jsx(Icon, { path: iconPath, className: iconClass, isLoading: message.type === "loading" }),
+        /* @__PURE__ */ jsx(
+          StatusIconWithLoading,
+          {
+            path: iconPath,
+            className: iconClass,
+            isLoading: message.type === "loading",
+            spinnerClass: messageLoadingSpinnerClasses
+          }
+        ),
         /* @__PURE__ */ jsx("div", { className: messageContentClasses, children: message.content }),
         message.closable && /* @__PURE__ */ jsx(
           "button",
@@ -79,7 +66,7 @@ var MessageItem = ({ message, onClose }) => {
             onClick: handleClose,
             "aria-label": MESSAGE_CLOSE_ARIA_LABEL,
             type: "button",
-            children: /* @__PURE__ */ jsx(Icon, { path: messageCloseIconPath, className: "w-4 h-4" })
+            children: /* @__PURE__ */ jsx(StatusIcon, { path: messageCloseIconPath, className: "w-4 h-4" })
           }
         )
       ]
@@ -101,17 +88,7 @@ var MessageContainer = ({ position = "top" }) => {
   }, []);
   const containerClasses = classNames(messageContainerBaseClasses, messagePositionClasses[position]);
   const handleRemove = useCallback((id) => {
-    const index = messageInstances.findIndex((msg) => msg.id === id);
-    if (index !== -1) {
-      const instance = messageInstances[index];
-      messageInstances.splice(index, 1);
-      if (instance.onClose) {
-        instance.onClose();
-      }
-      if (updateCallback) {
-        updateCallback();
-      }
-    }
+    removeMessage(id);
   }, []);
   return /* @__PURE__ */ jsx(
     "div",
@@ -210,50 +187,29 @@ function clearAll() {
   }
 }
 function normalizeOptions(options) {
-  if (typeof options === "string") {
-    return { content: options };
-  }
-  return options;
+  return normalizeStringOption(options, "content");
 }
 var Message = {
-  /**
-   * Show an info message
-   */
   info(options) {
     const config = normalizeOptions(options);
     return addMessage({ ...config, type: "info" });
   },
-  /**
-   * Show a success message
-   */
   success(options) {
     const config = normalizeOptions(options);
     return addMessage({ ...config, type: "success" });
   },
-  /**
-   * Show a warning message
-   */
   warning(options) {
     const config = normalizeOptions(options);
     return addMessage({ ...config, type: "warning" });
   },
-  /**
-   * Show an error message
-   */
   error(options) {
     const config = normalizeOptions(options);
     return addMessage({ ...config, type: "error" });
   },
-  /**
-   * Show a loading message
-   */
   loading(options) {
     const config = normalizeOptions(options);
     return addMessage({ ...config, type: "loading", duration: 0 });
   },
-  /**
-   * Clear all messages
-   */
   clear() {
     clearAll();
   }

package/dist/{chunk-4IO2M3ZJ.js → chunk-J3HKED4B.js}

@@ -1,12 +1,12 @@
 'use strict';
 
-var chunkIQINYCU6_js = require('./chunk-IQINYCU6.js');
-var chunkMKWXJZ3T_js = require('./chunk-MKWXJZ3T.js');
-var chunk6MGEGOYJ_js = require('./chunk-6MGEGOYJ.js');
-var chunk2TS6X5RA_js = require('./chunk-2TS6X5RA.js');
-var chunkYYGTJKP5_js = require('./chunk-YYGTJKP5.js');
-var chunkVO4WDK4K_js = require('./chunk-VO4WDK4K.js');
-var chunkTZ26HQAW_js = require('./chunk-TZ26HQAW.js');
+var chunkPR3PQUKM_js = require('./chunk-PR3PQUKM.js');
+var chunkQYYAXM5F_js = require('./chunk-QYYAXM5F.js');
+var chunk2GKTVAAB_js = require('./chunk-2GKTVAAB.js');
+var chunkVCULFIZ5_js = require('./chunk-VCULFIZ5.js');
+var chunkI5TCE5E7_js = require('./chunk-I5TCE5E7.js');
+var chunkSSQOCZ6O_js = require('./chunk-SSQOCZ6O.js');
+var chunkCI2WHAT2_js = require('./chunk-CI2WHAT2.js');
 var react = require('react');
 var tigercatCore = require('@expcat/tigercat-core');
 var jsxRuntime = require('react/jsx-runtime');
@@ -14,7 +14,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var renderAction = (item, action, index) => {
   const key = action.key ?? `${item.id}-action-${index}`;
   return /* @__PURE__ */ jsxRuntime.jsx(
-    chunkMKWXJZ3T_js.Link,
+    chunkQYYAXM5F_js.Link,
     {
       size: "sm",
       variant: "primary",
@@ -64,34 +64,34 @@ var ActivityFeed = ({
       (action, actionIndex) => renderAction(item, action, actionIndex)
     );
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "tiger-activity-item", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3 items-start", children: [
-      showAvatar && item.user ? /* @__PURE__ */ jsxRuntime.jsx(chunkTZ26HQAW_js.Avatar, { size: "sm", src: item.user.avatar, text: item.user.name, className: "shrink-0" }) : null,
+      showAvatar && item.user ? /* @__PURE__ */ jsxRuntime.jsx(chunkCI2WHAT2_js.Avatar, { size: "sm", src: item.user.avatar, text: item.user.name, className: "shrink-0" }) : null,
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1 min-w-0", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-2 mb-1", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 min-w-0", children: [
-            titleText ? /* @__PURE__ */ jsxRuntime.jsx(chunkYYGTJKP5_js.Text, { tag: "div", size: "sm", weight: "medium", className: "truncate", children: titleText }) : null,
-            item.status ? /* @__PURE__ */ jsxRuntime.jsx(chunk2TS6X5RA_js.Tag, { variant: item.status.variant ?? "default", size: "sm", className: "shrink-0", children: item.status.label }) : null
+            titleText ? /* @__PURE__ */ jsxRuntime.jsx(chunkI5TCE5E7_js.Text, { tag: "div", size: "sm", weight: "medium", className: "truncate", children: titleText }) : null,
+            item.status ? /* @__PURE__ */ jsxRuntime.jsx(chunkVCULFIZ5_js.Tag, { variant: item.status.variant ?? "default", size: "sm", className: "shrink-0", children: item.status.label }) : null
           ] }),
-          timeText ? /* @__PURE__ */ jsxRuntime.jsx(chunkYYGTJKP5_js.Text, { tag: "div", size: "xs", color: "muted", className: "shrink-0 whitespace-nowrap", children: timeText }) : null
+          timeText ? /* @__PURE__ */ jsxRuntime.jsx(chunkI5TCE5E7_js.Text, { tag: "div", size: "xs", color: "muted", className: "shrink-0 whitespace-nowrap", children: timeText }) : null
         ] }),
-        descriptionText ? /* @__PURE__ */ jsxRuntime.jsx(chunkYYGTJKP5_js.Text, { tag: "div", size: "sm", color: "muted", className: "mb-2 break-words", children: descriptionText }) : null,
+        descriptionText ? /* @__PURE__ */ jsxRuntime.jsx(chunkI5TCE5E7_js.Text, { tag: "div", size: "sm", color: "muted", className: "mb-2 break-words", children: descriptionText }) : null,
         actionNodes?.length ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-wrap gap-2", children: actionNodes }) : null
       ] })
     ] }) });
   };
   if (loading) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: wrapperClasses, ...props, "data-tiger-activity-feed": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunkVO4WDK4K_js.Card, { variant: "bordered", size: "sm", className: "tiger-activity-feed-loading", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center py-4", children: /* @__PURE__ */ jsxRuntime.jsx(chunk6MGEGOYJ_js.Loading, { text: loadingText }) }) }) });
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: wrapperClasses, ...props, "data-tiger-activity-feed": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunkSSQOCZ6O_js.Card, { variant: "bordered", size: "sm", className: "tiger-activity-feed-loading", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center py-4", children: /* @__PURE__ */ jsxRuntime.jsx(chunk2GKTVAAB_js.Loading, { text: loadingText }) }) }) });
   }
   if (resolvedGroups.length === 0) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: wrapperClasses, ...props, "data-tiger-activity-feed": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunkVO4WDK4K_js.Card, { variant: "bordered", size: "sm", className: "tiger-activity-feed-empty", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center py-6", children: /* @__PURE__ */ jsxRuntime.jsx(chunkYYGTJKP5_js.Text, { tag: "div", size: "sm", color: "muted", children: emptyText }) }) }) });
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: wrapperClasses, ...props, "data-tiger-activity-feed": true, children: /* @__PURE__ */ jsxRuntime.jsx(chunkSSQOCZ6O_js.Card, { variant: "bordered", size: "sm", className: "tiger-activity-feed-empty", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center py-6", children: /* @__PURE__ */ jsxRuntime.jsx(chunkI5TCE5E7_js.Text, { tag: "div", size: "sm", color: "muted", children: emptyText }) }) }) });
   }
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: wrapperClasses, ...props, "data-tiger-activity-feed": true, children: resolvedGroups.map((group, groupIndex) => {
     const headerNode = renderGroupHeader?.(group);
     const groupTitle = group.title;
     const timelineItems = tigercatCore.toActivityTimelineItems(group.items);
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-      showGroupTitle && groupTitle ? headerNode ?? /* @__PURE__ */ jsxRuntime.jsx(chunkYYGTJKP5_js.Text, { tag: "div", size: "sm", weight: "medium", color: "muted", children: groupTitle }) : null,
+      showGroupTitle && groupTitle ? headerNode ?? /* @__PURE__ */ jsxRuntime.jsx(chunkI5TCE5E7_js.Text, { tag: "div", size: "sm", weight: "medium", color: "muted", children: groupTitle }) : null,
       /* @__PURE__ */ jsxRuntime.jsx(
-        chunkIQINYCU6_js.Timeline,
+        chunkPR3PQUKM_js.Timeline,
         {
           items: timelineItems,
           renderItem: (timelineItem, index) => {

package/dist/{chunk-MF3H7WWW.mjs → chunk-JNLX47UL.mjs}

@@ -1,4 +1,5 @@
 import { useEscapeKey } from './chunk-WLIFEALE.mjs';
+import { Button } from './chunk-ENSLMM3L.mjs';
 import React, { useEffect, useCallback, useMemo, useId, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { getModalContentClasses, getModalContainerClasses, resolveLocaleText, captureActiveElement, focusFirst, restoreFocus, getFocusableElements, getFocusTrapNavigation, classNames, modalMaskClasses, modalHeaderClasses, modalTitleClasses, modalCloseButtonClasses, modalBodyClasses, modalFooterClasses, modalWrapperClasses, closeIconViewBox, closeIconPathD, closeIconPathStrokeWidth, closeIconPathStrokeLinejoin, closeIconPathStrokeLinecap } from '@expcat/tigercat-core';
@@ -21,8 +22,11 @@ var Modal = ({
   onVisibleChange,
   onClose,
   onCancel,
-  onOk: _onOk,
+  onOk,
   closeAriaLabel,
+  showDefaultFooter = false,
+  okText,
+  cancelText,
   locale,
   style,
   ...rest
@@ -44,6 +48,10 @@ var Modal = ({
     onCancel?.();
     onVisibleChange?.(false);
   }, [onCancel, onVisibleChange]);
+  const handleOk = useCallback(() => {
+    onOk?.();
+    onVisibleChange?.(false);
+  }, [onOk, onVisibleChange]);
   const handleMaskClick = useCallback(
     (event) => {
       if (maskClosable && event.target === event.currentTarget) {
@@ -60,6 +68,18 @@ var Modal = ({
     locale?.modal?.closeAriaLabel,
     locale?.common?.closeText
   );
+  const resolvedCancelText = resolveLocaleText(
+    "\u53D6\u6D88",
+    cancelText,
+    locale?.modal?.cancelText,
+    locale?.common?.cancelText
+  );
+  const resolvedOkText = resolveLocaleText(
+    "\u786E\u5B9A",
+    okText,
+    locale?.modal?.okText,
+    locale?.common?.okText
+  );
   const reactId = useId();
   const modalId = useMemo(() => `tiger-modal-${reactId}`, [reactId]);
   const titleId = `${modalId}-title`;
@@ -74,15 +94,13 @@ var Modal = ({
   const closeButtonRef = useRef(null);
   const previousActiveElementRef = useRef(null);
   useEffect(() => {
-    if (!visible) return;
-    previousActiveElementRef.current = captureActiveElement();
-    const timer = setTimeout(() => {
-      focusFirst([closeButtonRef.current, dialogRef.current]);
-    }, 0);
-    return () => clearTimeout(timer);
-  }, [visible]);
-  useEffect(() => {
-    if (visible) return;
+    if (visible) {
+      previousActiveElementRef.current = captureActiveElement();
+      const timer = setTimeout(() => {
+        focusFirst([closeButtonRef.current, dialogRef.current]);
+      }, 0);
+      return () => clearTimeout(timer);
+    }
     restoreFocus(previousActiveElementRef.current);
   }, [visible]);
   useEscapeKey({ enabled: visible, onEscape: handleClose });
@@ -118,9 +136,6 @@ var Modal = ({
   if (!shouldRender) {
     return null;
   }
-  if (destroyOnClose && !visible) {
-    return null;
-  }
   const modalContent = /* @__PURE__ */ jsxs(
     "div",
     {
@@ -141,7 +156,7 @@ var Modal = ({
         /* @__PURE__ */ jsx("div", { className: containerClasses, onClick: handleMaskClick, children: /* @__PURE__ */ jsxs(
           "div",
           {
-            className: classNames(contentClasses),
+            className: contentClasses,
             style,
             ...dialogDivProps,
             role: "dialog",
@@ -167,7 +182,10 @@ var Modal = ({
                 )
               ] }),
               children && /* @__PURE__ */ jsx("div", { className: modalBodyClasses, children }),
-              footer && /* @__PURE__ */ jsx("div", { className: modalFooterClasses, "data-tiger-modal-footer": "", children: footer })
+              footer ? /* @__PURE__ */ jsx("div", { className: modalFooterClasses, "data-tiger-modal-footer": "", children: footer }) : showDefaultFooter ? /* @__PURE__ */ jsxs("div", { className: modalFooterClasses, "data-tiger-modal-footer": "", children: [
+                /* @__PURE__ */ jsx(Button, { variant: "secondary", onClick: handleClose, children: resolvedCancelText }),
+                /* @__PURE__ */ jsx(Button, { onClick: handleOk, children: resolvedOkText })
+              ] }) : null
             ]
           }
         ) })