react-native-navigation 7.23.0 → 7.23.1-snapshot.277

package/.buildkite/pipeline.yml

@@ -1,19 +1,48 @@
-env:
-  CI: true
-  ANDROID_HOME: /usr/local/share/android-sdk/
-  PATH: "$PATH:/usr/local/share/android-sdk/platform-tools/"
 steps:
-  - label: "Android :android:"
+  - block: ":rocket: Release!"
+    prompt: "Fill out the details for release"
+    if: 'build.message =~ /^release\$/i'
+    fields:
+      - text: "VERSION"
+        key: "version"
+      - text: "NPM_TAG"
+        key: "npm-tag"
+        default: 'null'
+        required: false
+      - text: "BUILD_DOCUMENTATION_VERSION"
+        key: "build-documentation-version"
+        default: 'null'
+        hint: 'Leave NULL if no version is specified'
+      - text: "REMOVE_DOCUMENTATION_VERSION"
+        key: "remove-documentation-version"
+        default: 'null'
+        hint: 'Leave NULL if no version is specified'
+  
+  - label: ":android: Android"
     command:
-    - "env"
+    - "nvm install"
     - "npm install"
-    - "npm run clean"
+    - "npm run test-js"
     - "npm run test-unit-android -- --release"
     - "npm run test-e2e-android-multi -- --release --headless --verbose --ci"
-         
-  - label: "IOS :ios:"
+    key: "android_build"
+
+  - label: ":ios: iOS"
     command:
-    - "env"
+    - "nvm install"
     - "npm install"
-    - "npm run clean"
+    - "npm run test-unit-ios -- --release"
+    - "npm run test-snapshot-ios -- --release"
     - "npm run test-e2e-ios -- --release --multi --ci"
+    key: "ios_build"
+
+  - label: ":package: Publish"
+    env:
+    if: "build.pull_request.id == null"
+    command:
+    - "nvm install"
+    - "npm install"
+    - "npm run release"
+    depends_on:
+    - "android_build"
+    - "ios_build"

package/.nvmrc

@@ -0,0 +1 @@
+14

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -2,9 +2,30 @@ package com.reactnativenavigation.views.stack.topbar.titlebar
 
 import android.annotation.SuppressLint
 import android.content.Context
+import androidx.core.view.children
 import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
 
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
-                        componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName)
+                        componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
+    }
+
+    private fun interceptReactRootViewMeasureSpec(widthMeasureSpec: Int): Int {
+        // This is a HACK.
+        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
+        // It's causing infinite measurements, that hung up the UI.
+        // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
+        // See for more details https://github.com/wix/react-native-navigation/pull/7096
+        var measuredWidth = 0;
+        this.children.forEach {
+            if (it.measuredWidth > measuredWidth) {
+                measuredWidth = it.measuredWidth
+            }
+        }
+        return if (measuredWidth > 0) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
+            widthMeasureSpec
+    }
+}

package/lib/dist/interfaces/Options.d.ts

