@momo-kits/foundation 0.81.36-beta.1 → 0.81.36-beta.3

package/Layout/Screen.tsx

@@ -12,6 +12,7 @@ import {useHeaderHeight} from '@react-navigation/stack';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import React, {
   forwardRef,
+  Fragment,
   ReactNode,
   useContext,
   useEffect,
@@ -259,25 +260,33 @@ const Screen = forwardRef(
     /**
      * build content for screen
      */
-    const renderContent = () => {
-      const results = validateChildren(children, [Section, Card]);
+    const renderContent = (children: any): any => {
+      const results = validateChildren(children, [Section, Card, undefined]);
       if (Array.isArray(results)) {
         return results.map((item, index) => {
-          const space = item.props?.useMargin === false ? 0 : Spacing.M;
-          return (
-            <View
-              key={`ScreenItem${index}`}
-              style={{
-                marginTop: space,
-                flex: item.props?.expanded ? 1 : undefined,
-              }}>
-              {item}
-            </View>
-          );
+          const space = item?.props?.useMargin === false ? 0 : Spacing.M;
+          if (item?.type == Fragment) {
+            return renderContent(item?.props?.children);
+          }
+          if (item) {
+            return (
+              <View
+                key={`ScreenItem${index}`}
+                style={{
+                  marginTop: space,
+                  flex: item.props?.expanded ? 1 : undefined,
+                }}>
+                {item}
+              </View>
+            );
+          }
         });
       } else {
         const item: any = children;
         const space = item?.props?.useMargin === false ? 0 : Spacing.M;
+        if (item?.type == Fragment) {
+          return renderContent(item?.props?.children);
+        }
         return (
           <View
             key={`ScreenItem`}
@@ -326,7 +335,7 @@ const Screen = forwardRef(
               style={[styles.screenBanner, {maxHeight: 210 + layoutOffset}]}>
               {renderHeader()}
             </View>
-            {renderContent()}
+            {renderContent(children)}
           </Component>
           {Footer && (
             <View

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.36-beta.1",
+    "version": "0.81.36-beta.3",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {