@univerjs/ui 0.4.0-alpha.0 → 0.4.0-alpha.2

package/lib/es/index.js

@@ -6,14 +6,12 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-import { toDisposable, IUniverInstanceService, DocumentFlavor, useDependency, LocaleService, ColorKit, createIdentifier, Disposable, Workbook, UniverInstanceType, DocumentDataModel, SlideDataModel, remove, FOCUSING_UNIVER_EDITOR, IContextService, Inject, Injector, Tools, IConfigService, isRealNum, ErrorService, CommandType, IUndoRedoService, UndoCommand, RedoCommand, Optional, ICommandService, useInjector, ILogService, useObservable as useObservable$2, ThemeService, LifecycleService, connectInjector, isInternalEditorID, LifecycleStages, DependentOn, Plugin, mergeOverrideWithDependencies, ILocalStorageService, BaselineOffset, getBorderStyleType, BorderStyleTypes } from "@univerjs/core";
+import { toDisposable, IUniverInstanceService, DocumentFlavor, useDependency, LocaleService, ColorKit, createIdentifier, Disposable, Workbook, UniverInstanceType, DocumentDataModel, SlideDataModel, remove, FOCUSING_UNIVER_EDITOR, IContextService, Inject, Injector, Tools, IConfigService, isRealNum, ErrorService, CommandType, IUndoRedoService, UndoCommand, RedoCommand, Optional, ICommandService, useInjector, ILogService, useObservable as useObservable$1, ThemeService, LifecycleService, connectInjector, isInternalEditorID, LifecycleStages, DependentOn, Plugin, mergeOverrideWithDependencies, ILocalStorageService, BaselineOffset, getBorderStyleType, BorderStyleTypes } from "@univerjs/core";
 import * as React from "react";
 import React__default, { forwardRef, useRef, createElement, cloneElement, useEffect, useState, useMemo, useCallback, memo, createContext, useContext, version as version$1, isValidElement, useLayoutEffect } from "react";
-import { Observable, switchMap, BehaviorSubject, isObservable, fromEvent, Subject, combineLatest, map, distinctUntilChanged, throttleTime, animationFrameScheduler, filter, debounceTime, startWith, take, ReplaySubject } from "rxjs";
+import { Observable, switchMap, BehaviorSubject, isObservable, fromEvent, Subject, combineLatest, distinctUntilChanged, throttleTime, animationFrameScheduler, filter, debounceTime, map as map$1, startWith, take, ReplaySubject } from "rxjs";
 import { InputNumber, resizeObserverCtor, Menu as Menu$1, MenuItemGroup, MenuItem as MenuItem$1, SubMenu, MessageType, RectPopup, Popup, Tooltip, Dropdown, defaultTheme, themeInstance, ConfigProvider, ConfigContext, Confirm, Dialog, Message } from "@univerjs/design";
-import clsx$1, { clsx as clsx$2 } from "clsx";
-import { map as map$1 } from "rxjs/operators";
-import { useObservable as useObservable$1 } from "@univerjs/ui";
+import { map } from "rxjs/operators";
 import { IRenderManagerService, UniverRenderEnginePlugin, ptToPx } from "@univerjs/engine-render";
 import ReactDOM$1, { createPortal } from "react-dom";
 var __assign = function() {
@@ -1555,6 +1553,21 @@ const useVirtualList = /* @__PURE__ */ __name((list, options) => {
     }
   ];
 }, "useVirtualList");
