Skip to content
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

[iOS] Fixes Reject error kind in Fabric #41955

Closed
wants to merge 6 commits into from
Closed

[iOS] Fixes Reject error kind in Fabric #41955

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
005a88d
[iOS] Fixes Reject error kind in Fabric
zhongwuzw Dec 15, 2023
8dc0647
Update review feedback
zhongwuzw Jan 9, 2024
2dcf769
Refactor some code
zhongwuzw Jan 9, 2024
079b630
rename function
zhongwuzw Jan 9, 2024
6033ae2
Remove unnecessary function
zhongwuzw Jan 9, 2024
773247d
Apply review
zhongwuzw Jan 9, 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
17 changes: 13 additions & 4 deletions ...act-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,20 @@ id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value, s
return;
}

NSDictionary *jsError = RCTJSErrorFromCodeMessageAndNSError(code, message, error);
reject->call([jsError](jsi::Runtime &rt, jsi::Function &jsFunction) {
jsFunction.call(rt, convertObjCObjectToJSIValue(rt, jsError));
NSDictionary *jsErrorDetails = RCTJSErrorFromCodeMessageAndNSError(code, message, error);
reject->call([jsErrorDetails](jsi::Runtime &rt, jsi::Function &jsFunction) {
// From JS documentation:
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/Error#cause an
// Error can be created with `new Error(message, option);`. the `option` param is a JS object with the
// `cause` property. Create a valid `option` object
NSDictionary<NSString *, id> *jsErrorOptions = @{@"cause" : jsErrorDetails};
auto jsiObjCError = convertObjCObjectToJSIValue(rt, jsErrorOptions);
zhongwuzw marked this conversation as resolved.
Show resolved Hide resolved
NSString *message =
jsErrorDetails[@"message"] ? jsErrorDetails[@"message"] : @"Unknown error from a native module";
zhongwuzw marked this conversation as resolved.
Show resolved Hide resolved
auto jsError =
rt.global().getPropertyAsFunction(rt, "Error").call(rt, [message UTF8String], jsiObjCError);
zhongwuzw marked this conversation as resolved.
Show resolved Hide resolved
jsFunction.call(rt, jsError);
});

resolveWasCalled = NO;
resolve = std::nullopt;
reject = std::nullopt;
Expand Down
Loading