Fix safe area stories cut off

app/react-native/src/preview/components/OnDeviceUI/OnDeviceUI.tsx

@@ -1,18 +1,20 @@
-import styled from '@emotion/native';
 import { StoryIndex } from '@storybook/client-api';
+import styled from '@emotion/native';
+import { useTheme } from 'emotion-theming';
 import React, { useState, useRef } from 'react';
 import {
   Animated,
   Dimensions,
-  FlexStyle,
+  Easing,
   Keyboard,
   KeyboardAvoidingView,
   Platform,
-  SafeAreaView,
   TouchableOpacity,
   StatusBar,
   StyleSheet,
   View,
+  ViewStyle,
+  StyleProp,
 } from 'react-native';
 import { useStoryContextParam } from '../../../hooks';
 import StoryListView from '../StoryListView';
@@ -25,22 +27,23 @@ import Addons from './addons/Addons';
 import {
   getAddonPanelPosition,
   getNavigatorPanelPosition,
-  getPreviewPosition,
-  getPreviewScale,
+  getPreviewShadowStyle,
+  getPreviewStyle,
 } from './animation';
 import Navigation from './navigation';
 import { PREVIEW, ADDONS } from './navigation/constants';
 import Panel from './Panel';
 import { useWindowDimensions } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-const ANIMATION_DURATION = 300;
+const ANIMATION_DURATION = 400;
 const IS_IOS = Platform.OS === 'ios';
 // @ts-ignore: Property 'Expo' does not exist on type 'Global'
 const getExpoRoot = () => global.Expo || global.__expo || global.__exponent;
 export const IS_EXPO = getExpoRoot() !== undefined;
 const IS_ANDROID = Platform.OS === 'android';
 const BREAKPOINT = 1024;
