@expcat/tigercat-react 1.3.4 → 1.5.0

package/dist/{chunk-LRPPXU74.mjs → chunk-CR4QBH46.mjs}

@@ -1,13 +1,25 @@
+import {
+  renderBodyPortal,
+  useBodyScrollLock,
+  useEscapeKey,
+  useFocusTrap
+} from "./chunk-SEWNVIHH.mjs";
 import {
   StatusIcon
 } from "./chunk-FLYJVZED.mjs";
+import {
+  useTigerConfig
+} from "./chunk-QAIBQHIO.mjs";
 
 // src/components/Tour.tsx
 import { useState, useEffect, useRef, useCallback, useMemo } from "react";
-import ReactDOM from "react-dom";
 import {
   classNames,
   isBrowser,
+  mergeTigerLocale,
+  captureActiveElement,
+  focusFirst,
+  restoreFocus,
   tourPopoverClasses,
   tourTitleClasses,
   tourDescriptionClasses,
@@ -20,6 +32,7 @@ import {
   getActiveTourSteps,
   getCurrentActiveTourStep,
   getActiveTourStepPosition,
+  getTourLabels,
   closeIconPathD
 } from "@expcat/tigercat-core";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -28,17 +41,27 @@ var Tour = ({
   loadSteps,
   open = false,
   current: controlledCurrent,
-  nextText = "Next",
-  prevText = "Previous",
-  finishText = "Finish",
+  nextText,
+  prevText,
+  finishText,
   closable = true,
   showIndicators = true,
+  locale,
   className,
   onOpenChange,
   onClose,
   onFinish,
   onChange
 }) => {
+  const config = useTigerConfig();
+  const mergedLocale = useMemo(
+    () => mergeTigerLocale(config.locale, locale),
+    [config.locale, locale]
+  );
+  const labels = useMemo(
+    () => getTourLabels(mergedLocale, { nextText, prevText, finishText }),
+    [finishText, mergedLocale, nextText, prevText]
+  );
   const [internalStep, setInternalStep] = useState(0);
   const [resolvedSteps, setResolvedSteps] = useState(steps);
   const currentStep = controlledCurrent ?? internalStep;
@@ -51,6 +74,8 @@ var Tour = ({
   const step = activeStepInfo?.step;
   const [targetRect, setTargetRect] = useState();
   const popoverRef = useRef(null);
+  const closeButtonRef = useRef(null);
+  const previousActiveElementRef = useRef(null);
   useEffect(() => {
     if (!loadSteps) {
       setResolvedSteps(steps);
@@ -112,6 +137,19 @@ var Tour = ({
     onOpenChange?.(false);
     onClose?.();
   }, [onOpenChange, onClose]);
+  useEffect(() => {
+    if (open) {
+      previousActiveElementRef.current = captureActiveElement();
+      const timer = setTimeout(() => {
+        focusFirst([closeButtonRef.current, popoverRef.current]);
+      }, 0);
+      return () => clearTimeout(timer);
+    }
+    restoreFocus(previousActiveElementRef.current);
+  }, [open]);
+  useEscapeKey({ enabled: open, onEscape: close });
+  useBodyScrollLock({ enabled: open });
+  useFocusTrap({ enabled: open, containerRef: popoverRef });
   if (!open || !step) return null;
   if (!isBrowser()) return null;
   const placement = step.placement ?? "bottom";
@@ -145,9 +183,10 @@ var Tour = ({
           closable && /* @__PURE__ */ jsx(
             "button",
             {
+              ref: closeButtonRef,
               className: tourCloseButtonClasses,
               type: "button",
-              "aria-label": "Close tour",
+              "aria-label": labels.closeAriaLabel,
               onClick: close,
               children: /* @__PURE__ */ jsx(StatusIcon, { path: closeIconPathD, className: "h-4 w-4" })
             }
@@ -167,7 +206,7 @@ var Tour = ({
                   type: "button",
                   className: "px-3 py-1.5 text-sm rounded-md border border-[var(--tiger-border,#e5e7eb)] text-[var(--tiger-text,#111827)] hover:bg-[var(--tiger-surface-muted,#f9fafb)] transition-colors mr-2",
                   onClick: prev,
-                  children: prevText
+                  children: labels.prevText
                 }
               ),
               /* @__PURE__ */ jsx(
@@ -176,7 +215,7 @@ var Tour = ({
                   type: "button",
                   className: "px-3 py-1.5 text-sm rounded-md bg-[var(--tiger-primary,#2563eb)] text-white hover:bg-[var(--tiger-primary-hover,#1d4ed8)] transition-colors",
                   onClick: next,
-                  children: isLast ? finishText : nextText
+                  children: isLast ? labels.finishText : labels.nextText
                 }
               )
             ] })
@@ -185,7 +224,7 @@ var Tour = ({
       }
     )
   ] });
-  return ReactDOM.createPortal(content, document.body);
+  return renderBodyPortal(content);
 };
 
 export {

package/dist/{chunk-7U6VWD4H.mjs → chunk-CSJGNEHR.mjs}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-6QML6T3Y.mjs";
 import {
   ChartLegend
-} from "./chunk-UBP7HZSU.mjs";
+} from "./chunk-ZG2W4HS5.mjs";
 import {
   ChartTooltip
-} from "./chunk-NASC6XHN.mjs";
+} from "./chunk-O6YIPNXX.mjs";
 import {
   ChartCanvas
 } from "./chunk-DKNVSQSV.mjs";

package/dist/{chunk-OZD75CLT.js → chunk-CXXOZLP4.js}

@@ -1,8 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkTDODFBBOjs = require('./chunk-TDODFBBO.js');
-
-
 var _chunkZLNBE4ISjs = require('./chunk-ZLNBE4IS.js');
 
 
@@ -11,6 +8,9 @@ var _chunkZLNBE4ISjs = require('./chunk-ZLNBE4IS.js');
 
 var _chunkSTTQ5LXXjs = require('./chunk-STTQ5LXX.js');
 
+
+var _chunkTDODFBBOjs = require('./chunk-TDODFBBO.js');
+
 // src/components/Modal.tsx
 var _react = require('react'); var _react2 = _interopRequireDefault(_react);
 
@@ -77,6 +77,8 @@ var Modal = ({
   );
   const [hasBeenOpened, setHasBeenOpened] = _react2.default.useState(open);
   const [dragOffset, setDragOffset] = _react2.default.useState({ x: 0, y: 0 });
+  const prevOpenRef = _react.useRef.call(void 0, open);
+  const suppressNextCloseRef = _react.useRef.call(void 0, false);
   _react.useEffect.call(void 0, () => {
     if (open) {
       setHasBeenOpened(true);
@@ -106,20 +108,28 @@ var Modal = ({
     [isDraggable, dragOffset]
   );
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onOpenChange, 'optionalCall', _ => _(open)]);
-    if (!open && onClose) {
-      onClose();
+    if (prevOpenRef.current && !open) {
+      if (suppressNextCloseRef.current) {
+        suppressNextCloseRef.current = false;
+      } else {
+        _optionalChain([onClose, 'optionalCall', _ => _()]);
+      }
     }
-  }, [open, onOpenChange, onClose]);
+    prevOpenRef.current = open;
+  }, [open, onClose]);
   const shouldRender = destroyOnClose ? open : hasBeenOpened;
   const handleClose = _react.useCallback.call(void 0, () => {
     _optionalChain([onCancel, 'optionalCall', _2 => _2()]);
     _optionalChain([onOpenChange, 'optionalCall', _3 => _3(false)]);
-  }, [onCancel, onOpenChange]);
+    suppressNextCloseRef.current = true;
+    _optionalChain([onClose, 'optionalCall', _4 => _4()]);
+  }, [onCancel, onOpenChange, onClose]);
   const handleOk = _react.useCallback.call(void 0, () => {
-    _optionalChain([onOk, 'optionalCall', _4 => _4()]);
-    _optionalChain([onOpenChange, 'optionalCall', _5 => _5(false)]);
-  }, [onOk, onOpenChange]);
+    _optionalChain([onOk, 'optionalCall', _5 => _5()]);
+    _optionalChain([onOpenChange, 'optionalCall', _6 => _6(false)]);
+    suppressNextCloseRef.current = true;
+    _optionalChain([onClose, 'optionalCall', _7 => _7()]);
+  }, [onOk, onOpenChange, onClose]);
   const handleMaskClick = _react.useCallback.call(void 0, 
     (event) => {
       if (_tigercatcore.shouldCloseOnMaskClick.call(void 0, event, maskClosable)) {
@@ -136,23 +146,23 @@ var Modal = ({
   const resolvedCloseAriaLabel = _tigercatcore.resolveLocaleText.call(void 0, 
     "Close",
     closeAriaLabel,
-    _optionalChain([labels, 'optionalAccess', _6 => _6.closeAriaLabel]),
-    _optionalChain([mergedLocale, 'optionalAccess', _7 => _7.modal, 'optionalAccess', _8 => _8.closeAriaLabel]),
-    _optionalChain([mergedLocale, 'optionalAccess', _9 => _9.common, 'optionalAccess', _10 => _10.closeText])
+    _optionalChain([labels, 'optionalAccess', _8 => _8.closeAriaLabel]),
+    _optionalChain([mergedLocale, 'optionalAccess', _9 => _9.modal, 'optionalAccess', _10 => _10.closeAriaLabel]),
+    _optionalChain([mergedLocale, 'optionalAccess', _11 => _11.common, 'optionalAccess', _12 => _12.closeText])
   );
   const resolvedCancelText = _tigercatcore.resolveLocaleText.call(void 0, 
     "\u53D6\u6D88",
     cancelText,
-    _optionalChain([labels, 'optionalAccess', _11 => _11.cancelText]),
-    _optionalChain([mergedLocale, 'optionalAccess', _12 => _12.modal, 'optionalAccess', _13 => _13.cancelText]),
-    _optionalChain([mergedLocale, 'optionalAccess', _14 => _14.common, 'optionalAccess', _15 => _15.cancelText])
+    _optionalChain([labels, 'optionalAccess', _13 => _13.cancelText]),
+    _optionalChain([mergedLocale, 'optionalAccess', _14 => _14.modal, 'optionalAccess', _15 => _15.cancelText]),
+    _optionalChain([mergedLocale, 'optionalAccess', _16 => _16.common, 'optionalAccess', _17 => _17.cancelText])
   );
   const resolvedOkText = _tigercatcore.resolveLocaleText.call(void 0, 
     "\u786E\u5B9A",
     okText,
-    _optionalChain([labels, 'optionalAccess', _16 => _16.okText]),
-    _optionalChain([mergedLocale, 'optionalAccess', _17 => _17.modal, 'optionalAccess', _18 => _18.okText]),
-    _optionalChain([mergedLocale, 'optionalAccess', _19 => _19.common, 'optionalAccess', _20 => _20.okText])
+    _optionalChain([labels, 'optionalAccess', _18 => _18.okText]),
+    _optionalChain([mergedLocale, 'optionalAccess', _19 => _19.modal, 'optionalAccess', _20 => _20.okText]),
+    _optionalChain([mergedLocale, 'optionalAccess', _21 => _21.common, 'optionalAccess', _22 => _22.okText])
   );
   const reactId = _react.useId.call(void 0, );
   const modalId = _react.useMemo.call(void 0, () => `tiger-modal-${reactId}`, [reactId]);
@@ -188,7 +198,7 @@ var Modal = ({
   }, []);
   const handleTouchStart = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([dialogDivProps, 'access', _21 => _21.onTouchStart, 'optionalCall', _22 => _22(event)]);
+      _optionalChain([dialogDivProps, 'access', _23 => _23.onTouchStart, 'optionalCall', _24 => _24(event)]);
       if (!open || !mobileSheet) return;
       const point = _tigercatcore.getGestureTouchPoint.call(void 0, event.touches);
       touchStartRef.current = point;
@@ -198,7 +208,7 @@ var Modal = ({
   );
   const handleTouchMove = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([dialogDivProps, 'access', _23 => _23.onTouchMove, 'optionalCall', _24 => _24(event)]);
+      _optionalChain([dialogDivProps, 'access', _25 => _25.onTouchMove, 'optionalCall', _26 => _26(event)]);
       if (!touchStartRef.current) return;
       const point = _tigercatcore.getGestureTouchPoint.call(void 0, event.touches);
       if (point) {
@@ -209,7 +219,7 @@ var Modal = ({
   );
   const handleTouchEnd = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([dialogDivProps, 'access', _25 => _25.onTouchEnd, 'optionalCall', _26 => _26(event)]);
+      _optionalChain([dialogDivProps, 'access', _27 => _27.onTouchEnd, 'optionalCall', _28 => _28(event)]);
       const gesture = _tigercatcore.resolveSwipeGesture.call(void 0, 
         touchStartRef.current,
         _nullishCoalesce(_tigercatcore.getGestureTouchPoint.call(void 0, event.changedTouches), () => ( touchCurrentRef.current)),
@@ -224,7 +234,7 @@ var Modal = ({
   );
   const handleTouchCancel = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([dialogDivProps, 'access', _27 => _27.onTouchCancel, 'optionalCall', _28 => _28(event)]);
+      _optionalChain([dialogDivProps, 'access', _29 => _29.onTouchCancel, 'optionalCall', _30 => _30(event)]);
       resetTouchGesture();
     },
     [dialogDivProps, resetTouchGesture]

package/dist/{chunk-7QZ4XT2P.mjs → chunk-D4X3NBAI.mjs}

@@ -1,6 +1,9 @@
+import {
+  useInputGroupContext
+} from "./chunk-34VGG7AK.mjs";
 import {
   useControlledState
-} from "./chunk-UQMPEMY7.mjs";
+} from "./chunk-WHYHLUXG.mjs";
 
 // src/components/Textarea.tsx
 import { forwardRef, useLayoutEffect, useMemo, useRef } from "react";
@@ -12,7 +15,7 @@ import {
 import { jsx, jsxs } from "react/jsx-runtime";
 var Textarea = forwardRef(
   ({
-    size = "md",
+    size,
     disabled = false,
     readonly = false,
     required = false,
@@ -33,11 +36,10 @@ var Textarea = forwardRef(
     className,
     ...props
   }, ref) => {
+    const inputGroup = useInputGroupContext();
+    const effectiveSize = size ?? inputGroup?.size ?? "md";
     const textareaRef = useRef(null);
-    const [currentValue, setInternalValue, isControlled] = useControlledState(
-      value,
-      defaultValue || ""
-    );
+    const [currentValue, setValue] = useControlledState(value, defaultValue || "");
     const setRefs = (node) => {
       textareaRef.current = node;
       if (typeof ref === "function") ref(node);
@@ -50,16 +52,14 @@ var Textarea = forwardRef(
     const textareaClasses = useMemo(
       () => classNames(
         "block",
-        getInputClasses({ size }),
+        getInputClasses({ size: effectiveSize }),
         autoResize ? "resize-none" : "resize-y",
         className
       ),
-      [size, autoResize, className]
+      [effectiveSize, autoResize, className]
     );
     const handleInput = (event) => {
-      if (!isControlled) {
-        setInternalValue(event.currentTarget.value);
-      }
+      setValue(event.currentTarget.value);
       onInput?.(event);
     };
     const handleChange = (event) => {