fix(padding/spacing): fix some bugs where duplicates are created

ph1p · Jul 29, 2022 · 2e29709 · 2e29709
1 parent 563421c
commit 2e29709
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -352,6 +352,7 @@ const setMeasurements = async (
   };
 
   for (const node of nodes) {
+    if(!node) continue;
     let surrounding: SurroundingSettings = store.surrounding;
 
     if (!state.detached) {
@@ -463,7 +464,7 @@ const setMeasurements = async (
       Object.keys(Alignments)
         .filter((k) => k !== Alignments.CENTER && padding[k])
         .forEach((direction: Alignments) => {
-          removePaddingGroup(node, direction, store.isGlobalGroup);
+          removePaddingGroup(node, direction, state.isGlobalGroup);
 
           const paddingLine = createPaddingLine({
             ...settings,

diff --git a/src/main/spacing.ts b/src/main/spacing.ts
@@ -107,7 +107,7 @@ export const drawSpacing = async (
     labelPattern = '',
     labelsOutside = false,
     strokeCap = 'NONE',
-  },
+  }
 ) => {
   const state = await getState();
   const LABEL_OUTSIDE_MARGIN = 4 * (state.labelFontSize / 10);
@@ -253,7 +253,7 @@ export const drawSpacing = async (
     if (cutsVerticalRectPoints) {
       if (strokeCap === 'STANDARD') {
         spacingGroup.push(
-          [true, false].map((isFirst) =>
+          ...[true, false].map((isFirst) =>
             createStandardCapForSpacing({
               line: line1,
               isFirst,
@@ -419,7 +419,7 @@ export const drawSpacing = async (
     if (cutsHorizontalRectPoints) {
       if (strokeCap === 'STANDARD') {
         spacingGroup.push(
-          [true, false].map((isFirst) =>
+          ...[true, false].map((isFirst) =>
             createStandardCapForSpacing({
               line: line4,
               isHorizontal: true,