Parcourir la source

Apply SideMenu options when it becomes visible

Fixes #5444
Guy Carmeli il y a 5 ans
Parent
révision
46ca0f3dcc

+ 4
- 0
lib/android/app/src/main/java/com/reactnativenavigation/presentation/SideMenuPresenter.java Voir le fichier

29
         return false;
29
         return false;
30
     }
30
     }
31
 
31
 
32
+    public void applyOptions(Options options) {
33
+        applyLockMode(options.sideMenuRootOptions);
34
+    }
35
+
32
     public void mergeOptions(SideMenuRootOptions options) {
36
     public void mergeOptions(SideMenuRootOptions options) {
33
         mergeLockMode(options);
37
         mergeLockMode(options);
34
         mergeVisibility(options);
38
         mergeVisibility(options);

+ 6
- 0
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java Voir le fichier

77
 		return children;
77
 		return children;
78
 	}
78
 	}
79
 
79
 
80
+    @Override
81
+    public void applyOptions(Options options) {
82
+        super.applyOptions(options);
83
+        presenter.applyOptions(options);
84
+    }
85
+
80
     @Override
86
     @Override
81
     public void applyChildOptions(Options options, ViewController child) {
87
     public void applyChildOptions(Options options, ViewController child) {
82
         super.applyChildOptions(options, child);
88
         super.applyChildOptions(options, child);

+ 7
- 0
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java Voir le fichier

81
         verify(presenter).bindView(eq(sideMenu));
81
         verify(presenter).bindView(eq(sideMenu));
82
     }
82
     }
83
 
83
 
84
+    @Test
85
+    public void applyOptions() {
86
+        Options options = new Options();
87
+        uut.applyOptions(options);
88
+        verify(presenter).applyOptions(options);
89
+    }
90
+
84
     @Test
91
     @Test
85
     public void getCurrentChild() {
92
     public void getCurrentChild() {
86
         setLeftRight(left, right);
93
         setLeftRight(left, right);