react-native-navigation 7.33.0 → 7.33.2

package/jest-setup.js

@@ -1,5 +1,26 @@
+const RESET_MODULE_EXCEPTIONS = ['react', 'react-redux'];
+const shonoActualRegistryCache = {};
+RESET_MODULE_EXCEPTIONS.forEach((moduleName) => {
+  jest.doMock(
+    moduleName,
+    () => {
+      if (!shonoActualRegistryCache[moduleName]) {
+        shonoActualRegistryCache[moduleName] = jest.requireActual(moduleName);
+      }
+      return shonoActualRegistryCache[moduleName];
+    },
+    { virtual: true }
+  );
+});
+
 const { mockDetox } = require('detox-testing-library-rnn-adapter');
 
+jest.mock('react-native-gesture-handler', () => {
+  return {
+    gestureHandlerRootHOC: jest.fn(),
+  };
+});
+
 mockDetox(() => require('./playground/index'));
 
 beforeEach(() => {

package/jest.config.js

@@ -14,7 +14,7 @@ module.exports = {
     '<rootDir>/e2e/',
     '<rootDir>/autolink/',
   ],
-  setupFilesAfterEnv: ['./jest-setup.js'],
+  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect', './jest-setup.js'],
   testPathIgnorePatterns: ['/node_modules/'],
   moduleNameMapper: {
     'react-native-navigation/Mock': '<rootDir>/lib/Mock',
@@ -38,4 +38,5 @@ module.exports = {
   resetMocks: true,
   resetModules: true,
   coverageReporters: ['json', 'lcov', 'text', 'html'],
+  testEnvironment: 'node',
 };

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -46,7 +46,11 @@ export class NativeCommandsSender {
   }
 
   pop(commandId: string, componentId: string, _options?: object) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+      if (!LayoutStore.getLayoutById(componentId)) {
+        reject(`Popping component failed - componentId '${componentId}' not found`);
+        return;
+      }
       const poppedChild = _.last(
         LayoutStore.getLayoutById(componentId).getStack().children
       ) as ComponentNode;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewController.java

@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
+import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.options.params.NullBool;
@@ -331,7 +332,19 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     @Override
     public void onChildViewAdded(View parent, View child) {
-        yellowBoxDelegate.onChildViewAdded(parent, child);
+        if (parent instanceof ViewGroup && child instanceof ViewGroup) {
+            ((ViewGroup) child).setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
+                @Override
+                public void onChildViewAdded(View parent, View child) {
+                    yellowBoxDelegate.onChildViewAdded(parent, child);
+                }
+
+                @Override
+                public void onChildViewRemoved(View parent, View child) {
+
+                }
+            });
+        }
     }
 
     @Override

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/viewcontrollers/viewcontroller/YellowBoxDelegate.kt

@@ -24,30 +24,23 @@ open class YellowBoxDelegate(private val context: Context, private val yellowBox
 
     open fun onChildViewAdded(parent: View, child: View?) {
         if (!context.isDebug()) return
-        onYellowBoxAdded(child)
+        onYellowBoxAdded(parent, child)
     }
 
-    fun onYellowBoxAdded(parent: View?) {
+    fun onYellowBoxAdded(parent: View?, child: View?) {
         if (isDestroyed) return
 
         this.parent = parent as ViewGroup
 
-        parent.setOnHierarchyChangeListener(object : ViewGroup.OnHierarchyChangeListener {
-            override fun onChildViewAdded(parent: View, child: View) {
-                if (!yellowBoxHelper.isYellowBox(parent, child) && (isDestroyed || tempViews.contains(child))) return
-                parent as ViewGroup
-                for (i in 1 until parent.childCount) {
-                    yellowBoxViews.add(parent[i])
-                    parent.removeView(parent[i])
-                    var tempView = View(context)
-                    tempViews.add(tempView)
-                    parent.addView(tempView, i)
-                }
-            }
-
-            override fun onChildViewRemoved(parent: View?, child: View?) {
-            }
-        })
+        if (!yellowBoxHelper.isYellowBox(parent, child) && (isDestroyed || tempViews.contains(child))) return
+        parent as ViewGroup
+        for (i in 1 until parent.childCount) {
+            yellowBoxViews.add(parent[i])
+            parent.removeView(parent[i])
+            var tempView = View(context)
+            tempViews.add(tempView)
+            parent.addView(tempView, i)
+        }
     }
 
     fun destroy() {

package/lib/dist/Mock/mocks/NativeCommandsSender.js

@@ -40,7 +40,11 @@ class NativeCommandsSender {
         });
     }
     pop(commandId, componentId, _options) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
+            if (!LayoutStore_1.LayoutStore.getLayoutById(componentId)) {
+                reject(`Popping component failed - componentId '${componentId}' not found`);
+                return;
+            }
             const poppedChild = lodash_1.default.last(LayoutStore_1.LayoutStore.getLayoutById(componentId).getStack().children);
             LayoutStore_1.LayoutStore.pop(componentId);
             resolve(poppedChild.nodeId);

package/lib/ios/RNNFontAttributesCreator.h

@@ -6,12 +6,14 @@
 + (NSDictionary *)createWithFontFamily:(NSString *)fontFamily
                               fontSize:(NSNumber *)fontSize
                             fontWeight:(NSString *)fontWeight
-                                 color:(UIColor *)color;
+                                 color:(UIColor *)color
+                              centered:(BOOL)centered;
 
 + (NSDictionary *)createFromDictionary:(NSDictionary *)attributesDictionary
                             fontFamily:(NSString *)fontFamily
                               fontSize:(NSNumber *)fontSize
                             fontWeight:(NSString *)fontWeight
-                                 color:(UIColor *)color;
+                                 color:(UIColor *)color
+                              centered:(BOOL)centered;
 
 @end

package/lib/ios/RNNFontAttributesCreator.m

@@ -9,20 +9,23 @@
 + (NSDictionary *)createWithFontFamily:(NSString *)fontFamily
                               fontSize:(NSNumber *)fontSize
                             fontWeight:(NSString *)fontWeight
-                                 color:(UIColor *)color {
+                                 color:(UIColor *)color
+                              centered:(BOOL)centered {
     NSMutableDictionary *titleTextAttributes = [NSMutableDictionary new];
     return [self createFromDictionary:titleTextAttributes
                            fontFamily:fontFamily
                              fontSize:fontSize
                            fontWeight:fontWeight
-                                color:color];
+                                color:color
+                             centered:centered];
 }
 
 + (NSDictionary *)createFromDictionary:(NSDictionary *)attributesDictionary
                             fontFamily:(NSString *)fontFamily
                               fontSize:(NSNumber *)fontSize
                             fontWeight:(NSString *)fontWeight
-                                 color:(UIColor *)color {
+                                 color:(UIColor *)color
+                              centered:(BOOL)centered {
     NSMutableDictionary *titleTextAttributes =
         [NSMutableDictionary dictionaryWithDictionary:attributesDictionary];
     UIFont *currentFont = attributesDictionary[NSFontAttributeName];
@@ -36,7 +39,11 @@
                                                              style:nil
                                                            variant:nil
                                                    scaleMultiplier:1.0];
-    titleTextAttributes[NSParagraphStyleAttributeName] = NSParagraphStyle.defaultParagraphStyle;
+    NSMutableParagraphStyle *paragraphStyle = NSMutableParagraphStyle.new;
+    if (centered)
+        paragraphStyle.alignment = NSTextAlignmentCenter;
+
+    titleTextAttributes[NSParagraphStyleAttributeName] = paragraphStyle;
 
     return titleTextAttributes;
 }

package/lib/ios/RNNTabBarItemCreator.m

@@ -5,7 +5,7 @@
 @implementation RNNTabBarItemCreator
 
 - (UITabBarItem *)createTabBarItem:(UITabBarItem *)mergeItem {
-    return mergeItem ?: [UITabBarItem new];
+    return [UITabBarItem new];
 }
 
 - (UITabBarItem *)createTabBarItem:(RNNBottomTabOptions *)bottomTabOptions
@@ -96,7 +96,8 @@
                   fontFamily:fontFamily
                     fontSize:fontSize
                   fontWeight:fontWeight
-                       color:textColor];
+                       color:textColor
+                    centered:NO];
     [self setTitleAttributes:tabItem titleAttributes:normalAttributes];
 
     NSDictionary *selectedAttributes = [RNNFontAttributesCreator
@@ -104,7 +105,8 @@
                   fontFamily:fontFamily
                     fontSize:fontSize
                   fontWeight:fontWeight
-                       color:selectedTextColor];
+                       color:selectedTextColor
+                    centered:NO];
     [self setSelectedTitleAttributes:tabItem selectedTitleAttributes:selectedAttributes];
 }
 