+
 interface OnDeviceUIProps {
   storyIndex: StoryIndex;
   url?: string;
@@ -52,28 +55,38 @@ interface OnDeviceUIProps {
 
 const flex = { flex: 1 };
 
-const Preview = styled.View<{ disabled: boolean }>(flex, ({ disabled, theme }) => ({
-  borderLeftWidth: disabled ? 0 : 1,
-  borderTopWidth: disabled ? 0 : 1,
-  borderRightWidth: disabled ? 0 : 1,
-  borderBottomWidth: disabled ? 0 : 1,
-  borderColor: disabled ? 'transparent' : theme.previewBorderColor,
-  borderRadius: disabled ? 0 : 12,
-  overflow: 'hidden',
-}));
+interface PreviewProps {
+  animatedValue: Animated.Value;
+  style: StyleProp<ViewStyle>;
+  children?: React.ReactNode;
+}
 
-const absolutePosition: FlexStyle = {
-  position: 'absolute',
-  top: 0,
-  bottom: 0,
-  left: 0,
-  right: 0,
-};
+/**
+ * Story preview container.
+ */
+function Preview({ animatedValue, style, children }: PreviewProps) {
+  const theme: any = useTheme();
+  const containerStyle = {
+    backgroundColor: theme.backgroundColor,
+    ...getPreviewShadowStyle(animatedValue),
+  };
+  return (
+    <Animated.View style={[flex, containerStyle]}>
+      <View style={[flex, style]}>{children}</View>
+    </Animated.View>
+  );
+}
 
 const styles = StyleSheet.create({
   expoAndroidContainer: { paddingTop: StatusBar.currentHeight },
 });
 
+const Container = styled.View(({ theme }) => ({
+  flex: 1,
+  backgroundColor: theme.backgroundColor,
+  ...(IS_ANDROID && IS_EXPO ? styles.expoAndroidContainer : undefined),
+}));
+
 const OnDeviceUI = ({
   storyIndex,
   isUIHidden,
@@ -82,55 +95,80 @@ const OnDeviceUI = ({
   tabOpen: initialTabOpen,
 }: OnDeviceUIProps) => {
   const [tabOpen, setTabOpen] = useState(initialTabOpen || PREVIEW);
-  const [slideBetweenAnimation, setSlideBetweenAnimation] = useState(false);
+  const lastTabOpen = React.useRef(tabOpen);
   const [previewDimensions, setPreviewDimensions] = useState<PreviewDimens>(() => ({
     width: Dimensions.get('window').width,
     height: Dimensions.get('window').height,
   }));
   const animatedValue = useRef(new Animated.Value(tabOpen));
   const wide = useWindowDimensions().width >= BREAKPOINT;
   const insets = useSafeAreaInsets();
+  const theme: any = useTheme();
   const [isUIVisible, setIsUIVisible] = useState(isUIHidden !== undefined ? !isUIHidden : true);
 
-  const handleToggleTab = React.useCallback((newTabOpen: number) => {
-    if (newTabOpen === tabOpen) {
-      return;
-    }
-    Animated.timing(animatedValue.current, {
-      toValue: newTabOpen,
-      duration: ANIMATION_DURATION,
-      useNativeDriver: true,
-    }).start();
-    setTabOpen(newTabOpen);
-    const isSwipingBetweenNavigatorAndAddons = tabOpen + newTabOpen === PREVIEW;
-    setSlideBetweenAnimation(isSwipingBetweenNavigatorAndAddons);
+  const handleToggleTab = React.useCallback(
+    (newTabOpen: number) => {
+      if (newTabOpen === tabOpen) {
+        return;
+      }
+      lastTabOpen.current = tabOpen;
+      Animated.timing(animatedValue.current, {
+        toValue: newTabOpen,
+        duration: ANIMATION_DURATION,
+        easing: Easing.inOut(Easing.cubic),
+        useNativeDriver: true,
+      }).start();
+      setTabOpen(newTabOpen);
 
-    // close the keyboard opened from a TextInput from story list or knobs
-    if (newTabOpen === PREVIEW) {
-      Keyboard.dismiss();
-    }
-  }, [tabOpen]);
+      // close the keyboard opened from a TextInput from story list or knobs
+      if (newTabOpen === PREVIEW) {
+        Keyboard.dismiss();
+      }
+    },
+    [tabOpen]
+  );
 
   const noSafeArea = useStoryContextParam<boolean>('noSafeArea', false);
   const previewWrapperStyles = [
     flex,
-    getPreviewPosition({
+    getPreviewStyle({
       animatedValue: animatedValue.current,
       previewDimensions,
-      slideBetweenAnimation,
       wide,
-      noSafeArea,
       insets,
+      tabOpen,
+      lastTabOpen: lastTabOpen.current,
     }),
   ];
 
-  const previewStyles = [flex, getPreviewScale(animatedValue.current, slideBetweenAnimation, wide)];
+  // The initial value is just a guess until the layout calculation has been done.
+  const [navBarHeight, setNavBarHeight] = React.useState(insets.bottom + 40);
+  const measureNavigation = React.useCallback(
+    ({ nativeEvent }) => {
+      const inset = insets.bottom;
+      setNavBarHeight(isUIVisible ? nativeEvent.layout.height - inset : 0);
+    },
+    [isUIVisible, insets]
+  );
 
-  const WrapperView = noSafeArea ? View : SafeAreaView;
-  const wrapperMargin = { marginBottom: isUIVisible ? insets.bottom + 40 : 0 };
+  // There are 4 cases for the additional UI margin:
+  //   1. Storybook UI is visible, and `noSafeArea` is false: Include top and
+  //      bottom safe area insets, and also include the navigation bar height.
+  //
+  //   2. Storybook UI is not visible, and `noSafeArea` is false: Include top
+  //      and bottom safe area insets.
+  //
+  //   3. Storybook UI is visible, and `noSafeArea` is true: Include only the
+  //      bottom safe area inset and the navigation bar height.
+  //
+  //   4. Storybook UI is not visible, and `noSafeArea` is true: No margin.
+  const safeAreaMargins = {
+    paddingBottom: isUIVisible ? insets.bottom + navBarHeight : noSafeArea ? 0 : insets.bottom,
+    paddingTop: !noSafeArea ? insets.top : 0,
+  };
   return (
     <>
-      <View style={[flex, IS_ANDROID && IS_EXPO && styles.expoAndroidContainer]}>
+      <Container>
         <KeyboardAvoidingView
           enabled={!shouldDisableKeyboardAvoidingView || tabOpen !== PREVIEW}
           behavior={IS_IOS ? 'padding' : null}
@@ -142,47 +180,44 @@ const OnDeviceUI = ({
             previewDimensions={previewDimensions}
           >
             <Animated.View style={previewWrapperStyles}>
-              <Animated.View style={previewStyles}>
-                <Preview disabled={tabOpen === PREVIEW}>
-                  <WrapperView style={[flex, wrapperMargin]}>
-                    <StoryView />
-                  </WrapperView>
-                </Preview>
-                {tabOpen !== PREVIEW ? (
-                  <TouchableOpacity
-                    style={absolutePosition}
-                    onPress={() => handleToggleTab(PREVIEW)}
-                  />
-                ) : null}
-              </Animated.View>
+              <Preview style={safeAreaMargins} animatedValue={animatedValue.current}>
+                <StoryView />
+              </Preview>
+              {tabOpen !== PREVIEW ? (
+                <TouchableOpacity
+                  style={StyleSheet.absoluteFillObject}
+                  onPress={() => handleToggleTab(PREVIEW)}
+                />
+              ) : null}
             </Animated.View>
             <Panel
-              style={getNavigatorPanelPosition(
-                animatedValue.current,
-                previewDimensions.width,
-                wide
-              )}
+              style={[
+                getNavigatorPanelPosition(animatedValue.current, previewDimensions.width, wide),
+                safeAreaMargins,
+                { backgroundColor: theme.storyListBackgroundColor },
+              ]}
             >
               <StoryListView storyIndex={storyIndex} />
             </Panel>
 
             <Panel
               style={[
                 getAddonPanelPosition(animatedValue.current, previewDimensions.width, wide),
-                wrapperMargin,
+                safeAreaMargins,
               ]}
             >
               <Addons active={tabOpen === ADDONS} />
             </Panel>
           </AbsolutePositionedKeyboardAwareView>
         </KeyboardAvoidingView>
         <Navigation
+          onLayout={measureNavigation}
           tabOpen={tabOpen}
           onChangeTab={handleToggleTab}
           isUIVisible={isUIVisible}
           setIsUIVisible={setIsUIVisible}
         />
-      </View>
+      </Container>
     </>
   );
 };