fix my mind

penpot · Jun 27, 2024 · 6c5c50f · 6c5c50f
1 parent 51b5b72
commit 6c5c50f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/ui-src/parser/creators/createComponentInstance.ts b/ui-src/parser/creators/createComponentInstance.ts
@@ -34,7 +34,7 @@ export const createComponentInstance = (
   }
 
   shape.id = id;
-  shape.shapeRef = originalUiComponent ? uiComponent.mainInstanceId : shapeRef;
+  shape.shapeRef = originalUiComponent || !shapeRef ? uiComponent.mainInstanceId : shapeRef;
   shape.componentFile = file.getId();
   shape.componentRoot = isComponentRoot;
   shape.componentId = uiComponent.componentId;

diff --git a/ui-src/parser/creators/createText.ts b/ui-src/parser/creators/createText.ts
@@ -5,7 +5,7 @@ import { symbolFills, symbolStrokes, symbolTouched } from '@ui/parser/creators/s
 
 export const createText = (
   file: PenpotFile,
-  { type, figmaId, characters, ...shape }: TextShape
+  { type, figmaId, characters, componentPropertyReferences, ...shape }: TextShape
 ) => {
   const { id, shapeRef } = parseFigmaId(file, figmaId);
 
@@ -17,7 +17,7 @@ export const createText = (
     !shape.hidden,
     characters,
     shape.touched,
-    shape.componentPropertyReferences
+    componentPropertyReferences
   );
 
   file.createText(shape);

diff --git a/ui-src/parser/parseFigmaId.ts b/ui-src/parser/parseFigmaId.ts
@@ -41,17 +41,11 @@ const parseShapeRef = (file: PenpotFile, figmaId: string | undefined): Uuid | un
     return;
   }
 
-  const id = identifiers.get(figmaRelatedId);
-
-  if (id) {
-    return id;
+  if (!identifiers.has(figmaRelatedId)) {
+    identifiers.set(figmaRelatedId, file.newId());
   }
 
-  const newId = file.newId();
-
-  identifiers.set(figmaRelatedId, newId);
-
-  return newId;
+  return identifiers.get(figmaRelatedId);
 };
 
 const getRelatedNodeId = (nodeId: string): string | undefined => {