Skip to content

fix(ios): Merging empty object should not override current value #1064

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
merged 3 commits into from
Feb 20, 2024
Merged

fix(ios): Merging empty object should not override current value #1064

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c9ebe0
fix merging
krizzu Feb 19, 2024
0eaa37c
fixup tests
krizzu Feb 20, 2024
da06b37
nits accepted
krizzu Feb 20, 2024
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
3 changes: 2 additions & 1 deletion packages/default-storage/ios/RNCAsyncStorage.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,8 @@ - (BOOL)_passthroughDelegate
if (value) {
NSError *jsonError;
NSMutableDictionary *mergedVal = RCTJSONParseMutable(value, &jsonError);
if (RCTMergeRecursive(mergedVal, RCTJSONParse(entry[1], &jsonError))) {
NSDictionary *mergingValue = RCTJSONParse(entry[1], &jsonError);
if (!mergingValue.count || RCTMergeRecursive(mergedVal, mergingValue)) {
entry = @[entry[0], RCTNullIfNil(RCTJSONStringify(mergedVal, NULL))];
}
if (jsonError) {
Expand Down