Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions NativeScript/ffi/shared/jsi/NativeApiJsiClassBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,12 @@ Value invokeNativeApiJsiBaseMethod(Runtime& runtime,
throw facebook::jsi::JSError(runtime, "__invokeBase receiver is not native.");
}

id receiver = receiverObject.getHostObject<NativeApiObjectHostObject>(runtime)->object();
// Dispatch through the host object so initializer selectors get their
// receiver-consumption bookkeeping (disown + round-trip/expando forget);
// calling the raw selector path here leaves dangling ownership of the
// placeholder an init consumes (e.g. UIColor.alloc().initWith...).
auto hostObject = receiverObject.getHostObject<NativeApiObjectHostObject>(runtime);
id receiver = hostObject->object();
std::string memberName = args[2].asString(runtime).utf8(runtime);
size_t actualArgc = count - 3;

Expand All @@ -703,17 +708,17 @@ Value invokeNativeApiJsiBaseMethod(Runtime& runtime,
selectWritablePropertyMember(members, memberName, false)) {
if (actualArgc == 0) {
Class dispatchClass = dispatchSuperclassForJsiDerivedReceiver(receiver, baseClass);
return callObjCSelector(runtime, bridge, receiver, false, propertyMember->selectorName,
propertyMember, nullptr, 0, dispatchClass);
return hostObject->callObjectSelector(runtime, propertyMember->selectorName,
propertyMember, nullptr, 0, dispatchClass);
}
if (actualArgc == 1 && !propertyMember->setterSelectorName.empty() &&
!propertyMember->readonly) {
Class dispatchClass = dispatchSuperclassForJsiDerivedReceiver(receiver, baseClass);
NativeApiMember setterMember = *propertyMember;
setterMember.selectorName = propertyMember->setterSelectorName;
setterMember.signatureOffset = propertyMember->setterSignatureOffset;
return callObjCSelector(runtime, bridge, receiver, false, setterMember.selectorName,
&setterMember, args + 3, actualArgc, dispatchClass);
return hostObject->callObjectSelector(runtime, setterMember.selectorName, &setterMember,
args + 3, actualArgc, dispatchClass);
}
}
}
Expand All @@ -723,6 +728,6 @@ Value invokeNativeApiJsiBaseMethod(Runtime& runtime,
}

Class dispatchClass = dispatchSuperclassForJsiDerivedReceiver(receiver, baseClass);
return callObjCSelector(runtime, bridge, receiver, false, member->selectorName, member, args + 3,
actualArgc, dispatchClass);
return hostObject->callObjectSelector(runtime, member->selectorName, member, args + 3,
actualArgc, dispatchClass);
}
Loading