publ-echo-test 0.0.68 → 0.0.70

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.
@@ -59,6 +59,7 @@ var ReactGridLayout = function (_a) {
59
59
  var _8 = useState(false), isMounted = _8[0], setIsMounted = _8[1];
60
60
  // const [selectedGroup, setSelectedGroup] = useState<string>('1');
61
61
  var editableItems = blockStructure ? findChildrenComponentIds(blockStructure, editingGroupBlock) : [];
62
+ var editingGroupAllChildren = (blockStructure && editingGroupBlock) ? findAllChildrenComponentIds(blockStructure, editingGroupBlock).map(function (i) { return i.toString(); }) : [];
62
63
  var _9 = useState([]), oldGroupChildren = _9[0], setOldGroupChildren = _9[1];
63
64
  var _10 = useState(function () {
64
65
  return synchronizeLayoutWithChildren(props.layout || [], children, cols, compactType, allowOverlap);
@@ -494,6 +495,7 @@ var ReactGridLayout = function (_a) {
494
495
  var z = l.z || 0;
495
496
  var isInBulk = bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(l.i);
496
497
  var isRoot = editingGroupBlock === 'ROOT';
498
+ var outsideOfEditingGroup = !editingGroupAllChildren.includes(l.i);
497
499
  var baseZ = function () {
498
500
  if (!isRoot && editable) {
499
501
  return zIndexMap.EDITING_GROUP;
@@ -508,7 +510,8 @@ var ReactGridLayout = function (_a) {
508
510
  };
509
511
  return (_jsx(GridItem, { className: classNames({
510
512
  'editable-grid-item': (!isRoot && editable),
511
- 'not-editable-grid-item': (!isRoot && !editable)
513
+ 'not-editable-grid-item': (!isRoot && !editable),
514
+ 'outside-of-editing-group': outsideOfEditingGroup,
512
515
  }),
513
516
  // className={editable ? 'editable-grid-item' : isInBulk ? 'bulk-grid-item': 'not-editable-grid-item'}
514
517
  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) {
634
637
  isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: false, children: _jsx("div", { onClick: handleClick, onDoubleClick: handleDoubleClick }) }, block.blockId) }));
635
638
  };
636
639
  var currentGroupBlocks = blockStructure ? findGroupBlocks(blockStructure, editingGroupBlock) : [];
637
- console.log('currentBlocks: ', currentGroupBlocks);
638
- console.log('blockStructure: ', blockStructure);
639
- console.log('editingGroupBlock: ', editingGroupBlock);
640
640
  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: {
641
641
  marginTop: margin[1] + "px",
642
642
  marginBottom: margin[1] + "px",
@@ -185,13 +185,22 @@ export var addBlockToRoot = function (blockStructure, newBlock) {
185
185
  return block;
186
186
  });
187
187
  };
188
- export var addBulkToTarget = function (blockStructure, targetId, bulkIds) {
188
+ export var addBulkToTarget = function (blockStructure, targetId, bulkIds // componentBlockId
189
+ ) {
189
190
  var structure = deepClone(blockStructure);
190
191
  var targetBlock = findBlockByBlockId(structure, targetId);
191
192
  if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
192
193
  return blockStructure;
193
194
  }
194
- var bulkBlocks = targetBlock.children.filter(function (child) { return bulkIds.includes(child.blockId); });
195
+ var bulkBlocks = targetBlock.children.filter(function (child) {
196
+ if (child.type === 'COMPONENT_BLOCK' && bulkIds.includes(child.componentBlockId.toString())) {
197
+ return true;
198
+ }
199
+ if (child.type === 'GROUP_BLOCK' && bulkIds.includes(child.blockId)) {
200
+ return true;
201
+ }
202
+ return false;
203
+ });
195
204
  if (bulkBlocks.length !== bulkIds.length) {
196
205
  throw new Error("Some bulkIds do not exist as children of the target block.");
197
206
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "publ-echo-test",
3
- "version": "0.0.68",
3
+ "version": "0.0.70",
4
4
  "private": false,
5
5
  "main": "dist/lib/index.js",
6
6
  "types": "dist/lib/index.d.js",