Skip to content

draft: remove infinite loop in Menu measurement #3502

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

Draft
fivecar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

draft: remove infinite loop in Menu measurement #3502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,7 @@ CHANGELOG.md
lib/

.expo

# New yarn stuff
.yarn/
.yarnrc.yml
32 changes: 13 additions & 19 deletions src/components/Menu/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
Easing,
findNodeHandle,
I18nManager,
LayoutChangeEvent,
LayoutRectangle,
NativeEventSubscription,
Platform,
Expand Down Expand Up @@ -209,14 +210,10 @@ class Menu extends React.Component<Props, State> {
typeof anchor?.x === 'number' &&
typeof anchor?.y === 'number';

private measureMenuLayout = () =>
new Promise<LayoutRectangle>((resolve) => {
if (this.menu) {
this.menu.measureInWindow((x, y, width, height) => {
resolve({ x, y, width, height });
});
}
});
private onMenuLayout = (evt: LayoutChangeEvent) => {
const { width, height } = evt.nativeEvent.layout;
this.setState({ menuLayout: { width, height } });
};

private measureAnchorLayout = () =>
new Promise<LayoutRectangle>((resolve) => {
Expand Down Expand Up @@ -298,10 +295,7 @@ class Menu extends React.Component<Props, State> {

private show = async () => {
const windowLayout = Dimensions.get('window');
const [menuLayout, anchorLayout] = await Promise.all([
this.measureMenuLayout(),
this.measureAnchorLayout(),
]);
const anchorLayout = await this.measureAnchorLayout();

// When visible is true for first render
// native views can be still not rendered and
Expand All @@ -312,8 +306,8 @@ class Menu extends React.Component<Props, State> {
if (
!windowLayout.width ||
!windowLayout.height ||
!menuLayout.width ||
!menuLayout.height ||
!this.state.menuLayout.width ||
!this.state.menuLayout.height ||
(!anchorLayout.width && !this.isCoordinate(this.props.anchor)) ||
(!anchorLayout.height && !this.isCoordinate(this.props.anchor))
) {
Expand All @@ -329,18 +323,17 @@ class Menu extends React.Component<Props, State> {
height: anchorLayout.height,
width: anchorLayout.width,
},
menuLayout: {
width: menuLayout.width,
height: menuLayout.height,
},
}),
() => {
this.attachListeners();

const { animation } = this.props.theme;
Animated.parallel([
Animated.timing(this.state.scaleAnimation, {
toValue: { x: menuLayout.width, y: menuLayout.height },
toValue: {
x: this.state.menuLayout.width,
y: this.state.menuLayout.height,
},
duration: ANIMATION_DURATION * animation.scale,
easing: EASING,
useNativeDriver: true,
Expand Down Expand Up @@ -608,6 +601,7 @@ class Menu extends React.Component<Props, State> {
this.menu = ref;
}}
collapsable={false}
onLayout={this.onMenuLayout.bind(this)}
accessibilityViewIsModal={visible}
style={[styles.wrapper, positionStyle, style]}
pointerEvents={visible ? 'box-none' : 'none'}
Expand Down
Loading