Fix undefined props after calling setRoot with the same componentId (#…

…7712)
wix · May 15, 2023 · 73ee650 · 73ee650
1 parent dcff945
commit 73ee650
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/src/commands/LayoutTreeCrawler.test.ts b/lib/src/commands/LayoutTreeCrawler.test.ts
@@ -55,7 +55,7 @@ describe('LayoutTreeCrawler', () => {
 
   it('pass props to option processor', () => {
     const passProps = { someProp: 'here' };
-    when(mockedStore.getPropsForId('testId')).thenReturn(passProps);
+    when(mockedStore.getPendingProps('testId')).thenReturn(passProps);
     const node = {
       id: 'testId',
       type: LayoutType.Component,
@@ -67,11 +67,7 @@ describe('LayoutTreeCrawler', () => {
     };
     uut.crawl(node, CommandName.SetRoot);
     verify(
-      mockedOptionsProcessor.processOptions(
-        CommandName.SetRoot,
-        undefined,
-        deepEqual(passProps)
-      )
+      mockedOptionsProcessor.processOptions(CommandName.SetRoot, undefined, deepEqual(passProps))
     ).called();
   });
 });
diff --git a/lib/src/commands/LayoutTreeCrawler.ts b/lib/src/commands/LayoutTreeCrawler.ts
@@ -24,7 +24,7 @@ export class LayoutTreeCrawler {
     if (node.type === LayoutType.Component) {
       this.handleComponent(node);
     }
-    const componentProps = this.store.getPropsForId(node.id) || undefined;
+    const componentProps = this.store.getPendingProps(node.id) || undefined;
     this.optionsProcessor.processOptions(commandName, node.data.options, componentProps);
     node.children.forEach((value: LayoutNode) => this.crawl(value, commandName));
   }

diff --git a/lib/src/components/Store.ts b/lib/src/components/Store.ts
@@ -23,6 +23,10 @@ export class Store {
     this.pendingPropsById[componentId] = newProps;
   }
 
+  getPendingProps(componentId: string) {
+    return this.pendingPropsById[componentId];
+  }
+
   getPropsForId(componentId: string) {
     if (this.pendingPropsById[componentId]) {
       this.propsById[componentId] = this.pendingPropsById[componentId];