From cb54fe33b62423eeca5d093237066037ba7edf00 Mon Sep 17 00:00:00 2001 From: Navneet Kambo Date: Tue, 26 Jan 2021 13:21:20 -0800 Subject: [PATCH 1/3] Export RCTDevSettings noop impl on shipping builds to JS --- React/CoreModules/RCTDevSettings.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index 47b0dab10918da..892c0256aa4a73 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -502,6 +502,8 @@ @interface RCTDevSettings () @implementation RCTDevSettings +RCT_EXPORT_MODULE() + - (instancetype)initWithDataSource:(id)dataSource { return [super init]; From 4eead7734e0b18cf3a902b0845119346f4c1d2c4 Mon Sep 17 00:00:00 2001 From: Navneet Kambo Date: Tue, 26 Jan 2021 13:34:08 -0800 Subject: [PATCH 2/3] Add a protocol method to get all set keys on dev settings --- React/CoreModules/RCTDevSettings.h | 5 +++++ React/CoreModules/RCTDevSettings.mm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/React/CoreModules/RCTDevSettings.h b/React/CoreModules/RCTDevSettings.h index 4ae81f2257bb04..1c7bec9e8395eb 100644 --- a/React/CoreModules/RCTDevSettings.h +++ b/React/CoreModules/RCTDevSettings.h @@ -28,6 +28,11 @@ */ - (id)settingForKey:(NSString *)key; +/** + * Returns all keys that are overridden + */ +- (NSArray *)overridenKeys; + @end @interface RCTDevSettings : RCTEventEmitter diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index 892c0256aa4a73..21980349501adb 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -103,6 +103,11 @@ - (id)settingForKey:(NSString *)key return _settings[key]; } +- (NSArray *)overridenKeys +{ + return [_settings allKeys]; +} + - (void)_reloadWithDefaults:(NSDictionary *)defaultValues { NSDictionary *existingSettings = [_userDefaults objectForKey:kRCTDevSettingsUserDefaultsKey]; From 0e6e12553778755db083effb6dabc0d3a2b337bc Mon Sep 17 00:00:00 2001 From: Navneet Kambo Date: Tue, 26 Jan 2021 13:53:11 -0800 Subject: [PATCH 3/3] tag changes --- React/CoreModules/RCTDevSettings.h | 2 ++ React/CoreModules/RCTDevSettings.mm | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/React/CoreModules/RCTDevSettings.h b/React/CoreModules/RCTDevSettings.h index 1c7bec9e8395eb..39d4b4c9d04fc0 100644 --- a/React/CoreModules/RCTDevSettings.h +++ b/React/CoreModules/RCTDevSettings.h @@ -28,10 +28,12 @@ */ - (id)settingForKey:(NSString *)key; +// [TODO(macOS ISS#2323203) /** * Returns all keys that are overridden */ - (NSArray *)overridenKeys; +// ]TODO(macOS ISS#2323203) @end diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index 21980349501adb..849b374db5500c 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -103,10 +103,12 @@ - (id)settingForKey:(NSString *)key return _settings[key]; } +// [TODO(macOS ISS#2323203) - (NSArray *)overridenKeys { return [_settings allKeys]; } +// ]TODO(macOS ISS#2323203) - (void)_reloadWithDefaults:(NSDictionary *)defaultValues { @@ -507,7 +509,7 @@ @interface RCTDevSettings () @implementation RCTDevSettings -RCT_EXPORT_MODULE() +RCT_EXPORT_MODULE() // TODO(macOS ISS#2323203) - (instancetype)initWithDataSource:(id)dataSource {