Browse Source

V2 rn49 (#2411)

* largeTitleFix

* update to rn 49 - reload still not working on ios

* bridge fix

* small fixes

* testing with rn50

* removed package-lock

* go back to 49, problem with android in 50
yogevbd 6 years ago
parent
commit
8ff90efd3d

+ 0
- 1
e2e/init.js View File

1
-require('babel-polyfill'); // eslint-disable-line import/no-extraneous-dependencies
2
 const detox = require('detox');
1
 const detox = require('detox');
3
 const config = require('../package.json').detox;
2
 const config = require('../package.json').detox;
4
 
3
 

+ 4
- 0
lib/ios/RNNNavigationOptions.m View File

94
 				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBar.textFontSize floatValue]];
94
 				navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBar.textFontSize floatValue]];
95
 			}
95
 			}
96
 			viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
96
 			viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
97
+			if (@available(iOS 11.0, *)){
98
+				viewController.navigationController.navigationBar.largeTitleTextAttributes = navigationBarTitleTextAttributes;
99
+			}
100
+			
97
 		}
101
 		}
98
 		
102
 		
99
 		
103
 		

+ 8
- 0
lib/ios/ReactNativeNavigation.m View File

87
 	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
87
 	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
88
 }
88
 }
89
 
89
 
90
+-(void)onBridgeWillReload {
91
+	UIApplication.sharedApplication.delegate.window.rootViewController =  nil;
92
+}
93
+
90
 # pragma mark - private
94
 # pragma mark - private
91
 
95
 
92
 -(void)createBridgeLoadJsAndThenInitDependencyGraph {
96
 -(void)createBridgeLoadJsAndThenInitDependencyGraph {
102
 											 selector:@selector(onJavaScriptWillLoad)
106
 											 selector:@selector(onJavaScriptWillLoad)
103
 												 name:RCTJavaScriptWillStartLoadingNotification
107
 												 name:RCTJavaScriptWillStartLoadingNotification
104
 											   object:nil];
108
 											   object:nil];
109
+	[[NSNotificationCenter defaultCenter] addObserver:self
110
+											 selector:@selector(onBridgeWillReload)
111
+												 name:RCTBridgeWillReloadNotification
112
+											   object:nil];
105
 }
113
 }
106
 
114
 
107
 @end
115
 @end

+ 0
- 9666
package-lock.json
File diff suppressed because it is too large
View File


+ 3
- 3
package.json View File

58
     "jsdoc": "3.x.x",
58
     "jsdoc": "3.x.x",
59
     "jsdoc-to-markdown": "3.x.x",
59
     "jsdoc-to-markdown": "3.x.x",
60
     "mocha": "4.x.x",
60
     "mocha": "4.x.x",
61
-    "react": "16.0.0-alpha.6",
62
-    "react-native": "0.44.2",
61
+    "react": "16.0.0-beta.5",
62
+    "react-native": "0.49.x",
63
     "react-redux": "5.x.x",
63
     "react-redux": "5.x.x",
64
-    "react-test-renderer": "16.0.0-alpha.6",
64
+    "react-test-renderer": "16.0.0-alpha.12",
65
     "redux": "3.x.x",
65
     "redux": "3.x.x",
66
     "remx": "2.x.x",
66
     "remx": "2.x.x",
67
     "semver": "5.x.x",
67
     "semver": "5.x.x",

+ 61
- 1
playground/ios/playground.xcodeproj/project.pbxproj View File

218
 			remoteGlobalIDString = 2D2A28881D9B049200D4039D;
218
 			remoteGlobalIDString = 2D2A28881D9B049200D4039D;
219
 			remoteInfo = "RCTWebSocket-tvOS";
219
 			remoteInfo = "RCTWebSocket-tvOS";
220
 		};
220
 		};
221
+		E8CB6AA71FF10BC4007C82EF /* PBXContainerItemProxy */ = {
222
+			isa = PBXContainerItemProxy;
223
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
224
+			proxyType = 2;
225
+			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
226
+			remoteInfo = "third-party";
227
+		};
228
+		E8CB6AA91FF10BC4007C82EF /* PBXContainerItemProxy */ = {
229
+			isa = PBXContainerItemProxy;
230
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
231
+			proxyType = 2;
232
+			remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
233
+			remoteInfo = "third-party-tvOS";
234
+		};
235
+		E8CB6AAB1FF10BC4007C82EF /* PBXContainerItemProxy */ = {
236
+			isa = PBXContainerItemProxy;
237
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
238
+			proxyType = 2;
239
+			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
240
+			remoteInfo = "double-conversion";
241
+		};
242
+		E8CB6AAD1FF10BC4007C82EF /* PBXContainerItemProxy */ = {
243
+			isa = PBXContainerItemProxy;
244
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
245
+			proxyType = 2;
246
+			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
247
+			remoteInfo = "double-conversion-tvOS";
248
+		};
221
 /* End PBXContainerItemProxy section */
