@lancom/shared 0.0.339 → 0.0.340

package/components/editor/editor_layers/editor-layers.vue

@@ -146,11 +146,19 @@ export default {
       if (!selected || !selected.editableDetails) {
         this.setEditModeSelectedLayer(false);
       }
+      if (selected) {
+        this.openSelectedLayerGroup(selected);
+      }
     },
     editableSide() {
       this.setEditModeSelectedLayer(false);
     }
   },
+  mounted() {
+    if (this.selectedLayer) {
+      this.openSelectedLayerGroup(this.selectedLayer);
+    }
+  },
   methods: {
     ...mapMutations([
       'setSelectedLayer',
@@ -164,8 +172,14 @@ export default {
       'setEditablePrintArea'
     ]),
     ...mapActions(['increaseLayersUpdatesCount']),
-    toggleOpenedGroup(printArea) {
-      this.openedGroup = printArea?._id === this.openedGroup ? null : printArea?._id;
+    openSelectedLayerGroup(selected) {
+      const group = this.editableLayersGroups.find(g => g.layers?.includes(selected));
+      if (group?.printArea) {
+        this.toggleOpenedGroup(group?.printArea, true);
+      }
+    },
+    toggleOpenedGroup(printArea, foreOpen) {
+      this.openedGroup = (printArea?._id === this.openedGroup && !foreOpen) ? null : printArea?._id;
       if (printArea) {
         if (this.editableSide.id !== printArea.side) {
           this.setEditableSide({ id: printArea.side });

package/components/editor/editor_print_area_options/editor-print-area-options.vue

@@ -63,16 +63,19 @@ export default {
       });
       const productsOptions = (this.product.printAreas || [])
         .map(printArea => {
-          const mainOption = { ...groupItemToOption(printArea), sides: [printArea.side] };
           const suboptions = [
-            mainOption,
+            { ...groupItemToOption(printArea), sides: [printArea.side] },
             ...(printArea.sizes || []).map(i => ({ ...groupItemToOption({ ...i, side: printArea.side, parentPrintArea: printArea._id }), sides: [printArea.side] }))
-          ];
+          ]
+          .filter(s => !this.product.printAreasDisabled?.includes(s.printArea?._id));
+          // console.log('suboptions: ', suboptions);
           return {
-            ...(suboptions.find(s => s.printArea?._id === this.selected || this.hasPrintAreaLayers(s.printArea)) || mainOption),
+            ...(suboptions.find(s => s.printArea?._id === this.selected || this.hasPrintAreaLayers(s.printArea)) || suboptions[0] || {}),
             suboptions
           };
-        });
+        })
+        .filter(pa => !!pa.printArea?._id);
+      // console.log('productsOptions: ', productsOptions);
       const options = productsOptions.filter(({ sides }) => sides.includes(this.side));
       return this.allowNoPrint ? [...options, { label: 'No Print' }] : options;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.339",
+  "version": "0.0.340",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {