diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-09-23 16:30:13 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-09-23 16:30:13 +0200 |
| commit | 56cab1133826be7e0a9888434c1de6a441d340d5 (patch) | |
| tree | 02bb3c09194f41bbd5d2d5e8323859437e138891 /gui/src/renderer | |
| parent | 8b581a2020d307ba85248637227a31c983bf8410 (diff) | |
| parent | 939e364400f7697dfb19dd1048fe4b9ecb025db3 (diff) | |
| download | mullvadvpn-56cab1133826be7e0a9888434c1de6a441d340d5.tar.xz mullvadvpn-56cab1133826be7e0a9888434c1de6a441d340d5.zip | |
Merge branch 'fix-hover-stutter'
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/components/TransitionContainer.tsx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx index 8ef9611ac0..9f7056888a 100644 --- a/gui/src/renderer/components/TransitionContainer.tsx +++ b/gui/src/renderer/components/TransitionContainer.tsx @@ -36,9 +36,9 @@ const styles = { transitionView: Styles.createViewStyle({ flex: 1, }), - userInteractionBlocker: Styles.createViewStyle({ + blockUserInteraction: Styles.createViewStyle({ // @ts-ignore - zIndex: 2, + pointerEvents: 'none', }), transitionContainer: Styles.createViewStyle({ flex: 1, @@ -150,7 +150,12 @@ export default class TransitionContainer extends Component<IProps, IState> { this.state.itemQueue.length > 0 || this.state.nextItem ? true : false; return ( - <View style={styles.transitionContainer} onLayout={this.onLayout}> + <View + style={[ + styles.transitionContainer, + disableUserInteraction ? styles.blockUserInteraction : undefined, + ]} + onLayout={this.onLayout}> {this.state.currentItem && ( <Animated.View key={this.state.currentItem.view.props.viewId} @@ -166,10 +171,6 @@ export default class TransitionContainer extends Component<IProps, IState> { {this.state.nextItem.view} </Animated.View> )} - - {disableUserInteraction && ( - <View style={[styles.animatedContainer, styles.userInteractionBlocker]} /> - )} </View> ); } |
