react-native-navigation 7.36.0 → 7.37.0-hotfix.1

package/.nvmrc

@@ -1 +1 @@
-14
+16

package/lib/dist/src/commands/LayoutTreeCrawler.js

@@ -14,7 +14,7 @@ class LayoutTreeCrawler {
         if (node.type === LayoutType_1.LayoutType.Component) {
             this.handleComponent(node);
         }
-        const componentProps = this.store.getPendingProps(node.id) || undefined;
+        const componentProps = this.store.getPropsForId(node.id) || undefined;
         this.optionsProcessor.processOptions(commandName, node.data.options, componentProps);
         node.children.forEach((value) => this.crawl(value, commandName));
     }

package/lib/dist/src/components/ComponentWrapper.js

@@ -40,6 +40,7 @@ class ComponentWrapper {
             }
             componentDidMount() {
                 this._isMounted = true;
+                store.consumePendingProps(this.state.componentId);
             }
             componentWillUnmount() {
                 store.clearComponent(this.state.componentId);

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

@@ -10,8 +10,8 @@ export declare class Store {
     private lazyRegistratorFn;
     updateProps(componentId: string, props: any, callback?: () => void): void;
     setPendingProps(componentId: string, newProps: any): void;
-    getPendingProps(componentId: string): any;
     getPropsForId(componentId: string): any;
+    consumePendingProps(componentId: string): void;
     mergeNewPropsForId(componentId: string, newProps: any): void;
     clearComponent(componentId: string): void;
     setComponentClassForName(componentName: string | number, ComponentClass: ComponentProvider): void;

package/lib/dist/src/components/Store.js

@@ -18,15 +18,14 @@ class Store {
     setPendingProps(componentId, newProps) {
         this.pendingPropsById[componentId] = newProps;
     }
-    getPendingProps(componentId) {
-        return this.pendingPropsById[componentId];
-    }
     getPropsForId(componentId) {
+        return this.pendingPropsById[componentId] || this.propsById[componentId] || {};
+    }
+    consumePendingProps(componentId) {
         if (this.pendingPropsById[componentId]) {
             this.propsById[componentId] = this.pendingPropsById[componentId];
             delete this.pendingPropsById[componentId];
         }
-        return this.propsById[componentId] || {};
     }
     mergeNewPropsForId(componentId, newProps) {
         const currentProps = this.getPropsForId(componentId);

package/lib/ios/RNNComponentRootView.m

@@ -7,6 +7,23 @@
     self.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
     return self;
 }
+
+#ifndef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                  eventEmitter:(RNNEventEmitter *)eventEmitter
+           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+    self = [super initWithBridge:bridge
+                      moduleName:moduleName
+               initialProperties:initialProperties
+                    eventEmitter:eventEmitter
+             reactViewReadyBlock:reactViewReadyBlock];
+    [bridge.uiManager setAvailableSize:UIScreen.mainScreen.bounds.size forRootView:self];
+    return self;
+}
+#endif
+
 - (NSString *)componentType {
     return ComponentTypeScreen;
 }

package/lib/ios/RNNUIBarButtonItem.m

@@ -87,9 +87,28 @@
                      buttonOptions:(RNNButtonOptions *)buttonOptions
                            onPress:(RNNButtonPressCallback)onPress {
     self = [super initWithCustomView:reactView];
-    [reactView setFrame:CGRectMake(0, 0, 50, 50)];
     [self applyOptions:buttonOptions];
-
+    reactView.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
+    reactView.hidden = CGRectEqualToRect(reactView.frame, CGRectZero);
+
+    [NSLayoutConstraint deactivateConstraints:reactView.constraints];
+    self.widthConstraint =
+        [NSLayoutConstraint constraintWithItem:reactView
+                                     attribute:NSLayoutAttributeWidth
+                                     relatedBy:NSLayoutRelationEqual
+                                        toItem:nil
+                                     attribute:NSLayoutAttributeNotAnAttribute
+                                    multiplier:1.0
+                                      constant:reactView.intrinsicContentSize.width];
+    self.heightConstraint =
+        [NSLayoutConstraint constraintWithItem:reactView
+                                     attribute:NSLayoutAttributeHeight
+                                     relatedBy:NSLayoutRelationEqual
+                                        toItem:nil
+                                     attribute:NSLayoutAttributeNotAnAttribute
+                                    multiplier:1.0
+                                      constant:reactView.intrinsicContentSize.height];
+    [NSLayoutConstraint activateConstraints:@[ self.widthConstraint, self.heightConstraint ]];
     reactView.delegate = self;
 
     reactView.backgroundColor = [UIColor clearColor];

package/lib/src/commands/LayoutTreeCrawler.ts

@@ -24,7 +24,7 @@ export class LayoutTreeCrawler {
     if (node.type === LayoutType.Component) {
       this.handleComponent(node);
     }
-    const componentProps = this.store.getPendingProps(node.id) || undefined;
+    const componentProps = this.store.getPropsForId(node.id) || undefined;
     this.optionsProcessor.processOptions(commandName, node.data.options, componentProps);
     node.children.forEach((value: LayoutNode) => this.crawl(value, commandName));
   }

package/lib/src/components/ComponentWrapper.tsx

@@ -70,6 +70,7 @@ export class ComponentWrapper {
 
       componentDidMount() {
         this._isMounted = true;
+        store.consumePendingProps(this.state.componentId);
       }
 
       componentWillUnmount() {

package/lib/src/components/Store.ts

@@ -23,16 +23,15 @@ export class Store {
     this.pendingPropsById[componentId] = newProps;
   }
 
-  getPendingProps(componentId: string) {
-    return this.pendingPropsById[componentId];
+  getPropsForId(componentId: string) {
+    return this.pendingPropsById[componentId] || this.propsById[componentId] || {};
   }
 
-  getPropsForId(componentId: string) {
+  consumePendingProps(componentId: string) {
     if (this.pendingPropsById[componentId]) {
       this.propsById[componentId] = this.pendingPropsById[componentId];
       delete this.pendingPropsById[componentId];
     }
-    return this.propsById[componentId] || {};
   }
 
   mergeNewPropsForId(componentId: string, newProps: any) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.36.0",
+  "version": "7.37.0-hotfix.1",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -50,6 +50,9 @@
     "release": "node ./scripts/release",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx ./"
   },
+  "overrides": {
+    "@babel/traverse": "7.22.6"
+  },
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
@@ -68,10 +71,10 @@
     "tslib": "1.9.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
+    "@babel/core": "7.22.9",
     "@babel/plugin-proposal-export-default-from": "7.10.1",
     "@babel/plugin-proposal-export-namespace-from": "7.10.1",
-    "@babel/runtime": "^7.20.0",
+    "@babel/runtime": "7.22.6",
     "@babel/types": "7.22.5",
     "@react-native/metro-config": "^0.73.0",
     "@react-native-community/blur": "^3.6.0",