@expcat/tigercat-react 0.2.27 → 0.3.69

package/dist/chunk-IRH2ZVD3.js

@@ -0,0 +1,197 @@
+'use strict';
+
+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 DataTableWithToolbar = ({
+  toolbar,
+  onSearchChange,
+  onSearch,
+  onFiltersChange,
+  onBulkAction,
+  pagination = false,
+  onPageChange,
+  onPageSizeChange,
+  className,
+  tableClassName,
+  ...tableProps
+}) => {
+  const [internalSearch, setInternalSearch] = react.useState(toolbar?.defaultSearchValue ?? "");
+  const [internalFilters, setInternalFilters] = react.useState(
+    () => {
+      const initial = {};
+      toolbar?.filters?.forEach((filter) => {
+        if (filter.value === void 0) {
+          initial[filter.key] = filter.defaultValue ?? null;
+        }
+      });
+      return initial;
+    }
+  );
+  react.useEffect(() => {
+    if (toolbar?.searchValue !== void 0) {
+      setInternalSearch(toolbar.searchValue ?? "");
+    }
+  }, [toolbar?.searchValue]);
+  react.useEffect(() => {
+    const filters = toolbar?.filters;
+    if (!filters) return;
+    setInternalFilters((prev) => {
+      const next = { ...prev };
+      filters.forEach((filter) => {
+        if (filter.value === void 0 && !(filter.key in next)) {
+          next[filter.key] = filter.defaultValue ?? null;
+        }
+      });
+      return next;
+    });
+  }, [toolbar?.filters]);
+  const searchValue = toolbar?.searchValue !== void 0 ? toolbar.searchValue : internalSearch;
+  const resolvedFilters = react.useMemo(() => {
+    const next = {};
+    toolbar?.filters?.forEach((filter) => {
+      next[filter.key] = filter.value !== void 0 ? filter.value : internalFilters[filter.key] ?? filter.defaultValue ?? null;
+    });
+    return next;
+  }, [toolbar?.filters, internalFilters]);
+  const hasSearch = Boolean(
+    toolbar && (toolbar.searchPlaceholder || toolbar.searchValue !== void 0 || toolbar.defaultSearchValue !== void 0 || toolbar.showSearchButton || toolbar.onSearchChange || toolbar.onSearch || onSearchChange || onSearch)
+  );
+  const hasFilters = Boolean(toolbar?.filters && toolbar.filters.length > 0);
+  const hasBulkActions = Boolean(toolbar?.bulkActions && toolbar.bulkActions.length > 0);
+  const selectedKeys = toolbar?.selectedKeys ?? tableProps.rowSelection?.selectedRowKeys ?? [];
+  const selectedCount = toolbar?.selectedCount ?? selectedKeys.length;
+  const bulkLabel = toolbar?.bulkActionsLabel ?? "\u5DF2\u9009\u62E9";
+  const wrapperClasses = react.useMemo(
+    () => tigercatCore.classNames("tiger-data-table-with-toolbar flex flex-col gap-3", className),
+    [className]
+  );
+  const handleSearchChange = (value) => {
+    if (toolbar?.searchValue === void 0) {
+      setInternalSearch(value);
+    }
+    onSearchChange?.(value);
+    toolbar?.onSearchChange?.(value);
+  };
+  const handleSearchSubmit = () => {
+    onSearch?.(searchValue ?? "");
+    toolbar?.onSearch?.(searchValue ?? "");
+  };
+  const handleFilterSelect = (filter, value) => {
+    const nextFilters = {
+      ...resolvedFilters,
+      [filter.key]: value
+    };
+    if (filter.value === void 0) {
+      setInternalFilters((prev) => ({
+        ...prev,
+        [filter.key]: value
+      }));
+    }
+    onFiltersChange?.(nextFilters);
+    toolbar?.onFiltersChange?.(nextFilters);
+  };
+  const handleBulkAction = (action) => {
+    const keys = selectedKeys ?? [];
+    action.onClick?.(keys);
+    onBulkAction?.(action, keys);
+    toolbar?.onBulkAction?.(action, keys);
+  };
+  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 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(
+            chunkOYCMGKQ7_js.Input,
+            {
+              type: "search",
+              size: "sm",
+              value: searchValue,
+              placeholder: toolbar?.searchPlaceholder ?? "\u641C\u7D22",
+              onChange: (event) => handleSearchChange(String(event.currentTarget.value)),
+              onKeyDown: (event) => {
+                if (event.key === "Enter") {
+                  handleSearchSubmit();
+                }
+              }
+            }
+          ),
+          toolbar?.showSearchButton ?? true ? /* @__PURE__ */ jsxRuntime.jsx(
+            chunkF24IF2QL_js.Button,
+            {
+              size: "sm",
+              variant: "primary",
+              className: "whitespace-nowrap shrink-0",
+              onClick: handleSearchSubmit,
+              disabled: !onSearch && !toolbar?.onSearch,
+              children: toolbar?.searchButtonText ?? "\u641C\u7D22"
+            }
+          ) : null
+        ] }) : null,
+        hasFilters ? toolbar?.filters?.map((filter) => {
+          const currentValue = resolvedFilters[filter.key];
+          const clearable = filter.clearable !== false;
+          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,
+                {
+                  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: "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,
+          " ",
+          selectedCount,
+          " \u9879"
+        ] }) : null,
+        toolbar?.bulkActions?.map((action) => /* @__PURE__ */ jsxRuntime.jsx(
+          chunkF24IF2QL_js.Button,
+          {
+            size: "sm",
+            variant: action.variant ?? "outline",
+            disabled: action.disabled || selectedCount === 0,
+            onClick: () => handleBulkAction(action),
+            children: action.label
+          },
+          action.key
+        ))
+      ] }) : null
+    ] });
+  };
+  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(chunkZTVATZB6_js.Table, { ...tableProps, pagination: false, className: tableClassName }),
+    showPagination ? /* @__PURE__ */ jsxRuntime.jsx(chunk3GW3UAKB_js.Pagination, { ...pagination, onChange: onPageChange, onPageSizeChange }) : null
+  ] });
+};
+var DataTableWithToolbar_default = DataTableWithToolbar;
+
+exports.DataTableWithToolbar = DataTableWithToolbar;
+exports.DataTableWithToolbar_default = DataTableWithToolbar_default;

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-J3HKED4B.js

