Merge options (#3055)

* migrate js and java to mergeOptions

* migrate ios to mergeOptions

docs/docs/screen-api.md

@@ -128,12 +128,12 @@ this.props.navigator.handleDeepLink({
   Navigation.handleDeepLink(...);
 ``` -->
 
-## setOptions(componentId, options = {})
+## mergeOptions(componentId, options = {})
 
 Set options dynamically for component.
 
 ```js
-Navigation.setOptions(this.props.componentId, {
+Navigation.mergeOptions(this.props.componentId, {
   topBar: {
     visible: true,
     title: {

docs/docs/styling.md

@@ -42,10 +42,10 @@ Navigation.setDefaultOptions({
 ```
 
 ## Setting styles dynamically
-Use the `setOptions` method to change a screen's style dynamically.
+Use the `mergeOptions` method to change a screen's style dynamically.
 
 ```js
-Navigation.setOptions(this.props.componentId, {
+Navigation.mergeOptions(this.props.componentId, {
   topBar: {
     visible: true
   }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -55,9 +55,9 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     }
 
 	@ReactMethod
-	public void setOptions(final String onComponentId, final ReadableMap options) {
+	public void mergeOptions(final String onComponentId, final ReadableMap options) {
 		final Options navOptions = Options.parse(new TypefaceLoader(activity()), new JSONObject(options.toHashMap()));
-		handle(() -> navigator().setOptions(onComponentId, navOptions));
+		handle(() -> navigator().mergeOptions(onComponentId, navOptions));
 	}
 
 	@ReactMethod

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -100,7 +100,7 @@ public class Navigator extends ParentController implements ModalListener {
         return defaultOptions;
     }
 
-    public void setOptions(final String componentId, Options options) {
+    public void mergeOptions(final String componentId, Options options) {
         ViewController target = findControllerById(componentId);
         if (target instanceof NavigationOptionsListener) {
             ((NavigationOptionsListener) target).mergeOptions(options);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -243,7 +243,7 @@ public class NavigatorTest extends BaseTest {
     }
 
     @Test
-    public void setOptions_CallsApplyNavigationOptions() {
+    public void mergeOptions_CallsApplyNavigationOptions() {
         ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId", new Options());
         componentVc.setParentController(parentController);
         assertThat(componentVc.options.topBar.title.text.get("")).isEmpty();
@@ -252,13 +252,13 @@ public class NavigatorTest extends BaseTest {
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
 
-        uut.setOptions("theId", options);
+        uut.mergeOptions("theId", options);
         assertThat(componentVc.options.topBar.title.text.get()).isEqualTo("new title");
     }
 
     @Test
-    public void setOptions_AffectsOnlyComponentViewControllers() {
-        uut.setOptions("some unknown child id", new Options());
+    public void mergeOptions_AffectsOnlyComponentViewControllers() {
+        uut.mergeOptions("some unknown child id", new Options());
     }
 
     @NonNull

lib/ios/RNNBridgeModule.m

@@ -24,8 +24,8 @@ RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock
 	}];
 }
 
-RCT_EXPORT_METHOD(setOptions:(NSString*)componentId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler setOptions:componentId options:options completion:^{
+RCT_EXPORT_METHOD(mergeOptions:(NSString*)componentId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler mergeOptions:componentId options:options completion:^{
 		resolve(componentId);
 	}];
 }

lib/ios/RNNCommandsHandler.h

@@ -10,7 +10,7 @@
 
 -(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) setOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void) mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
 -(void) setDefaultOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -38,7 +38,7 @@
 	completion();
 }
 
--(void) setOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
+-(void) mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	UIViewController* vc = [_store findComponentForId:componentId];

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -80,7 +80,7 @@
 	NSDictionary* dictFromJs = @{@"topBar": @{@"backgroundColor" :@(0xFFFF0000)}};
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
-	[self.uut setOptions:@"componentId" options:dictFromJs completion:^{
+	[self.uut mergeOptions:@"componentId" options:dictFromJs completion:^{
 		XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 		XCTAssertTrue([nav.navigationBar.barTintColor isEqual:expectedColor]);
 	}];

lib/src/Navigation.ts

@@ -70,8 +70,8 @@ export class Navigation {
   /**
    * Change a component's navigation options
    */
-  public setOptions(componentId: string, options): void {
-    this.commands.setOptions(componentId, options);
+  public mergeOptions(componentId: string, options): void {
+    this.commands.mergeOptions(componentId, options);
   }
 
   /**

lib/src/adapters/NativeCommandsSender.ts

@@ -14,8 +14,8 @@ export class NativeCommandsSender {
     return this.nativeCommandsModule.setDefaultOptions(options);
   }
 
-  setOptions(componentId: string, options: object) {
-    return this.nativeCommandsModule.setOptions(componentId, options);
+  mergeOptions(componentId: string, options: object) {
+    return this.nativeCommandsModule.mergeOptions(componentId, options);
   }
 
   push(onComponentId: string, layout: object) {

lib/src/commands/Commands.test.ts

@@ -68,17 +68,17 @@ describe('Commands', () => {
     });
   });
 
-  describe('setOptions', () => {
+  describe('mergeOptions', () => {
     it('deep clones input to avoid mutation errors', () => {
       const obj = { title: 'test' };
-      uut.setOptions('theComponentId', obj);
-      expect(mockCommandsSender.setOptions.mock.calls[0][1]).not.toBe(obj);
+      uut.mergeOptions('theComponentId', obj);
+      expect(mockCommandsSender.mergeOptions.mock.calls[0][1]).not.toBe(obj);
     });
 
     it('passes options for component', () => {
-      uut.setOptions('theComponentId', { title: '1' });
-      expect(mockCommandsSender.setOptions).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.setOptions).toHaveBeenCalledWith('theComponentId', { title: '1' });
+      uut.mergeOptions('theComponentId', { title: '1' });
+      expect(mockCommandsSender.mergeOptions).toHaveBeenCalledTimes(1);
+      expect(mockCommandsSender.mergeOptions).toHaveBeenCalledWith('theComponentId', { title: '1' });
     });
   });
 
@@ -360,7 +360,7 @@ describe('Commands', () => {
       const argsForMethodName = {
         setRoot: [{}],
         setDefaultOptions: [{}],
-        setOptions: ['id', {}],
+        mergeOptions: ['id', {}],
         showModal: [{}],
         dismissModal: ['id'],
         dismissAllModals: [],
@@ -375,7 +375,7 @@ describe('Commands', () => {
       const paramsForMethodName = {
         setRoot: { layout: 'parsed' },
         setDefaultOptions: { options: {} },
-        setOptions: { componentId: 'id', options: {} },
+        mergeOptions: { componentId: 'id', options: {} },
         showModal: { layout: 'parsed' },
         dismissModal: { componentId: 'id' },
         dismissAllModals: {},

lib/src/commands/Commands.ts

@@ -27,12 +27,12 @@ export class Commands {
     this.commandsObserver.notify('setDefaultOptions', { options });
   }
 
-  public setOptions(componentId, options) {
+  public mergeOptions(componentId, options) {
     const input = _.cloneDeep(options);
     this.layoutTreeCrawler.processOptions(input);
 
-    this.nativeCommandsSender.setOptions(componentId, input);
-    this.commandsObserver.notify('setOptions', { componentId, options });
+    this.nativeCommandsSender.mergeOptions(componentId, input);
+    this.commandsObserver.notify('mergeOptions', { componentId, options });
   }
 
   public showModal(simpleApi) {

playground/src/screens/OptionsScreen.js

@@ -125,7 +125,7 @@ class OptionsScreen extends Component {
 
   onNavigationButtonPressed(id) {
     if (id === BUTTON_ONE) {
-      Navigation.setOptions(this.props.componentId, {
+      Navigation.mergeOptions(this.props.componentId, {
         topBar: {
           rightButtons: [{
             id: BUTTON_TWO,
@@ -142,7 +142,7 @@ class OptionsScreen extends Component {
         }
       });
     } else if (id === BUTTON_TWO) {
-      Navigation.setOptions(this.props.componentId, {
+      Navigation.mergeOptions(this.props.componentId, {
         topBar: {
           rightButtons: [{
             id: BUTTON_ONE,
@@ -165,7 +165,7 @@ class OptionsScreen extends Component {
   }
 
   onClickDynamicOptions = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         title: {
           text: 'Dynamic Title',
@@ -173,8 +173,7 @@ class OptionsScreen extends Component {
           largeTitle: false,
           fontSize: 20,
           fontFamily: 'HelveticaNeue-CondensedBold'
-        },
-        color: 'red',
+        }
       }
     });
   }
@@ -196,7 +195,7 @@ class OptionsScreen extends Component {
   }
 
   onClickTopBarTransparent = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         transparent: true
       }
@@ -204,7 +203,7 @@ class OptionsScreen extends Component {
   }
 
   onClickTopBarOpaque = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         transparent: false
       }
@@ -212,7 +211,7 @@ class OptionsScreen extends Component {
   }
 
   onClickShowTopBar = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         visible: true,
         animate: true
@@ -221,7 +220,7 @@ class OptionsScreen extends Component {
   }
 
   onClickHideTopBar = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         visible: false,
         animate: true
@@ -230,7 +229,7 @@ class OptionsScreen extends Component {
   }
 
   onClickFab = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       fab: {
         id: FAB,
         visible: false
@@ -268,7 +267,7 @@ class OptionsScreen extends Component {
   }
 
   onShowTopBarReactView = () => {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         title: {
           component: {

playground/src/screens/OrientationDetectScreen.js

@@ -12,7 +12,7 @@ class OrientationDetectScreen extends Component {
 
     this.detectHorizontal = this.detectHorizontal.bind(this);
     this.state = { horizontal: false };
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       orientation: props.orientation
     });
   }

playground/src/screens/ScrollViewScreen.js

@@ -58,7 +58,7 @@ class ScrollViewScreen extends Component {
   }
 
   componentDidUpdate() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         hideOnScroll: this.state.topBarHideOnScroll
       },

playground/src/screens/SideMenuScreen.js

@@ -20,7 +20,7 @@ class SideMenuScreen extends Component {
   }
 
   hideSideMenu() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       sideMenu: {
         [this.props.side]: {
           visible: false

playground/src/screens/TextScreen.js

@@ -58,7 +58,7 @@ class TextScreen extends Component {
   }
 
   onButtonPress() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       bottomTab: {
         badge: `TeSt`
       }
@@ -66,7 +66,7 @@ class TextScreen extends Component {
   }
 
   onClickSwitchToTab() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       bottomTabs: {
         currentTabIndex: 1,
         visible: false,
@@ -78,7 +78,7 @@ class TextScreen extends Component {
   }
 
   onClickSwitchToTabByComponentID() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       bottomTabs: {
         currentTabId: globalFirstComponentID
       }
@@ -86,7 +86,7 @@ class TextScreen extends Component {
   }
 
   hideTabBar(visible) {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       bottomTabs: {
         visible,
         animate: true
@@ -95,7 +95,7 @@ class TextScreen extends Component {
   }
 
   showSideMenu(side) {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       sideMenu: {
         [side]: {
           visible: true

playground/src/screens/TopTabOptionsScreen.js

@@ -33,7 +33,7 @@ class TopTabOptionsScreen extends PureComponent {
   }
 
   onClickDynamicOptions() {
-    Navigation.setOptions(this.props.componentId, {
+    Navigation.mergeOptions(this.props.componentId, {
       topBar: {
         title: {
           text: 'Dynamic Title',

playground/src/screens/WelcomeScreen.js

@@ -417,7 +417,7 @@ class WelcomeScreen extends Component {
         ]
       }
     });
-    Navigation.setOptions('my unique id', {
+    Navigation.mergeOptions('my unique id', {
       topBar: {
         title: {
           text: 'User provided id'