@nocobase/flow-engine 2.2.0-beta.1 → 2.2.0-beta.11

package/lib/JSRunner.d.ts

@@ -27,6 +27,7 @@ export interface JSRunnerOptions {
  * 3. Fallback keeps v1-compatible behavior (enabled).
  */
 export declare function shouldPreprocessRunJSTemplates(options?: Pick<JSRunnerOptions, 'preprocessTemplates' | 'version'>): boolean;
+export declare const RUNJS_ALLOWED_BARE_GLOBAL_NAMES: readonly ["ctx", "console", "window", "document", "navigator", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "Array", "ArrayBuffer", "BigInt", "BigInt64Array", "BigUint64Array", "Boolean", "DataView", "Date", "Error", "EvalError", "FinalizationRegistry", "Float32Array", "Float64Array", "Int8Array", "Int16Array", "Int32Array", "Map", "Math", "Number", "Object", "Promise", "Proxy", "RangeError", "ReferenceError", "Reflect", "RegExp", "Set", "String", "Symbol", "SyntaxError", "TypeError", "URIError", "Uint8Array", "Uint8ClampedArray", "Uint16Array", "Uint32Array", "WeakMap", "WeakRef", "WeakSet", "JSON", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isFinite", "isNaN", "parseFloat", "parseInt", "undefined", "NaN", "Infinity", "fetch", "localStorage", "sessionStorage", "XMLHttpRequest", "WebSocket", "Worker", "SharedWorker", "ServiceWorker", "BroadcastChannel", "EventSource", "indexedDB", "caches", "Function", "eval", "globalThis", "Intl", "Blob", "URL", "location"];
 export declare class JSRunner {
     private globals;
     private timeoutMs;

package/lib/JSRunner.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var JSRunner_exports = {};
 __export(JSRunner_exports, {
   JSRunner: () => JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES: () => RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates: () => shouldPreprocessRunJSTemplates
 });
 module.exports = __toCommonJS(JSRunner_exports);
@@ -40,6 +41,113 @@ function shouldPreprocessRunJSTemplates(options) {
   return (options == null ? void 0 : options.version) !== "v2";
 }
 __name(shouldPreprocessRunJSTemplates, "shouldPreprocessRunJSTemplates");
+const RUNJS_BROWSER_GLOBAL_NAMES = [
+  "fetch",
+  "localStorage",
+  "sessionStorage",
+  "XMLHttpRequest",
+  "WebSocket",
+  "Worker",
+  "SharedWorker",
+  "ServiceWorker",
+  "BroadcastChannel",
+  "EventSource",
+  "indexedDB",
+  "caches",
+  "Function",
+  "eval",
+  "globalThis",
+  "Intl",
+  "Blob",
+  "URL",
+  "location"
+];
+const RUNJS_ALLOWED_BARE_GLOBAL_NAMES = [
+  "ctx",
+  "console",
+  "window",
+  "document",
+  "navigator",
+  "setTimeout",
+  "clearTimeout",
+  "setInterval",
+  "clearInterval",
+  "Array",
+  "ArrayBuffer",
+  "BigInt",
+  "BigInt64Array",
+  "BigUint64Array",
+  "Boolean",
+  "DataView",
+  "Date",
+  "Error",
+  "EvalError",
+  "FinalizationRegistry",
+  "Float32Array",
+  "Float64Array",
+  "Int8Array",
+  "Int16Array",
+  "Int32Array",
+  "Map",
+  "Math",
+  "Number",
+  "Object",
+  "Promise",
+  "Proxy",
+  "RangeError",
+  "ReferenceError",
+  "Reflect",
+  "RegExp",
+  "Set",
+  "String",
+  "Symbol",
+  "SyntaxError",
+  "TypeError",
+  "URIError",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "Uint16Array",
+  "Uint32Array",
+  "WeakMap",
+  "WeakRef",
+  "WeakSet",
+  "JSON",
+  "decodeURI",
+  "decodeURIComponent",
+  "encodeURI",
+  "encodeURIComponent",
+  "isFinite",
+  "isNaN",
+  "parseFloat",
+  "parseInt",
+  "undefined",
+  "NaN",
+  "Infinity",
+  ...RUNJS_BROWSER_GLOBAL_NAMES
+];
+function collectRunJSBrowserGlobals(providedGlobals = {}) {
+  const windowGlobal = providedGlobals.window;
+  if (!windowGlobal || typeof windowGlobal !== "object") {
+    return {};
+  }
+  const windowRecord = windowGlobal;
+  const globals = {};
+  RUNJS_BROWSER_GLOBAL_NAMES.forEach((name) => {
+    if (Object.prototype.hasOwnProperty.call(providedGlobals, name)) {
+      return;
+    }
+    try {
+      const value = windowRecord[name];
+      if (typeof value === "undefined") {
+        return;
+      }
+      globals[name] = name === "fetch" && typeof value === "function" ? value.bind(windowGlobal) : value;
+    } catch {
+    }
+  });
+  return globals;
+}
+__name(collectRunJSBrowserGlobals, "collectRunJSBrowserGlobals");
 const BARE_CTX_TEMPLATE_RE = /(^|[=(:,[\s)])(\{\{\s*(ctx(?:\.|\[|\?\.)[^}]*)\s*\}\})/m;
 function extractDeprecatedCtxTemplateUsage(code) {
   const src = String(code || "");
@@ -78,7 +186,6 @@ const _JSRunner = class _JSRunner {
   globals;
   timeoutMs;
   constructor(options = {}) {
-    var _a, _b;
     const bindWindowFn = /* @__PURE__ */ __name((key) => {
       if (typeof window !== "undefined" && typeof window[key] === "function") {
         return window[key].bind(window);
@@ -87,25 +194,7 @@ const _JSRunner = class _JSRunner {
       return typeof fn === "function" ? fn.bind(globalThis) : fn;
     }, "bindWindowFn");
     const providedGlobals = options.globals || {};
-    const liftedGlobals = {};
-    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "Blob")) {
-      try {
-        const blobCtor = (_a = providedGlobals.window) == null ? void 0 : _a.Blob;
-        if (typeof blobCtor !== "undefined") {
-          liftedGlobals.Blob = blobCtor;
-        }
-      } catch {
-      }
-    }
-    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "URL")) {
-      try {
-        const urlCtor = (_b = providedGlobals.window) == null ? void 0 : _b.URL;
-        if (typeof urlCtor !== "undefined") {
-          liftedGlobals.URL = urlCtor;
-        }
-      } catch {
-      }
-    }
+    const liftedGlobals = collectRunJSBrowserGlobals(providedGlobals);
     this.globals = {
       console,
       setTimeout: bindWindowFn("setTimeout"),
@@ -169,5 +258,6 @@ let JSRunner = _JSRunner;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates
 });

package/lib/components/FieldModelRenderer.js

@@ -58,41 +58,54 @@ const flowModelRendererPropKeys = [
   "extraToolbarItems"
 ];
 function FieldModelRenderer(props) {
-  const { model, ...rest } = props;
+  const { model, onChange, ...rest } = props;
   const composingRef = (0, import_react.useRef)(false);
-  const handleChange = /* @__PURE__ */ __name((e) => {
-    var _a;
-    let val;
-    if (e && e.target && typeof e.target.value !== "undefined") {
-      val = e.target.value;
-    } else if (typeof e === "string" || typeof e === "number" || typeof e === "boolean" || typeof e === "object" && !(e instanceof Event)) {
-      val = e;
-    } else {
-      val = null;
-    }
-    model.setProps({ value: val });
-    if (!composingRef.current) {
-      (_a = props.onChange) == null ? void 0 : _a.call(props, val);
-    }
-  }, "handleChange");
-  const handleCompositionStart = /* @__PURE__ */ __name(() => {
+  const handleChange = (0, import_react.useCallback)(
+    (e) => {
+      var _a;
+      let val;
+      if (e && e.target && typeof e.target.value !== "undefined") {
+        val = e.target.value;
+      } else if (typeof e === "string" || typeof e === "number" || typeof e === "boolean" || typeof e === "object" && !(e instanceof Event)) {
+        val = e;
+      } else {
+        val = null;
+      }
+      const isComposing = composingRef.current || ((_a = e == null ? void 0 : e.nativeEvent) == null ? void 0 : _a.isComposing);
+      if (isComposing) {
+        return;
+      }
+      model.setProps({ value: val });
+      if (!composingRef.current) {
+        onChange == null ? void 0 : onChange(val);
+      }
+    },
+    [model, onChange]
+  );
+  const handleCompositionStart = (0, import_react.useCallback)(() => {
     composingRef.current = true;
-  }, "handleCompositionStart");
-  const handleCompositionEnd = /* @__PURE__ */ __name((e, flag = true) => {
-    composingRef.current = false;
-    if (flag) {
-      props.onChange(e);
-    }
-  }, "handleCompositionEnd");
-  const modelProps = {
-    onCompositionStart: handleCompositionStart,
-    onCompositionEnd: handleCompositionEnd,
-    ...import_lodash.default.omit(rest, flowModelRendererPropKeys),
-    onChange: handleChange
-  };
+  }, []);
+  const handleCompositionEnd = (0, import_react.useCallback)(
+    (e, flag = true) => {
+      composingRef.current = false;
+      if (flag) {
+        handleChange(e);
+      }
+    },
+    [handleChange]
+  );
+  const modelProps = (0, import_react.useMemo)(
+    () => ({
+      onCompositionStart: handleCompositionStart,
+      onCompositionEnd: handleCompositionEnd,
+      ...import_lodash.default.omit(rest, flowModelRendererPropKeys),
+      onChange: handleChange
+    }),
+    [handleChange, handleCompositionEnd, handleCompositionStart, rest]
+  );
   (0, import_react.useEffect)(() => {
     model && model.setProps(modelProps);
-  }, [modelProps]);
+  }, [model, modelProps]);
   return /* @__PURE__ */ import_react.default.createElement(import_FlowModelRenderer.FlowModelRenderer, { model, ...rest });
 }
 __name(FieldModelRenderer, "FieldModelRenderer");

package/lib/components/MobilePopup.js

@@ -48,14 +48,34 @@ var import_lazy_helper = require("../lazy-helper");
 const { Popup } = (0, import_lazy_helper.lazy)(() => import("antd-mobile"), "Popup");
 const { CloseOutline } = (0, import_lazy_helper.lazy)(() => import("antd-mobile-icons"), "CloseOutline");
 const MobilePopup = /* @__PURE__ */ __name((props) => {
+  var _a;
   const { title, visible, onClose: closePopup, children, minHeight, className, footer } = props;
   const { t } = (0, import_react_i18next.useTranslation)();
   const { componentCls, hashId } = (0, import_MobilePopup.useMobileActionDrawerStyle)();
-  const style = (0, import_react.useMemo)(() => {
+  const bodyStyles = (_a = props.styles) == null ? void 0 : _a.body;
+  const popupStyle = (0, import_react.useMemo)(() => {
     return {
-      minHeight
+      minHeight: (bodyStyles == null ? void 0 : bodyStyles.minHeight) ?? minHeight,
+      height: bodyStyles == null ? void 0 : bodyStyles.height,
+      maxHeight: bodyStyles == null ? void 0 : bodyStyles.maxHeight
     };
-  }, [minHeight]);
+  }, [bodyStyles == null ? void 0 : bodyStyles.height, bodyStyles == null ? void 0 : bodyStyles.maxHeight, bodyStyles == null ? void 0 : bodyStyles.minHeight, minHeight]);
+  const bodyStyle = (0, import_react.useMemo)(() => {
+    return {
+      padding: 0,
+      ...bodyStyles
+    };
+  }, [bodyStyles]);
+  const handleCloseKeyDown = (0, import_react.useCallback)(
+    (event) => {
+      if (event.key !== "Enter" && event.key !== " ") {
+        return;
+      }
+      event.preventDefault();
+      closePopup();
+    },
+    [closePopup]
+  );
   const theme = (0, import_react.useMemo)(() => {
     return {
       token: {
@@ -75,21 +95,19 @@ const MobilePopup = /* @__PURE__ */ __name((props) => {
       onClose: closePopup,
       onMaskClick: closePopup,
       bodyClassName: "nb-mobile-action-drawer-body",
-      bodyStyle: {
-        padding: 0
-      },
-      maskStyle: style,
-      style,
+      bodyStyle,
+      style: popupStyle,
       destroyOnClose: true
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "nb-mobile-action-drawer-header" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "nb-mobile-action-drawer-placeholder" }, /* @__PURE__ */ import_react.default.createElement(CloseOutline, null)), /* @__PURE__ */ import_react.default.createElement("span", null, title), /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "nb-mobile-action-drawer-header" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "nb-mobile-action-drawer-placeholder" }, /* @__PURE__ */ import_react.default.createElement(CloseOutline, null)), /* @__PURE__ */ import_react.default.createElement("span", { className: "nb-mobile-action-drawer-title" }, title), /* @__PURE__ */ import_react.default.createElement(
       "span",
       {
         className: "nb-mobile-action-drawer-close-icon",
         onClick: closePopup,
         role: "button",
         tabIndex: 0,
-        "aria-label": t("Close")
+        "aria-label": t("Close"),
+        onKeyDown: handleCloseKeyDown
       },
       /* @__PURE__ */ import_react.default.createElement(CloseOutline, null)
     )),

package/lib/components/MobilePopup.style.js

@@ -96,9 +96,17 @@ const genStyleHook = /* @__PURE__ */ __name((component, styleFn) => {
         return [genCommonStyle(token, prefixCls), styleInterpolation];
       }
     );
-    const memoizedWrapSSR = (0, import_react.useMemo)(() => {
-      return wrapSSR;
-    }, [theme2, token, hashId, prefixCls, iconPrefixCls, rootPrefixCls, props]);
+    const wrapSSRDeps = [theme2, token, hashId, prefixCls, iconPrefixCls, rootPrefixCls, props];
+    const wrapSSRCacheRef = (0, import_react.useRef)();
+    const currentCache = wrapSSRCacheRef.current;
+    let memoizedWrapSSR = (currentCache == null ? void 0 : currentCache.wrapSSR) || wrapSSR;
+    if (!currentCache || wrapSSRDeps.some((dep, index) => dep !== currentCache.deps[index])) {
+      wrapSSRCacheRef.current = {
+        deps: wrapSSRDeps,
+        wrapSSR
+      };
+      memoizedWrapSSR = wrapSSR;
+    }
     return {
       wrapSSR: memoizedWrapSSR,
       hashId,
@@ -112,14 +120,14 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
   return {
     [componentCls]: {
       ".nb-mobile-action-drawer-header": {
-        height: "var(--nb-mobile-page-header-height)",
+        height: "var(--nb-mobile-page-header-height, 46px)",
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
         borderBottom: `1px solid ${token.colorSplit}`,
         position: "sticky",
         top: 0,
-        backgroundColor: "white",
+        backgroundColor: token.colorBgContainer,
         zIndex: 1e3,
         // to match the button named 'Add block'
         "& + .nb-grid-container > .nb-grid > .nb-grid-warp > .ant-btn": {
@@ -129,17 +137,30 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
       ".nb-mobile-action-drawer-placeholder": {
         display: "inline-block",
         padding: 12,
+        flex: "0 0 auto",
         visibility: "hidden"
       },
+      ".nb-mobile-action-drawer-title": {
+        flex: "1 1 auto",
+        minWidth: 0,
+        overflow: "hidden",
+        textAlign: "center",
+        textOverflow: "ellipsis",
+        whiteSpace: "nowrap"
+      },
       ".nb-mobile-action-drawer-close-icon": {
         display: "inline-block",
         padding: 12,
+        flex: "0 0 auto",
         cursor: "pointer"
       },
       ".nb-mobile-action-drawer-body": {
         borderTopLeftRadius: 8,
         borderTopRightRadius: 8,
-        maxHeight: "calc(100% - var(--nb-mobile-page-header-height))",
+        maxHeight: "calc(100vh - var(--nb-mobile-page-header-height, 46px))",
+        "@supports (height: 100dvh)": {
+          maxHeight: "calc(100dvh - var(--nb-mobile-page-header-height, 46px))"
+        },
         overflowY: "auto",
         overflowX: "hidden",
         backgroundColor: token.colorBgLayout,

package/lib/components/dnd/index.js

@@ -57,6 +57,10 @@ const EMPTY_COLUMN_UID = "EMPTY_COLUMN";
 const TOOLBAR_DRAG_ACTIVITY_EVENT = "nb-toolbar-drag-activity";
 const TOOLBAR_DRAG_ANCHOR_EVENT = "nb-toolbar-drag-anchor";
 const MENU_SUBMENU_POPUP_SELECTOR = ".ant-menu-submenu-popup";
+const getToolbarModelUidFromNode = /* @__PURE__ */ __name((node) => {
+  var _a;
+  return ((_a = node == null ? void 0 : node.closest(".nb-toolbar-container[data-model-uid]")) == null ? void 0 : _a.getAttribute("data-model-uid")) || null;
+}, "getToolbarModelUidFromNode");
 const resolveOverlayAnchorTransform = /* @__PURE__ */ __name(({
   activeId,
   active,
@@ -76,7 +80,7 @@ const resolveOverlayAnchorTransform = /* @__PURE__ */ __name(({
 const resolveDraggableHostNode = /* @__PURE__ */ __name((activatorNode) => {
   const ownerDocument = activatorNode == null ? void 0 : activatorNode.ownerDocument;
   const floatToolbarContainer = activatorNode == null ? void 0 : activatorNode.closest(".nb-toolbar-container[data-model-uid]");
-  const toolbarModelUid = floatToolbarContainer == null ? void 0 : floatToolbarContainer.getAttribute("data-model-uid");
+  const toolbarModelUid = getToolbarModelUidFromNode(activatorNode);
   if (!ownerDocument || !toolbarModelUid) {
     return activatorNode;
   }
@@ -99,6 +103,7 @@ const DragHandler = /* @__PURE__ */ __name(({
   const dragHandlerRef = (0, import_react.useRef)(null);
   const draggableNodeRef = (0, import_react.useRef)(null);
   const pointerPressCleanupRef = (0, import_react.useRef)(null);
+  const toolbarDragModelUidRef = (0, import_react.useRef)(null);
   const isDraggingRef = (0, import_react.useRef)(isDragging);
   const isPointerPressActiveRef = (0, import_react.useRef)(false);
   const isToolbarDragActiveRef = (0, import_react.useRef)(false);
@@ -128,9 +133,11 @@ const DragHandler = /* @__PURE__ */ __name(({
       if (!ownerDocument) {
         return;
       }
+      const toolbarModelUid = getToolbarModelUidFromNode(dragHandlerRef.current) || toolbarDragModelUidRef.current || model.uid;
+      toolbarDragModelUidRef.current = active ? toolbarModelUid : null;
       ownerDocument.dispatchEvent(
         new CustomEvent(TOOLBAR_DRAG_ACTIVITY_EVENT, {
-          detail: { active, modelUid: model.uid }
+          detail: { active, modelUid: toolbarModelUid }
         })
       );
     },

package/lib/components/settings/wrappers/contextual/FlowsFloatContextMenu.js

@@ -44,6 +44,7 @@ var import_react = __toESM(require("react"));
 var import_react_dom = require("react-dom");
 var import_antd = require("antd");
 var import_css = require("@emotion/css");
+var import_ahooks = require("ahooks");
 var import_hooks = require("../../../../hooks");
 var import_provider = require("../../../../provider");
 var import_utils = require("../../../../utils");
@@ -312,6 +313,38 @@ const buildToolbarContainerStyle = /* @__PURE__ */ __name((portalRect, toolbarSt
 const isModelByIdProps = /* @__PURE__ */ __name((props) => {
   return "uid" in props && "modelClassName" in props && Boolean(props.uid) && Boolean(props.modelClassName);
 }, "isModelByIdProps");
+const stopResizeInteractionEvent = /* @__PURE__ */ __name((event) => {
+  var _a;
+  if (!event) {
+    return;
+  }
+  event.preventDefault();
+  event.stopPropagation();
+  const nativeEvent = "nativeEvent" in event ? event.nativeEvent : event;
+  (_a = nativeEvent.stopImmediatePropagation) == null ? void 0 : _a.call(nativeEvent);
+}, "stopResizeInteractionEvent");
+const pendingResizeClickSuppressions = /* @__PURE__ */ new WeakMap();
+const clearPendingResizeClickSuppression = /* @__PURE__ */ __name((ownerDocument) => {
+  const pending = pendingResizeClickSuppressions.get(ownerDocument);
+  if (!pending) {
+    return;
+  }
+  ownerDocument.removeEventListener("click", pending.listener, true);
+  (ownerDocument.defaultView || window).clearTimeout(pending.timer);
+  pendingResizeClickSuppressions.delete(ownerDocument);
+}, "clearPendingResizeClickSuppression");
+const suppressNextResizeClick = /* @__PURE__ */ __name((ownerDocument) => {
+  clearPendingResizeClickSuppression(ownerDocument);
+  const listener = /* @__PURE__ */ __name((event) => {
+    stopResizeInteractionEvent(event);
+    clearPendingResizeClickSuppression(ownerDocument);
+  }, "listener");
+  const timer = (ownerDocument.defaultView || window).setTimeout(() => {
+    clearPendingResizeClickSuppression(ownerDocument);
+  }, 0);
+  pendingResizeClickSuppressions.set(ownerDocument, { listener, timer });
+  ownerDocument.addEventListener("click", listener, true);
+}, "suppressNextResizeClick");
 const FlowsFloatContextMenu = (0, import_reactive.observer)((props) => {
   const ctx = (0, import__.useFlowContext)();
   if (!ctx.flowSettingsEnabled) {
@@ -326,44 +359,64 @@ const ResizeHandles = /* @__PURE__ */ __name((props) => {
   const isDraggingRef = (0, import_react.useRef)(false);
   const dragTypeRef = (0, import_react.useRef)(null);
   const dragStartPosRef = (0, import_react.useRef)({ x: 0, y: 0 });
+  const dragOwnerDocumentRef = (0, import_react.useRef)(null);
   const { onDragStart, onDragEnd } = props;
-  const handleDragMove = (0, import_react.useCallback)(
-    (e) => {
-      if (!isDraggingRef.current || !dragTypeRef.current) return;
-      const deltaX = e.clientX - dragStartPosRef.current.x;
-      switch (dragTypeRef.current) {
-        case "left":
-          props.model.parent.emitter.emit("onResizeLeft", { resizeDistance: -deltaX, model: props.model });
-          break;
-        case "right":
-          props.model.parent.emitter.emit("onResizeRight", { resizeDistance: deltaX, model: props.model });
-          break;
-      }
-    },
-    [props.model]
-  );
-  const handleDragEnd = (0, import_react.useCallback)(() => {
+  const handleDragMove = (0, import_ahooks.useMemoizedFn)((e) => {
+    if (!isDraggingRef.current || !dragTypeRef.current) return;
+    stopResizeInteractionEvent(e);
+    const deltaX = e.clientX - dragStartPosRef.current.x;
+    switch (dragTypeRef.current) {
+      case "left":
+        props.model.parent.emitter.emit("onResizeLeft", { resizeDistance: -deltaX, model: props.model });
+        break;
+      case "right":
+        props.model.parent.emitter.emit("onResizeRight", { resizeDistance: deltaX, model: props.model });
+        break;
+    }
+  });
+  const handleDragEnd = (0, import_ahooks.useMemoizedFn)((e) => {
+    if (!isDraggingRef.current) {
+      return;
+    }
+    stopResizeInteractionEvent(e);
+    const ownerDocument = dragOwnerDocumentRef.current || document;
+    ownerDocument.removeEventListener("mousemove", handleDragMove, true);
+    ownerDocument.removeEventListener("mouseup", handleDragEnd, true);
+    suppressNextResizeClick(ownerDocument);
     isDraggingRef.current = false;
     dragTypeRef.current = null;
     dragStartPosRef.current = { x: 0, y: 0 };
-    document.removeEventListener("mousemove", handleDragMove);
-    document.removeEventListener("mouseup", handleDragEnd);
+    dragOwnerDocumentRef.current = null;
     props.model.parent.emitter.emit("onResizeEnd");
     onDragEnd == null ? void 0 : onDragEnd();
-  }, [handleDragMove, onDragEnd, props.model]);
-  const handleDragStart = (0, import_react.useCallback)(
-    (e, type) => {
-      e.preventDefault();
-      e.stopPropagation();
-      isDraggingRef.current = true;
-      dragTypeRef.current = type;
-      dragStartPosRef.current = { x: e.clientX, y: e.clientY };
-      document.addEventListener("mousemove", handleDragMove);
-      document.addEventListener("mouseup", handleDragEnd);
-      onDragStart == null ? void 0 : onDragStart();
-    },
-    [handleDragMove, handleDragEnd, onDragStart]
-  );
+  });
+  (0, import_react.useEffect)(() => {
+    return () => {
+      const dragOwnerDocument = dragOwnerDocumentRef.current;
+      dragOwnerDocument == null ? void 0 : dragOwnerDocument.removeEventListener("mousemove", handleDragMove, true);
+      dragOwnerDocument == null ? void 0 : dragOwnerDocument.removeEventListener("mouseup", handleDragEnd, true);
+      if (isDraggingRef.current) {
+        suppressNextResizeClick(dragOwnerDocument || document);
+        props.model.parent.emitter.emit("onResizeEnd");
+        onDragEnd == null ? void 0 : onDragEnd();
+      }
+      isDraggingRef.current = false;
+      dragTypeRef.current = null;
+      dragStartPosRef.current = { x: 0, y: 0 };
+      dragOwnerDocumentRef.current = null;
+    };
+  }, [handleDragMove, handleDragEnd, onDragEnd, props.model]);
+  const handleDragStart = (0, import_ahooks.useMemoizedFn)((e, type) => {
+    stopResizeInteractionEvent(e);
+    const ownerDocument = e.currentTarget.ownerDocument;
+    isDraggingRef.current = true;
+    dragTypeRef.current = type;
+    dragStartPosRef.current = { x: e.clientX, y: e.clientY };
+    dragOwnerDocumentRef.current = ownerDocument;
+    ownerDocument.addEventListener("mousemove", handleDragMove, true);
+    ownerDocument.addEventListener("mouseup", handleDragEnd, true);
+    onDragStart == null ? void 0 : onDragStart();
+  });
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -466,6 +519,7 @@ const FlowsFloatContextMenuWithModel = (0, import_reactive.observer)(
         getPopupContainer,
         handleSettingsMenuOpenChange,
         model,
+        modelUid,
         settingsMenuLevel,
         showCopyUidButton,
         showDeleteButton,

package/lib/components/settings/wrappers/contextual/useFloatToolbarVisibility.js

@@ -44,6 +44,17 @@ const getToolbarModelUidFromTarget = /* @__PURE__ */ __name((target) => {
   }
   return ((_a = target.closest(".nb-toolbar-container[data-model-uid]")) == null ? void 0 : _a.getAttribute("data-model-uid")) || null;
 }, "getToolbarModelUidFromTarget");
+const escapeCssAttributeValue = /* @__PURE__ */ __name((value) => {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\a ").replace(/\r/g, "\\d ").replace(/\f/g, "\\c ");
+}, "escapeCssAttributeValue");
+const isToolbarModelUidRendered = /* @__PURE__ */ __name((ownerDocument, modelUid) => {
+  if (!ownerDocument) {
+    return false;
+  }
+  return !!ownerDocument.querySelector(
+    `.nb-toolbar-container[data-model-uid="${escapeCssAttributeValue(modelUid)}"]`
+  );
+}, "isToolbarModelUidRendered");
 const isNodeWithinDescendantFloatToolbar = /* @__PURE__ */ __name((target, container, currentModelUid) => {
   const targetModelUid = getToolbarModelUidFromTarget(target);
   if (!container || !targetModelUid || targetModelUid === currentModelUid) {
@@ -222,6 +233,15 @@ const useFloatToolbarVisibility = /* @__PURE__ */ __name(({
       const isCurrentHostTarget = !childWithMenu || childWithMenu === containerRef.current;
       if (isCurrentHostTarget) {
         clearHideToolbarTimer();
+        setActiveChildToolbarIds((prevIds) => {
+          var _a;
+          if (!prevIds.length) {
+            return prevIds;
+          }
+          const ownerDocument = ((_a = containerRef.current) == null ? void 0 : _a.ownerDocument) ?? null;
+          const nextIds = prevIds.filter((id) => isToolbarModelUidRendered(ownerDocument, id));
+          return nextIds.length === prevIds.length ? prevIds : nextIds;
+        });
         setHostHovered(true);
       }
       setHideMenu(!!childWithMenu && childWithMenu !== containerRef.current);

package/lib/flowContext.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { ISchema } from '@formily/json-schema';
-import { APIClient, RequestOptions } from '@nocobase/sdk';
+import type { APIClient, RequestOptions } from '@nocobase/sdk';
 import type { Router } from '@remix-run/router';
 import { MessageInstance } from 'antd/es/message/interface';
 import type { HookAPI } from 'antd/es/modal/useModal';