publ-echo-test 0.0.159 → 0.0.161
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.
|
@@ -740,6 +740,7 @@ var ReactGridLayout = function (_a) {
|
|
|
740
740
|
var currentGroupBlocks = blockStructure
|
|
741
741
|
? findGroupBlocks(blockStructure, editingGroupBlock)
|
|
742
742
|
: [];
|
|
743
|
+
console.log('currentGroupBlocks', currentGroupBlocks);
|
|
743
744
|
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: {
|
|
744
745
|
marginTop: margin[1] + 'px',
|
|
745
746
|
marginBottom: margin[1] + 'px',
|
|
@@ -115,14 +115,17 @@ export var findGroupBlocks = function (block, targetId) {
|
|
|
115
115
|
return [];
|
|
116
116
|
}
|
|
117
117
|
var groupBlocks = targetBlock.children.filter(function (child) { return child.type === 'GROUP_BLOCK'; });
|
|
118
|
-
var bulkInTarget =
|
|
119
|
-
|
|
118
|
+
var bulkInTarget = targetBlock.children.find(function (block) { return block.blockId === 'BULK'; });
|
|
119
|
+
if (bulkInTarget && bulkInTarget.type === 'GROUP_BLOCK') {
|
|
120
|
+
var groupInBulk = bulkInTarget.children.filter(function (child) { return child.type === 'GROUP_BLOCK'; });
|
|
121
|
+
console.log('groupInBulk', groupInBulk);
|
|
122
|
+
if (groupInBulk && groupInBulk.length > 0) {
|
|
123
|
+
return [targetBlock].concat(groupBlocks).concat(groupInBulk);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
120
126
|
if (targetBlock.blockId === 'ROOT') {
|
|
121
127
|
return groupBlocks;
|
|
122
128
|
}
|
|
123
|
-
if (groupInBulk && groupInBulk.length > 0) {
|
|
124
|
-
return [targetBlock].concat(groupBlocks).concat(groupInBulk);
|
|
125
|
-
}
|
|
126
129
|
return [targetBlock].concat(groupBlocks);
|
|
127
130
|
};
|
|
128
131
|
// export const findAllComponentBlockIds = (blockStructure: Block[]): number[] => {
|