react-native-navigation 7.23.1 → 7.24.0

package/.buildkite/pipeline.yml

@@ -1,19 +1,59 @@
-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"
+    timeout_in_minutes: 90
+
+  - label: ":ios: iOS - Unit"
     command:
-    - "env"
+    - "nvm install"
     - "npm install"
-    - "npm run clean"
+    - "npm run test-unit-ios -- --release"
+    key: "ios_unit"
+    timeout_in_minutes: 90
+
+  - label: ":ios: iOS - E2E"
+    command:
+    - "nvm install"
+    - "npm install"
+    - "npm run test-snapshot-ios -- --release"
     - "npm run test-e2e-ios -- --release --multi --ci"
+    key: "ios_e2e"
+    timeout_in_minutes: 90
+
+  - label: ":package: Publish"
+    env:
+    if: "build.pull_request.id == null"
+    command:
+    - "nvm install"
+    - "npm install"
+    - "npm run release"
+    depends_on:
+    - "android_build"
+    - "ios_unit"
+    - "ios_e2e"
+    timeout_in_minutes: 90

package/.nvmrc

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

package/Mock.d.ts

@@ -0,0 +1 @@
+export * from './lib/Mock';

package/Mock.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+(0, tslib_1.__exportStar)(require("./lib/Mock"), exports);

package/Mock.ts

@@ -1 +1 @@
-export * from './lib/dist/Mock';
+export * from './lib/Mock';

package/README.md

@@ -8,7 +8,6 @@
   <a href="https://www.npmjs.com/package/react-native-navigation"><img src="https://img.shields.io/npm/v/react-native-navigation/latest.svg?style=flat-square" alt="NPM latest version"></a>
   <a href="https://www.npmjs.com/package/react-native-navigation"><img src="https://img.shields.io/npm/v/react-native-navigation/snapshot.svg?style=flat-square" alt="NPM snapshot version"></a>
   <a href="https://jenkins-oss.wixpress.com/job/multi-react-native-navigation-master/"><img src="https://img.shields.io/jenkins/s/http/jenkins-oss.wixpress.com:8080/job/multi-react-native-navigation-master.svg?style=flat-square" alt="NPM snapshot version"></a>
-  <a href="https://github.com/wix/react-native-navigation/pulls"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fmerge-chance.info%2Fbadge%3Frepo%3Dwix/react-native-navigation"></a>
 
 </p>
 <p align="center">

package/jest.config.js

@@ -0,0 +1,40 @@
+module.exports = {
+  preset: 'react-native',
+  transformIgnorePatterns: [
+    'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable)/)',
+  ],
+  transform: {
+    '\\.[jt]sx?$': 'babel-jest',
+  },
+  roots: [
+    '<rootDir>/lib/src/',
+    '<rootDir>/playground/src/',
+    '<rootDir>/integration/',
+    '<rootDir>/scripts/',
+    '<rootDir>/e2e/',
+  ],
+  setupFilesAfterEnv: ['./jest-setup.js'],
+  testPathIgnorePatterns: ['/node_modules/'],
+  moduleNameMapper: {
+    'react-native-navigation/Mock': '<rootDir>/lib/Mock',
+    'react-native-navigation': '<rootDir>/lib/src',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+      '<rootDir>/playground/img/layouts@2x.png',
+  },
+  collectCoverageFrom: [
+    'lib/src/**/*.ts',
+    'lib/src/**/*.tsx',
+    'integration/**/*.js',
+    '!lib/dist/index.js',
+    '!lib/dist/Navigation.js',
+    '!lib/dist/adapters/**/*',
+    '!lib/dist/interfaces/**/*',
+    '!lib/dist/**/*.test.*',
+    '!integration/**/*.test.*',
+    '!integration/*.test.*',
+    '!e2e/**/*test.js',
+  ],
+  resetMocks: true,
+  resetModules: true,
+  coverageReporters: ['json', 'lcov', 'text', 'html'],
+};

package/lib/{src/Mock → Mock}/Components/ComponentScreen.tsx

@@ -1,11 +1,13 @@
 import React, { Component } from 'react';
 import { Button, View, Text } from 'react-native';
-import { Navigation } from '../..';
+import { Navigation } from '../../src';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { connect } from '../connect';
 import { TopBar } from './TopBar';