+function r(e2) {
+  var t2, f2, n2 = "";
+  if (typeof e2 == "string" || typeof e2 == "number") n2 += e2;
+  else if (typeof e2 == "object") if (Array.isArray(e2)) {
+    var o = e2.length;
+    for (t2 = 0; t2 < o; t2++) e2[t2] && (f2 = r(e2[t2])) && (n2 && (n2 += " "), n2 += f2);
+  } else for (f2 in e2) e2[f2] && (n2 && (n2 += " "), n2 += f2);
+  return n2;
+}
+__name(r, "r");
+function clsx$1() {
+  for (var e2, t2, f2 = 0, n2 = "", o = arguments.length; f2 < o; f2++) (e2 = arguments[f2]) && (t2 = r(e2)) && (n2 && (n2 += " "), n2 += t2);
+  return n2;
+}
+__name(clsx$1, "clsx$1");
 var __defProp$h = Object.defineProperty, __getOwnPropDesc$h = Object.getOwnPropertyDescriptor, __decorateClass$h = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$h(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -1877,14 +1890,12 @@ function MenuWrapper(props) {
     var _a19;
     if (!item.children) return item;
     let hasChildren = !1;
-    const hiddenObservables = (_a19 = item.children) == null ? void 0 : _a19.map((item2) => {
+    const hiddenObservables = (_a19 = item.children) == null ? void 0 : _a19.map((subItem) => {
       var _a20, _b;
-      return (_b = (_a20 = item2.item) == null ? void 0 : _a20.hidden$) != null ? _b : new Observable((n2) => n2.next(!1));
+      return (_b = (_a20 = subItem.item) == null ? void 0 : _a20.hidden$) != null ? _b : new Observable((s) => (s.next(!1), s.unsubscribe()));
     });
-    return combineLatest(hiddenObservables).pipe(
-      map((hiddenValues) => hiddenValues.every((hidden) => hidden === !0))
-    ).subscribe((allHidden) => {
-      allHidden || (hasChildren = !0);
+    return combineLatest(hiddenObservables).subscribe((hiddenValues) => {
+      hasChildren = hiddenValues.every((hidden) => hidden === !0), hasChildren || (hasChildren = !0);
     }).unsubscribe(), hasChildren;
   }), [menuItems]);
   return filteredMenuItems && filteredMenuItems.map((item) => {
@@ -2227,7 +2238,7 @@ function UndoMenuItemFactory(accessor) {
     icon: "UndoSingle",
     title: "Undo",
     tooltip: "toolbar.undo",
-    disabled$: undoRedoService.undoRedoStatus$.pipe(map$1((v2) => v2.undos <= 0))
+    disabled$: undoRedoService.undoRedoStatus$.pipe(map((v2) => v2.undos <= 0))
   };
 }
 __name(UndoMenuItemFactory, "UndoMenuItemFactory");
@@ -2239,7 +2250,7 @@ function RedoMenuItemFactory(accessor) {
     icon: "RedoSingle",
     title: "Redo",
     tooltip: "toolbar.redo",
-    disabled$: undoRedoService.undoRedoStatus$.pipe(map$1((v2) => v2.redos <= 0))
+    disabled$: undoRedoService.undoRedoStatus$.pipe(map((v2) => v2.redos <= 0))
   };
 }
 __name(RedoMenuItemFactory, "RedoMenuItemFactory");
@@ -2531,7 +2542,7 @@ const shortcutPanelGroupTitle = "univer-shortcut-panel-group-title", shortcutPan
   shortcutPanelItemShortcut
 };
 function ShortcutPanel() {
-  const shortcutService = useDependency(IShortcutService), localeService = useDependency(LocaleService), currentLocale = useObservable$1(localeService.currentLocale$), [shortcutItems, setShortcutItems] = React__default.useState([]), updateShortcuts = useCallback(() => {
+  const shortcutService = useDependency(IShortcutService), localeService = useDependency(LocaleService), currentLocale = useObservable(localeService.currentLocale$), [shortcutItems, setShortcutItems] = React__default.useState([]), updateShortcuts = useCallback(() => {
     var _a19;
     const shortcutGroups = /* @__PURE__ */ new Map(), shortcuts = shortcutService.getAllShortcuts().filter((item) => !!item.group);
     for (const shortcut of shortcuts) {
@@ -2608,18 +2619,18 @@ var _typeofExports = _typeof$2.exports;
   var _typeof3 = _typeofExports.default;
   function _getRequireWildcardCache(e2) {
     if (typeof WeakMap != "function") return null;
-    var r = /* @__PURE__ */ new WeakMap(), t2 = /* @__PURE__ */ new WeakMap();
+    var r2 = /* @__PURE__ */ new WeakMap(), t2 = /* @__PURE__ */ new WeakMap();
     return (_getRequireWildcardCache = /* @__PURE__ */ __name(function(e3) {
-      return e3 ? t2 : r;
+      return e3 ? t2 : r2;
     }, "_getRequireWildcardCache"))(e2);
   }
   __name(_getRequireWildcardCache, "_getRequireWildcardCache");
-  function _interopRequireWildcard2(e2, r) {
-    if (!r && e2 && e2.__esModule) return e2;
+  function _interopRequireWildcard2(e2, r2) {
+    if (!r2 && e2 && e2.__esModule) return e2;
     if (e2 === null || _typeof3(e2) != "object" && typeof e2 != "function") return {
       default: e2
     };
-    var t2 = _getRequireWildcardCache(r);
+    var t2 = _getRequireWildcardCache(r2);
     if (t2 && t2.has(e2)) return t2.get(e2);
     var n2 = {
       __proto__: null
@@ -2648,12 +2659,12 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     module.exports = _regeneratorRuntime = /* @__PURE__ */ __name(function() {
       return e2;
     }, "_regeneratorRuntime"), module.exports.__esModule = !0, module.exports.default = module.exports;
-    var t2, e2 = {}, r = Object.prototype, n2 = r.hasOwnProperty, o = Object.defineProperty || function(t3, e3, r2) {
-      t3[e3] = r2.value;
+    var t2, e2 = {}, r2 = Object.prototype, n2 = r2.hasOwnProperty, o = Object.defineProperty || function(t3, e3, r3) {
+      t3[e3] = r3.value;
     }, i = typeof Symbol == "function" ? Symbol : {}, a = i.iterator || "@@iterator", c2 = i.asyncIterator || "@@asyncIterator", u2 = i.toStringTag || "@@toStringTag";
-    function define(t3, e3, r2) {
+    function define(t3, e3, r3) {
       return Object.defineProperty(t3, e3, {
-        value: r2,
+        value: r3,
         enumerable: !0,
         configurable: !0,
         writable: !0
@@ -2663,22 +2674,22 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     try {
       define({}, "");
     } catch {
-      define = /* @__PURE__ */ __name(function(t4, e3, r2) {
-        return t4[e3] = r2;
+      define = /* @__PURE__ */ __name(function(t4, e3, r3) {
+        return t4[e3] = r3;
       }, "define");
     }
-    function wrap(t3, e3, r2, n3) {
+    function wrap(t3, e3, r3, n3) {
       var i2 = e3 && e3.prototype instanceof Generator ? e3 : Generator, a2 = Object.create(i2.prototype), c3 = new Context2(n3 || []);
       return o(a2, "_invoke", {
-        value: makeInvokeMethod(t3, r2, c3)
+        value: makeInvokeMethod(t3, r3, c3)
       }), a2;
     }
     __name(wrap, "wrap");
-    function tryCatch(t3, e3, r2) {
+    function tryCatch(t3, e3, r3) {
       try {
         return {
           type: "normal",
-          arg: t3.call(e3, r2)
+          arg: t3.call(e3, r3)
         };
       } catch (t4) {
         return {
@@ -2703,7 +2714,7 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
       return this;
     });
     var d2 = Object.getPrototypeOf, v2 = d2 && d2(d2(values([])));
-    v2 && v2 !== r && n2.call(v2, a) && (p2 = v2);
+    v2 && v2 !== r2 && n2.call(v2, a) && (p2 = v2);
     var g2 = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p2);
     function defineIteratorMethods(t3) {
       ["next", "throw", "return"].forEach(function(e3) {
@@ -2714,8 +2725,8 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     }
     __name(defineIteratorMethods, "defineIteratorMethods");
     function AsyncIterator(t3, e3) {
-      function invoke(r3, o2, i2, a2) {
-        var c3 = tryCatch(t3[r3], t3, o2);
+      function invoke(r4, o2, i2, a2) {
+        var c3 = tryCatch(t3[r4], t3, o2);
         if (c3.type !== "throw") {
           var u3 = c3.arg, h3 = u3.value;
           return h3 && _typeof3(h3) == "object" && n2.call(h3, "__await") ? e3.resolve(h3.__await).then(function(t4) {
@@ -2731,20 +2742,20 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
         a2(c3.arg);
       }
       __name(invoke, "invoke");
-      var r2;
+      var r3;
       o(this, "_invoke", {
         value: /* @__PURE__ */ __name(function(t4, n3) {
           function callInvokeWithMethodAndArg() {
-            return new e3(function(e4, r3) {
-              invoke(t4, n3, e4, r3);
+            return new e3(function(e4, r4) {
+              invoke(t4, n3, e4, r4);
             });
           }
-          return __name(callInvokeWithMethodAndArg, "callInvokeWithMethodAndArg"), r2 = r2 ? r2.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+          return __name(callInvokeWithMethodAndArg, "callInvokeWithMethodAndArg"), r3 = r3 ? r3.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
         }, "value")
       });
     }
     __name(AsyncIterator, "AsyncIterator");
-    function makeInvokeMethod(e3, r2, n3) {
+    function makeInvokeMethod(e3, r3, n3) {
       var o2 = h2;
       return function(i2, a2) {
         if (o2 === f2) throw Error("Generator is already running");
@@ -2770,7 +2781,7 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
             n3.dispatchException(n3.arg);
           } else n3.method === "return" && n3.abrupt("return", n3.arg);
           o2 = f2;
-          var p3 = tryCatch(e3, r2, n3);
+          var p3 = tryCatch(e3, r3, n3);
           if (p3.type === "normal") {
             if (o2 = n3.done ? s : l2, p3.arg === y) continue;
             return {
@@ -2783,13 +2794,13 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
       };
     }
     __name(makeInvokeMethod, "makeInvokeMethod");
-    function maybeInvokeDelegate(e3, r2) {
-      var n3 = r2.method, o2 = e3.iterator[n3];
-      if (o2 === t2) return r2.delegate = null, n3 === "throw" && e3.iterator.return && (r2.method = "return", r2.arg = t2, maybeInvokeDelegate(e3, r2), r2.method === "throw") || n3 !== "return" && (r2.method = "throw", r2.arg = new TypeError("The iterator does not provide a '" + n3 + "' method")), y;
-      var i2 = tryCatch(o2, e3.iterator, r2.arg);
-      if (i2.type === "throw") return r2.method = "throw", r2.arg = i2.arg, r2.delegate = null, y;
+    function maybeInvokeDelegate(e3, r3) {
+      var n3 = r3.method, o2 = e3.iterator[n3];
+      if (o2 === t2) return r3.delegate = null, n3 === "throw" && e3.iterator.return && (r3.method = "return", r3.arg = t2, maybeInvokeDelegate(e3, r3), r3.method === "throw") || n3 !== "return" && (r3.method = "throw", r3.arg = new TypeError("The iterator does not provide a '" + n3 + "' method")), y;
+      var i2 = tryCatch(o2, e3.iterator, r3.arg);
+      if (i2.type === "throw") return r3.method = "throw", r3.arg = i2.arg, r3.delegate = null, y;
       var a2 = i2.arg;
-      return a2 ? a2.done ? (r2[e3.resultName] = a2.value, r2.next = e3.nextLoc, r2.method !== "return" && (r2.method = "next", r2.arg = t2), r2.delegate = null, y) : a2 : (r2.method = "throw", r2.arg = new TypeError("iterator result is not an object"), r2.delegate = null, y);
+      return a2 ? a2.done ? (r3[e3.resultName] = a2.value, r3.next = e3.nextLoc, r3.method !== "return" && (r3.method = "next", r3.arg = t2), r3.delegate = null, y) : a2 : (r3.method = "throw", r3.arg = new TypeError("iterator result is not an object"), r3.delegate = null, y);
     }
     __name(maybeInvokeDelegate, "maybeInvokeDelegate");
     function pushTryEntry(t3) {
@@ -2812,8 +2823,8 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     __name(Context2, "Context");
     function values(e3) {
       if (e3 || e3 === "") {
-        var r2 = e3[a];
-        if (r2) return r2.call(e3);
+        var r3 = e3[a];
+        if (r3) return r3.call(e3);
         if (typeof e3.next == "function") return e3;
         if (!isNaN(e3.length)) {
           var o2 = -1, i2 = /* @__PURE__ */ __name(function next() {
@@ -2842,10 +2853,10 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
       };
     }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c2, function() {
       return this;
-    }), e2.AsyncIterator = AsyncIterator, e2.async = function(t3, r2, n3, o2, i2) {
+    }), e2.AsyncIterator = AsyncIterator, e2.async = function(t3, r3, n3, o2, i2) {
       i2 === void 0 && (i2 = Promise);
-      var a2 = new AsyncIterator(wrap(t3, r2, n3, o2), i2);
-      return e2.isGeneratorFunction(r2) ? a2 : a2.next().then(function(t4) {
+      var a2 = new AsyncIterator(wrap(t3, r3, n3, o2), i2);
+      return e2.isGeneratorFunction(r3) ? a2 : a2.next().then(function(t4) {
         return t4.done ? t4.value : a2.next();
       });
     }, defineIteratorMethods(g2), define(g2, u2, "Generator"), define(g2, a, function() {
@@ -2853,11 +2864,11 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     }), define(g2, "toString", function() {
       return "[object Generator]";
     }), e2.keys = function(t3) {
-      var e3 = Object(t3), r2 = [];
-      for (var n3 in e3) r2.push(n3);
-      return r2.reverse(), /* @__PURE__ */ __name(function next() {
-        for (; r2.length; ) {
-          var t4 = r2.pop();
+      var e3 = Object(t3), r3 = [];
+      for (var n3 in e3) r3.push(n3);
+      return r3.reverse(), /* @__PURE__ */ __name(function next() {
+        for (; r3.length; ) {
+          var t4 = r3.pop();
           if (t4 in e3) return next.value = t4, next.done = !1, next;
         }
         return next.done = !0, next;
@@ -2865,7 +2876,7 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
     }, e2.values = values, Context2.prototype = {
       constructor: Context2,
       reset: /* @__PURE__ */ __name(function(e3) {
-        if (this.prev = 0, this.next = 0, this.sent = this._sent = t2, this.done = !1, this.delegate = null, this.method = "next", this.arg = t2, this.tryEntries.forEach(resetTryEntry), !e3) for (var r2 in this) r2.charAt(0) === "t" && n2.call(this, r2) && !isNaN(+r2.slice(1)) && (this[r2] = t2);
+        if (this.prev = 0, this.next = 0, this.sent = this._sent = t2, this.done = !1, this.delegate = null, this.method = "next", this.arg = t2, this.tryEntries.forEach(resetTryEntry), !e3) for (var r3 in this) r3.charAt(0) === "t" && n2.call(this, r3) && !isNaN(+r3.slice(1)) && (this[r3] = t2);
       }, "reset"),
       stop: /* @__PURE__ */ __name(function() {
         this.done = !0;
@@ -2875,9 +2886,9 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
       }, "stop"),
       dispatchException: /* @__PURE__ */ __name(function(e3) {
         if (this.done) throw e3;
-        var r2 = this;
+        var r3 = this;
         function handle(n3, o3) {
-          return a2.type = "throw", a2.arg = e3, r2.next = n3, o3 && (r2.method = "next", r2.arg = t2), !!o3;
+          return a2.type = "throw", a2.arg = e3, r3.next = n3, o3 && (r3.method = "next", r3.arg = t2), !!o3;
         }
         __name(handle, "handle");
         for (var o2 = this.tryEntries.length - 1; o2 >= 0; --o2) {
@@ -2898,8 +2909,8 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
         }
       }, "dispatchException"),
       abrupt: /* @__PURE__ */ __name(function(t3, e3) {
-        for (var r2 = this.tryEntries.length - 1; r2 >= 0; --r2) {
-          var o2 = this.tryEntries[r2];
+        for (var r3 = this.tryEntries.length - 1; r3 >= 0; --r3) {
+          var o2 = this.tryEntries[r3];
           if (o2.tryLoc <= this.prev && n2.call(o2, "finallyLoc") && this.prev < o2.finallyLoc) {
             var i2 = o2;
             break;
@@ -2915,28 +2926,28 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
       }, "complete"),
       finish: /* @__PURE__ */ __name(function(t3) {
         for (var e3 = this.tryEntries.length - 1; e3 >= 0; --e3) {
-          var r2 = this.tryEntries[e3];
-          if (r2.finallyLoc === t3) return this.complete(r2.completion, r2.afterLoc), resetTryEntry(r2), y;
+          var r3 = this.tryEntries[e3];
+          if (r3.finallyLoc === t3) return this.complete(r3.completion, r3.afterLoc), resetTryEntry(r3), y;
         }
       }, "finish"),
       catch: /* @__PURE__ */ __name(function(t3) {
         for (var e3 = this.tryEntries.length - 1; e3 >= 0; --e3) {
-          var r2 = this.tryEntries[e3];
-          if (r2.tryLoc === t3) {
-            var n3 = r2.completion;
+          var r3 = this.tryEntries[e3];
+          if (r3.tryLoc === t3) {
+            var n3 = r3.completion;
             if (n3.type === "throw") {
               var o2 = n3.arg;
-              resetTryEntry(r2);
+              resetTryEntry(r3);
             }
             return o2;
           }
         }
         throw Error("illegal catch attempt");
       }, "_catch"),
-      delegateYield: /* @__PURE__ */ __name(function(e3, r2, n3) {
+      delegateYield: /* @__PURE__ */ __name(function(e3, r3, n3) {
         return this.delegate = {
           iterator: values(e3),
-          resultName: r2,
+          resultName: r3,
           nextLoc: n3
         }, this.method === "next" && (this.arg = t2), y;
       }, "delegateYield")
@@ -2946,26 +2957,26 @@ var interopRequireDefaultExports = interopRequireDefault.exports, regeneratorRun
 })(regeneratorRuntime);
 var regeneratorRuntimeExports = regeneratorRuntime.exports, asyncToGenerator = { exports: {} };
 (function(module) {
-  function asyncGeneratorStep(n2, t2, e2, r, o, a, c2) {
+  function asyncGeneratorStep(n2, t2, e2, r2, o, a, c2) {
     try {
       var i = n2[a](c2), u2 = i.value;
     } catch (n3) {
       return void e2(n3);
     }
-    i.done ? t2(u2) : Promise.resolve(u2).then(r, o);
+    i.done ? t2(u2) : Promise.resolve(u2).then(r2, o);
   }
   __name(asyncGeneratorStep, "asyncGeneratorStep");
   function _asyncToGenerator(n2) {
     return function() {
       var t2 = this, e2 = arguments;
-      return new Promise(function(r, o) {
+      return new Promise(function(r2, o) {
         var a = n2.apply(t2, e2);
         function _next(n3) {
-          asyncGeneratorStep(a, r, o, _next, _throw, "next", n3);
+          asyncGeneratorStep(a, r2, o, _next, _throw, "next", n3);
         }
         __name(_next, "_next");
         function _throw(n3) {
-          asyncGeneratorStep(a, r, o, _next, _throw, "throw", n3);
+          asyncGeneratorStep(a, r2, o, _next, _throw, "throw", n3);
         }
         __name(_throw, "_throw"), _next(void 0);
       });
@@ -2976,15 +2987,15 @@ var regeneratorRuntimeExports = regeneratorRuntime.exports, asyncToGenerator = {
 var asyncToGeneratorExports = asyncToGenerator.exports, objectSpread2 = { exports: {} }, defineProperty = { exports: {} }, toPropertyKey$2 = { exports: {} }, toPrimitive$2 = { exports: {} };
 (function(module) {
   var _typeof3 = _typeofExports.default;
-  function toPrimitive2(t2, r) {
+  function toPrimitive2(t2, r2) {
     if (_typeof3(t2) != "object" || !t2) return t2;
     var e2 = t2[Symbol.toPrimitive];
     if (e2 !== void 0) {
-      var i = e2.call(t2, r || "default");
+      var i = e2.call(t2, r2 || "default");
       if (_typeof3(i) != "object") return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return (r === "string" ? String : Number)(t2);
+    return (r2 === "string" ? String : Number)(t2);
   }
   __name(toPrimitive2, "toPrimitive"), module.exports = toPrimitive2, module.exports.__esModule = !0, module.exports.default = module.exports;
 })(toPrimitive$2);
@@ -3000,37 +3011,37 @@ var toPrimitiveExports = toPrimitive$2.exports;
 var toPropertyKeyExports = toPropertyKey$2.exports;
 (function(module) {
   var toPropertyKey2 = toPropertyKeyExports;
-  function _defineProperty2(e2, r, t2) {
-    return (r = toPropertyKey2(r)) in e2 ? Object.defineProperty(e2, r, {
+  function _defineProperty2(e2, r2, t2) {
+    return (r2 = toPropertyKey2(r2)) in e2 ? Object.defineProperty(e2, r2, {
       value: t2,
       enumerable: !0,
       configurable: !0,
       writable: !0
-    }) : e2[r] = t2, e2;
+    }) : e2[r2] = t2, e2;
   }
   __name(_defineProperty2, "_defineProperty"), module.exports = _defineProperty2, module.exports.__esModule = !0, module.exports.default = module.exports;
 })(defineProperty);
 var definePropertyExports = defineProperty.exports;
 (function(module) {
   var defineProperty2 = definePropertyExports;
-  function ownKeys2(e2, r) {
+  function ownKeys2(e2, r2) {
     var t2 = Object.keys(e2);
     if (Object.getOwnPropertySymbols) {
       var o = Object.getOwnPropertySymbols(e2);
-      r && (o = o.filter(function(r2) {
-        return Object.getOwnPropertyDescriptor(e2, r2).enumerable;
+      r2 && (o = o.filter(function(r3) {
+        return Object.getOwnPropertyDescriptor(e2, r3).enumerable;
       })), t2.push.apply(t2, o);
     }
     return t2;
   }
   __name(ownKeys2, "ownKeys");
   function _objectSpread22(e2) {
-    for (var r = 1; r < arguments.length; r++) {
-      var t2 = arguments[r] != null ? arguments[r] : {};
-      r % 2 ? ownKeys2(Object(t2), !0).forEach(function(r2) {
-        defineProperty2(e2, r2, t2[r2]);
-      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys2(Object(t2)).forEach(function(r2) {
-        Object.defineProperty(e2, r2, Object.getOwnPropertyDescriptor(t2, r2));
+    for (var r2 = 1; r2 < arguments.length; r2++) {
+      var t2 = arguments[r2] != null ? arguments[r2] : {};
+      r2 % 2 ? ownKeys2(Object(t2), !0).forEach(function(r3) {
+        defineProperty2(e2, r3, t2[r3]);
+      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys2(Object(t2)).forEach(function(r3) {
+        Object.defineProperty(e2, r3, Object.getOwnPropertyDescriptor(t2, r3));
       });
     }
     return e2;
@@ -3343,7 +3354,7 @@ function useComponentsOfPart(part, injector) {
     () => uiPartsService.componentRegistered$.pipe(
       filter((key) => key === part),
       debounceTime(200),
-      map(() => updateCounterRef.current += 1),
+      map$1(() => updateCounterRef.current += 1),
       startWith(updateCounterRef.current += 1)
       // trigger update when subscribe
     ),
@@ -3649,7 +3660,7 @@ function useToolbarGroups(categories, initCategory) {
         var _a20;
         return (_a20 = item.hidden$) != null ? _a20 : new Observable((observer) => observer.next(!1));
       })
-    ).pipe(map((hiddenValues) => activeItems.filter((_, index) => !hiddenValues[index]))).subscribe((items) => setVisibleItems(items));
+    ).pipe(map$1((hiddenValues) => activeItems.filter((_, index) => !hiddenValues[index]))).subscribe((items) => setVisibleItems(items));
     return () => s.unsubscribe();
   }, [groups, category]), useEffect(() => {
     const s = menuService.menuChanged$.subscribe(() => {
@@ -3928,7 +3939,22 @@ function Ribbon(props) {
       visibleGroups,
       hiddenGroups
     };
-  }, [ribbon, category, collapsedIds]);
+  }, [ribbon, category, collapsedIds]), fakeToolbarContent = useMemo(() => activeGroup.allGroups.map((groupItem) => {
+    var _a19;
+    return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$7.toolbarGroup, children: (_a19 = groupItem.children) == null ? void 0 : _a19.map((child) => child.item && /* @__PURE__ */ jsxRuntimeExports.jsx(
+      ToolbarItem,
+      {
+        ref: /* @__PURE__ */ __name((ref) => {
+          toolbarItemRefs.current[child.key] = {
+            el: ref == null ? void 0 : ref.nativeElement,
+            key: child.key
+          };
+        }, "ref"),
+        ...child.item
+      },
+      child.key
+    )) }, groupItem.key);
+  }), [activeGroup.allGroups]);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
     hasHeaderMenu && /* @__PURE__ */ jsxRuntimeExports.jsxs("header", { className: styles$7.headerbar, children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$7.menubar, children: ribbon.length > 1 && ribbon.map((group) => /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -3977,22 +4003,7 @@ function Ribbon(props) {
           // left: 0,
           // opacity: 1,
         },
-        children: activeGroup.allGroups.map((groupItem) => {
-          var _a19;
-          return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$7.toolbarGroup, children: (_a19 = groupItem.children) == null ? void 0 : _a19.map((child) => child.item && /* @__PURE__ */ jsxRuntimeExports.jsx(
-            ToolbarItem,
-            {
-              ref: /* @__PURE__ */ __name((ref) => {
-                toolbarItemRefs.current[child.key] = {
-                  el: ref == null ? void 0 : ref.nativeElement,
-                  key: child.key
-                };
-              }, "ref"),
-              ...child.item
-            },
-            child.key
-          )) }, groupItem.key);
-        })
+        children: fakeToolbarContent
       }
     )
   ] });
@@ -4056,7 +4067,7 @@ const IZenZoneService = createIdentifier("univer.zen-zone-service"), zenZone = "
   zenZoneClose
 };
 function ZenZone() {
-  const zenZoneService = useDependency(IZenZoneService), [visible, setVisible] = useState(!1), [componentKey, setComponentKey] = useState(), hidden = useObservable$2(zenZoneService.temporaryHidden$), componentManager = useDependency(ComponentManager);
+  const zenZoneService = useDependency(IZenZoneService), [visible, setVisible] = useState(!1), [componentKey, setComponentKey] = useState(), hidden = useObservable$1(zenZoneService.temporaryHidden$), componentManager = useDependency(ComponentManager);
   useEffect(() => {
     const subscriptions = [
       zenZoneService.visible$.subscribe((visible2) => {
@@ -4331,7 +4342,7 @@ function MobileMenuItem(props) {
   const { menuItem, onClick } = props, { id, type, title, label, icon } = menuItem;
   if (type !== MenuItemType.BUTTON)
     throw new Error(`[MobileMenuItem]: on mobile devices only "BUTTON" type menu items are supported. Please check "${id}".`);
-  const disabled = useObservable$2(menuItem.disabled$, !1), activated = useObservable$2(menuItem.activated$, !1), hidden = useObservable$2(menuItem.hidden$, !1), value = useObservable$2(menuItem.value$), className = clsx$2(styles$1.mobileMenuItem, {
+  const disabled = useObservable$1(menuItem.disabled$, !1), activated = useObservable$1(menuItem.activated$, !1), hidden = useObservable$1(menuItem.hidden$, !1), value = useObservable$1(menuItem.value$), className = clsx$1(styles$1.mobileMenuItem, {
     [styles$1.mobileMenuItemActivated]: activated,
     [styles$1.mobileMenuItemHidden]: hidden
   });
@@ -4714,7 +4725,7 @@ let DesktopConfirmService = (_a12 = class extends Disposable {
   constructor(_injector, _uiPartsService) {
     super();
     __publicField(this, "_confirmOptions", []);
-    __publicField(this, "confirmOptions$", new Subject());
+    __publicField(this, "confirmOptions$", new BehaviorSubject([]));
     this._injector = _injector, this._uiPartsService = _uiPartsService, this._initUIPart();
   }
   open(option) {
@@ -4874,7 +4885,7 @@ var localforage$1 = { exports: {} };
   (function(f2) {
     module.exports = f2();
   })(function() {
-    return (/* @__PURE__ */ __name(function e2(t2, n2, r) {
+    return (/* @__PURE__ */ __name(function e2(t2, n2, r2) {
       function s(o2, u2) {
         if (!n2[o2]) {
           if (!t2[o2]) {
@@ -4888,12 +4899,12 @@ var localforage$1 = { exports: {} };
           t2[o2][0].call(l2.exports, function(e3) {
             var n3 = t2[o2][1][e3];
             return s(n3 || e3);
-          }, l2, l2.exports, e2, t2, n2, r);
+          }, l2, l2.exports, e2, t2, n2, r2);
         }
         return n2[o2].exports;
       }
       __name(s, "s");
-      for (var i = typeof commonjsRequire == "function" && commonjsRequire, o = 0; o < r.length; o++) s(r[o]);
+      for (var i = typeof commonjsRequire == "function" && commonjsRequire, o = 0; o < r2.length; o++) s(r2[o]);
       return s;
     }, "e"))({ 1: [function(_dereq_, module2, exports2) {
       (function(global2) {
@@ -6442,25 +6453,25 @@ const _DesktopMessageService = class _DesktopMessageService {
 };
 __name(_DesktopMessageService, "DesktopMessageService");
 let DesktopMessageService = _DesktopMessageService;
-function _arrayLikeToArray$1(r, a) {
-  (a == null || a > r.length) && (a = r.length);
-  for (var e2 = 0, n2 = Array(a); e2 < a; e2++) n2[e2] = r[e2];
+function _arrayLikeToArray$1(r2, a) {
+  (a == null || a > r2.length) && (a = r2.length);
+  for (var e2 = 0, n2 = Array(a); e2 < a; e2++) n2[e2] = r2[e2];
   return n2;
 }
 __name(_arrayLikeToArray$1, "_arrayLikeToArray$1");
-function _arrayWithoutHoles(r) {
-  if (Array.isArray(r)) return _arrayLikeToArray$1(r);
+function _arrayWithoutHoles(r2) {
+  if (Array.isArray(r2)) return _arrayLikeToArray$1(r2);
 }
 __name(_arrayWithoutHoles, "_arrayWithoutHoles");
-function _iterableToArray(r) {
-  if (typeof Symbol < "u" && r[Symbol.iterator] != null || r["@@iterator"] != null) return Array.from(r);
+function _iterableToArray(r2) {
+  if (typeof Symbol < "u" && r2[Symbol.iterator] != null || r2["@@iterator"] != null) return Array.from(r2);
 }
 __name(_iterableToArray, "_iterableToArray");
-function _unsupportedIterableToArray$1(r, a) {
-  if (r) {
-    if (typeof r == "string") return _arrayLikeToArray$1(r, a);
-    var t2 = {}.toString.call(r).slice(8, -1);
-    return t2 === "Object" && r.constructor && (t2 = r.constructor.name), t2 === "Map" || t2 === "Set" ? Array.from(r) : t2 === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t2) ? _arrayLikeToArray$1(r, a) : void 0;
+function _unsupportedIterableToArray$1(r2, a) {
+  if (r2) {
+    if (typeof r2 == "string") return _arrayLikeToArray$1(r2, a);
+    var t2 = {}.toString.call(r2).slice(8, -1);
+    return t2 === "Object" && r2.constructor && (t2 = r2.constructor.name), t2 === "Map" || t2 === "Set" ? Array.from(r2) : t2 === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t2) ? _arrayLikeToArray$1(r2, a) : void 0;
   }
 }
 __name(_unsupportedIterableToArray$1, "_unsupportedIterableToArray$1");
@@ -6469,25 +6480,25 @@ function _nonIterableSpread() {
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
 }
 __name(_nonIterableSpread, "_nonIterableSpread");
-function _toConsumableArray(r) {
-  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray$1(r) || _nonIterableSpread();
+function _toConsumableArray(r2) {
+  return _arrayWithoutHoles(r2) || _iterableToArray(r2) || _unsupportedIterableToArray$1(r2) || _nonIterableSpread();
 }
 __name(_toConsumableArray, "_toConsumableArray");
-function _arrayWithHoles$1(r) {
-  if (Array.isArray(r)) return r;
+function _arrayWithHoles$1(r2) {
+  if (Array.isArray(r2)) return r2;
 }
 __name(_arrayWithHoles$1, "_arrayWithHoles$1");
-function _iterableToArrayLimit$1(r, l2) {
-  var t2 = r == null ? null : typeof Symbol < "u" && r[Symbol.iterator] || r["@@iterator"];
+function _iterableToArrayLimit$1(r2, l2) {
+  var t2 = r2 == null ? null : typeof Symbol < "u" && r2[Symbol.iterator] || r2["@@iterator"];
   if (t2 != null) {
     var e2, n2, i, u2, a = [], f2 = !0, o = !1;
     try {
-      if (i = (t2 = t2.call(r)).next, l2 === 0) {
+      if (i = (t2 = t2.call(r2)).next, l2 === 0) {
         if (Object(t2) !== t2) return;
         f2 = !1;
       } else for (; !(f2 = (e2 = i.call(t2)).done) && (a.push(e2.value), a.length !== l2); f2 = !0) ;
-    } catch (r2) {
-      o = !0, n2 = r2;
+    } catch (r3) {
+      o = !0, n2 = r3;
     } finally {
       try {
         if (!f2 && t2.return != null && (u2 = t2.return(), Object(u2) !== u2)) return;
@@ -6504,26 +6515,26 @@ function _nonIterableRest$1() {
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
 }
 __name(_nonIterableRest$1, "_nonIterableRest$1");
-function _slicedToArray$1(r, e2) {
-  return _arrayWithHoles$1(r) || _iterableToArrayLimit$1(r, e2) || _unsupportedIterableToArray$1(r, e2) || _nonIterableRest$1();
+function _slicedToArray$1(r2, e2) {
+  return _arrayWithHoles$1(r2) || _iterableToArrayLimit$1(r2, e2) || _unsupportedIterableToArray$1(r2, e2) || _nonIterableRest$1();
 }
 __name(_slicedToArray$1, "_slicedToArray$1");
-function _objectWithoutPropertiesLoose(r, e2) {
-  if (r == null) return {};
+function _objectWithoutPropertiesLoose(r2, e2) {
+  if (r2 == null) return {};
   var t2 = {};
-  for (var n2 in r) if ({}.hasOwnProperty.call(r, n2)) {
+  for (var n2 in r2) if ({}.hasOwnProperty.call(r2, n2)) {
     if (e2.includes(n2)) continue;
-    t2[n2] = r[n2];
+    t2[n2] = r2[n2];
   }
   return t2;
 }
 __name(_objectWithoutPropertiesLoose, "_objectWithoutPropertiesLoose");
 function _objectWithoutProperties(e2, t2) {
   if (e2 == null) return {};
-  var o, r, i = _objectWithoutPropertiesLoose(e2, t2);
+  var o, r2, i = _objectWithoutPropertiesLoose(e2, t2);
   if (Object.getOwnPropertySymbols) {
     var s = Object.getOwnPropertySymbols(e2);
-    for (r = 0; r < s.length; r++) o = s[r], t2.includes(o) || {}.propertyIsEnumerable.call(e2, o) && (i[o] = e2[o]);
+    for (r2 = 0; r2 < s.length; r2++) o = s[r2], t2.includes(o) || {}.propertyIsEnumerable.call(e2, o) && (i[o] = e2[o]);
   }
   return i;
 }
@@ -6537,15 +6548,15 @@ function _typeof$1(o) {
   }, _typeof$1(o);
 }
 __name(_typeof$1, "_typeof$1");
-function toPrimitive$1(t2, r) {
+function toPrimitive$1(t2, r2) {
   if (_typeof$1(t2) != "object" || !t2) return t2;
   var e2 = t2[Symbol.toPrimitive];
   if (e2 !== void 0) {
-    var i = e2.call(t2, r || "default");
+    var i = e2.call(t2, r2 || "default");
     if (_typeof$1(i) != "object") return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return (r === "string" ? String : Number)(t2);
+  return (r2 === "string" ? String : Number)(t2);
 }
 __name(toPrimitive$1, "toPrimitive$1");
 function toPropertyKey$1(t2) {
@@ -6553,33 +6564,33 @@ function toPropertyKey$1(t2) {
   return _typeof$1(i) == "symbol" ? i : i + "";
 }
 __name(toPropertyKey$1, "toPropertyKey$1");
-function _defineProperty$1(e2, r, t2) {
-  return (r = toPropertyKey$1(r)) in e2 ? Object.defineProperty(e2, r, {
+function _defineProperty$1(e2, r2, t2) {
+  return (r2 = toPropertyKey$1(r2)) in e2 ? Object.defineProperty(e2, r2, {
     value: t2,
     enumerable: !0,
     configurable: !0,
     writable: !0
-  }) : e2[r] = t2, e2;
+  }) : e2[r2] = t2, e2;
 }
 __name(_defineProperty$1, "_defineProperty$1");
-function ownKeys$1(e2, r) {
+function ownKeys$1(e2, r2) {
   var t2 = Object.keys(e2);
   if (Object.getOwnPropertySymbols) {
     var o = Object.getOwnPropertySymbols(e2);
-    r && (o = o.filter(function(r2) {
-      return Object.getOwnPropertyDescriptor(e2, r2).enumerable;
+    r2 && (o = o.filter(function(r3) {
+      return Object.getOwnPropertyDescriptor(e2, r3).enumerable;
     })), t2.push.apply(t2, o);
   }
   return t2;
 }
 __name(ownKeys$1, "ownKeys$1");
 function _objectSpread2$1(e2) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t2 = arguments[r] != null ? arguments[r] : {};
-    r % 2 ? ownKeys$1(Object(t2), !0).forEach(function(r2) {
-      _defineProperty$1(e2, r2, t2[r2]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys$1(Object(t2)).forEach(function(r2) {
-      Object.defineProperty(e2, r2, Object.getOwnPropertyDescriptor(t2, r2));
+  for (var r2 = 1; r2 < arguments.length; r2++) {
+    var t2 = arguments[r2] != null ? arguments[r2] : {};
+    r2 % 2 ? ownKeys$1(Object(t2), !0).forEach(function(r3) {
+      _defineProperty$1(e2, r3, t2[r3]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys$1(Object(t2)).forEach(function(r3) {
+      Object.defineProperty(e2, r3, Object.getOwnPropertyDescriptor(t2, r3));
     });
   }
   return e2;
@@ -6589,7 +6600,7 @@ function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function(n2) {
     for (var e2 = 1; e2 < arguments.length; e2++) {
       var t2 = arguments[e2];
-      for (var r in t2) ({}).hasOwnProperty.call(t2, r) && (n2[r] = t2[r]);
+      for (var r2 in t2) ({}).hasOwnProperty.call(t2, r2) && (n2[r2] = t2[r2]);
     }
     return n2;
   }, _extends.apply(null, arguments);
@@ -6677,8 +6688,8 @@ var b = Symbol.for("react.element"), c = Symbol.for("react.portal"), d = Symbol.
 u = Symbol.for("react.module.reference");
 function v(a) {
   if (typeof a == "object" && a !== null) {
-    var r = a.$$typeof;
-    switch (r) {
+    var r2 = a.$$typeof;
+    switch (r2) {
       case b:
         switch (a = a.type, a) {
           case d:
@@ -6697,11 +6708,11 @@ function v(a) {
               case g:
                 return a;
               default:
-                return r;
+                return r2;
             }
         }
       case c:
-        return r;
+        return r2;
     }
   }
 }
@@ -6781,15 +6792,15 @@ function _classCallCheck(a, n2) {
   if (!(a instanceof n2)) throw new TypeError("Cannot call a class as a function");
 }
 __name(_classCallCheck, "_classCallCheck");
-function _defineProperties(e2, r) {
-  for (var t2 = 0; t2 < r.length; t2++) {
-    var o = r[t2];
+function _defineProperties(e2, r2) {
+  for (var t2 = 0; t2 < r2.length; t2++) {
+    var o = r2[t2];
     o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e2, toPropertyKey$1(o.key), o);
   }
 }
 __name(_defineProperties, "_defineProperties");
-function _createClass(e2, r, t2) {
-  return r && _defineProperties(e2.prototype, r), t2 && _defineProperties(e2, t2), Object.defineProperty(e2, "prototype", {
+function _createClass(e2, r2, t2) {
+  return r2 && _defineProperties(e2.prototype, r2), t2 && _defineProperties(e2, t2), Object.defineProperty(e2, "prototype", {
     writable: !1
   }), e2;
 }
@@ -6842,10 +6853,10 @@ function _possibleConstructorReturn(t2, e2) {
 }
 __name(_possibleConstructorReturn, "_possibleConstructorReturn");
 function _createSuper(t2) {
-  var r = _isNativeReflectConstruct();
+  var r2 = _isNativeReflectConstruct();
   return function() {
     var e2, o = _getPrototypeOf(t2);
-    if (r) {
+    if (r2) {
       var s = _getPrototypeOf(this).constructor;
       e2 = Reflect.construct(o, arguments, s);
     } else e2 = o.apply(this, arguments);
@@ -6877,18 +6888,18 @@ function useEvent(callback) {
   return memoFn;
 }
 __name(useEvent, "useEvent");
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
+function _arrayWithHoles(r2) {
+  if (Array.isArray(r2)) return r2;
 }
 __name(_arrayWithHoles, "_arrayWithHoles");
-function _iterableToArrayLimit(r, l2) {
-  var t2 = r == null ? null : typeof Symbol < "u" && r[Symbol.iterator] || r["@@iterator"];
+function _iterableToArrayLimit(r2, l2) {
+  var t2 = r2 == null ? null : typeof Symbol < "u" && r2[Symbol.iterator] || r2["@@iterator"];
   if (t2 != null) {
     var e2, n2, i, u2, a = [], f2 = !0, o = !1;
     try {
-      if (i = (t2 = t2.call(r)).next, l2 !== 0) for (; !(f2 = (e2 = i.call(t2)).done) && (a.push(e2.value), a.length !== l2); f2 = !0) ;
-    } catch (r2) {
-      o = !0, n2 = r2;
+      if (i = (t2 = t2.call(r2)).next, l2 !== 0) for (; !(f2 = (e2 = i.call(t2)).done) && (a.push(e2.value), a.length !== l2); f2 = !0) ;
+    } catch (r3) {
+      o = !0, n2 = r3;
     } finally {
       try {
         if (!f2 && t2.return != null && (u2 = t2.return(), Object(u2) !== u2)) return;
@@ -6900,17 +6911,17 @@ function _iterableToArrayLimit(r, l2) {
   }
 }
 __name(_iterableToArrayLimit, "_iterableToArrayLimit");
-function _arrayLikeToArray(r, a) {
-  (a == null || a > r.length) && (a = r.length);
-  for (var e2 = 0, n2 = Array(a); e2 < a; e2++) n2[e2] = r[e2];
+function _arrayLikeToArray(r2, a) {
+  (a == null || a > r2.length) && (a = r2.length);
+  for (var e2 = 0, n2 = Array(a); e2 < a; e2++) n2[e2] = r2[e2];
   return n2;
 }
 __name(_arrayLikeToArray, "_arrayLikeToArray");
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if (typeof r == "string") return _arrayLikeToArray(r, a);
-    var t2 = {}.toString.call(r).slice(8, -1);
-    return t2 === "Object" && r.constructor && (t2 = r.constructor.name), t2 === "Map" || t2 === "Set" ? Array.from(r) : t2 === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t2) ? _arrayLikeToArray(r, a) : void 0;
+function _unsupportedIterableToArray(r2, a) {
+  if (r2) {
+    if (typeof r2 == "string") return _arrayLikeToArray(r2, a);
+    var t2 = {}.toString.call(r2).slice(8, -1);
+    return t2 === "Object" && r2.constructor && (t2 = r2.constructor.name), t2 === "Map" || t2 === "Set" ? Array.from(r2) : t2 === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t2) ? _arrayLikeToArray(r2, a) : void 0;
   }
 }
 __name(_unsupportedIterableToArray, "_unsupportedIterableToArray");
@@ -6919,8 +6930,8 @@ function _nonIterableRest() {
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
 }
 __name(_nonIterableRest, "_nonIterableRest");
-function _slicedToArray(r, e2) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e2) || _unsupportedIterableToArray(r, e2) || _nonIterableRest();
+function _slicedToArray(r2, e2) {
+  return _arrayWithHoles(r2) || _iterableToArrayLimit(r2, e2) || _unsupportedIterableToArray(r2, e2) || _nonIterableRest();
 }
 __name(_slicedToArray, "_slicedToArray");
 function canUseDom() {
@@ -6940,15 +6951,15 @@ function useSafeState(defaultValue) {
   return __name(safeSetState, "safeSetState"), [value, safeSetState];
 }
 __name(useSafeState, "useSafeState");
-function toPrimitive(t2, r) {
+function toPrimitive(t2, r2) {
   if (_typeof(t2) != "object" || !t2) return t2;
   var e2 = t2[Symbol.toPrimitive];
   if (e2 !== void 0) {
-    var i = e2.call(t2, r || "default");
+    var i = e2.call(t2, r2 || "default");
     if (_typeof(i) != "object") return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return (r === "string" ? String : Number)(t2);
+  return (r2 === "string" ? String : Number)(t2);
 }
 __name(toPrimitive, "toPrimitive");
 function toPropertyKey(t2) {
@@ -6956,33 +6967,33 @@ function toPropertyKey(t2) {
   return _typeof(i) == "symbol" ? i : i + "";
 }
 __name(toPropertyKey, "toPropertyKey");
-function _defineProperty(e2, r, t2) {
-  return (r = toPropertyKey(r)) in e2 ? Object.defineProperty(e2, r, {
+function _defineProperty(e2, r2, t2) {
+  return (r2 = toPropertyKey(r2)) in e2 ? Object.defineProperty(e2, r2, {
     value: t2,
     enumerable: !0,
     configurable: !0,
     writable: !0
-  }) : e2[r] = t2, e2;
+  }) : e2[r2] = t2, e2;
 }
 __name(_defineProperty, "_defineProperty");
-function ownKeys(e2, r) {
+function ownKeys(e2, r2) {
   var t2 = Object.keys(e2);
   if (Object.getOwnPropertySymbols) {
     var o = Object.getOwnPropertySymbols(e2);
-    r && (o = o.filter(function(r2) {
-      return Object.getOwnPropertyDescriptor(e2, r2).enumerable;
+    r2 && (o = o.filter(function(r3) {
+      return Object.getOwnPropertyDescriptor(e2, r3).enumerable;
     })), t2.push.apply(t2, o);
   }
   return t2;
 }
 __name(ownKeys, "ownKeys");
 function _objectSpread2(e2) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t2 = arguments[r] != null ? arguments[r] : {};
-    r % 2 ? ownKeys(Object(t2), !0).forEach(function(r2) {
-      _defineProperty(e2, r2, t2[r2]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys(Object(t2)).forEach(function(r2) {
-      Object.defineProperty(e2, r2, Object.getOwnPropertyDescriptor(t2, r2));
+  for (var r2 = 1; r2 < arguments.length; r2++) {
+    var t2 = arguments[r2] != null ? arguments[r2] : {};
+    r2 % 2 ? ownKeys(Object(t2), !0).forEach(function(r3) {
+      _defineProperty(e2, r3, t2[r3]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e2, Object.getOwnPropertyDescriptors(t2)) : ownKeys(Object(t2)).forEach(function(r3) {
+      Object.defineProperty(e2, r3, Object.getOwnPropertyDescriptor(t2, r3));
     });
   }
   return e2;
@@ -7349,30 +7360,23 @@ function genCSSMotionList(transitionSupport) {
       return _this = _super.call.apply(_super, [this].concat(args)), _defineProperty$1(_assertThisInitialized(_this), "state", {
         keyEntities: []
       }), _defineProperty$1(_assertThisInitialized(_this), "removeKey", function(removeKey) {
-        _this.setState(function(prevState) {
-          var nextKeyEntities = prevState.keyEntities.map(function(entity) {
-            return entity.key !== removeKey ? entity : _objectSpread2$1(_objectSpread2$1({}, entity), {}, {
-              status: STATUS_REMOVED
-            });
+        var keyEntities = _this.state.keyEntities, nextKeyEntities = keyEntities.map(function(entity) {
+          return entity.key !== removeKey ? entity : _objectSpread2$1(_objectSpread2$1({}, entity), {}, {
+            status: STATUS_REMOVED
           });
-          return {
-            keyEntities: nextKeyEntities
-          };
-        }, function() {
-          var keyEntities = _this.state.keyEntities, restKeysCount = keyEntities.filter(function(_ref) {
-            var status = _ref.status;
-            return status !== STATUS_REMOVED;
-          }).length;
-          restKeysCount === 0 && _this.props.onAllRemoved && _this.props.onAllRemoved();
         });
+        return _this.setState({
+          keyEntities: nextKeyEntities
+        }), nextKeyEntities.filter(function(_ref) {
+          var status = _ref.status;
+          return status !== STATUS_REMOVED;
+        }).length;
       }), _this;
     }
     return __name(CSSMotionList3, "CSSMotionList"), _createClass(CSSMotionList3, [{
       key: "render",
       value: /* @__PURE__ */ __name(function() {
-        var _this2 = this, keyEntities = this.state.keyEntities, _this$props = this.props, component = _this$props.component, children = _this$props.children, _onVisibleChanged = _this$props.onVisibleChanged;
-        _this$props.onAllRemoved;
-        var restProps = _objectWithoutProperties(_this$props, _excluded$2), Component = component || React.Fragment, motionProps = {};
+        var _this2 = this, keyEntities = this.state.keyEntities, _this$props = this.props, component = _this$props.component, children = _this$props.children, _onVisibleChanged = _this$props.onVisibleChanged, onAllRemoved = _this$props.onAllRemoved, restProps = _objectWithoutProperties(_this$props, _excluded$2), Component = component || React.Fragment, motionProps = {};
         return MOTION_PROP_NAMES.forEach(function(prop) {
           motionProps[prop] = restProps[prop], delete restProps[prop];
         }), delete restProps.keys, /* @__PURE__ */ React.createElement(Component, restProps, keyEntities.map(function(_ref2, index) {
@@ -7382,9 +7386,12 @@ function genCSSMotionList(transitionSupport) {
             visible,
             eventProps,
             onVisibleChanged: /* @__PURE__ */ __name(function(changedVisible) {
-              _onVisibleChanged == null || _onVisibleChanged(changedVisible, {
+              if (_onVisibleChanged == null || _onVisibleChanged(changedVisible, {
                 key: eventProps.key
-              }), changedVisible || _this2.removeKey(eventProps.key);
+              }), !changedVisible) {
+                var restKeysCount = _this2.removeKey(eventProps.key);
+                restKeysCount === 0 && onAllRemoved && onAllRemoved();
+              }
             }, "onVisibleChanged")
           }), function(props, ref) {
             return children(_objectSpread2$1(_objectSpread2$1({}, props), {}, {
@@ -8894,7 +8901,7 @@ function handelTableToJson(table) {
   });
   for (let i = 0; i < data.length; i++)
     data[i] = new Array(colLen);
-  let r = 0;
+  let r2 = 0;
   return trs.forEach((item) => {
     let c2 = 0;
     item.querySelectorAll("td").forEach((td) => {
@@ -8907,23 +8914,23 @@ function handelTableToJson(table) {
       const txt = td.innerText;
       txt.trim().length === 0 ? cell.v = "" : cell.v = txt;
       const style2 = handleStringToStyle(td);
-      for (Tools.isPlainObject(style2) && (cell.s = style2); c2 < colLen && data[r][c2] != null; )
+      for (Tools.isPlainObject(style2) && (cell.s = style2); c2 < colLen && data[r2][c2] != null; )
         c2++;
       if (c2 !== colLen) {
-        if (data[r][c2] == null) {
-          data[r][c2] = cell;
+        if (data[r2][c2] == null) {
+          data[r2][c2] = cell;
           const rowSpan = (_a19 = Number(td.getAttribute("rowSpan"))) != null ? _a19 : 1, colSpan = (_b = Number(td.getAttribute("colSpan"))) != null ? _b : 1;
           if (rowSpan > 1 || colSpan > 1) {
-            const first = { rs: +rowSpan - 1, cs: +colSpan - 1, r, c: c2 };
-            data[r][c2].mc = first;
+            const first = { rs: +rowSpan - 1, cs: +colSpan - 1, r: r2, c: c2 };
+            data[r2][c2].mc = first;
             for (let rp = 0; rp < rowSpan; rp++)
               for (let cp = 0; cp < colSpan; cp++)
-                rp === 0 && cp === 0 || (data[r + rp][c2 + cp] = { mc: null });
+                rp === 0 && cp === 0 || (data[r2 + rp][c2 + cp] = { mc: null });
           }
         }
         c2++;
       }
-    }), r++;
+    }), r2++;
   }), data;
 }
 __name(handelTableToJson, "handelTableToJson");
@@ -8980,7 +8987,7 @@ function handelExcelToJson(html) {
   });
   for (let i = 0; i < data.length; i++)
     data[i] = new Array(colLen);
-  let r = 0;
+  let r2 = 0;
   return trs.forEach((item) => {
     let c2 = 0;
     item.querySelectorAll("td").forEach((td) => {
@@ -8996,23 +9003,23 @@ function handelExcelToJson(html) {
       for (const attr in excelStyle)
         td.classList.contains(attr) && (cssText += excelStyle[attr]);
       const style2 = handleStringToStyle(td, cssText);
-      for (Tools.isPlainObject(style2) && (cell.s = style2); c2 < colLen && data[r][c2] != null; )
+      for (Tools.isPlainObject(style2) && (cell.s = style2); c2 < colLen && data[r2][c2] != null; )
         c2++;
       if (c2 !== colLen) {
-        if (data[r][c2] == null) {
-          data[r][c2] = cell;
+        if (data[r2][c2] == null) {
+          data[r2][c2] = cell;
           const rowSpan = (_a20 = Number(td.getAttribute("rowSpan"))) != null ? _a20 : 1, colSpan = (_b = Number(td.getAttribute("colSpan"))) != null ? _b : 1;
           if (rowSpan > 1 || colSpan > 1) {
-            const first = { rs: +rowSpan - 1, cs: +colSpan - 1, r, c: c2 };
-            data[r][c2].mc = first;
+            const first = { rs: +rowSpan - 1, cs: +colSpan - 1, r: r2, c: c2 };
+            data[r2][c2].mc = first;
             for (let rp = 0; rp < rowSpan; rp++)
               for (let cp = 0; cp < colSpan; cp++)
-                rp === 0 && cp === 0 || (data[r + rp][c2 + cp] = { mc: null });
+                rp === 0 && cp === 0 || (data[r2 + rp][c2 + cp] = { mc: null });
           }
         }
         c2++;
       }
-    }), r++;
+    }), r2++;
   }), data;
 }
 __name(handelExcelToJson, "handelExcelToJson");