publ-echo-test 0.0.68 → 0.0.70

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -59,6 +59,7 @@ var ReactGridLayout = function (_a) {
     var _8 = useState(false), isMounted = _8[0], setIsMounted = _8[1];
     // const [selectedGroup, setSelectedGroup] = useState<string>('1');
     var editableItems = blockStructure ? findChildrenComponentIds(blockStructure, editingGroupBlock) : [];
+    var editingGroupAllChildren = (blockStructure && editingGroupBlock) ? findAllChildrenComponentIds(blockStructure, editingGroupBlock).map(function (i) { return i.toString(); }) : [];
     var _9 = useState([]), oldGroupChildren = _9[0], setOldGroupChildren = _9[1];
     var _10 = useState(function () {
         return synchronizeLayoutWithChildren(props.layout || [], children, cols, compactType, allowOverlap);
@@ -494,6 +495,7 @@ var ReactGridLayout = function (_a) {
         var z = l.z || 0;
         var isInBulk = bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(l.i);
         var isRoot = editingGroupBlock === 'ROOT';
+        var outsideOfEditingGroup = !editingGroupAllChildren.includes(l.i);
         var baseZ = function () {
             if (!isRoot && editable) {
                 return zIndexMap.EDITING_GROUP;
@@ -508,7 +510,8 @@ var ReactGridLayout = function (_a) {
         };
         return (_jsx(GridItem, { className: classNames({
                 'editable-grid-item': (!isRoot && editable),
-                'not-editable-grid-item': (!isRoot && !editable)
+                'not-editable-grid-item': (!isRoot && !editable),
+                'outside-of-editing-group': outsideOfEditingGroup,
             }), 
             // className={editable ? 'editable-grid-item' : isInBulk ? 'bulk-grid-item': 'not-editable-grid-item'}
             z: baseZ() + z, isDraggable: editable, isResizable: editable, containerWidth: width, cols: cols, margin: margin, containerPadding: containerPadding || margin, maxRows: maxRows, rowHeight: rowHeight, cancel: draggableCancel, handle: draggableHandle, onDragStop: onDragStopHandler, onDragStart: onDragStartHandler, onDrag: onDragHandler, onResizeStart: onResizeStartHandler, onResize: onResizeHandler, onResizeStop: onResizeStopHandler, onFitToContent: onFitToContentHandler, isBounded: bounded, useCSSTransforms: useCSSTransforms && isMounted, usePercentages: !isMounted, transformScale: transformScale, w: l.w, h: l.h, x: l.x, y: l.y, i: l.i, minH: l.minH, minW: l.minW, maxH: l.maxH, maxW: l.maxW, static: l.static, droppingPosition: isDroppingItem ? droppingPosition : undefined, resizeHandles: resizeHandlesOptions, resizeHandle: resizeHandle, isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: !!l.autoResize, children: child }, l.i));
@@ -634,9 +637,6 @@ var ReactGridLayout = function (_a) {
                 isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: false, children: _jsx("div", { onClick: handleClick, onDoubleClick: handleDoubleClick }) }, block.blockId) }));
     };
     var currentGroupBlocks = blockStructure ? findGroupBlocks(blockStructure, editingGroupBlock) : [];
-    console.log('currentBlocks: ', currentGroupBlocks);
-    console.log('blockStructure: ', blockStructure);
-    console.log('editingGroupBlock: ', editingGroupBlock);
     return (_jsxs("div", { ref: innerRef, className: mergedClassName, style: mergedStyle, onDrop: isDroppable ? onDropHandler : noop, onDragLeave: isDroppable ? onDragLeaveHandler : noop, onDragEnter: isDroppable ? onDragEnterHandler : noop, onDragOver: isDroppable ? onDragOverHandler : noop, children: [currentGroupBlocks.map(function (each) { return processGroup(each); }), React.Children.map(children, function (child) { return processGridItem(child); }), placeholder(), activeDrag && _jsx("div", { className: "grid-guide-line-center" }), activeDrag && (_jsx("div", { className: "grid-placeholder", style: {
                     marginTop: margin[1] + "px",
                     marginBottom: margin[1] + "px",

package/dist/lib/GridLayoutEditor/group.js

@@ -185,13 +185,22 @@ export var addBlockToRoot = function (blockStructure, newBlock) {
         return block;
     });
 };
-export var addBulkToTarget = function (blockStructure, targetId, bulkIds) {
+export var addBulkToTarget = function (blockStructure, targetId, bulkIds // componentBlockId
+) {
     var structure = deepClone(blockStructure);
     var targetBlock = findBlockByBlockId(structure, targetId);
     if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
         return blockStructure;
     }
-    var bulkBlocks = targetBlock.children.filter(function (child) { return bulkIds.includes(child.blockId); });
+    var bulkBlocks = targetBlock.children.filter(function (child) {
+        if (child.type === 'COMPONENT_BLOCK' && bulkIds.includes(child.componentBlockId.toString())) {
+            return true;
+        }
+        if (child.type === 'GROUP_BLOCK' && bulkIds.includes(child.blockId)) {
+            return true;
+        }
+        return false;
+    });
     if (bulkBlocks.length !== bulkIds.length) {
         throw new Error("Some bulkIds do not exist as children of the target block.");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publ-echo-test",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "private": false,
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.js",