fix for vectors without geometry

penpot · Apr 17, 2024 · ecb9592 · ecb9592
1 parent 6a0b6bc
commit ecb9592
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/plugin-src/transformers/partials/transformStrokes.ts b/plugin-src/transformers/partials/transformStrokes.ts
@@ -6,13 +6,20 @@ const isVectorLike = (node: MinimalStrokesMixin | VectorLikeMixin): node is Vect
   return 'vectorNetwork' in node;
 };
 
+const hasGeometry = (
+  node: MinimalStrokesMixin | GeometryMixin | (MinimalStrokesMixin & VectorLikeMixin)
+): boolean => {
+  return 'fillGeometry' in node && node.fillGeometry.length > 0;
+};
+
 export const transformStrokes = (
-  node: MinimalStrokesMixin | (MinimalStrokesMixin & VectorLikeMixin)
+  node: MinimalStrokesMixin | GeometryMixin | (MinimalStrokesMixin & VectorLikeMixin)
 ): Partial<ShapeAttributes> => {
   return {
     strokes: translateStrokes(
       node.strokes,
       node.strokeWeight,
+      hasGeometry(node),
       isVectorLike(node) ? node.vectorNetwork : undefined
     )
   };

diff --git a/plugin-src/translators/translateStrokes.ts b/plugin-src/translators/translateStrokes.ts
@@ -5,6 +5,7 @@ import { Stroke, StrokeCaps } from '@ui/lib/types/utils/stroke';
 export const translateStrokes = (
   paints: readonly Paint[],
   strokeWeight: number | typeof figma.mixed,
+  hasGeometry?: boolean,
   vectorNetwork?: VectorNetwork
 ): Stroke[] => {
   return paints.map((paint, index) => {
@@ -15,9 +16,11 @@ export const translateStrokes = (
       strokeWidth: strokeWeight === figma.mixed ? 1 : strokeWeight
     };
 
-    if (index === 0 && vectorNetwork && vectorNetwork.vertices.length === 2) {
+    if (!hasGeometry && index === 0 && vectorNetwork && vectorNetwork.vertices.length) {
       stroke.strokeCapStart = translateStrokeCap(vectorNetwork.vertices[0]);
-      stroke.strokeCapEnd = translateStrokeCap(vectorNetwork.vertices[1]);
+      stroke.strokeCapEnd = translateStrokeCap(
+        vectorNetwork.vertices[vectorNetwork.vertices.length - 1]
+      );
     }
 
     return stroke;