@next-core/editor-bricks-helper 0.41.0 → 0.42.1

package/dist/index.esm.js

@@ -4,11 +4,11 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { sortBy, clamp, isEmpty, cloneDeep, upperFirst, omit } from 'lodash';
 import { hasOwnProperty, isBrickNode, normalizeBuilderNode, JsonStorage, isRouteNode } from '@next-core/brick-utils';
 export { isBrickNode, isCustomTemplateNode, isRouteNode, isSnippetNode } from '@next-core/brick-utils';
+import yaml from 'js-yaml';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { useDrag, useDrop, DndProvider } from 'react-dnd';
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import { developHelper, getRuntime, BrickAsComponent, property, BrickWrapper, UpdatingElement } from '@next-core/brick-kit';
-import yaml from 'js-yaml';
 import _decorate from '@babel/runtime/helpers/decorate';
 import ReactDOM from 'react-dom';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -658,6 +658,63 @@ function isParentExpandableTemplate(nodes, parentUid) {
   return nodes.find(node => node.$$uid === parentUid).$$isExpandableTemplate;
 }
 
+var jsonFieldsInBrick = ["properties", "events", "lifeCycle", "params", "if", "transform"];
+var yamlFieldsInBrick = ["permissionsPreCheck", "transformFrom"];
+var ignoredFieldsInBrick = ["brick", "template", "portal", "slots", "id", "children", "instanceId"];
+// The reverse operation of *normalize*.
+// https://github.com/easyops-cn/next-basics/blob/5a6710d567821bcb4a0c71e22d55212193d8b0cb/bricks/next-builder/src/shared/storyboard/buildStoryboard.ts#L394
+function reverseNormalize(brickConf, ctx) {
+  return Object.fromEntries(Object.entries(brickConf).map(_ref => {
+    var [key, value] = _ref;
+    return value === undefined || ignoredFieldsInBrick.includes(key) ? undefined : jsonFieldsInBrick.includes(key) ? [key, JSON.stringify(value)] : yamlFieldsInBrick.includes(key) ? [key, yaml.safeDump(value)] : [key, value];
+  }).filter(Boolean).concat(Object.entries(ctx.nodeData), [["brick", ctx.nodeData.type === "template" ? brickConf.template : brickConf.brick], ["portal", ctx.isPortalCanvas || brickConf.portal]]));
+}
+
+function getSnippetNodeDetail(_ref) {
+  var {
+    parent,
+    parentUid,
+    mountPoint,
+    nodeUid,
+    brickConf,
+    isPortalCanvas,
+    sort
+  } = _ref;
+  var type = brickConf.template ? "template" : brickConf.bg ? "provider" : "brick";
+  return {
+    nodeUid,
+    parentUid,
+    nodeData: reverseNormalize(brickConf, {
+      isPortalCanvas,
+      nodeData: {
+        type,
+        parent,
+        mountPoint,
+        sort
+      }
+    }),
+    children: brickConf.slots ? Object.entries(brickConf.slots).flatMap(_ref2 => {
+      var [mountPoint, slotConf] = _ref2;
+      return slotConf.bricks.map(childBrickConf => ({
+        childBrickConf,
+        mountPoint
+      }));
+    }).map((_ref3, index) => {
+      var {
+        childBrickConf,
+        mountPoint
+      } = _ref3;
+      return getSnippetNodeDetail({
+        parentUid: nodeUid,
+        mountPoint,
+        nodeUid: getUniqueNodeId(),
+        brickConf: childBrickConf,
+        sort: index
+      });
+    }) : []
+  };
+}
+
 var BuilderInternalEventType;
 
 (function (BuilderInternalEventType) {
@@ -1136,25 +1193,40 @@ class BuilderDataManager {
 
   workbenchNodeAdd(detail) {
     var {
-      rootId,
-      nodes
+      nodes,
+      edges,
+      rootId
     } = this.data;
     var {
       nodeData,
-      dragOverNodeInstanceId,
-      dragStatus
+      dragOverInstanceId,
+      parentInstanceId,
+      dragStatus,
+      mountPoint
     } = detail;
 
     if (nodeData.instanceId) ; else {
-      var _nodes$find;
-
       // insert
       var newNodeUid = getUniqueNodeId();
-      var isRoot = dragOverNodeInstanceId === "#main-mount-point";
-      var dragOverNodeUid = (_nodes$find = nodes.find(item => isRoot ? item.$$uid === rootId : item.instanceId === dragOverNodeInstanceId)) === null || _nodes$find === void 0 ? void 0 : _nodes$find.$$uid;
+      var overNode = nodes.find(item => item.instanceId === dragOverInstanceId);
+      var dragOverNodeUid = overNode.$$uid;
+      var realDragStatus = dragStatus;
+
+      if (dragOverNodeUid === rootId) {
+        realDragStatus = "inside";
+      } else {
+        var overEdge = edges.find(item => item.child === dragOverNodeUid);
+        var overParentNode = nodes.find(item => item.$$uid === overEdge.parent);
+
+        if (overParentNode.instanceId !== parentInstanceId) {
+          // 如果instanceId不相同, 说明父元素被修改, dragStatus强制等于inside, uid也需要切换成实际父元素的uid
+          realDragStatus = "inside";
+          dragOverNodeUid = nodes.find(item => item.instanceId === parentInstanceId).$$uid;
+        }
+      }
+
       var {
         parentUid,
-        mountPoint,
         sortIndex,
         sortUids: nodeUids,
         sortNodeIds: nodeIds
@@ -1164,10 +1236,29 @@ class BuilderDataManager {
         },
         dragNodeUid: newNodeUid,
         dragOverNodeUid,
-        dragStatus
+        dragStatus: realDragStatus
       });
-      nodeData.parent = nodes.find(item => item.$$uid === parentUid).instanceId;
+      nodeData.parent = parentInstanceId;
       nodeData.mountPoint = mountPoint;
+
+      if (nodeData.bricks) {
+        // snippet
+        this.snippetApply({
+          parentUid,
+          nodeDetails: nodeData.bricks.map(brickConf => getSnippetNodeDetail({
+            parent: parentInstanceId,
+            parentUid: parentUid,
+            mountPoint: mountPoint,
+            nodeUid: newNodeUid,
+            brickConf: brickConf,
+            isPortalCanvas: false
+          })),
+          nodeIds,
+          nodeUids
+        });
+        return;
+      }
+
       this.runAddNodeAction({
         nodeUid: newNodeUid,
         parentUid,
@@ -2348,63 +2439,6 @@ function getSortedIdsAfterDropped(droppingInfo) {
   };
 }
 
-var jsonFieldsInBrick = ["properties", "events", "lifeCycle", "params", "if", "transform"];
-var yamlFieldsInBrick = ["permissionsPreCheck", "transformFrom"];
-var ignoredFieldsInBrick = ["brick", "template", "portal", "slots", "id", "children", "instanceId"];
-// The reverse operation of *normalize*.
-// https://github.com/easyops-cn/next-basics/blob/5a6710d567821bcb4a0c71e22d55212193d8b0cb/bricks/next-builder/src/shared/storyboard/buildStoryboard.ts#L394
-function reverseNormalize(brickConf, ctx) {
-  return Object.fromEntries(Object.entries(brickConf).map(_ref => {
-    var [key, value] = _ref;
-    return value === undefined || ignoredFieldsInBrick.includes(key) ? undefined : jsonFieldsInBrick.includes(key) ? [key, JSON.stringify(value)] : yamlFieldsInBrick.includes(key) ? [key, yaml.safeDump(value)] : [key, value];
-  }).filter(Boolean).concat(Object.entries(ctx.nodeData), [["brick", ctx.nodeData.type === "template" ? brickConf.template : brickConf.brick], ["portal", ctx.isPortalCanvas || brickConf.portal]]));
-}
-
-function getSnippetNodeDetail(_ref) {
-  var {
-    parent,
-    parentUid,
-    mountPoint,
-    nodeUid,
-    brickConf,
-    isPortalCanvas,
-    sort
-  } = _ref;
-  var type = brickConf.template ? "template" : brickConf.bg ? "provider" : "brick";
-  return {
-    nodeUid,
-    parentUid,
-    nodeData: reverseNormalize(brickConf, {
-      isPortalCanvas,
-      nodeData: {
-        type,
-        parent,
-        mountPoint,
-        sort
-      }
-    }),
-    children: brickConf.slots ? Object.entries(brickConf.slots).flatMap(_ref2 => {
-      var [mountPoint, slotConf] = _ref2;
-      return slotConf.bricks.map(childBrickConf => ({
-        childBrickConf,
-        mountPoint
-      }));
-    }).map((_ref3, index) => {
-      var {
-        childBrickConf,
-        mountPoint
-      } = _ref3;
-      return getSnippetNodeDetail({
-        parentUid: nodeUid,
-        mountPoint,
-        nodeUid: getUniqueNodeId(),
-        brickConf: childBrickConf,
-        sort: index
-      });
-    }) : []
-  };
-}
-
 function processDrop(_ref) {
   var {
     manager,