package/lib/ios/RNNTitleViewHelper.m

@@ -111,7 +111,7 @@
     subtitleFrame.origin.y = subtitleFrame.size.height;
 
     UILabel *subtitleLabel = [[UILabel alloc] initWithFrame:subtitleFrame];
-    subtitleLabel.textAlignment = NSTextAlignmentCenter;
+
     subtitleLabel.backgroundColor = [UIColor clearColor];
     subtitleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
@@ -119,7 +119,8 @@
         [RNNFontAttributesCreator createWithFontFamily:[_subtitleOptions.fontFamily withDefault:nil]
                                               fontSize:[_subtitleOptions.fontSize withDefault:@(12)]
                                             fontWeight:[_subtitleOptions.fontWeight withDefault:nil]
-                                                 color:[_subtitleOptions.color withDefault:nil]];
+                                                 color:[_subtitleOptions.color withDefault:nil]
+                                              centered:YES];
     [subtitleLabel setAttributedText:[[NSAttributedString alloc] initWithString:self.subtitle
                                                                      attributes:fontAttributes]];
 
@@ -128,7 +129,7 @@
     labelframe.size = labelSize;
     subtitleLabel.frame = labelframe;
     [subtitleLabel sizeToFit];
-
+    subtitleLabel.textAlignment = NSTextAlignmentCenter;
     if (_subtitleOptions.color.hasValue) {
         UIColor *color = _subtitleOptions.color.get;
         subtitleLabel.textColor = color;
@@ -145,7 +146,6 @@
         titleFrame.size.height /= 2;
     }
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:titleFrame];
-    titleLabel.textAlignment = NSTextAlignmentCenter;
     titleLabel.backgroundColor = [UIColor clearColor];
 
     titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
