@next-core/editor-bricks-helper 0.41.1 → 0.42.2

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.42.2](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.42.1...@next-core/editor-bricks-helper@0.42.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* **BuilderDataManager:** add node redirect parent error ([ac3e0cc](https://github.com/easyops-cn/next-core/commit/ac3e0cc2ab4115062eb057fce803de23bbd77cbf))
+
+
+
+
+
+## [0.42.1](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.42.0...@next-core/editor-bricks-helper@0.42.1) (2022-06-15)
+
+**Note:** Version bump only for package @next-core/editor-bricks-helper
+
+
+
+
+
+# [0.42.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.41.1...@next-core/editor-bricks-helper@0.42.0) (2022-06-14)
+
+
+### Features
+
+* **BuilderDataManager:** support preview snippet apply ([ef506d4](https://github.com/easyops-cn/next-core/commit/ef506d4ae83946665e1a30a125948ff5504ba4aa))
+
+
+
+
+
 ## [0.41.1](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.41.0...@next-core/editor-bricks-helper@0.41.1) (2022-06-10)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper

package/dist/index.bundle.js

@@ -1,17 +1,17 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/defineProperty'), require('lodash'), require('@next-core/brick-utils'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-dnd'), require('@babel/runtime/helpers/asyncToGenerator'), require('@next-core/brick-kit'), require('js-yaml'), require('@babel/runtime/helpers/decorate'), require('react-dom'), require('react-dnd-html5-backend')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/defineProperty', 'lodash', '@next-core/brick-utils', '@babel/runtime/helpers/objectWithoutProperties', 'react-dnd', '@babel/runtime/helpers/asyncToGenerator', '@next-core/brick-kit', 'js-yaml', '@babel/runtime/helpers/decorate', 'react-dom', 'react-dnd-html5-backend'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.EditorBricksHelper = {}, global.React, global._objectSpread, global._defineProperty, global.lodash, global.brickUtils, global._objectWithoutProperties, global.reactDnd, global._asyncToGenerator, global.brickKit, global.yaml, global._decorate, global.ReactDOM, global.reactDndHtml5Backend));
-})(this, (function (exports, React, _objectSpread, _defineProperty, lodash, brickUtils, _objectWithoutProperties, reactDnd, _asyncToGenerator, brickKit, yaml, _decorate, ReactDOM, reactDndHtml5Backend) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/defineProperty'), require('lodash'), require('@next-core/brick-utils'), require('js-yaml'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-dnd'), require('@babel/runtime/helpers/asyncToGenerator'), require('@next-core/brick-kit'), require('@babel/runtime/helpers/decorate'), require('react-dom'), require('react-dnd-html5-backend')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/defineProperty', 'lodash', '@next-core/brick-utils', 'js-yaml', '@babel/runtime/helpers/objectWithoutProperties', 'react-dnd', '@babel/runtime/helpers/asyncToGenerator', '@next-core/brick-kit', '@babel/runtime/helpers/decorate', 'react-dom', 'react-dnd-html5-backend'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.EditorBricksHelper = {}, global.React, global._objectSpread, global._defineProperty, global.lodash, global.brickUtils, global.yaml, global._objectWithoutProperties, global.reactDnd, global._asyncToGenerator, global.brickKit, global._decorate, global.ReactDOM, global.reactDndHtml5Backend));
+})(this, (function (exports, React, _objectSpread, _defineProperty, lodash, brickUtils, yaml, _objectWithoutProperties, reactDnd, _asyncToGenerator, brickKit, _decorate, ReactDOM, reactDndHtml5Backend) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
   var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+  var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
   var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
   var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-  var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
   var _decorate__default = /*#__PURE__*/_interopDefaultLegacy(_decorate);
   var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 
@@ -660,6 +660,63 @@
     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__default["default"].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) {
@@ -1138,25 +1195,40 @@
 
     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 => dragStatus === "inside" ? item.$$uid === overEdge.child : 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
@@ -1166,10 +1238,29 @@
           },
           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,
@@ -2350,63 +2441,6 @@
     };
   }
 
-  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__default["default"].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,