Page MenuHomePhabricator
Files F3499910

D12985.diff
No OneTemporary
Actions

D12985.diff
View Options

diff --git a/native/tooltip/nux-tips-overlay.react.js b/native/tooltip/nux-tips-overlay.react.js
--- a/native/tooltip/nux-tips-overlay.react.js
+++ b/native/tooltip/nux-tips-overlay.react.js
@@ -114,22 +114,14 @@
dimensions,
position,
styles,
- closeTip,
- contentContainerStyle,
opacityStyle,
buttonStyle,
- tipHorizontalOffset,
- onTipContainerLayout,
- tipContainerOpacity,
- tipVerticalBelow,
- tipHorizontal,
- tipScale,
tipContainerStyle,
- ...navAndRouteForFlow
+ navigation,
+ route,
} = this.props;
let triangleStyle;
- const { route } = this.props;
const { initialCoordinates } = route.params;
const { x, width } = initialCoordinates;
const extraLeftSpace = x;
@@ -146,37 +138,32 @@
};
}
- const triangleUp = <View style={[styles.triangleUp, triangleStyle]} />;
-
- const buttonProps: ButtonProps<BaseNUXTipsOverlayProps> = {
- ...navAndRouteForFlow,
- progress: position,
- };
-
- let tip = null;
-
- tip = (
- <AnimatedView
- style={tipContainerStyle}
- onLayout={this.props.onTipContainerLayout}
- >
- {triangleUp}
- <View style={styles.items}>
- <MenuComponent {...navAndRouteForFlow} key="menu" />
- </View>
- </AnimatedView>
- );
-
return (
<TouchableWithoutFeedback onPress={this.props.closeTip}>
<View style={styles.container}>
<AnimatedView style={opacityStyle} />
<View style={this.props.contentContainerStyle}>
<View style={buttonStyle}>
- <ButtonComponent {...buttonProps} />
+ <ButtonComponent
+ navigation={navigation}
+ route={route}
+ progress={position}
+ />
</View>
</View>
- {tip}
+ <AnimatedView
+ style={tipContainerStyle}
+ onLayout={this.props.onTipContainerLayout}
+ >
+ <View style={[styles.triangleUp, triangleStyle]} />
+ <View style={styles.items}>
+ <MenuComponent
+ navigation={navigation}
+ route={route}
+ key="menu"
+ />
+ </View>
+ </AnimatedView>
</View>
</TouchableWithoutFeedback>
);

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 12:35 AM (18 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2684143
Default Alt Text
D12985.diff (2 KB)

Event Timeline