@@ -154,7 +154,8 @@
         [RNNFontAttributesCreator createWithFontFamily:[_titleOptions.fontFamily withDefault:nil]
                                               fontSize:[_titleOptions.fontSize withDefault:@(16)]
                                             fontWeight:[_titleOptions.fontWeight withDefault:nil]
-                                                 color:[_subtitleOptions.color withDefault:nil]];
+                                                 color:[_subtitleOptions.color withDefault:nil]
+                                              centered:YES];
     [titleLabel setAttributedText:[[NSAttributedString alloc] initWithString:self.title
                                                                   attributes:fontAttributes]];
 

package/lib/ios/RNNUIBarButtonItem.m

@@ -176,7 +176,8 @@
                                      createWithFontFamily:[button.fontFamily withDefault:nil]
                                                  fontSize:[button.fontSize withDefault:@(17)]
                                                fontWeight:[button.fontWeight withDefault:nil]
-                                                    color:button.color.get]];
+                                                    color:button.color.get
+                                                 centered:NO]];
 
     [self setTitleTextAttributes:textAttributes forState:UIControlStateNormal];
     [self setTitleTextAttributes:textAttributes forState:UIControlStateHighlighted];
@@ -188,7 +189,8 @@
                                      createWithFontFamily:[button.fontFamily withDefault:nil]
                                                  fontSize:[button.fontSize withDefault:@(17)]
                                                fontWeight:[button.fontWeight withDefault:nil]
-                                                    color:[button.disabledColor withDefault:nil]]];
+                                                    color:[button.disabledColor withDefault:nil]
+                                                 centered:NO]];
 
     [self setTitleTextAttributes:disabledTextAttributes forState:UIControlStateDisabled];
 }

package/lib/ios/TopBarAppearancePresenter.m

@@ -145,7 +145,8 @@
                                             fontFamily:fontFamily
                                               fontSize:fontSize
                                             fontWeight:fontWeight
-                                                 color:fontColor];
+                                                 color:fontColor
+                                              centered:YES];
 
     self.getAppearance.titleTextAttributes = titleTextAttributes;
     self.getScrollEdgeAppearance.titleTextAttributes = titleTextAttributes;
@@ -161,7 +162,8 @@
                                             fontFamily:fontFamily
                                               fontSize:fontSize
                                             fontWeight:fontWeight
