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

Jump to bottom

[RNMobile] Try fixing split/merge issue on native mobile by dropping selection update event when late #29683

Merged
merged 12 commits into from
Mar 18, 2021
Merged

[RNMobile] Try fixing split/merge issue on native mobile by dropping selection update event when late #29683

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1a926f5
Bump native event count and drop selection update event if late
hypest Mar 9, 2021
d78ea4b
Limit the event count bump and event dropping to iOS
hypest Mar 9, 2021
b20609c
Sync native mobile event counter to the JS side one
hypest Mar 10, 2021
35dc09b
More usage of event counter bumping instead of undefining
hypest Mar 11, 2021
506cb27
Introducing shouldDropEventFromAztec and using it in onChange too
hypest Mar 11, 2021
629d81f
Don't bump the local event counter on componentDidUpdate
hypest Mar 11, 2021
ede2d82
Merge branch 'trunk' into rnmobile/try-fix-split-issue-drop-selection…
hypest Mar 16, 2021
4a32a01
Use window.console, to satisfy linter
hypest Mar 16, 2021
ef8d922
Fix typo in comments
hypest Mar 18, 2021
016201d
Merge branch 'trunk' into rnmobile/try-fix-split-issue-drop-selection…
hypest Mar 18, 2021
21024ff
Sync changelog instructions for native mobile
hypest Mar 18, 2021
3fef783
Changelog entry for the split/merge regression fix
hypest Mar 18, 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
29 changes: 27 additions & 2 deletions packages/rich-text/src/component/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export class RichText extends Component {
this.convertFontSizeFromString = this.convertFontSizeFromString.bind(
this
);
this.manipulateEventCounterToForceNativeToRefresh = this.manipulateEventCounterToForceNativeToRefresh.bind(
this
);
this.state = {
activeFormats: [],
selectedFormat: null,
Expand Down Expand Up @@ -593,6 +596,13 @@ export class RichText extends Component {
}

onSelectionChangeFromAztec( start, end, text, event ) {
if ( ! this.isIOS && event.nativeEvent.eventCount <= this.lastEventCount ) {
console.log(
`Dropping onSelectionChange from Aztec as its event counter is older than latest sent to the native side.`
);
return;
}

// `end` can be less than `start` on iOS
// Let's fix that here so `rich-text/slice` can work properly
const realStart = Math.min( start, end );
Expand Down Expand Up @@ -667,6 +677,21 @@ export class RichText extends Component {
return value;
}

manipulateEventCounterToForceNativeToRefresh() {
if ( this.isIOS ) {
this.lastEventCount = undefined;
return;
}

if ( typeof this.lastEventCount !== 'undefined' ) {
this.lastEventCount += 100; // bump by a hundred, hopefully native hasn't bombarded the JS side in the meantime.
} else {
window.console.warn(
"Tried to bump the RichText native event counter but was 'undefined'. Aborting bump."
);
}
}

shouldComponentUpdate( nextProps ) {
if (
nextProps.tagName !== this.props.tagName ||
Expand Down Expand Up @@ -703,7 +728,7 @@ export class RichText extends Component {
this.needsSelectionUpdate = true;
}

this.lastEventCount = undefined; // force a refresh on the native side
this.manipulateEventCounterToForceNativeToRefresh(); // force a refresh on the native side
}

if ( ! this.comesFromAztec ) {
Expand Down Expand Up @@ -748,7 +773,7 @@ export class RichText extends Component {
componentDidUpdate( prevProps ) {
if ( this.props.value !== this.value ) {
this.value = this.props.value;
this.lastEventCount = undefined;
this.manipulateEventCounterToForceNativeToRefresh(); // force a refresh on the native side
}
const { __unstableIsSelected: isSelected } = this.props;

Expand Down