+import { events } from '../Stores/EventsStore';
+import _ from 'lodash';
 
 export const ComponentScreen = connect(
   class extends Component<ComponentProps> {
@@ -34,7 +36,13 @@ export const ComponentScreen = connect(
             <Button
               testID={bottomTabOptions?.testID}
               title={bottomTabOptions?.text || ''}
-              onPress={() => LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i)}
+              onPress={() => {
+                events.invokeBottomTabPressed({
+                  tabIndex: i,
+                });
+                if (_.defaultTo(bottomTabOptions?.selectTabOnPress, true))
+                  LayoutStore.selectTabIndex(this.props.layoutNode.getBottomTabs(), i);
+              }}
             />
             <Text>{bottomTabOptions?.badge}</Text>
           </View>
@@ -46,6 +54,9 @@ export const ComponentScreen = connect(
 
     render() {
       const Component = Navigation.mock.store.getWrappedComponent(this.props.layoutNode.data.name);
+      if (!Component)
+        throw new Error(`${this.props.layoutNode.data.name} has not been registered.`);
+
       return (
         <View testID={this.isVisible() ? VISIBLE_SCREEN_TEST_ID : undefined}>
           {this.props.layoutNode.getStack() && (

package/lib/{src/Mock → Mock}/Components/NavigationButton.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Button, TouchableOpacity } from 'react-native';
-import { Navigation, OptionsTopBarButton } from '../../';
+import { Navigation, OptionsTopBarButton } from '../../src';
 import { events } from '../Stores/EventsStore';
 
 interface ButtonProps {

package/lib/{src/Mock → Mock}/Components/TopBar.tsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Button, View, Text } from 'react-native';
-import { Navigation, OptionsTopBarButton } from '../..';
-import { OptionsTopBar, OptionsTopBarBackButton } from '../../interfaces/Options';
+import { Navigation, OptionsTopBarButton } from '../../src';
+import { OptionsTopBar, OptionsTopBarBackButton } from '../../src/interfaces/Options';
 import ParentNode from '../Layouts/ParentNode';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { NavigationButton } from './NavigationButton';

package/lib/{src/Mock → Mock}/Layouts/BottomTabsNode.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { Options } from '../../index';
+import { Options } from '../../src/index';
 import { LayoutStore } from '../Stores/LayoutStore';
 import ParentNode from './ParentNode';
 

package/lib/{src/Mock → Mock}/Layouts/ComponentNode.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { OptionsTopBarButton } from 'react-native-navigation/interfaces/Options';
+import { OptionsTopBarButton } from '../../src';
 import { events } from '../Stores/EventsStore';
 import ParentNode from './ParentNode';
 

package/lib/{src/Mock → Mock}/Layouts/Node.ts

@@ -1,4 +1,4 @@
-import { Options } from '../../index';
+import { Options } from '../../src/index';
 import ParentNode from './ParentNode';
 
 interface Data {

package/lib/{src/Mock → Mock}/Layouts/ParentNode.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import { OptionsTopBarButton } from '../../interfaces/Options';
-import { Options } from '../../index';
+import { OptionsTopBarButton } from '../../src/interfaces/Options';
+import { Options } from '../../src/index';
 import { LayoutStore } from '../Stores/LayoutStore';
 import ComponentNode from './ComponentNode';
 import LayoutNodeFactory from './LayoutNodeFactory';

package/lib/{src/Mock → Mock}/Stores/EventsStore.ts

@@ -2,8 +2,9 @@ import {
   ComponentDidDisappearEvent,
   ComponentWillAppearEvent,
   ModalDismissedEvent,
-} from '../../interfaces/ComponentEvents';
-import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../index';
+} from '../../src/interfaces/ComponentEvents';
+import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
+import { BottomTabPressedEvent } from '../../src/interfaces/Events';
 
 export const events = {
   navigationButtonPressed: [(_event: NavigationButtonPressedEvent) => {}],
@@ -11,6 +12,7 @@ export const events = {
   componentDidAppear: [(_event: ComponentDidAppearEvent) => {}],
   componentDidDisappear: [(_event: ComponentDidDisappearEvent) => {}],
   modalDismissed: [(_event: ModalDismissedEvent) => {}],
+  bottomTabPressed: [(_event: BottomTabPressedEvent) => {}],
   invokeComponentWillAppear: (event: ComponentWillAppearEvent) => {
     events.componentWillAppear &&
       events.componentWillAppear.forEach((listener) => {
@@ -41,4 +43,10 @@ export const events = {
         listener(event);
       });
   },
+  invokeBottomTabPressed: (event: BottomTabPressedEvent) => {
+    events.bottomTabPressed &&
+      events.bottomTabPressed?.forEach((listener) => {
+        listener(event);
+      });
+  },
 };

package/lib/{src/Mock → Mock}/Stores/LayoutStore.ts

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import BottomTabsNode from '../Layouts/BottomTabsNode';
 import ParentNode from '../Layouts/ParentNode';
 import LayoutNodeFactory from '../Layouts/LayoutNodeFactory';
-import { Options } from '../../interfaces/Options';
+import { Options } from '../../src/interfaces/Options';
 import StackNode from '../Layouts/StackNode';
 
 const remx = require('remx');
@@ -77,7 +77,8 @@ const setters = remx.setters({
   },
   mergeOptions(componentId: string, options: Options) {
     const layout = getters.getLayoutById(componentId);
-    layout.mergeOptions(options);
+    if (layout) layout.mergeOptions(options);
+    else console.warn(`[RNN error] Merge options failure: cannot find layout for: ${componentId}`);
   },
 });
 

package/lib/Mock/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const VISIBLE_SCREEN_TEST_ID = "VISIBLE_SCREEN_TEST_ID";
+export declare const VISIBLE_OVERLAY_TEST_ID = "VISIBLE_OVERLAY_TEST_ID";

package/lib/Mock/constants.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VISIBLE_OVERLAY_TEST_ID = exports.VISIBLE_SCREEN_TEST_ID = void 0;
+exports.VISIBLE_SCREEN_TEST_ID = 'VISIBLE_SCREEN_TEST_ID';
+exports.VISIBLE_OVERLAY_TEST_ID = 'VISIBLE_OVERLAY_TEST_ID';

package/lib/Mock/index.d.ts

@@ -0,0 +1,3 @@
+export declare const ApplicationMock: any;
+export * from './constants';
+export declare function mockNativeComponents(): void;

package/lib/Mock/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mockNativeComponents = exports.ApplicationMock = void 0;
+const tslib_1 = require("tslib");
+exports.ApplicationMock = require('./Application').Application;
+(0, tslib_1.__exportStar)(require("./constants"), exports);
+function mockNativeComponents() {
+    const { NativeCommandsSender } = require('./mocks/NativeCommandsSender');
+    const { NativeEventsReceiver } = require('./mocks/NativeEventsReceiver');
+    const { AppRegistryService } = require('./mocks/AppRegistryService');
+    const { Navigation } = require('react-native-navigation');
+    Navigation.mockNativeComponents(new NativeCommandsSender(), new NativeEventsReceiver(), new AppRegistryService());
+}
+exports.mockNativeComponents = mockNativeComponents;

package/lib/{src/Mock → Mock}/mocks/NativeCommandsSender.tsx

@@ -1,6 +1,6 @@
 import { LayoutStore } from '../Stores/LayoutStore';
 import LayoutNodeFactory from '../Layouts/LayoutNodeFactory';
-import { LayoutNode } from 'react-native-navigation/commands/LayoutTreeCrawler';
+import { LayoutNode } from '../../src/commands/LayoutTreeCrawler';
 import { events } from '../Stores/EventsStore';
 import _ from 'lodash';
 import ComponentNode from '../Layouts/ComponentNode';

package/lib/{src/Mock → Mock}/mocks/NativeEventsReceiver.ts

@@ -11,13 +11,13 @@ import {
   ModalDismissedEvent,
   ScreenPoppedEvent,
   ModalAttemptedToDismissEvent,
-} from '../../interfaces/ComponentEvents';
+} from '../../src/interfaces/ComponentEvents';
 import {
   CommandCompletedEvent,
   BottomTabSelectedEvent,
   BottomTabLongPressedEvent,
   BottomTabPressedEvent,
-} from '../../interfaces/Events';
+} from '../../src/interfaces/Events';
 import { events } from './../Stores/EventsStore';
 
 export class NativeEventsReceiver {
@@ -73,10 +73,13 @@ export class NativeEventsReceiver {
   }
 
   public registerBottomTabPressedListener(
-    _callback: (data: BottomTabPressedEvent) => void
+    callback: (data: BottomTabPressedEvent) => void
   ): EmitterSubscription {
+    events.bottomTabPressed.push(callback);
     return {
-      remove: () => {},
+      remove: () => {
+        _.remove(events.bottomTabPressed, (value) => value === callback);
+      },
     } as EmitterSubscription;
   }
 

package/lib/android/app/build.gradle

@@ -3,27 +3,29 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 29
-def DEFAULT_MIN_SDK_VERSION = 19
-def DEFAULT_TARGET_SDK_VERSION = 29
-def kotlinVersion = rootProject.ext.get("RNNKotlinVersion")
-def kotlinStdlib = safeExtGet('RNNKotlinStdlib', 'kotlin-stdlib-jdk8')
-def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.4.3')
+def safeExtGetFallbackLowerBound(prop, fallback) {
+    Math.max(safeExtGet(prop,fallback),fallback)
+}
 
+def DEFAULT_COMPILE_SDK_VERSION = 30
+def DEFAULT_MIN_SDK_VERSION = 21
+def DEFAULT_TARGET_SDK_VERSION = 30
+def DEFAULT_KOTLIN_VERSION = "1.5.31"
+def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
+def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
+def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
+def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion safeExtGetFallbackLowerBound('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGetFallbackLowerBound('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
     }
     buildTypes {
         release {
@@ -170,13 +172,13 @@ allprojects { p ->
 }
 
 dependencies {
-    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.google.android.material:material:1.2.0-alpha03'
 
     implementation 'com.github.wix-playground:ahbottomnavigation:3.3.0'
@@ -188,12 +190,12 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
 
     // tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.4"
-    testImplementation 'org.assertj:assertj-core:3.8.0'
-    testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
-    testImplementation 'org.mockito:mockito-core:3.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.robolectric:robolectric:4.7.2"
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:4.0.0'
+    testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
     testImplementation 'org.mockito:mockito-inline:3.4.0'
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/options/FontOptions.kt

@@ -26,11 +26,11 @@ class FontOptions {
 
     @JvmOverloads fun getTypeface(typefaceLoader: TypefaceLoader, defaultTypeface: Typeface? = null): Typeface? {
         if (isDirty) {
-            _typeface = typefaceLoader.getTypeFace(fontFamily.get(""), fontStyle.get(""), fontWeight.get(""))
+            _typeface = typefaceLoader.getTypeFace(fontFamily.get(null), fontStyle.get(""), fontWeight.get(""), defaultTypeface)
             isDirty = false
         }
         return _typeface
-                ?: defaultTypeface?.let { typefaceLoader.getTypeFace(fontFamily.get(""), fontStyle.get(""), fontWeight.get(""), it) }
+                ?: defaultTypeface?.let { typefaceLoader.getTypeFace(fontFamily.get(null), fontStyle.get(""), fontWeight.get(""), it) }
     }
 
     fun mergeWith(other: FontOptions) {

package/lib/android/app/src/main/java/com/reactnativenavigation/options/HardwareBackButtonOptions.kt

@@ -6,10 +6,40 @@ import com.reactnativenavigation.options.parsers.BoolParser
 import org.json.JSONObject
 
 
+sealed class HwBackBottomTabsBehaviour {
+    object Undefined : HwBackBottomTabsBehaviour() {
+        override fun hasValue(): Boolean = false
+    }
+
+    object Exit : HwBackBottomTabsBehaviour()
+    object PrevSelection : HwBackBottomTabsBehaviour()
+    object JumpToFirst : HwBackBottomTabsBehaviour()
+
+    open fun hasValue(): Boolean = true
+
+    companion object {
+        private const val BEHAVIOUR_EXIT = "exit"
+        private const val BEHAVIOUR_PREV = "previous"
+        private const val BEHAVIOUR_FIRST = "first"
+        fun fromString(behaviour: String?): HwBackBottomTabsBehaviour {
+            return when (behaviour) {
+                BEHAVIOUR_PREV -> PrevSelection
+                BEHAVIOUR_FIRST -> JumpToFirst
+                BEHAVIOUR_EXIT -> Exit
+                else -> Undefined
+            }
+        }
+    }
+}
+
 open class HardwareBackButtonOptions(json: JSONObject? = null) {
 
-    @JvmField var dismissModalOnPress: Bool = NullBool()
-    @JvmField var popStackOnPress: Bool = NullBool()
+    @JvmField
+    var dismissModalOnPress: Bool = NullBool()
+
+    @JvmField
+    var popStackOnPress: Bool = NullBool()
+    var bottomTabOnPress: HwBackBottomTabsBehaviour = HwBackBottomTabsBehaviour.Undefined
 
     init {
         parse(json)
@@ -18,16 +48,19 @@ open class HardwareBackButtonOptions(json: JSONObject? = null) {
     fun mergeWith(other: HardwareBackButtonOptions) {
         if (other.dismissModalOnPress.hasValue()) dismissModalOnPress = other.dismissModalOnPress
         if (other.popStackOnPress.hasValue()) popStackOnPress = other.popStackOnPress
+        if (other.bottomTabOnPress.hasValue()) bottomTabOnPress = other.bottomTabOnPress
     }
 
     fun mergeWithDefault(defaultOptions: HardwareBackButtonOptions) {
         if (!dismissModalOnPress.hasValue()) dismissModalOnPress = defaultOptions.dismissModalOnPress
         if (!popStackOnPress.hasValue()) popStackOnPress = defaultOptions.popStackOnPress
+        if (!bottomTabOnPress.hasValue()) bottomTabOnPress = defaultOptions.bottomTabOnPress
     }
 
     private fun parse(json: JSONObject?) {
         json ?: return
         dismissModalOnPress = BoolParser.parse(json, "dismissModalOnPress")
         popStackOnPress = BoolParser.parse(json, "popStackOnPress")
+        bottomTabOnPress = HwBackBottomTabsBehaviour.fromString(json.optString("bottomTabsOnPress"))
     }
 }