fix: fixed extracting paddingBottom in scrollable components

gorhom · Jul 31, 2020 · 945104a · 945104a
1 parent 62ec5f6
commit 945104a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/src/components/flatList/FlatList.tsx b/src/components/flatList/FlatList.tsx
@@ -53,16 +53,12 @@ const FlatList = forwardRef(
 
     // styles
     const contentContainerStyle = useMemo(() => {
-      const {
-        //@ts-ignore
-        paddingBottom = 0,
-        // @ts-ignore
-        ...restContentContainerStyle
-      } = _contentContainerStyle;
-
       return {
-        ...restContentContainerStyle,
-        paddingBottom: contentPaddingBottom + Math.max(paddingBottom ?? 0, 0),
+        // @ts-ignore
+        ...(_contentContainerStyle ?? {}),
+        paddingBottom:
+          contentPaddingBottom +
+          Math.max(_contentContainerStyle?.paddingBottom ?? 0, 0),
       };
     }, [_contentContainerStyle, contentPaddingBottom]);
 

diff --git a/src/components/scrollView/ScrollView.tsx b/src/components/scrollView/ScrollView.tsx
@@ -55,16 +55,12 @@ const ScrollView = forwardRef(
 
     // styles
     const contentContainerStyle = useMemo(() => {
-      const {
-        //@ts-ignore
-        paddingBottom = 0,
-        // @ts-ignore
-        ...restContentContainerStyle
-      } = _contentContainerStyle;
-
       return {
-        ...restContentContainerStyle,
-        paddingBottom: contentPaddingBottom + Math.max(paddingBottom ?? 0, 0),
+        // @ts-ignore
+        ...(_contentContainerStyle ?? {}),
+        paddingBottom:
+          contentPaddingBottom +
+          Math.max(_contentContainerStyle?.paddingBottom ?? 0, 0),
       };
     }, [_contentContainerStyle, contentPaddingBottom]);
 

diff --git a/src/components/sectionList/SectionList.tsx b/src/components/sectionList/SectionList.tsx
@@ -53,15 +53,12 @@ const SectionList = forwardRef(
 
     // styles
     const contentContainerStyle = useMemo(() => {
-      const {
-        //@ts-ignore
-        paddingBottom = 0,
-        // @ts-ignore
-        ...restContentContainerStyle
-      } = _contentContainerStyle;
       return {
-        ...restContentContainerStyle,
-        paddingBottom: contentPaddingBottom + Math.max(paddingBottom ?? 0, 0),
+        // @ts-ignore
+        ...(_contentContainerStyle ?? {}),
+        paddingBottom:
+          contentPaddingBottom +
+          Math.max(_contentContainerStyle?.paddingBottom ?? 0, 0),
       };
     }, [_contentContainerStyle, contentPaddingBottom]);