publ-echo-test 0.0.138 → 0.0.140

package/dist/lib/GridLayoutEditor/group.d.ts

@@ -10,34 +10,34 @@ export declare function getBlockSpecificType(block: Block): "ROOT" | "BULK" | "C
 export type SectionPedigree = RootBlock;
 export type Block = ComponentBlock | GroupBlock | RootBlock;
 export type ZOrder = {
-    [platform in "mobile" | "desktop"]: {
+    [platform in 'mobile' | 'desktop']: {
         [componentBlockId: string]: number;
     };
 };
 export type ComponentBlock = {
     blockId: string;
-    type: "COMPONENT_BLOCK";
+    type: 'COMPONENT_BLOCK';
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     componentBlockId: number;
 };
 export type GroupBlock = {
     blockId: string;
-    type: "GROUP_BLOCK";
+    type: 'GROUP_BLOCK';
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     children: (ComponentBlock | GroupBlock)[];
 };
 export type RootBlock = {
-    blockId: "ROOT";
-    type: "GROUP_BLOCK";
+    blockId: 'ROOT';
+    type: 'GROUP_BLOCK';
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     children: (ComponentBlock | GroupBlock)[];
 };
 export type BulkBlockInternal = {
-    blockId: "BULK";
-    type: "GROUP_BLOCK";
+    blockId: 'BULK';
+    type: 'GROUP_BLOCK';
     zOrderDesktopInternal: number;
     zOrderMobileInternal: number;
     children: (ComponentBlock | GroupBlock)[];
@@ -49,6 +49,6 @@ export declare const findAllChildrenBlockIds: (block: Block, targetId: string) =
 export declare const findDirectChildrenBlockIds: (block: Block, targetId: string) => string[];
 export declare const findGroupBlocks: (block: Block, targetId: string) => GroupBlock[];
 export declare const addBulkToTarget: (block: Block, targetId: string, bulkBlockIds: string[]) => Block;
-export declare const getBlockWorkDirPath: (block: Block, blockId: string) => string | null;
+export declare function getBlockWorkDirPath(blockStructure: Block, targetBlockId: string): string;
 export declare function formatBlockIdToCbId(blockId: string): number | null;
 export declare function formatCbIdToBlockId(cbId: number): string;

package/dist/lib/GridLayoutEditor/group.js

@@ -8,12 +8,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 export var zIndexMap = {
-    'BULK': 20000,
-    'EDITING_GROUP_CHILD': 10000,
-    'EDITING_GROUP': 9000,
-    'GROUP': 5000,
-    'CB': 500,
-    'ROOT': 500, //?
+    BULK: 20000,
+    EDITING_GROUP_CHILD: 10000,
+    EDITING_GROUP: 9000,
+    GROUP: 5000,
+    CB: 500,
+    ROOT: 500, //?
 };
 export function getBlockSpecificType(block) {
     if (block.blockId === 'ROOT') {
@@ -119,7 +119,7 @@ export var findGroupBlocks = function (block, targetId) {
     if (targetBlock.blockId === 'ROOT') {
         return groupBlocks;
     }
-    if (groupInBulk.length > 0) {
+    if (groupInBulk && groupInBulk.length > 0) {
         return [targetBlock].concat(groupBlocks).concat(groupInBulk);
     }
     return [targetBlock].concat(groupBlocks);
@@ -174,11 +174,14 @@ export var findGroupBlocks = function (block, targetId) {
 export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     var blockCopy = deepClone(block);
     var targetBlock = findBlockByBlockId(blockCopy, targetId);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
+    if (!targetBlock ||
+        targetBlock.type !== 'GROUP_BLOCK' ||
+        !targetBlock.children) {
         return block;
     }
     var bulkBlocks = targetBlock.children.filter(function (child) {
-        if (child.type === 'COMPONENT_BLOCK' && bulkBlockIds.includes(child.blockId.toString())) {
+        if (child.type === 'COMPONENT_BLOCK' &&
+            bulkBlockIds.includes(child.blockId.toString())) {
             return true;
         }
         if (child.type === 'GROUP_BLOCK' && bulkBlockIds.includes(child.blockId)) {
@@ -194,8 +197,12 @@ export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     }
     // Remove bulk blocks from target's children
     targetBlock.children = targetBlock.children.filter(function (child) { return !bulkBlockIds.includes(child.blockId); });
-    var zOrdersDesktop = bulkBlocks.map(function (block) { return block.zOrderDesktopInternal; }).filter(function (each) { return each !== null; });
-    var zOrdersMobile = bulkBlocks.map(function (block) { return block.zOrderMobileInternal; }).filter(function (each) { return each !== null; });
+    var zOrdersDesktop = bulkBlocks
+        .map(function (block) { return block.zOrderDesktopInternal; })
+        .filter(function (each) { return each !== null; });
+    var zOrdersMobile = bulkBlocks
+        .map(function (block) { return block.zOrderMobileInternal; })
+        .filter(function (each) { return each !== null; });
     var zOrderDesktopInternal = Math.max.apply(Math, zOrdersDesktop);
     var zOrderMobileInternal = Math.max.apply(Math, zOrdersMobile);
     // Create the new bulkBlock
@@ -210,29 +217,25 @@ export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     targetBlock.children.push(bulkBlock);
     return blockCopy;
 };
-var findWorkDirPath = function (block, id, path) {
-    if (block.type === 'COMPONENT_BLOCK') {
-        return null;
+function findPathHelper(current, targetBlockId) {
+    if (current.blockId === targetBlockId) {
+        return [current.blockId];
     }
-    for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
-        var child = _a[_i];
-        var currentPath = child.type === 'COMPONENT_BLOCK' ? path : __spreadArray(__spreadArray([], path, true), [child.blockId], false);
-        if (child.blockId === id) {
-            return currentPath;
-        }
-        if ('children' in child && child.children) {
-            var result = findWorkDirPath(child, id, currentPath);
-            if (result) {
-                return result;
+    if ('children' in current && Array.isArray(current.children)) {
+        for (var _i = 0, _a = current.children; _i < _a.length; _i++) {
+            var child = _a[_i];
+            var result = findPathHelper(child, targetBlockId);
+            if (result !== null) {
+                return __spreadArray([current.blockId], result, true);
             }
         }
     }
     return null;
-};
-export var getBlockWorkDirPath = function (block, blockId) {
-    var path = findWorkDirPath(block, blockId, ['/ROOT']);
-    return path ? path.join('/') : null;
-};
+}
+export function getBlockWorkDirPath(blockStructure, targetBlockId) {
+    var path = findPathHelper(blockStructure, targetBlockId);
+    return path ? '/' + path.join('/') : '';
+}
 export function formatBlockIdToCbId(blockId) {
     var match = blockId.match(/^CB_(\d+)$/);
     return match ? parseInt(match[1], 10) : null;

package/package.json

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