@applicaster/zapp-react-native-ui-components 13.0.0-rc.123 → 13.0.0-rc.124

package/Components/ModalComponent/BottomSheetModalContent.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useRef } from "react";
-import { View, ScrollView, Platform } from "react-native";
+import { View, ScrollView } from "react-native";
 import { Button } from "./Button";
 import { ItemIconProps } from "./Button/ItemIcon";
 import { ItemProps } from "./Button/Item";
@@ -9,7 +9,7 @@ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 
 import type { PluginConfiguration } from "./";
 
-import { ModalHeader } from "./Header";
+import { ModalHeader as DefaultModalHeader } from "./Header";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 type ModalComponentProps = {
@@ -22,6 +22,7 @@ type ModalComponentProps = {
   title?: string;
   maxHeight?: number;
   dismiss: () => void;
+  headerComponent?: React.ComponentType;
   buttonComponent?: React.ComponentType;
   iconProps?: ItemIconProps | ((theme: PluginConfiguration) => ItemIconProps);
   itemProps?:
@@ -48,9 +49,11 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
     dismiss,
     summary,
     title,
+    headerComponent: ModalHeader = DefaultModalHeader,
     buttonComponent: ButtonComponent = Button,
-    getSelectedItemIcon = (theme) =>
-      theme.modal_bottom_sheet_item_selected_icon,
+    getSelectedItemIcon = ({
+      modal_bottom_sheet_item_selected_icon,
+    }: BaseThemePropertiesMobile) => modal_bottom_sheet_item_selected_icon,
     getDefaultItemIcon = () => null,
     iconPlacement,
   } = props;
@@ -103,26 +106,27 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
       />
       <ScrollView
         contentContainerStyle={{
-          paddingBottom:
-            paddingBottom + (Platform.OS === "ios" ? bottomInset : 0),
+          paddingBottom: paddingBottom + bottomInset,
         }}
       >
-        {items.map((item, index) => (
-          <ButtonComponent
-            key={index}
-            configuration={theme}
-            selectedItem={current_selection}
-            item={item}
-            onPress={handlePress}
-            label={theme[item?.label] ?? item?.label}
-            iconBaseProps={iconBaseProps}
-            itemBaseProps={itemBaseProps}
-            labelBaseProps={labelBaseProps}
-            selectedItemIcon={getSelectedItemIcon(theme)}
-            defaultItemIcon={getDefaultItemIcon(theme)}
-            iconPlacement={iconPlacement}
-          />
-        ))}
+        {items.map((item, index) =>
+          item ? (
+            <ButtonComponent
+              key={index}
+              configuration={theme}
+              selectedItem={current_selection}
+              item={item}
+              onPress={handlePress}
+              label={theme[item?.label] ?? item?.label}
+              iconBaseProps={iconBaseProps}
+              itemBaseProps={itemBaseProps}
+              labelBaseProps={labelBaseProps}
+              selectedItemIcon={getSelectedItemIcon(theme)}
+              defaultItemIcon={getDefaultItemIcon(theme)}
+              iconPlacement={iconPlacement}
+            />
+          ) : null
+        )}
       </ScrollView>
     </View>
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-rc.123",
+  "version": "13.0.0-rc.124",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,10 +31,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-rc.123",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-rc.123",
-    "@applicaster/zapp-react-native-redux": "13.0.0-rc.123",
-    "@applicaster/zapp-react-native-utils": "13.0.0-rc.123",
+    "@applicaster/applicaster-types": "13.0.0-rc.124",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-rc.124",
+    "@applicaster/zapp-react-native-redux": "13.0.0-rc.124",
+    "@applicaster/zapp-react-native-utils": "13.0.0-rc.124",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",