Selaa lähdekoodia

fixed top tabs

Daniel Zlotin 8 vuotta sitten
vanhempi
commit
f88c46ccd5
1 muutettua tiedostoa jossa 15 lisäystä ja 6 poistoa
  1. 15
    6
      src/deprecated/platformSpecificDeprecated.android.js

+ 15
- 6
src/deprecated/platformSpecificDeprecated.android.js Näytä tiedosto

19
   addNavigationStyleParams(screen);
19
   addNavigationStyleParams(screen);
20
   screen.passProps = params.passProps;
20
   screen.passProps = params.passProps;
21
 
21
 
22
-  if (screen.topTabs) {
23
-    _.forEach(screen.topTabs, (tab) => {
24
-      addNavigatorParams(tab);
25
-      adaptNavigationParams(tab);
26
-    });
27
-  }
28
 
22
 
29
   //const drawer = setupDrawer(params.drawer);
23
   //const drawer = setupDrawer(params.drawer);
30
 
24
 
31
   /*
25
   /*
32
    * adapt to new API
26
    * adapt to new API
33
    */
27
    */
28
+  adaptTopTabs(screen);
34
   screen.screenId = screen.screen;
29
   screen.screenId = screen.screen;
35
   params.screen = adaptNavigationStyleToScreenStyle(screen);
30
   params.screen = adaptNavigationStyleToScreenStyle(screen);
36
   params.screen = adaptNavigationParams(screen);
31
   params.screen = adaptNavigationParams(screen);
39
   newPlatformSpecific.startApp(params);
34
   newPlatformSpecific.startApp(params);
40
 }
35
 }
41
 
36
 
37
+function adaptTopTabs(topTabs) {
38
+  _.forEach(topTabs, (tab) => {
39
+    addNavigatorParams(tab);
40
+    adaptNavigationParams(tab);
41
+  });
42
+}
43
+
42
 function navigatorPush(navigator, params) {
44
 function navigatorPush(navigator, params) {
43
   addNavigatorParams(params, navigator);
45
   addNavigatorParams(params, navigator);
44
   addNavigatorButtons(params);
46
   addNavigatorButtons(params);
45
   addTitleBarBackButtonIfNeeded(params);
47
   addTitleBarBackButtonIfNeeded(params);
46
   addNavigationStyleParams(params);
48
   addNavigationStyleParams(params);
47
 
49
 
50
+  adaptTopTabs(params);
51
+
48
   params.screenId = params.screen;
52
   params.screenId = params.screen;
49
   let adapted = adaptNavigationStyleToScreenStyle(params);
53
   let adapted = adaptNavigationStyleToScreenStyle(params);
50
   adapted = adaptNavigationParams(adapted);
54
   adapted = adaptNavigationParams(adapted);
77
   addNavigatorButtons(params);
81
   addNavigatorButtons(params);
78
   addNavigationStyleParams(params);
82
   addNavigationStyleParams(params);
79
 
83
 
84
+  adaptTopTabs(params);
85
+
80
   params.screenId = params.screen;
86
   params.screenId = params.screen;
81
   let adapted = adaptNavigationStyleToScreenStyle(params);
87
   let adapted = adaptNavigationStyleToScreenStyle(params);
82
   adapted = adaptNavigationParams(adapted);
88
   adapted = adaptNavigationParams(adapted);
153
     addTabIcon(tab);
159
     addTabIcon(tab);
154
     tab.passProps = params.passProps;
160
     tab.passProps = params.passProps;
155
 
161
 
162
+    adaptTopTabs(params);
163
+
156
     tab.screenId = tab.screen;
164
     tab.screenId = tab.screen;
157
 
165
 
158
     let newtab = adaptNavigationStyleToScreenStyle(tab);
166
     let newtab = adaptNavigationStyleToScreenStyle(tab);
255
   /*
263
   /*
256
    * adapt to new API
264
    * adapt to new API
257
    */
265
    */
266
+  adaptTopTabs(params);
258
   params.screenId = params.screen;
267
   params.screenId = params.screen;
259
   let adapted = adaptNavigationStyleToScreenStyle(params);
268
   let adapted = adaptNavigationStyleToScreenStyle(params);
260
   adapted = adaptNavigationParams(adapted);
269
   adapted = adaptNavigationParams(adapted);