Skip to content

[Fabric] iOS: Fixes textinput onscroll event payload #43445

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

Closed
zhongwuzw wants to merge 2 commits into from
Closed

[Fabric] iOS: Fixes textinput onscroll event payload #43445

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91dd672
[Fabric] iOS: Fixes textinput onscroll event payload
zhongwuzw Mar 12, 2024
44407d3
Fixes ci failure
zhongwuzw Mar 14, 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
54 changes: 53 additions & 1 deletion ...s/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,53 @@ static jsi::Value textInputMetricsPayload(
return payload;
};

static jsi::Value textInputMetricsScrollPayload(
jsi::Runtime& runtime,
const TextInputMetrics& textInputMetrics) {
auto payload = jsi::Object(runtime);

{
auto contentOffset = jsi::Object(runtime);
contentOffset.setProperty(runtime, "x", textInputMetrics.contentOffset.x);
contentOffset.setProperty(runtime, "y", textInputMetrics.contentOffset.y);
payload.setProperty(runtime, "contentOffset", contentOffset);
}

{
auto contentInset = jsi::Object(runtime);
contentInset.setProperty(runtime, "top", textInputMetrics.contentInset.top);
contentInset.setProperty(
runtime, "left", textInputMetrics.contentInset.left);
contentInset.setProperty(
runtime, "bottom", textInputMetrics.contentInset.bottom);
contentInset.setProperty(
runtime, "right", textInputMetrics.contentInset.right);
payload.setProperty(runtime, "contentInset", contentInset);
}

{
auto contentSize = jsi::Object(runtime);
contentSize.setProperty(
runtime, "width", textInputMetrics.contentSize.width);
contentSize.setProperty(
runtime, "height", textInputMetrics.contentSize.height);
payload.setProperty(runtime, "contentSize", contentSize);
}

{
auto layoutMeasurement = jsi::Object(runtime);
layoutMeasurement.setProperty(
runtime, "width", textInputMetrics.layoutMeasurement.width);
layoutMeasurement.setProperty(
runtime, "height", textInputMetrics.layoutMeasurement.height);
payload.setProperty(runtime, "layoutMeasurement", layoutMeasurement);
}

payload.setProperty(runtime, "zoomScale", textInputMetrics.zoomScale ?: 1);
Copy link
Contributor

@sammy-SC sammy-SC Mar 14, 2024

Choose a reason for hiding this comment

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

why is this check needed? Isn't zoomScale always set from Objective-C?

If is isn't, wouldn't it be better to assign a default value to zoomScale?

Copy link
Contributor Author

@zhongwuzw zhongwuzw Mar 14, 2024

Choose a reason for hiding this comment

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

I just kept the same as Old arch

react-native/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm

Line 58 in 082decb

@"zoomScale" : @(scrollView.zoomScale ?: 1),
. Seems the default zoomScale should be 1.0, and we think 0 is a invalid value.

Copy link
Contributor

@sammy-SC sammy-SC Mar 14, 2024

Choose a reason for hiding this comment

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

that's fair. Thanks for the clarification.


return payload;
};

static jsi::Value textInputMetricsContentSizePayload(
jsi::Runtime& runtime,
const TextInputMetrics& textInputMetrics) {
Expand Down Expand Up @@ -121,7 +168,12 @@ void TextInputEventEmitter::onKeyPress(

void TextInputEventEmitter::onScroll(
const TextInputMetrics& textInputMetrics) const {
dispatchTextInputEvent("scroll", textInputMetrics);
dispatchEvent(
"scroll",
[textInputMetrics](jsi::Runtime& runtime) {
return textInputMetricsScrollPayload(runtime, textInputMetrics);
},
EventPriority::AsynchronousBatched);
}

void TextInputEventEmitter::dispatchTextInputEvent(
Expand Down