fixes

penpot · Jun 6, 2024 · 4a9b42f · 4a9b42f
1 parent cec9529
commit 4a9b42f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/plugin-src/RemoteComponentLibrary.ts b/plugin-src/RemoteComponentLibrary.ts
@@ -1,10 +1,10 @@
 class RemoteComponentsLibrary {
   private components: Record<string, ComponentNode | ComponentSetNode> = {};
-  private keys: string[] = [];
+  private queue: string[] = [];
 
   public register(id: string, component: ComponentNode | ComponentSetNode) {
     if (!Object.prototype.hasOwnProperty.call(this.components, id)) {
-      this.keys.push(id);
+      this.queue.push(id);
     }
 
     this.components[id] = component;
@@ -14,19 +14,16 @@ class RemoteComponentsLibrary {
     return this.components[id];
   }
 
-  public pop(): ComponentNode | ComponentSetNode {
-    const lastKey = this.keys.pop();
+  public next(): ComponentNode | ComponentSetNode {
+    const lastKey = this.queue.pop();
 
     if (!lastKey) throw new Error('No components to pop');
 
-    const value = this.components[lastKey];
-    delete this.components[lastKey];
-
-    return value;
+    return this.components[lastKey];
   }
 
-  public length(): number {
-    return this.keys.length;
+  public remaining(): number {
+    return this.queue.length;
   }
 }
 

diff --git a/plugin-src/transformers/transformComponentNode.ts b/plugin-src/transformers/transformComponentNode.ts
@@ -23,6 +23,7 @@ export const transformComponentNode = async (
     type: 'component',
     name: node.name,
     path: node.parent?.type === 'COMPONENT_SET' ? node.parent.name : '',
+    showContent: !node.clipsContent,
     ...transformFigmaIds(node),
     ...transformFills(node),
     ...transformEffects(node),

diff --git a/plugin-src/transformers/transformDocumentNode.ts b/plugin-src/transformers/transformDocumentNode.ts
@@ -30,7 +30,7 @@ export const transformDocumentNode = async (node: DocumentNode): Promise<PenpotD
     await sleep(0);
   }
 
-  if (remoteComponentLibrary.length() > 0) {
+  if (remoteComponentLibrary.remaining() > 0) {
     children.push({
       name: 'External Components',
       children: await translateRemoteChildren()

diff --git a/plugin-src/transformers/transformInstanceNode.ts b/plugin-src/transformers/transformInstanceNode.ts
@@ -21,11 +21,11 @@ export const transformInstanceNode = async (
 ): Promise<ComponentInstance | undefined> => {
   const mainComponent = await node.getMainComponentAsync();
 
-  if (mainComponent === null || isUnprocessableComponent(mainComponent)) {
+  if (mainComponent === null) {
     return;
   }
 
-  if (isExternalComponent(mainComponent)) {
+  if (isExternalComponent(mainComponent) || isUnprocessableComponent(mainComponent)) {
     await registerExternalComponents(mainComponent);
   }
 
@@ -34,6 +34,7 @@ export const transformInstanceNode = async (
     name: node.name,
     mainComponentFigmaId: mainComponent.id,
     isComponentRoot: isComponentRoot(node),
+    showContent: !node.clipsContent,
     ...transformFigmaIds(node),
     ...transformFills(node),
     ...transformEffects(node),

diff --git a/plugin-src/translators/translateChildren.ts b/plugin-src/translators/translateChildren.ts
@@ -55,8 +55,8 @@ export const translateChildren = async (
 export const translateRemoteChildren = async (): Promise<PenpotNode[]> => {
   const transformedChildren: PenpotNode[] = [];
 
-  while (remoteComponentLibrary.length() > 0) {
-    const child = remoteComponentLibrary.pop();
+  while (remoteComponentLibrary.remaining() > 0) {
+    const child = remoteComponentLibrary.next();
 
     const penpotNode = await transformSceneNode(child);
 

diff --git a/ui-src/lib/types/shapes/componentShape.ts b/ui-src/lib/types/shapes/componentShape.ts
@@ -19,6 +19,7 @@ export type ComponentAttributes = {
   type?: 'component';
   name: string;
   path: string;
+  showContent?: boolean;
   mainInstanceId?: Uuid;
   mainInstancePage?: Uuid;
 };
diff --git a/ui-src/parser/creators/createComponent.ts b/ui-src/parser/creators/createComponent.ts
@@ -17,7 +17,6 @@ export const createComponent = (file: PenpotFile, { figmaId }: ComponentRoot) =>
 
   const frameId = createArtboard(file, {
     ...component,
-    showContent: true,
     componentFile: file.getId(),
     componentId,
     componentRoot: true,

diff --git a/ui-src/parser/creators/createComponentInstance.ts b/ui-src/parser/creators/createComponentInstance.ts
@@ -34,7 +34,6 @@ export const createComponentInstance = (
 
   createArtboard(file, {
     ...rest,
-    showContent: true,
     shapeRef: uiComponent.mainInstanceId,
     componentFile: file.getId(),
     componentRoot: isComponentRoot,

diff --git a/ui-src/types/component.ts b/ui-src/types/component.ts
@@ -16,5 +16,6 @@ export type ComponentInstance = ShapeGeomAttributes &
     figmaId?: string;
     figmaRelatedId?: string;
     isComponentRoot: boolean;
+    showContent?: boolean;
     type: 'instance';
   };