@next-core/editor-bricks-helper 0.34.0 → 0.35.2

package/CHANGELOG.md

@@ -3,118 +3,95 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.34.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.35...@next-core/editor-bricks-helper@0.34.0) (2022-02-21)
-
+## [0.35.2](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.35.1...@next-core/editor-bricks-helper@0.35.2) (2022-03-04)
 
-### Bug Fixes
+**Note:** Version bump only for package @next-core/editor-bricks-helper
 
-* export type BuilderDataManager ([1c9f821](https://github.com/easyops-cn/next-core/commit/1c9f8217f7a3feee77f7f0544fc46a95942648f7))
 
 
-### Features
 
-* record brick instance id in storyboard for development ([9d1193e](https://github.com/easyops-cn/next-core/commit/9d1193e11cf5cd35d10d36afe4f07a52a7f7841a))
 
+## [0.35.1](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.35.0...@next-core/editor-bricks-helper@0.35.1) (2022-03-04)
 
+**Note:** Version bump only for package @next-core/editor-bricks-helper
 
 
 
-## [0.33.35](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.34...@next-core/editor-bricks-helper@0.33.35) (2022-02-17)
 
-**Note:** Version bump only for package @next-core/editor-bricks-helper
 
+# [0.35.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.34.0...@next-core/editor-bricks-helper@0.35.0) (2022-02-28)
 
 
+### Features
 
+* support wrapper theme hidden ([87e3299](https://github.com/easyops-cn/next-core/commit/87e32997e496718d6d27e213b93b265dc3540ac6))
+* update type ([f07ac57](https://github.com/easyops-cn/next-core/commit/f07ac57c12a867d3a6eada0838d2e7f2742d6478))
+* update type ([a32c5b1](https://github.com/easyops-cn/next-core/commit/a32c5b1c6ae8a7496a2e58e45c65097f94188e9b))
+* update unit test ([4f8b06c](https://github.com/easyops-cn/next-core/commit/4f8b06c3cfdd4d46ad97d2cade76a7f0712d2cf0))
+* update unit test ([cd8c97c](https://github.com/easyops-cn/next-core/commit/cd8c97c98160867f4b81e183fd40bd1fa037ac01))
 
-## [0.33.34](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.33...@next-core/editor-bricks-helper@0.33.34) (2022-02-17)
 
-**Note:** Version bump only for package @next-core/editor-bricks-helper
 
 
 
+# [0.34.0](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.35...@next-core/editor-bricks-helper@0.34.0) (2022-02-21)
 
+### Bug Fixes
 
-## [0.33.33](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.32...@next-core/editor-bricks-helper@0.33.33) (2022-02-17)
-
-**Note:** Version bump only for package @next-core/editor-bricks-helper
+- export type BuilderDataManager ([1c9f821](https://github.com/easyops-cn/next-core/commit/1c9f8217f7a3feee77f7f0544fc46a95942648f7))
 
+### Features
 
+- record brick instance id in storyboard for development ([9d1193e](https://github.com/easyops-cn/next-core/commit/9d1193e11cf5cd35d10d36afe4f07a52a7f7841a))
 
+## [0.33.35](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.34...@next-core/editor-bricks-helper@0.33.35) (2022-02-17)
 
+**Note:** Version bump only for package @next-core/editor-bricks-helper
 
-## [0.33.32](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.31...@next-core/editor-bricks-helper@0.33.32) (2022-02-15)
+## [0.33.34](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.33...@next-core/editor-bricks-helper@0.33.34) (2022-02-17)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
+## [0.33.33](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.32...@next-core/editor-bricks-helper@0.33.33) (2022-02-17)
 
+**Note:** Version bump only for package @next-core/editor-bricks-helper
 
+## [0.33.32](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.31...@next-core/editor-bricks-helper@0.33.32) (2022-02-15)
 
+**Note:** Version bump only for package @next-core/editor-bricks-helper
 
 ## [0.33.31](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.30...@next-core/editor-bricks-helper@0.33.31) (2022-02-15)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.30](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.29...@next-core/editor-bricks-helper@0.33.30) (2022-02-15)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.29](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.28...@next-core/editor-bricks-helper@0.33.29) (2022-02-15)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.28](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.27...@next-core/editor-bricks-helper@0.33.28) (2022-02-15)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.27](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.26...@next-core/editor-bricks-helper@0.33.27) (2022-02-14)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.26](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.25...@next-core/editor-bricks-helper@0.33.26) (2022-02-14)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.25](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.24...@next-core/editor-bricks-helper@0.33.25) (2022-01-28)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.24](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.23...@next-core/editor-bricks-helper@0.33.24) (2022-01-28)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper
 
-
-
-
-
 ## [0.33.23](https://github.com/easyops-cn/next-core/compare/@next-core/editor-bricks-helper@0.33.22...@next-core/editor-bricks-helper@0.33.23) (2022-01-27)
 
 **Note:** Version bump only for package @next-core/editor-bricks-helper

package/README.md

@@ -4,10 +4,10 @@ Generated by [@next-core/brick-scripts] v2.0.4
 
 ## Development
 
-`lerna run start --scope=@libs/editor-bricks-helper`
+`lerna run start --scope=@next-core/editor-bricks-helper`
 
 ## Build
 
-`lerna run build --scope=@libs/editor-bricks-helper`
+`lerna run build --scope=@next-core/editor-bricks-helper`
 
 [@next-core/brick-scripts]: https://github.com/easyops-cn/next-core/tree/master/packages/brick-scripts

package/dist/index.bundle.js

@@ -296,14 +296,16 @@
     var {
       rootId,
       nodes,
-      edges
+      edges,
+      wrapperNode
     } = _ref;
     var idsToDelete = new Set();
     collectIdsToDelete(nodeUid, edges, idsToDelete);
     return {
       rootId,
       nodes: nodes.filter(node => !idsToDelete.has(node.$$uid)),
-      edges: edges.filter(edge => !idsToDelete.has(edge.parent) && !idsToDelete.has(edge.child))
+      edges: edges.filter(edge => !idsToDelete.has(edge.parent) && !idsToDelete.has(edge.child)),
+      wrapperNode: (wrapperNode === null || wrapperNode === void 0 ? void 0 : wrapperNode.$$uid) === nodeUid ? null : wrapperNode
     };
   }
 
@@ -455,10 +457,12 @@
 
   function getAppendingNodesAndEdges(nodeData, nodeUid, templateSourceMap) {
     var storyList = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+    var isRoot = arguments.length > 4 ? arguments[4] : undefined;
     var nodes = [];
     var edges = [];
+    var wrapperNode;
 
-    var walk = (nodeData, currentUid, processedTemplateSet, isTemplateInternalNode, inheritedTemplateRefToUid) => {
+    var walk = (nodeData, currentUid, processedTemplateSet, isTemplateInternalNode, inheritedTemplateRefToUid, layoutType) => {
       var _templateSource$child, _storyList$find, _templateSource$child2;
 
       var builderNode = getBuilderNode(nodeData, currentUid, isTemplateInternalNode);
@@ -471,7 +475,11 @@
       var templateSource;
 
       if (brickUtils.isBrickNode(builderNode) && (!builderNode.brick.includes(".") && builderNode.brick.startsWith("tpl-") && !processedTemplateSet.has(builderNode.brick) && (templateSource = templateSourceMap === null || templateSourceMap === void 0 ? void 0 : templateSourceMap.get(builderNode.brick)) && ((_templateSource$child = templateSource.children) === null || _templateSource$child === void 0 ? void 0 : _templateSource$child.length) > 0 || builderNode.brick.includes(".tpl-") && (templateSource = storyList === null || storyList === void 0 ? void 0 : (_storyList$find = storyList.find(item => item.storyId === builderNode.brick)) === null || _storyList$find === void 0 ? void 0 : _storyList$find.originData) && ((_templateSource$child2 = templateSource.children) === null || _templateSource$child2 === void 0 ? void 0 : _templateSource$child2.length) > 0)) {
-        // Avoid nesting the same templates.
+        if (templateSource.layoutType === "wrapper") {
+          builderNode.layoutType = "wrapper";
+        } // Avoid nesting the same templates.
+
+
         processedTemplateSet.add(builderNode.brick);
         builderNode.$$isExpandableTemplate = true;
         builderNode.$$templateProxy = templateSource.proxy && JSON.parse(templateSource.proxy);
@@ -615,9 +623,30 @@
     };
 
     walk(nodeData, nodeUid, new Set());
+
+    var _loop2 = function (i) {
+      // 布局模板属于第一层
+      var item = nodes[i];
+
+      if (item.layoutType === "wrapper" && isRoot && edges.find(edge => edge.child === item.$$uid).parent === nodeUid) {
+        if (!wrapperNode) {
+          wrapperNode = item;
+        }
+
+        return "break";
+      }
+    };
+
+    for (var i = 0; i < nodes.length; i++) {
+      var _ret = _loop2(i);
+
+      if (_ret === "break") break;
+    }
+
     return {
       nodes,
-      edges
+      edges,
+      wrapperNode
     };
   }
   function isBasicRefProperty(propRef) {
@@ -655,7 +684,8 @@
       _defineProperty__default["default"](this, "data", {
         rootId: null,
         nodes: [],
-        edges: []
+        edges: [],
+        wrapperNode: null
       });
 
       _defineProperty__default["default"](this, "hoverNodeUid", void 0);
@@ -690,7 +720,8 @@
         var {
           rootId,
           nodes,
-          edges
+          edges,
+          wrapperNode
         } = this.data;
         var {
           nodeUid,
@@ -713,7 +744,8 @@
         var newData = {
           rootId,
           nodes: newNodes,
-          edges: newEdges
+          edges: newEdges,
+          wrapperNode
         };
         this.data = _objectSpread__default["default"](_objectSpread__default["default"]({}, newData), {}, {
           edges: reorderBuilderEdges(newData, {
@@ -787,7 +819,7 @@
 
       var newData = _objectSpread__default["default"]({
         rootId
-      }, getAppendingNodesAndEdges(root, rootId, templateSourceMap, this.storyList));
+      }, getAppendingNodesAndEdges(root, rootId, templateSourceMap, this.storyList, true));
 
       this.data = _objectSpread__default["default"](_objectSpread__default["default"]({}, newData), {}, {
         edges: expandTemplateEdges(newData)
@@ -811,7 +843,23 @@
       this.runAddNodeAction(detail);
     }
 
+    redirectMountPoint(detail) {
+      var {
+        rootId,
+        wrapperNode
+      } = this.data;
+
+      if (detail.parentUid === rootId) {
+        detail.nodeData.mountPoint = "bricks";
+      }
+
+      if (wrapperNode && wrapperNode.instanceId === detail.nodeData.parent) {
+        detail.nodeData.mountPoint = "content";
+      }
+    }
+
     nodeAdd(detail) {
+      this.redirectMountPoint(detail);
       this.runAddNodeAction(detail);
       this.eventTarget.dispatchEvent(new CustomEvent(BuilderInternalEventType.NODE_ADD, {
         detail
@@ -822,7 +870,8 @@
       var {
         rootId,
         nodes,
-        edges
+        edges,
+        wrapperNode
       } = this.data;
       var {
         nodeUid,
@@ -834,7 +883,8 @@
           id: nodeData.id,
           instanceId: nodeData.instanceId
         }) : node),
-        edges
+        edges,
+        wrapperNode
       };
       this.triggerDataChange();
     }
@@ -843,7 +893,8 @@
       var {
         rootId,
         nodes,
-        edges
+        edges,
+        wrapperNode
       } = this.data;
       var {
         nodeDetails,
@@ -885,7 +936,8 @@
       var newData = {
         rootId,
         nodes: newNodes,
-        edges: newEdges
+        edges: newEdges,
+        wrapperNode
       };
       this.data = _objectSpread__default["default"](_objectSpread__default["default"]({}, newData), {}, {
         edges: reorderBuilderEdges(newData, {
@@ -926,8 +978,10 @@
       var {
         rootId,
         nodes,
-        edges
+        edges,
+        wrapperNode
       } = this.data;
+      this.redirectMountPoint(detail);
       var {
         nodeUid,
         parentUid,
@@ -943,7 +997,8 @@
           mountPoint: nodeData.mountPoint,
           sort: undefined,
           $$isTemplateDelegated: isParentExpandableTemplate(nodes, parentUid)
-        })
+        }),
+        wrapperNode
       };
       this.data = _objectSpread__default["default"](_objectSpread__default["default"]({}, newData), {}, {
         edges: reorderBuilderEdges(newData, {
@@ -961,14 +1016,16 @@
       var {
         rootId,
         nodes,
-        edges
+        edges,
+        wrapperNode
       } = this.data;
       this.data = {
         rootId,
         edges,
         nodes: nodes.map(node => node.$$uid === rootId ? _objectSpread__default["default"](_objectSpread__default["default"]({}, node), {}, {
           context: detail.context
-        }) : node)
+        }) : node),
+        wrapperNode
       };
       this.triggerDataChange();
     }
@@ -1183,14 +1240,22 @@
   function useBuilderNode(_ref) {
     var {
       nodeUid,
-      isRoot
+      isRoot,
+      isWrapper
     } = _ref;
     var {
       rootId,
-      nodes
+      nodes,
+      wrapperNode
     } = useBuilderData();
     var currentUid = isRoot ? rootId : nodeUid;
-    return React.useMemo(() => nodes.find(node => node.$$uid === currentUid), [nodes, currentUid]);
+    return React.useMemo(() => {
+      if (isWrapper) {
+        return wrapperNode;
+      }
+
+      return nodes.find(node => node.$$uid === currentUid);
+    }, [nodes, currentUid, isWrapper, wrapperNode]);
   }
 
   function useBuilderContextMenuStatus() {
@@ -1602,26 +1667,30 @@
     var {
       nodeUid,
       isRoot,
-      doNotExpandTemplates
+      doNotExpandTemplates,
+      isWrapper
     } = _ref;
     var {
       rootId,
       nodes,
-      edges
+      edges,
+      wrapperNode
     } = useBuilderData();
     return React.useMemo(() => getBuilderGroupedChildNodes({
       nodes,
       edges,
-      nodeUid: isRoot ? rootId : nodeUid,
-      doNotExpandTemplates
-    }), [doNotExpandTemplates, edges, isRoot, nodeUid, nodes, rootId]);
+      nodeUid: isRoot ? isWrapper ? wrapperNode.$$uid : rootId : nodeUid,
+      doNotExpandTemplates,
+      isWrapper: isWrapper
+    }), [doNotExpandTemplates, edges, isRoot, nodeUid, nodes, rootId, isWrapper, wrapperNode]);
   }
   function getBuilderGroupedChildNodes(_ref2) {
     var {
       nodeUid,
       nodes,
       edges,
-      doNotExpandTemplates
+      doNotExpandTemplates,
+      isWrapper
     } = _ref2;
     var groups = new Map();
     var relatedEdges = lodash.sortBy(edges.filter(edge => edge.parent === nodeUid && (doNotExpandTemplates ? !edge.$$isTemplateInternal : !edge.$$isTemplateDelegated)), [edge => edge.sort]);
@@ -1643,7 +1712,7 @@
     return Array.from(groups.entries()).map(_ref3 => {
       var [mountPoint, childNodes] = _ref3;
       return {
-        mountPoint,
+        mountPoint: isWrapper ? "bricks" : mountPoint,
         childNodes
       };
     });
@@ -2133,20 +2202,30 @@
       dropZoneStyle,
       dropZoneBodyStyle,
       slotContentLayout,
-      showOutlineIfEmpty
+      showOutlineIfEmpty,
+      hiddenWrapper = true
     } = _ref;
     var dropZoneBody = React__default["default"].useRef();
     var [dropPositionCursor, setDropPositionCursor] = React__default["default"].useState(null);
     var dropPositionCursorRef = React__default["default"].useRef();
     var contextMenuStatus = useBuilderContextMenuStatus();
     var manager = useBuilderDataManager();
+    var {
+      nodes,
+      edges,
+      wrapperNode
+    } = useBuilderData();
+    var isWrapper = hiddenWrapper && isRoot && !lodash.isEmpty(wrapperNode);
     var node = useBuilderNode({
       nodeUid,
-      isRoot
+      isRoot,
+      isWrapper
     });
     var groupedChildNodes = useBuilderGroupedChildNodes({
       nodeUid,
-      isRoot
+      isRoot,
+      doNotExpandTemplates: isWrapper,
+      isWrapper
     });
     var isGeneralizedPortalCanvas = independentPortalCanvas ? canvasIndex > 0 : isPortalCanvas;
     var hasTabs = separateCanvas || independentPortalCanvas;
@@ -2176,10 +2255,6 @@
 
       return isGeneralizedPortalCanvas ? selfChildNodes.length : 0;
     }, [hasTabs, selfChildNodesInCurrentCanvas, isGeneralizedPortalCanvas, selfChildNodes]);
-    var {
-      nodes,
-      edges
-    } = useBuilderData();
     var getDroppingContext = React__default["default"].useCallback(() => {
       if (delegatedContext) {
         var _siblingGroups$find$c, _siblingGroups$find;
@@ -2201,12 +2276,12 @@
 
       return {
         droppingParentUid: node.$$uid,
-        droppingParentInstanceId: node.instanceId,
+        droppingParentInstanceId: isWrapper ? wrapperNode.instanceId : node.instanceId,
         droppingMountPoint: mountPoint,
         droppingChildNodes: selfChildNodes,
         droppingSiblingGroups: groupedChildNodes
       };
-    }, [delegatedContext, edges, groupedChildNodes, mountPoint, node, nodes, selfChildNodes]);
+    }, [delegatedContext, edges, groupedChildNodes, mountPoint, node, nodes, selfChildNodes, isWrapper, wrapperNode]);
     var [{
       isDraggingOverCurrent
     }, dropRef] = reactDnd.useDrop({
@@ -2249,7 +2324,7 @@
     React__default["default"].useEffect(() => {
       manager.updateDroppingStatus(delegatedContext ? delegatedContext.templateUid : node.$$uid, delegatedContext ? delegatedContext.templateMountPoint : mountPoint, isDraggingOverCurrent);
     }, [isDraggingOverCurrent, mountPoint, manager, delegatedContext, node]);
-    var droppable = !!delegatedContext || !(node.$$isExpandableTemplate || node.$$isTemplateInternalNode);
+    var droppable = !!delegatedContext || isWrapper || !(node.$$isExpandableTemplate || node.$$isTemplateInternalNode);
     var dropZoneRef = React__default["default"].useRef();
     var dropZoneRefCallback = React__default["default"].useCallback(element => {
       dropZoneRef.current = element;