@nocobase/flow-engine 2.0.30 → 2.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/components/settings/wrappers/contextual/useFloatToolbarPortal.js +1 -3
  2. package/package.json +4 -4
  3. package/src/components/settings/wrappers/contextual/DefaultSettingsIcon.tsx +2 -1
  4. package/src/components/settings/wrappers/contextual/useFloatToolbarPortal.ts +1 -3
package/lib/components/settings/wrappers/contextual/useFloatToolbarPortal.js CHANGED
@@ -36,7 +36,6 @@ const APP_CONTAINER_SELECTOR = "#nocobase-app-container";
36
36
  const DRAWER_CONTENT_WRAPPER_SELECTOR = ".ant-drawer-content-wrapper";
37
37
  const DRAWER_CONTENT_SELECTOR = ".ant-drawer-content";
38
38
  const DRAWER_ROOT_SELECTOR = ".ant-drawer-root";
39
- const MODAL_CONTENT_SELECTOR = ".ant-modal-content";
40
39
  const MODAL_SELECTOR = ".ant-modal";
41
40
  const MODAL_WRAP_SELECTOR = ".ant-modal-wrap";
42
41
  const MODAL_ROOT_SELECTOR = ".ant-modal-root";
@@ -54,9 +53,8 @@ const createAbsolutePortalHostConfig = /* @__PURE__ */ __name((element) => ({
54
53
  }), "createAbsolutePortalHostConfig");
55
54
  const popupPortalHostResolvers = [
56
55
  (hostEl) => getClosestElement(hostEl, DRAWER_CONTENT_WRAPPER_SELECTOR),
57
- (hostEl) => getClosestElement(hostEl, MODAL_CONTENT_SELECTOR),
58
- (hostEl) => getClosestElement(hostEl, MODAL_SELECTOR),
59
56
  (hostEl) => getClosestElement(hostEl, MODAL_WRAP_SELECTOR),
57
+ (hostEl) => getClosestElement(hostEl, MODAL_SELECTOR),
60
58
  (hostEl) => {
61
59
  const drawerContent = getClosestElement(hostEl, DRAWER_CONTENT_SELECTOR);
62
60
  return drawerContent ? getClosestElement(drawerContent, DRAWER_CONTENT_WRAPPER_SELECTOR) || drawerContent : null;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/flow-engine",
3
- "version": "2.0.30",
3
+ "version": "2.0.31",
4
4
  "private": false,
5
5
  "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
6
6
  "main": "lib/index.js",
@@ -8,8 +8,8 @@
8
8
  "dependencies": {
9
9
  "@formily/antd-v5": "1.x",
10
10
  "@formily/reactive": "2.x",
11
- "@nocobase/sdk": "2.0.30",
12
- "@nocobase/shared": "2.0.30",
11
+ "@nocobase/sdk": "2.0.31",
12
+ "@nocobase/shared": "2.0.31",
13
13
  "ahooks": "^3.7.2",
14
14
  "dayjs": "^1.11.9",
15
15
  "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
36
36
  ],
37
37
  "author": "NocoBase Team",
38
38
  "license": "Apache-2.0",
39
- "gitHead": "6ac70f8dda4e7970242435bc1d1a5b70954e643f"
39
+ "gitHead": "085eec006c7be5fbc98dabfdab98ff358eab9d95"
40
40
  }
package/src/components/settings/wrappers/contextual/DefaultSettingsIcon.tsx CHANGED
@@ -242,7 +242,8 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
242
242
  }, [onDropdownVisibleChange]);
243
243
  const resolvePopupContainer = useCallback<NonNullable<DropdownProps['getPopupContainer']>>(
244
244
  (triggerNode) => {
245
- // 优先挂到工具栏自身容器，避免 modal / drawer 中鼠标从图标移动到菜单时先离开工具栏树。
245
+ // 工具栏自身容器必须优先，保证鼠标从 icon 移到菜单时仍处于同一 hover 树。
246
+ // 弹窗场景的裁剪问题由 useFloatToolbarPortal 负责把 toolbar 挂到正确的 popup host。
246
247
  return (
247
248
  getToolbarPopupContainer(triggerNode) ||
248
249
  getPopupContainer?.(triggerNode) ||
package/src/components/settings/wrappers/contextual/useFloatToolbarPortal.ts CHANGED
@@ -14,7 +14,6 @@ const APP_CONTAINER_SELECTOR = '#nocobase-app-container';
14
14
  const DRAWER_CONTENT_WRAPPER_SELECTOR = '.ant-drawer-content-wrapper';
15
15
  const DRAWER_CONTENT_SELECTOR = '.ant-drawer-content';
16
16
  const DRAWER_ROOT_SELECTOR = '.ant-drawer-root';
17
- const MODAL_CONTENT_SELECTOR = '.ant-modal-content';
18
17
  const MODAL_SELECTOR = '.ant-modal';
19
18
  const MODAL_WRAP_SELECTOR = '.ant-modal-wrap';
20
19
  const MODAL_ROOT_SELECTOR = '.ant-modal-root';
@@ -79,9 +78,8 @@ const createAbsolutePortalHostConfig = (element: HTMLElement): ToolbarPortalHost
79
78
 
80
79
  const popupPortalHostResolvers: Array<(hostEl: HTMLElement | null) => HTMLElement | null> = [
81
80
  (hostEl) => getClosestElement(hostEl, DRAWER_CONTENT_WRAPPER_SELECTOR),
82
- (hostEl) => getClosestElement(hostEl, MODAL_CONTENT_SELECTOR),
83
- (hostEl) => getClosestElement(hostEl, MODAL_SELECTOR),
84
81
  (hostEl) => getClosestElement(hostEl, MODAL_WRAP_SELECTOR),
82
+ (hostEl) => getClosestElement(hostEl, MODAL_SELECTOR),
85
83
  (hostEl) => {
86
84
  const drawerContent = getClosestElement(hostEl, DRAWER_CONTENT_SELECTOR);
87
85
  return drawerContent ? getClosestElement(drawerContent, DRAWER_CONTENT_WRAPPER_SELECTOR) || drawerContent : null;