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

React-Native: Add safe area wrapper for iphone x and later #8679

Merged
merged 4 commits into from
Nov 3, 2019
Merged

React-Native: Add safe area wrapper for iphone x and later #8679

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94f3441
Added safe area wrapper for iphone x.
Gongreg Nov 2, 2019
b1ec268
Merge branch 'next' into safe-area-view-fix
shilman Nov 3, 2019
c3b35a9
Update index.tsx
shilman Nov 3, 2019
e0e1655
Merge in next.
Gongreg Nov 3, 2019
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
94 changes: 47 additions & 47 deletions app/react-native/src/preview/components/OnDeviceUI/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Platform,
Animated,
TouchableOpacityProps,
SafeAreaView,
} from 'react-native';
import styled from '@emotion/native';
import addons from '@storybook/addons';
Expand Down Expand Up @@ -44,18 +45,15 @@ interface OnDeviceUIState {
previewHeight: number;
}

const Preview = styled.TouchableOpacity<TouchableOpacityProps>(
{
flex: 1,
},
({ disabled, theme }) => ({
borderLeftWidth: disabled ? '0' : '1',
borderTopWidth: disabled ? '0' : '1',
borderRightWidth: disabled ? '0' : '1',
borderBottomWidth: disabled ? '0' : '1',
borderColor: disabled ? 'transparent' : theme.previewBorderColor,
})
);
const flex = { flex: 1 };

const Preview = styled.TouchableOpacity<TouchableOpacityProps>(flex, ({ disabled, theme }) => ({
borderLeftWidth: disabled ? '0' : '1',
borderTopWidth: disabled ? '0' : '1',
borderRightWidth: disabled ? '0' : '1',
borderBottomWidth: disabled ? '0' : '1',
borderColor: disabled ? 'transparent' : theme.previewBorderColor,
}));

export default class OnDeviceUI extends PureComponent<OnDeviceUIProps, OnDeviceUIState> {
constructor(props: OnDeviceUIProps) {
Expand Down Expand Up @@ -116,48 +114,50 @@ export default class OnDeviceUI extends PureComponent<OnDeviceUIProps, OnDeviceU
const { tabOpen, slideBetweenAnimation, previewWidth, previewHeight } = this.state;

const previewWrapperStyles = [
{ flex: 1 },
flex,
getPreviewPosition(this.animatedValue, previewWidth, previewHeight, slideBetweenAnimation),
];

const previewStyles = [{ flex: 1 }, getPreviewScale(this.animatedValue, slideBetweenAnimation)];
const previewStyles = [flex, getPreviewScale(this.animatedValue, slideBetweenAnimation)];

return (
<KeyboardAvoidingView
enabled={!shouldDisableKeyboardAvoidingView || tabOpen !== PREVIEW}
behavior={IS_IOS ? 'padding' : null}
keyboardVerticalOffset={keyboardAvoidingViewVerticalOffset}
style={{ flex: 1 }}
>
<AbsolutePositionedKeyboardAwareView
onLayout={this.onLayout}
previewHeight={previewHeight}
previewWidth={previewWidth}
<SafeAreaView style={flex}>
<KeyboardAvoidingView
enabled={!shouldDisableKeyboardAvoidingView || tabOpen !== PREVIEW}
behavior={IS_IOS ? 'padding' : null}
keyboardVerticalOffset={keyboardAvoidingViewVerticalOffset}
style={flex}
>
<Animated.View style={previewWrapperStyles}>
<Animated.View style={previewStyles}>
<Preview
accessible={false}
disabled={tabOpen === PREVIEW}
onPress={this.handleOpenPreview}
>
<StoryView url={url} onDevice stories={stories} />
</Preview>
<AbsolutePositionedKeyboardAwareView
onLayout={this.onLayout}
previewHeight={previewHeight}
previewWidth={previewWidth}
>
<Animated.View style={previewWrapperStyles}>
<Animated.View style={previewStyles}>
<Preview
accessible={false}
disabled={tabOpen === PREVIEW}
onPress={this.handleOpenPreview}
>
<StoryView url={url} onDevice stories={stories} />
</Preview>
</Animated.View>
</Animated.View>
</Animated.View>
<Panel style={getNavigatorPanelPosition(this.animatedValue, previewWidth)}>
<StoryListView stories={stories} />
</Panel>
<Panel style={getAddonPanelPosition(this.animatedValue, previewWidth)}>
<Addons />
</Panel>
</AbsolutePositionedKeyboardAwareView>
<Navigation
tabOpen={tabOpen}
onChangeTab={this.handleToggleTab}
initialUiVisible={!isUIHidden}
/>
</KeyboardAvoidingView>
<Panel style={getNavigatorPanelPosition(this.animatedValue, previewWidth)}>
<StoryListView stories={stories} />
</Panel>
<Panel style={getAddonPanelPosition(this.animatedValue, previewWidth)}>
<Addons />
</Panel>
</AbsolutePositionedKeyboardAwareView>
<Navigation
tabOpen={tabOpen}
onChangeTab={this.handleToggleTab}
initialUiVisible={!isUIHidden}
/>
</KeyboardAvoidingView>
</SafeAreaView>
);
}
}