Fixed UIExplorer in Catalyst shell

Author: nicklockwood

Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* SampleAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* SampleAppTests.m */; };
 		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
+		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -82,6 +83,13 @@
 			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
 			remoteInfo = SampleApp;
 		};
+		139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
+			remoteInfo = RCTSettings;
+		};
 		146834031AC3E56700842450 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
@@ -117,6 +125,7 @@
 		00E356EE1AD99517003FC87E /* SampleAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SampleAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* SampleAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SampleAppTests.m; sourceTree = "<group>"; };
+		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../../Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* SampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iOS/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iOS/AppDelegate.m; sourceTree = "<group>"; };
@@ -142,6 +151,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
+				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
 				00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */,
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
 				00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */,
@@ -230,6 +240,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		139105B71AF99BAD00B5F7CC /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		13B07FAE1A68108700A75B9A /* SampleApp */ = {
 			isa = PBXGroup;
 			children = (
@@ -263,14 +281,15 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
-				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
 				00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */,
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
 				00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
+				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
 				00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
+				139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
+				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
 				00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */,
 			);
@@ -395,6 +414,10 @@
 					ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */;
 					ProjectRef = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
 				},
+				{
+					ProductGroup = 139105B71AF99BAD00B5F7CC /* Products */;
+					ProjectRef = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
+				},
 				{
 					ProductGroup = 832341B11AAA6A8300B99B32 /* Products */;
 					ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -470,6 +493,13 @@
 			remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		139105C11AF99BAD00B5F7CC /* libRCTSettings.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTSettings.a;
+			remoteRef = 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		146834041AC3E56700842450 /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;

Examples/SampleApp/index.ios.js

@@ -24,7 +24,7 @@ var SampleApp = React.createClass({
         </Text>
         <Text style={styles.instructions}>
           Press Cmd+R to reload,{'\n'}
-          Cmd+Control+Z for dev menu
+          Cmd+D or shake for dev menu
         </Text>
       </View>
     );

Libraries/Settings/RCTSettingsManager.m

@@ -12,6 +12,7 @@
 #import "RCTBridge.h"
 #import "RCTConvert.h"
 #import "RCTEventDispatcher.h"
+#import "RCTUtils.h"
 
 @implementation RCTSettingsManager
 {
@@ -53,13 +54,15 @@ - (void)userDefaultsDidChange:(NSNotification *)note
     return;
   }
 
-  [_bridge.eventDispatcher sendDeviceEventWithName:@"settingsUpdated" body:[_defaults dictionaryRepresentation]];
+  [_bridge.eventDispatcher
+   sendDeviceEventWithName:@"settingsUpdated"
+   body:RCTJSONClean([_defaults dictionaryRepresentation])];
 }
 
 - (NSDictionary *)constantsToExport
 {
   return @{
-    @"settings": [_defaults dictionaryRepresentation]
+    @"settings": RCTJSONClean([_defaults dictionaryRepresentation])
   };
 }
 

React/Base/RCTConvert.m

@@ -838,7 +838,9 @@ static id RCTConvertPropertyListValue(id json)
 {
   if (!json || json == (id)kCFNull) {
     return nil;
-  } else if ([json isKindOfClass:[NSDictionary class]]) {
+  }
+
+  if ([json isKindOfClass:[NSDictionary class]]) {
     __block BOOL copy = NO;
     NSMutableDictionary *values = [[NSMutableDictionary alloc] initWithCapacity:[json count]];
     [json enumerateKeysAndObjectsUsingBlock:^(NSString *key, id jsonValue, BOOL *stop) {
@@ -849,7 +851,9 @@ static id RCTConvertPropertyListValue(id json)
       copy |= value != jsonValue;
     }];
     return copy ? values : json;
-  } else if ([json isKindOfClass:[NSArray class]]) {
+  }
+
+  if ([json isKindOfClass:[NSArray class]]) {
     __block BOOL copy = NO;
     __block NSArray *values = json;
     [json enumerateObjectsUsingBlock:^(id jsonValue, NSUInteger idx, BOOL *stop) {
@@ -864,15 +868,17 @@ static id RCTConvertPropertyListValue(id json)
         for (NSInteger i = 0; i < idx; i++) {
           [(NSMutableArray *)values addObject:json[i]];
         }
-        [(NSMutableArray *)values addObject:value];
+        if (value) {
+          [(NSMutableArray *)values addObject:value];
+        }
         copy = YES;
       }
     }];
     return values;
-  } else {
-    // All other JSON types are supported by property lists
-    return json;
   }
+
+  // All other JSON types are supported by property lists
+  return json;
 }
 
 + (NSPropertyList)NSPropertyList:(id)json

React/Base/RCTUtils.h

@@ -19,6 +19,9 @@
 RCT_EXTERN NSString *RCTJSONStringify(id jsonObject, NSError **error);
 RCT_EXTERN id RCTJSONParse(NSString *jsonString, NSError **error);
 
+// Strip non JSON-safe values from an object graph
+RCT_EXTERN id RCTJSONClean(id object);
+
 // Get MD5 hash of a string (TODO: currently unused. Remove?)
 RCT_EXTERN NSString *RCTMD5Hash(NSString *string);
 

React/Base/RCTUtils.m

@@ -42,6 +42,57 @@ id RCTJSONParse(NSString *jsonString, NSError **error)
   return [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingAllowFragments error:error];
 }
 
+id RCTJSONClean(id object)
+{
+  static dispatch_once_t onceToken;
+  static NSSet *validLeafTypes;
+  dispatch_once(&onceToken, ^{
+    validLeafTypes = [[NSSet alloc] initWithArray:@[
+      [NSString class],
+      [NSMutableString class],
+      [NSNumber class],
+      [NSNull class],
+    ]];
+  });
+
+  if ([validLeafTypes containsObject:[object classForCoder]]) {
+    return object;
+  }
+
+  if ([object isKindOfClass:[NSDictionary class]]) {
+    __block BOOL copy = NO;
+    NSMutableDictionary *values = [[NSMutableDictionary alloc] initWithCapacity:[object count]];
+    [object enumerateKeysAndObjectsUsingBlock:^(NSString *key, id item, BOOL *stop) {
+      id value = RCTJSONClean(item);
+      values[key] = value;
+      copy |= value != item;
+    }];
+    return copy ? values : object;
+  }
+
+  if ([object isKindOfClass:[NSArray class]]) {
+    __block BOOL copy = NO;
+    __block NSArray *values = object;
+    [object enumerateObjectsUsingBlock:^(id item, NSUInteger idx, BOOL *stop) {
+      id value = RCTJSONClean(item);
+      if (copy) {
+        [(NSMutableArray *)values addObject:value];
+      } else if (value != item) {
+        // Converted value is different, so we'll need to copy the array
+        values = [[NSMutableArray alloc] initWithCapacity:values.count];
+        for (NSInteger i = 0; i < idx; i++) {
+          [(NSMutableArray *)values addObject:object[i]];
+        }
+        [(NSMutableArray *)values addObject:value];
+        copy = YES;
+      }
+    }];
+    return values;
+  }
+
+  return (id)kCFNull;
+}
+
 NSString *RCTMD5Hash(NSString *string)
 {
   const char *str = [string UTF8String];