react-native-navigation 7.23.1-snapshot.310 → 7.23.1-snapshot.315

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarController.kt

@@ -250,9 +250,9 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
         }
         toRemove.forEach {
             buttonBar.removeButton(it.value.buttonIntId)
-            btnControllers.remove(it.key)
         }
         toDestroy.values.forEach {
+            btnControllers.remove(it.id)
             it.destroy()
         }
         toAdd.forEach {

package/lib/dist/commands/LayoutTreeCrawler.js

@@ -21,7 +21,7 @@ class LayoutTreeCrawler {
         node.data.passProps = undefined;
     }
     savePropsToStore(node) {
-        this.store.updateProps(node.id, node.data.passProps);
+        this.store.setPendingProps(node.id, node.data.passProps);
     }
     assertComponentDataName(component) {
         if (!component.data.name) {

package/lib/dist/commands/OptionsProcessor.js

@@ -140,7 +140,7 @@ class OptionsProcessor {
         if (endsWith_1.default(key, 'Buttons')) {
             forEach_1.default(value, (button) => {
                 if (button.passProps && button.id) {
-                    this.store.updateProps(button.id, button.passProps);
+                    this.store.setPendingProps(button.id, button.passProps);
                     button.passProps = undefined;
                 }
             });
@@ -151,7 +151,7 @@ class OptionsProcessor {
             value.componentId = value.id ? value.id : this.uniqueIdProvider.generate('CustomComponent');
             this.store.ensureClassForName(value.name);
             if (value.passProps) {
-                this.store.updateProps(value.componentId, value.passProps);
+                this.store.setPendingProps(value.componentId, value.passProps);
             }
             options[key].passProps = undefined;
         }

package/lib/dist/components/Store.d.ts

@@ -4,10 +4,12 @@ import { IWrappedComponent } from './ComponentWrapper';
 export declare class Store {
     private componentsByName;
     private propsById;
+    private pendingPropsById;
     private componentsInstancesById;
     private wrappedComponents;
     private lazyRegistratorFn;
     updateProps(componentId: string, props: any, callback?: () => void): void;
+    setPendingProps(componentId: string, newProps: any): void;
     getPropsForId(componentId: string): any;
     mergeNewPropsForId(componentId: string, newProps: any): void;
     clearComponent(componentId: string): void;

package/lib/dist/components/Store.js

@@ -5,6 +5,7 @@ class Store {
     constructor() {
         this.componentsByName = {};
         this.propsById = {};
+        this.pendingPropsById = {};
         this.componentsInstancesById = {};
         this.wrappedComponents = {};
     }
@@ -15,7 +16,14 @@ class Store {
             component.setProps(props, callback);
         }
     }
+    setPendingProps(componentId, newProps) {
+        this.pendingPropsById[componentId] = newProps;
+    }
     getPropsForId(componentId) {
+        if (this.pendingPropsById[componentId]) {
+            this.propsById[componentId] = this.pendingPropsById[componentId];
+            delete this.pendingPropsById[componentId];
+        }
         return this.propsById[componentId] || {};
     }
     mergeNewPropsForId(componentId, newProps) {

package/lib/src/commands/LayoutTreeCrawler.ts

@@ -35,7 +35,7 @@ export class LayoutTreeCrawler {
   }
 
   private savePropsToStore(node: LayoutNode) {
-    this.store.updateProps(node.id, node.data.passProps);
+    this.store.setPendingProps(node.id, node.data.passProps);
   }
 
   private assertComponentDataName(component: LayoutNode) {

package/lib/src/commands/OptionsProcessor.ts

@@ -200,7 +200,7 @@ export class OptionsProcessor {
     if (endsWith(key, 'Buttons')) {
       forEach(value, (button) => {
         if (button.passProps && button.id) {
-          this.store.updateProps(button.id, button.passProps);
+          this.store.setPendingProps(button.id, button.passProps);
           button.passProps = undefined;
         }
       });
@@ -212,7 +212,7 @@ export class OptionsProcessor {
       value.componentId = value.id ? value.id : this.uniqueIdProvider.generate('CustomComponent');
       this.store.ensureClassForName(value.name);
       if (value.passProps) {
-        this.store.updateProps(value.componentId, value.passProps);
+        this.store.setPendingProps(value.componentId, value.passProps);
       }
       options[key].passProps = undefined;
     }

package/lib/src/components/Store.ts

@@ -5,6 +5,7 @@ import { IWrappedComponent } from './ComponentWrapper';
 export class Store {
   private componentsByName: Record<string, ComponentProvider> = {};
   private propsById: Record<string, any> = {};
+  private pendingPropsById: Record<string, any> = {};
   private componentsInstancesById: Record<string, IWrappedComponent> = {};
   private wrappedComponents: Record<string, React.ComponentClass<any>> = {};
   private lazyRegistratorFn: ((lazyComponentRequest: string | number) => void) | undefined;
@@ -18,7 +19,15 @@ export class Store {
     }
   }
 
+  setPendingProps(componentId: string, newProps: any) {
+    this.pendingPropsById[componentId] = newProps;
+  }
+
   getPropsForId(componentId: string) {
+    if (this.pendingPropsById[componentId]) {
+      this.propsById[componentId] = this.pendingPropsById[componentId];
+      delete this.pendingPropsById[componentId];
+    }
     return this.propsById[componentId] || {};
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.23.1-snapshot.310",
+  "version": "7.23.1-snapshot.315",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,