@@ -430,6 +430,11 @@ export interface OptionsTopBarButton {
      * Set the button icon
      */
     icon?: ImageResource;
+    /**
+     * Set the SF symbol as icon (will be used primarily)
+     * #### (iOS 13+ specific)
+     */
+    sfSymbol?: string;
     /**
      * Set the button icon insets
      */

package/lib/ios/RNNButtonBuilder.m

@@ -31,7 +31,9 @@
         return [[RNNUIBarButtonItem alloc] initCustomIcon:button
                                               iconCreator:_iconCreator
                                                   onPress:onPress];
-    } else if (button.icon.hasValue) {
+	} else if (button.sfSymbol.hasValue) {
+		return [[RNNUIBarButtonItem alloc] initWithSFSymbol:button onPress:onPress];
+	} else if (button.icon.hasValue) {
         return [[RNNUIBarButtonItem alloc] initWithIcon:button onPress:onPress];
     } else if (button.text.hasValue) {
         return [[RNNUIBarButtonItem alloc] initWithTitle:button onPress:onPress];

package/lib/ios/RNNButtonOptions.h

@@ -16,6 +16,7 @@
 @property(nonatomic, strong) Color *color;
 @property(nonatomic, strong) Color *disabledColor;
 @property(nonatomic, strong) Image *icon;
+@property(nonatomic, strong) Text *sfSymbol;
 @property(nonatomic, strong) Bool *enabled;
 @property(nonatomic, strong) RNNInsetsOptions *iconInsets;
 @property(nonatomic, strong) Bool *selectTabOnPress;

package/lib/ios/RNNButtonOptions.m

@@ -11,6 +11,7 @@
     self.fontWeight = [TextParser parse:dict key:@"fontWeight"];
     self.fontSize = [NumberParser parse:dict key:@"fontSize"];
     self.text = [TextParser parse:dict key:@"text"];
+	self.sfSymbol = [TextParser parse:dict key:@"sfSymbol"];
     self.testID = [TextParser parse:dict key:@"testID"];
     self.accessibilityLabel = [TextParser parse:dict key:@"accessibilityLabel"];
     self.color = [ColorParser parse:dict key:@"color"];
@@ -39,6 +40,7 @@
     newOptions.color = self.color.copy;
     newOptions.disabledColor = self.disabledColor.copy;
     newOptions.icon = self.icon.copy;
+	newOptions.sfSymbol = self.sfSymbol.copy;
     newOptions.iconInsets = self.iconInsets.copy;
     newOptions.enabled = self.enabled.copy;
     newOptions.selectTabOnPress = self.selectTabOnPress.copy;
@@ -71,6 +73,8 @@
         self.disabledColor = options.disabledColor;
     if (options.icon.hasValue)
         self.icon = options.icon;
+	if (options.sfSymbol.hasValue)
+		self.sfSymbol = options.sfSymbol;
     if (options.enabled.hasValue) {
         self.enabled = options.enabled;
         [self.iconBackground setEnabled:self.enabled];

package/lib/ios/RNNStackPresenter.m

@@ -82,6 +82,9 @@
         setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds withDefault:NO]];
 
     [stack.view setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
+    if (options.topBar.background.component.name.hasValue) {
+        [self setCustomNavigationComponentBackground:options perform:nil];
+    }
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {

package/lib/ios/RNNUIBarButtonItem.h

@@ -14,6 +14,8 @@ typedef void (^RNNButtonPressCallback)(NSString *buttonId);
 - (instancetype)initCustomIcon:(RNNButtonOptions *)buttonOptions
                    iconCreator:(RNNIconCreator *)iconCreator
                        onPress:(RNNButtonPressCallback)onPress;
+- (instancetype)initWithSFSymbol:(RNNButtonOptions *)buttonOptions
+					onPress:(RNNButtonPressCallback)onPress;
 - (instancetype)initWithIcon:(RNNButtonOptions *)buttonOptions
                      onPress:(RNNButtonPressCallback)onPress;
 - (instancetype)initWithTitle:(RNNButtonOptions *)buttonOptions

package/lib/ios/RNNUIBarButtonItem.m

@@ -20,6 +20,23 @@
     return self;
 }
 
+- (instancetype)initWithSFSymbol:(RNNButtonOptions *)buttonOptions
+						 onPress:(RNNButtonPressCallback)onPress {
+    UIImage *iconImage = [UIImage alloc];
+
+	if (@available(iOS 13.0, *)) {
+        iconImage = [UIImage systemImageNamed:[buttonOptions.sfSymbol withDefault:nil]];
+	}
+
+    self = [super initWithImage:iconImage
+                          style:UIBarButtonItemStylePlain
+                         target:self
+                         action:@selector(onButtonPressed:)];
+    [self applyOptions:buttonOptions];
+    self.onPress = onPress;
+    return self;
+}
+
 - (instancetype)initWithIcon:(RNNButtonOptions *)buttonOptions
                      onPress:(RNNButtonPressCallback)onPress {
     UIImage *iconImage = buttonOptions.icon.get;

package/lib/src/interfaces/Options.ts

@@ -488,6 +488,11 @@ export interface OptionsTopBarButton {
    * Set the button icon
    */
   icon?: ImageResource;
+  /**
+   * Set the SF symbol as icon (will be used primarily)
+   * #### (iOS 13+ specific)
+   */
+  sfSymbol?: string;
   /**
    * Set the button icon insets
    */

package/package.json

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