Skip to content

Cherry pick commit b3d41d3 to 0.62 [Minor tweaks to RCTDevSettings] #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeyImChris merged 1 commit into from
Jan 27, 2021
Merged

Cherry pick commit b3d41d3 to 0.62 [Minor tweaks to RCTDevSettings] #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions React/CoreModules/RCTDevSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
*/
- (id)settingForKey:(NSString *)key;

// [TODO(macOS ISS#2323203)
/**
* Returns all keys that are overridden
*/
- (NSArray<NSString *> *)overridenKeys;
// ]TODO(macOS ISS#2323203)

@end

@interface RCTDevSettings : RCTEventEmitter
Expand Down
9 changes: 9 additions & 0 deletions React/CoreModules/RCTDevSettings.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ - (id)settingForKey:(NSString *)key
return _settings[key];
}

// [TODO(macOS ISS#2323203)
- (NSArray<NSString *> *)overridenKeys
{
return [_settings allKeys];
}
// ]TODO(macOS ISS#2323203)

- (void)_reloadWithDefaults:(NSDictionary *)defaultValues
{
NSDictionary *existingSettings = [_userDefaults objectForKey:kRCTDevSettingsUserDefaultsKey];
Expand Down Expand Up @@ -475,6 +482,8 @@ - (void)jsLoaded:(NSNotification *)notification

@implementation RCTDevSettings

RCT_EXPORT_MODULE() // TODO(macOS ISS#2323203)

- (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource
{
return [super init];
Expand Down