Unify SlackSheet again (#1478)

rainbow-me · Dec 18, 2020 · 03dfe9e · 03dfe9e
1 parent 3a5822d
commit 03dfe9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 97 deletions.
diff --git a/src/components/sheet/SlackSheet.ios.js b/src/components/sheet/SlackSheet.ios.js
diff --git a/src/components/sheet/SlackSheet.android.js → src/components/sheet/SlackSheet.js b/src/components/sheet/SlackSheet.android.js → src/components/sheet/SlackSheet.js
@@ -26,6 +26,9 @@ const calculateTopPosition = (
   contentHeight,
   additionalTopPadding
 ) => {
+  if (ios) {
+    return '';
+  }
   if (deferredHeight) return '';
   const top =
     contentHeight && additionalTopPadding ? deviceHeight - contentHeight : 0;
@@ -38,9 +41,13 @@ const Container = styled(Centered).attrs({ direction: 'column' })`
   left: 0;
   overflow: hidden;
   position: absolute;
-  border-radius: 20;
+  ${android ? 'border-radius: 20;' : ''}
   ${({ deferredHeight, contentHeight, additionalTopPadding }) =>
-    calculateTopPosition(deferredHeight, contentHeight, additionalTopPadding)}
+    calculateTopPosition(
+      deferredHeight,
+      contentHeight,
+      additionalTopPadding
+    )}
   right: 0;
 `;
 
@@ -116,10 +123,12 @@ export default function SlackSheet({
         <Pressable onPress={goBack} style={[StyleSheet.absoluteFillObject]} />
       ) : null}
       <Container
-        additionalTopPadding={additionalTopPadding}
         backgroundColor={backgroundColor}
-        contentHeight={contentHeight}
-        deferredHeight={deferredHeight}
+        {...(android && {
+          additionalTopPadding,
+          contentHeight,
+          deferredHeight,
+        })}
         {...props}
       >
         {android && (