Page MenuHomePhabricator
Files F3247122

D5475.id17916.diff
No OneTemporary
Actions

D5475.id17916.diff
View Options

diff --git a/native/components/node-height-measurer.react.js b/native/components/node-height-measurer.react.js
--- a/native/components/node-height-measurer.react.js
+++ b/native/components/node-height-measurer.react.js
@@ -2,12 +2,16 @@
import invariant from 'invariant';
import * as React from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, PixelRatio } from 'react-native';
import shallowequal from 'shallowequal';
import type { Shape } from 'lib/types/core';
-import type { LayoutEvent } from '../types/react-native';
+import {
+ addLifecycleListener,
+ getCurrentLifecycleState,
+} from '../lifecycle/lifecycle';
+import type { LayoutEvent, EventSubscription } from '../types/react-native';
const measureBatchSize = 50;
@@ -66,10 +70,20 @@
State<Item, MergedItem>,
> {
containerWidth: ?number;
+ // we track font scale when native app state changes
+ appLifecycleSubscription: ?EventSubscription;
+ currentLifecycleState: ?string = getCurrentLifecycleState();
+ currentFontScale: number = PixelRatio.getFontScale();
constructor(props: Props<Item, MergedItem>) {
super(props);
+ this.state = NodeHeightMeasurer.createInitialStateFromProps(props);
+ }
+
+ static createInitialStateFromProps<InnerItem, InnerMergedItem>(
+ props: Props<InnerItem, InnerMergedItem>,
+ ): State<InnerItem, InnerMergedItem> {
const {
listData,
itemToID,
@@ -100,7 +114,7 @@
}
}
- this.state = {
+ return {
currentlyMeasuring: [],
iteration: 0,
measuredHeights,
@@ -181,7 +195,32 @@
}
}
+ handleAppStateChange: (nextState: ?string) => void = nextState => {
+ if (!nextState || nextState === 'unknown') {
+ return;
+ }
+
+ const lastState = this.currentLifecycleState;
+ this.currentLifecycleState = nextState;
+
+ // detect font scale changes only when app enters foreground
+ if (lastState !== 'background' || nextState !== 'active') {
+ return;
+ }
+
+ const lastScale = this.currentFontScale;
+ this.currentFontScale = PixelRatio.getFontScale();
+
+ if (lastScale !== this.currentFontScale) {
+ // recreate initial state to trigger full remeasurement
+ this.setState(NodeHeightMeasurer.createInitialStateFromProps(this.props));
+ }
+ };
+
componentDidMount() {
+ this.appLifecycleSubscription = addLifecycleListener(
+ this.handleAppStateChange,
+ );
this.triggerCallback(
this.state.measurableItems,
this.state.unmeasurableItems,
@@ -190,6 +229,12 @@
);
}
+ componentWillUnmount() {
+ if (this.appLifecycleSubscription) {
+ this.appLifecycleSubscription.remove();
+ }
+ }
+
triggerCallback(
measurableItems: Map<string, MergedItemPair<Item, MergedItem>>,
unmeasurableItems: Map<string, MergedItemPair<Item, MergedItem>>,

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 3:35 AM (20 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2496278
Default Alt Text
D5475.id17916.diff (2 KB)

Event Timeline