-                                                 color:fontColor];
+                                                 color:fontColor
+                                              centered:NO];
     self.getAppearance.largeTitleTextAttributes = largeTitleTextAttributes;
     self.getScrollEdgeAppearance.largeTitleTextAttributes = largeTitleTextAttributes;
 }

package/lib/ios/TopBarPresenter.m

@@ -112,7 +112,8 @@
                   fontFamily:fontFamily
                     fontSize:fontSize
                   fontWeight:fontWeight
-                       color:fontColor];
+                       color:fontColor
+                    centered:YES];
 }
 
 - (void)setLargeTitleAttributes:(RNNLargeTitleOptions *)largeTitleOptions {
@@ -126,7 +127,8 @@
                   fontFamily:fontFamily
                     fontSize:fontSize
                   fontWeight:fontWeight
-                       color:fontColor];
+                       color:fontColor
+                    centered:NO];
 }
 
 - (void)componentDidAppear {

package/metro.config.js

@@ -1,15 +1,4 @@
 module.exports = {
-  projectRoot: `${__dirname}/playground`,
+  projectRoot: `${__dirname}`,
   watchFolders: [__dirname],
-  resolver: {
-    sourceExts: ['ts', 'tsx', 'js'],
-  },
-  transformer: {
-    getTransformOptions: async () => ({
-      transform: {
-        experimentalImportSupport: false,
-        inlineRequires: false,
-      },
-    }),
-  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.33.0",
+  "version": "7.33.2",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -67,17 +67,17 @@
     "tslib": "1.9.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.8",
+    "@babel/core": "^7.20.0",
     "@babel/plugin-proposal-export-default-from": "7.10.1",
     "@babel/plugin-proposal-export-namespace-from": "7.10.1",
-    "@babel/runtime": "7.15.4",
+    "@babel/runtime": "^7.20.0",
     "@babel/types": "7.15.6",
     "@react-native-community/blur": "^3.6.0",
     "@react-native-community/datetimepicker": "^3.4.7",
     "@react-native-community/eslint-config": "2.0.0",
     "@react-native-community/netinfo": "^5.9.4",
-    "@testing-library/jest-native": "^4.0.1",
-    "@testing-library/react-native": "^7.2.0",
+    "@testing-library/jest-native": "^5.4.2",
+    "@testing-library/react-native": "^12.0.1",
     "@types/detox": "17.14.3",
     "@types/hoist-non-react-statics": "^3.0.1",
     "@types/jasmine": "3.5.10",
@@ -88,9 +88,9 @@
     "@types/react-test-renderer": "16.9.2",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^29.5.0",
     "clang-format": "^1.4.0",
-    "detox": "19.12.1",
+    "detox": "20.9.0",
     "detox-testing-library-rnn-adapter": "2.x.x",
     "eslint": "7.32.0",
     "eslint-config-prettier": "6.11.0",
@@ -98,20 +98,20 @@
     "github-release-notes": "https://github.com/yogevbd/github-release-notes/tarball/e601b3dba72dcd6cba323c1286ea6dd0c0110b58",
     "husky": "4.2.5",
     "identity-obj-proxy": "3.0.0",
-    "jest": "^26.6.3",
+    "jest": "^27.5.1",
     "lint-staged": "10.2.11",
     "metro-react-native-babel-preset": "^0.70.3",
     "pixelmatch": "^5.2.1",
     "pngjs": "^6.0.0",
     "prettier": "2.1.2",
-    "react": "18.0.0",
-    "react-native": "0.69.7",
-    "react-native-fast-image": "^8.3.4",
-    "react-native-gesture-handler": "^1.6.1",
-    "react-native-reanimated": "2.10.0",
-    "react-native-ui-lib": "6.21.0",
+    "react": "18.2.0",
+    "react-native": "0.71.8",
+    "react-native-fast-image": "^8.6.3",
+    "react-native-gesture-handler": "^2.10.1",
+    "react-native-reanimated": "2.14.1",
+    "react-native-ui-lib": "7.3.6",
     "react-redux": "5.x.x",
-    "react-test-renderer": "18.0.0",
+    "react-test-renderer": "18.2.0",
     "redux": "3.x.x",
     "remx": "3.x.x",
     "semver": "5.x.x",