249
 /* End PBXContainerItemProxy section */
222
 
250
 
223
 /* Begin PBXFileReference section */
251
 /* Begin PBXFileReference section */
301
 				7B8F2FE01E840F3600110AEC /* libcxxreact.a */,
329
 				7B8F2FE01E840F3600110AEC /* libcxxreact.a */,
302
 				7B8F2FE21E840F3600110AEC /* libjschelpers.a */,
330
 				7B8F2FE21E840F3600110AEC /* libjschelpers.a */,
303
 				7B8F2FE41E840F3600110AEC /* libjschelpers.a */,
331
 				7B8F2FE41E840F3600110AEC /* libjschelpers.a */,
332
+				E8CB6AA81FF10BC4007C82EF /* libthird-party.a */,
333
+				E8CB6AAA1FF10BC4007C82EF /* libthird-party.a */,
334
+				E8CB6AAC1FF10BC4007C82EF /* libdouble-conversion.a */,
335
+				E8CB6AAE1FF10BC4007C82EF /* libdouble-conversion.a */,
304
 			);
336
 			);
305
 			name = Products;
337
 			name = Products;
306
 			sourceTree = "<group>";
338
 			sourceTree = "<group>";
724
 			remoteRef = 7B8F30471E8412E100110AEC /* PBXContainerItemProxy */;
756
 			remoteRef = 7B8F30471E8412E100110AEC /* PBXContainerItemProxy */;
725
 			sourceTree = BUILT_PRODUCTS_DIR;
757
 			sourceTree = BUILT_PRODUCTS_DIR;
726
 		};
758
 		};
759
+		E8CB6AA81FF10BC4007C82EF /* libthird-party.a */ = {
760
+			isa = PBXReferenceProxy;
761
+			fileType = archive.ar;
762
+			path = "libthird-party.a";
763
+			remoteRef = E8CB6AA71FF10BC4007C82EF /* PBXContainerItemProxy */;
764
+			sourceTree = BUILT_PRODUCTS_DIR;
765
+		};
766
+		E8CB6AAA1FF10BC4007C82EF /* libthird-party.a */ = {
767
+			isa = PBXReferenceProxy;
768
+			fileType = archive.ar;
769
+			path = "libthird-party.a";
770
+			remoteRef = E8CB6AA91FF10BC4007C82EF /* PBXContainerItemProxy */;
771
+			sourceTree = BUILT_PRODUCTS_DIR;
772
+		};
773
+		E8CB6AAC1FF10BC4007C82EF /* libdouble-conversion.a */ = {
774
+			isa = PBXReferenceProxy;
775
+			fileType = archive.ar;
776
+			path = "libdouble-conversion.a";
777
+			remoteRef = E8CB6AAB1FF10BC4007C82EF /* PBXContainerItemProxy */;
778
+			sourceTree = BUILT_PRODUCTS_DIR;
779
+		};
780
+		E8CB6AAE1FF10BC4007C82EF /* libdouble-conversion.a */ = {
781
+			isa = PBXReferenceProxy;
782
+			fileType = archive.ar;
783
+			path = "libdouble-conversion.a";
784
+			remoteRef = E8CB6AAD1FF10BC4007C82EF /* PBXContainerItemProxy */;
785
+			sourceTree = BUILT_PRODUCTS_DIR;
786
+		};
727
 /* End PBXReferenceProxy section */
787
 /* End PBXReferenceProxy section */
728
 
788
 
729
 /* Begin PBXResourcesBuildPhase section */
789
 /* Begin PBXResourcesBuildPhase section */
751
 			);
811
 			);
752
 			runOnlyForDeploymentPostprocessing = 0;
812
 			runOnlyForDeploymentPostprocessing = 0;
753
 			shellPath = /bin/sh;
813
 			shellPath = /bin/sh;
754
-			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/packager/react-native-xcode.sh ./playground/index.ios.js";
814
+			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh ./playground/index.ios.js";
755
 		};
815
 		};
756
 /* End PBXShellScriptBuildPhase section */
816
 /* End PBXShellScriptBuildPhase section */
757
 
817
 

+ 2
- 1
playground/src/containers/CustomTransitionOrigin.js View File

13
       topBar: {
13
       topBar: {
14
         textFontFamily: 'HelveticaNeue-Italic',
14
         textFontFamily: 'HelveticaNeue-Italic',
15
         textFontSize: 16,
15
         textFontSize: 16,
16
-        largeTitle: false
16
+        largeTitle: false,
17
+        translucent: true
17
       }
18
       }
18
     };
19
     };
19
   }
20
   }