Fixes an issue that could cause Merge color variables to crash if the…

…re were Hotspots present in the document.
oodesign · Jan 19, 2022 · 514b51b · 514b51b
1 parent 845c469
commit 514b51b
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 33 deletions.
diff --git a/merge-duplicates.sketchplugin/Contents/Sketch/Main.js b/merge-duplicates.sketchplugin/Contents/Sketch/Main.js
diff --git a/merge-duplicates.sketchplugin/Contents/Sketch/Main.js.map b/merge-duplicates.sketchplugin/Contents/Sketch/Main.js.map
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/src/MergeColorVariables.js b/src/MergeColorVariables.js
@@ -66,25 +66,29 @@ function doUseColorSwatchesInLayers(colorVariable, colorVariablesToRemove) {
   const map = new Map();
 
   allLayers.forEach(layer => {
-    if (layer.type != "Slice") {
-      layer.style.fills
-        .concat(layer.style.borders)
-        .filter(item => item.fillType == 'Color')
-        .forEach(item => {
+    try{
+      if ((layer.type != "Slice") && (layer.type != "HotSpot")) {
+        layer.style.fills
+          .concat(layer.style.borders)
+          .filter(item => item.fillType == 'Color')
+          .forEach(item => {
+            colorVariablesToRemove.forEach(cvToRemove => {
+              if (item.color == cvToRemove.color) {
+                item.color = colorVariable.referencingColor;
+                if (!map.has(layer)) map.set(layer, true);
+              }
+            });
+          })
+        // Previous actions don't work for Text Layer colors that are colored using TextColor, so let's fix that:
+        if (layer.style.textColor) {
           colorVariablesToRemove.forEach(cvToRemove => {
-            if (item.color == cvToRemove.color) {
-              item.color = colorVariable.referencingColor;
-              if (!map.has(layer)) map.set(layer, true);
-            }
+            if (layer.style.textColor == cvToRemove.color)
+              layer.style.textColor = colorVariable.referencingColor;
           });
-        })
-      // Previous actions don't work for Text Layer colors that are colored using TextColor, so let's fix that:
-      if (layer.style.textColor) {
-        colorVariablesToRemove.forEach(cvToRemove => {
-          if (layer.style.textColor == cvToRemove.color)
-            layer.style.textColor = colorVariable.referencingColor;
-        });
+        }
       }
+    }catch (e){
+      console.log("Accessing style for layer '"+layer.name+"' ("+layer.type+") failed, and couldn't be checked.");
     }
   });