Skip to content

Minor tweaks to RCTDevSettings #696

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
nakambo merged 3 commits into from
Jan 26, 2021
Merged

Minor tweaks to RCTDevSettings #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb54fe3
Export RCTDevSettings noop impl on shipping builds to JS
nakambo Jan 26, 2021
4eead77
Add a protocol method to get all set keys on dev settings
nakambo Jan 26, 2021
0e6e125
tag changes
nakambo Jan 26, 2021
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 @@ -103,6 +103,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 @@ -502,6 +509,8 @@ @interface RCTDevSettings () <NativeDevSettingsSpec>

@implementation RCTDevSettings

RCT_EXPORT_MODULE() // TODO(macOS ISS#2323203)
Copy link
Member

@alloy alloy Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This being missing seems a merge failure when I pulled in code from upstream, as it exists there. In that case the comment isn’t necessary.

Copy link
Collaborator Author

@nakambo nakambo Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I see. I'll remove this if I touch this file in the near future.


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