@@ -0,0 +1,110 @@
+'use strict';
+
+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');
+
+var renderAction = (item, action, index) => {
+  const key = action.key ?? `${item.id}-action-${index}`;
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    chunkQYYAXM5F_js.Link,
+    {
+      size: "sm",
+      variant: "primary",
+      href: action.href,
+      target: action.target,
+      disabled: action.disabled,
+      onClick: () => action.onClick?.(item, action),
+      children: action.label
+    },
+    key
+  );
+};
+var ActivityFeed = ({
+  items = [],
+  groups,
+  groupBy,
+  groupOrder,
+  loading = false,
+  loadingText = "\u52A0\u8F7D\u4E2D...",
+  emptyText = "\u6682\u65E0\u52A8\u6001",
+  showAvatar = true,
+  showTime = true,
+  showGroupTitle = true,
+  renderItem,
+  renderGroupHeader,
+  className,
+  ...props
+}) => {
+  const resolvedGroups = react.useMemo(
+    () => tigercatCore.buildActivityGroups(items, groups, groupBy, groupOrder),
+    [items, groups, groupBy, groupOrder]
+  );
+  const wrapperClasses = tigercatCore.classNames(
+    "tiger-activity-feed",
+    "flex",
+    "flex-col",
+    "gap-6",
+    "w-full",
+    className
+  );
+  const renderDefaultItem = (item, index, group) => {
+    if (renderItem) return renderItem(item, index, group);
+    const titleText = item.title ?? (typeof item.content === "string" || typeof item.content === "number" ? String(item.content) : "");
+    const descriptionText = item.description;
+    const timeText = showTime ? tigercatCore.formatActivityTime(item.time) : "";
+    const actionNodes = item.actions?.map(
+      (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(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(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(chunkI5TCE5E7_js.Text, { tag: "div", size: "xs", color: "muted", className: "shrink-0 whitespace-nowrap", children: timeText }) : 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(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(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(chunkI5TCE5E7_js.Text, { tag: "div", size: "sm", weight: "medium", color: "muted", children: groupTitle }) : null,
+      /* @__PURE__ */ jsxRuntime.jsx(
+        chunkPR3PQUKM_js.Timeline,
+        {
+          items: timelineItems,
+          renderItem: (timelineItem, index) => {
+            const activity = timelineItem.activity;
+            if (!activity) return null;
+            return renderDefaultItem(activity, index, group);
+          }
+        }
+      )
+    ] }, group.key ?? groupIndex);
+  }) });
+};
+var ActivityFeed_default = ActivityFeed;
+
+exports.ActivityFeed = ActivityFeed;
+exports.ActivityFeed_default = ActivityFeed_default;

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
             ]
           }
         ) })