@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1124981321 → 13.0.0-alpha.1173186260

package/Components/ModalComponent/BottomSheetModalContent.tsx

@@ -1,23 +1,16 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { View, LayoutChangeEvent, ScrollView } from "react-native";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import { View, ScrollView, StyleSheet, Platform } from "react-native";
 import { Button } from "./Button";
 import { ItemIconProps } from "./Button/ItemIcon";
 import { ItemProps } from "./Button/Item";
 import { ItemLabelProps } from "./Button/ItemLabel";
-import {
-  defaultItemIconProps,
-  defaultItemLabelProps,
-  defaultItemProps,
-} from "./utils";
+import { getItemIconProps, getItemLabelProps, getItemProps } from "./utils";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 
+import type { PluginConfiguration } from "./";
+
 import { ModalHeader } from "./Header";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 type ModalComponentProps = {
   items: any[];
@@ -30,32 +23,48 @@ type ModalComponentProps = {
   maxHeight?: number;
   dismiss: () => void;
   buttonComponent?: React.ComponentType;
+  iconProps?: ItemIconProps | ((theme: PluginConfiguration) => ItemIconProps);
+  itemProps?:
+    | ItemProps
+    | ((theme: PluginConfiguration, width: number) => ItemProps);
+  labelProps?:
+    | ItemLabelProps
+    | ((theme: PluginConfiguration, width: number) => ItemLabelProps);
+  getSelectedItemIcon: (
+    theme: PluginConfiguration
+  ) => ItemIconProps["asset"] | null;
+  getDefaultItemIcon: (
+    theme: PluginConfiguration
+  ) => ItemIconProps["asset"] | null;
+  iconPlacement?: "left" | "right";
 };
 
+const styles = StyleSheet.create({
+  container: {
+    maxHeight: "100%",
+  },
+});
+
 export function BottomSheetModalContent(props: ModalComponentProps) {
   const {
     items,
     currentRoute,
-    maxHeight,
     current_selection = null,
     onPress,
     dismiss,
     summary,
     title,
     buttonComponent: ButtonComponent = Button,
+    getSelectedItemIcon = (theme) =>
+      theme.modal_bottom_sheet_item_selected_icon,
+    getDefaultItemIcon = () => null,
+    iconPlacement,
   } = props;
 
-  const [headerHeight, setHeaderHeight] = useState(0);
   const route = useRef(currentRoute);
   const theme = useTheme<BaseThemePropertiesMobile>();
-
-  const maxContentHeight = maxHeight
-    ? maxHeight - headerHeight - Number(theme.modal_bottom_sheet_padding_top)
-    : undefined;
-
-  const onHeaderLayout = useCallback((event: LayoutChangeEvent) => {
-    setHeaderHeight(event.nativeEvent.layout.height);
-  }, []);
+  const paddingTop = Number(theme.modal_bottom_sheet_padding_top);
+  const paddingBottom = Number(theme.modal_bottom_sheet_padding_bottom);
 
   useEffect(() => {
     if (currentRoute !== route.current) {
@@ -64,55 +73,62 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
   }, [currentRoute]);
 
   const iconBaseProps = useMemo<ItemIconProps>(() => {
-    return defaultItemIconProps(theme);
-  }, [theme]);
+    return getItemIconProps(theme, props.iconProps);
+  }, [theme, props.iconProps]);
 
   const itemBaseProps = useMemo<ItemProps>(() => {
-    return defaultItemProps(theme, props.width);
-  }, [theme, props.width]);
+    return getItemProps(theme, props.width, props.itemProps);
+  }, [theme, props.width, props.itemProps]);
 
   const labelBaseProps = useMemo<ItemLabelProps>(() => {
-    return defaultItemLabelProps(theme, props.width);
-  }, [theme, props.width]);
+    return getItemLabelProps(theme, props.width, props.labelProps);
+  }, [theme, props.width, props.labelProps]);
+
+  const handlePress = useCallback(
+    (item: any) => {
+      onPress(item);
+      dismiss();
+    },
+    [onPress, dismiss]
+  );
 
-  const handlePress = (item: any) => {
-    onPress(item);
-    dismiss();
-  };
+  const bottomInset = useSafeAreaInsets().bottom;
 
   return (
     <View
-      style={{
-        paddingTop: Number(theme.modal_bottom_sheet_padding_top),
-      }}
+      style={[
+        styles.container,
+        {
+          paddingTop: paddingTop,
+        },
+      ]}
     >
       <ModalHeader
-        width={props.width}
         dismiss={dismiss}
         configuration={theme}
-        onLayout={onHeaderLayout}
         summary={summary}
         title={title}
       />
       <ScrollView
-        bounces={false}
-        style={{ maxHeight: maxContentHeight }}
         contentContainerStyle={{
-          paddingBottom: Number(theme.modal_bottom_sheet_padding_bottom),
-          paddingTop: Number(theme.modal_bottom_sheet_padding_top),
+          paddingBottom:
+            Platform.OS === "ios" ? paddingBottom + bottomInset : paddingBottom,
         }}
       >
         {items.map((item, index) => (
           <ButtonComponent
             key={index}
-            width={props.width}
             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}
           />
         ))}
       </ScrollView>

package/Components/ModalComponent/Button/Item.tsx

@@ -5,7 +5,7 @@ export type ItemProps = {
   backgroundColor: string;
   focusedBackgroundColor: string;
   selectedBackgroundColor?: string;
-  focusectedBackgroundColor?: string;
+  focusedSelectedBackgroundColor?: string;
   borderRadius: number;
   marginBottom: number;
   marginLeft: number;
@@ -15,6 +15,7 @@ export type ItemProps = {
   paddingBottom: number;
   paddingRight: number;
   paddingLeft: number;
+  maxWidth: number;
   focused?: boolean;
   selected?: boolean;
   children?: ReactChild[];
@@ -33,11 +34,11 @@ function getBackgroundColor({
   backgroundColor,
   focusedBackgroundColor,
   selectedBackgroundColor,
-  focusectedBackgroundColor,
+  focusedSelectedBackgroundColor,
 }) {
   switch (true) {
     case selected && focused:
-      return focusectedBackgroundColor;
+      return focusedSelectedBackgroundColor;
     case selected && !focused:
       return selectedBackgroundColor;
     case !selected && focused:
@@ -51,7 +52,7 @@ export function Item(props: ItemProps) {
   const {
     backgroundColor,
     focusedBackgroundColor,
-    focusectedBackgroundColor,
+    focusedSelectedBackgroundColor,
     selectedBackgroundColor,
     children,
     focused,
@@ -68,7 +69,7 @@ export function Item(props: ItemProps) {
           backgroundColor: getBackgroundColor({
             selected,
             focused,
-            focusectedBackgroundColor,
+            focusedSelectedBackgroundColor,
             focusedBackgroundColor,
             selectedBackgroundColor,
             backgroundColor,

package/Components/ModalComponent/Button/assets.ts

@@ -1,4 +1,4 @@
 /* eslint-disable max-len */
 
 export const defaultSelectedAsset: string =
-  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAGsSURBVHgB7drdaYRAFIbhk2yuBTuwlXSQDrKdrOnErSSlpATBe0nOBxEMEXV+nDnjfg8MwiK4vKjMDIoQERERERERERHRY+j7vtHxJvTfb5wvHd/DMLyLpyc5IcTRw6eOZvrtcrlcq6q6i6PTBVqKM/GJdKpAa3EmrpGe5ST2xIFxHF/FwSnuoL1x1L2u66s4KD7QkXGg6EBHx4FiA6WIA0UGShUHiguUMg4UFSh1HCgmUI44UESgXHEgaCatf/wWslLeeY1GMsWBF/GEOHpodeouGkl8Vso7rtFIxjjg9YhNcea/+W4nrFyjkcxxwDnQUpxJrEhW4oBToLU4k9BIluKA60t6M6i+kzrfF7e1OODziLV6uG2d53onWYwDvi/pViJGshoHvCeKsSJZjgNBM+nQSNbjQPBSwzdSCXEgylrMNVIpcSDaYnVvJPWhA9OAZuO87HEg6mreIdIWE3Eg+nZHhEhm4sAh+0EBkUzFgcM2zDwimYsDh+4oOkQyGQcO33LdEclsHEiyJ70SyXScpBAJX3vNRif01yxSJ7SMH1USEREREREREREV7Ad//SBSU+GIIAAAAABJRU5ErkJggg==";
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAA+0lEQVR4nO3a3QnCQBBF4ZRiSXZgKVqKnVnCQBpQwb0QJA752ZjszPlg3/JwOU8b2K4DAAAAAAAAkIOZnczsvPeOQypxHmb27Pv+sveeQxnG0SFSMRaHSIUXJ32kKXHKue+99e+I4yCOgzgO4jiI4yCOgzgO4jiajfMedd366t50nK3/b0LE2SpSqDi1I4WMUytSs3G6z/jbhOGLIzUdR7aKFCKO1I4UKo7UihQyjqyNFDqOLI2UIo7MjZQqjkyNVL7LFUdmRMoXRypEihtHVkSKH0cWRMoTR2ZEyhdHJkTKG0ecSMSRkUjE+TaIRJxfeFQJAAAAAAAANOwFT0Mt2UgcaMoAAAAASUVORK5CYII=";

package/Components/ModalComponent/Button/index.tsx

@@ -4,11 +4,9 @@ import { Item, ItemProps } from "./Item";
 import { ItemIcon, ItemIconProps } from "./ItemIcon";
 import { ItemLabel, ItemLabelProps } from "./ItemLabel";
 import { defaultSelectedAsset } from "./assets";
-import * as assets from "./assets";
 
 type ButtonProps = {
   configuration: any;
-  width: number;
   selectedItem?: any;
   item: any; // Adjust type as needed
   onPress: (item: any) => void; // Adjust type as needed
@@ -17,6 +15,9 @@ type ButtonProps = {
   labelBaseProps?: ItemLabelProps;
   disabled?: boolean;
   label?: string | Record<string, string>;
+  iconPlacement?: "left" | "right";
+  selectedItemIcon?: ItemIconProps["asset"];
+  defaultItemIcon?: ItemIconProps["asset"];
 };
 
 const styles = StyleSheet.create({
@@ -31,81 +32,63 @@ export function Button({
   item,
   onPress,
   configuration,
-  width,
   iconBaseProps,
-  itemBaseProps,
+  itemBaseProps: itemProps,
   labelBaseProps,
   label,
+  iconPlacement = "left",
+  defaultItemIcon,
+  selectedItemIcon,
   disabled = false,
 }: ButtonProps) {
   const [focused, setFocused] = useState(false);
 
-  const selected = useMemo(
-    () => selectedItem && item.value === selectedItem?.value,
-    [selectedItem, selectedItem]
-  );
-
-  const itemProps = useMemo<ItemProps>(
-    () => ({
-      ...itemBaseProps,
-      width,
-    }),
-    [configuration, width]
-  );
+  const selected = selectedItem && item.value === selectedItem?.value;
 
-  const itemIconProps = useMemo<ItemIconProps>(
-    () => ({
-      ...iconBaseProps,
-      asset: configuration[item.asset] ?? assets[item.asset] ?? item.asset,
-    }),
-    [configuration, item.asset]
+  const itemIconPropsAssets = useMemo<ItemIconProps["asset"]>(
+    () => configuration[item.asset] ?? item.asset ?? defaultItemIcon,
+    [item.asset, defaultItemIcon]
   );
 
-  const selectedItemIconProps = useMemo<ItemIconProps>(
-    () => ({
-      ...iconBaseProps,
-      asset:
-        configuration["modal_bottom_sheet_item_selected_icon"] ||
-        defaultSelectedAsset,
-      marginRight: 10,
-    }),
-    [configuration]
+  const selectedItemIconPropsAssets = useMemo<ItemIconProps["asset"]>(
+    () => selectedItemIcon || defaultSelectedAsset,
+    [selectedItemIcon]
   );
 
-  const itemLabelProps = useMemo<ItemLabelProps>(
-    () => ({
-      ...labelBaseProps,
-      label: label ?? configuration[item?.label] ?? item?.label ?? null,
-    }),
-    [configuration, item?.label]
-  );
+  const renderItemIcon =
+    itemIconPropsAssets && itemIconPropsAssets.length > 0 ? (
+      <ItemIcon {...iconBaseProps} asset={itemIconPropsAssets} />
+    ) : null;
 
   if (disabled) return null;
 
   return (
-    <View style={{ maxWidth: width }}>
-      <TouchableOpacity
-        activeOpacity={1}
-        onPress={() => onPress(item)}
-        onPressIn={() => setFocused(true)}
-        onPressOut={() => setFocused(false)}
-      >
-        <Item {...itemProps} focused={focused} selected={selected}>
-          <View style={styles.label_icon_container}>
-            {itemIconProps.asset && itemIconProps.asset.length > 0 && (
-              <ItemIcon {...itemIconProps} />
-            )}
-            {itemLabelProps.label && (
-              <ItemLabel
-                {...itemLabelProps}
-                focused={focused}
-                selected={selected}
-              />
-            )}
-          </View>
-          {selected && <ItemIcon {...selectedItemIconProps} />}
-        </Item>
-      </TouchableOpacity>
-    </View>
+    <TouchableOpacity
+      activeOpacity={1}
+      onPress={() => onPress(item)}
+      onPressIn={() => setFocused(true)}
+      onPressOut={() => setFocused(false)}
+    >
+      <Item {...itemProps} focused={focused} selected={selected}>
+        <View style={styles.label_icon_container}>
+          {iconPlacement === "left" && renderItemIcon}
+
+          {label ? (
+            <ItemLabel
+              {...labelBaseProps}
+              label={label ?? null}
+              focused={focused}
+              selected={selected}
+            />
+          ) : null}
+        </View>
+
+        {selected ? (
+          <ItemIcon {...iconBaseProps} asset={selectedItemIconPropsAssets} />
+        ) : (
+          iconPlacement === "right" && renderItemIcon
+        )}
+      </Item>
+    </TouchableOpacity>
   );
 }

package/Components/ModalComponent/Header/index.tsx

@@ -1,5 +1,5 @@
 import React, { useMemo } from "react";
-import { View, StyleSheet, LayoutChangeEvent } from "react-native";
+import { LayoutChangeEvent, StyleSheet, View } from "react-native";
 import { Title, TitleProps } from "./Title";
 import { CloseButton, CloseButtonProps } from "./CloseButton";
 import { getCloseButtonProps, getTitleProps } from "./utils";
@@ -8,13 +8,18 @@ import { PluginConfiguration } from "../index";
 type Props = {
   dismiss: () => void;
   configuration: PluginConfiguration;
-  width: number;
   onLayout?: (event: LayoutChangeEvent) => void;
   summary?: string;
   title?: string;
 };
 
 const styles = StyleSheet.create({
+  noFlex: {
+    flex: 0,
+  },
+  flex: {
+    flex: 1,
+  },
   container: {
     flexDirection: "row",
     alignItems: "center",
@@ -22,7 +27,7 @@ const styles = StyleSheet.create({
 });
 
 export function ModalHeader(props: Props) {
-  const { configuration, dismiss, width, onLayout, summary, title } = props;
+  const { configuration, dismiss, onLayout, summary, title } = props;
 
   const closeButtonProps = useMemo<CloseButtonProps>(
     () => ({
@@ -55,15 +60,11 @@ export function ModalHeader(props: Props) {
 
   return (
     <View onLayout={onLayout} style={styles.container}>
-      <View
-        style={{
-          width: width - buttonsContainerWidth,
-        }}
-      >
-        {title && <Title {...titleProps} />}
-        {summary && <Title {...summaryProps} />}
+      <View style={styles.flex}>
+        {title ? <Title {...titleProps} /> : null}
+        {summary ? <Title {...summaryProps} /> : null}
       </View>
-      <View style={{ width: buttonsContainerWidth }}>
+      <View style={[styles.noFlex, { width: buttonsContainerWidth }]}>
         <CloseButton {...closeButtonProps} />
       </View>
     </View>

package/Components/ModalComponent/utils.ts

@@ -1,15 +1,18 @@
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { PluginConfiguration } from "./index";
+import { PluginConfiguration } from "./";
+import { ItemIconProps } from "./Button/ItemIcon";
+import { ItemLabelProps } from "./Button/ItemLabel";
+import { ItemProps } from "./Button/Item";
 
 export function defaultItemProps(
   config: PluginConfiguration,
   maxWidth: number
-) {
+): ItemProps {
   const {
     modal_bottom_sheet_item_background_color,
     modal_bottom_sheet_item_focus_background_color,
     modal_bottom_sheet_item_selected_background_color,
-    modal_bottom_sheet_item_focusected_background_color,
+    modal_bottom_sheet_item_focused_selected_background_color,
     modal_bottom_sheet_item_corner_radius,
     modal_bottom_sheet_item_margin_bottom,
     modal_bottom_sheet_item_margin_left,
@@ -25,8 +28,8 @@ export function defaultItemProps(
     backgroundColor: modal_bottom_sheet_item_background_color,
     focusedBackgroundColor: modal_bottom_sheet_item_focus_background_color,
     selectedBackgroundColor: modal_bottom_sheet_item_selected_background_color,
-    focusectedBackgroundColor:
-      modal_bottom_sheet_item_focusected_background_color,
+    focusedSelectedBackgroundColor:
+      modal_bottom_sheet_item_focused_selected_background_color,
     borderRadius: modal_bottom_sheet_item_corner_radius,
     marginBottom: modal_bottom_sheet_item_margin_bottom,
     marginTop: modal_bottom_sheet_item_margin_top,
@@ -43,7 +46,7 @@ export function defaultItemProps(
 export function defaultItemLabelProps(
   config: PluginConfiguration,
   sheetWidth: number
-) {
+): ItemLabelProps {
   const {
     modal_bottom_sheet_item_label_android_letter_spacing,
     modal_bottom_sheet_item_label_ios_letter_spacing,
@@ -103,7 +106,9 @@ export function defaultItemLabelProps(
   };
 }
 
-export function defaultItemIconProps(config: PluginConfiguration) {
+export function defaultItemIconProps(
+  config: PluginConfiguration
+): ItemIconProps {
   const {
     modal_bottom_sheet_item_icon_height,
     modal_bottom_sheet_item_icon_width,
@@ -124,3 +129,46 @@ export function defaultItemIconProps(config: PluginConfiguration) {
     marginRight: modal_bottom_sheet_item_icon_margin_right,
   };
 }
+
+export function getItemIconProps(
+  theme: PluginConfiguration,
+  iconProps?: ((theme: PluginConfiguration) => ItemIconProps) | ItemIconProps
+) {
+  if (iconProps) {
+    return typeof iconProps === "function" ? iconProps(theme) : iconProps;
+  }
+
+  return defaultItemIconProps(theme);
+}
+
+export function getItemLabelProps(
+  theme: PluginConfiguration,
+  width: number,
+  labelProps?:
+    | ((theme: PluginConfiguration, width: number) => ItemLabelProps)
+    | ItemLabelProps
+) {
+  if (labelProps) {
+    return typeof labelProps === "function"
+      ? labelProps(theme, width)
+      : labelProps;
+  }
+
+  return defaultItemLabelProps(theme, width);
+}
+
+export function getItemProps(
+  theme: PluginConfiguration,
+  width: number,
+  itemProps?:
+    | ((theme: PluginConfiguration, width: number) => ItemProps)
+    | ItemProps
+) {
+  if (itemProps) {
+    return typeof itemProps === "function"
+      ? itemProps(theme, width)
+      : itemProps;
+  }
+
+  return defaultItemProps(theme, width);
+}

package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx

@@ -90,7 +90,7 @@ export const NotificationView = (props: Props) => {
   return (
     <div onClick={onClose}>
       {children}
-      {open && (
+      {open ? (
         <div style={styles.body}>
           <div style={styles.title}>
             <h2>{MSG}</h2>
@@ -98,7 +98,7 @@ export const NotificationView = (props: Props) => {
 
           <h4 style={styles.subtitle}>{EXTRA_MSG}</h4>
         </div>
-      )}
+      ) : null}
     </div>
   );
 };

package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx

@@ -85,7 +85,7 @@ export const NotificationView = (props: Props) => {
   return (
     <div onClick={onClose}>
       {children}
-      {shown && (
+      {shown ? (
         <div style={styles.body}>
           <div style={styles.title}>
             <h2>{title}</h2>
@@ -93,7 +93,7 @@ export const NotificationView = (props: Props) => {
 
           <h4 style={styles.subtitle}>{subtitle}</h4>
         </div>
-      )}
+      ) : null}
     </div>
   );
 };

package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import { Text, Animated } from "react-native";
 
-import { shallow } from "enzyme";
 import renderer from "react-test-renderer";
 
 jest.useFakeTimers();
@@ -40,10 +39,6 @@ const {
 } = require("../NotificationView");
 
 describe("NotificationView", () => {
-  it("renders", () => {
-    shallow(<NotificationView dismiss={dismiss} />);
-  });
-
   it("Show online message when Online", () => {
     const component = renderer.create(
       <NotificationView online dismiss={dismiss} />

package/Components/OfflineHandler/utils/index.ts

@@ -57,7 +57,7 @@ export const useNotificationHeight = () => {
 
   const navBarHeight = platformSelect({ ios: 44, android: 56 });
 
-  const statusHeight = Platform.OS === "android" ? 0 : insets.top;
+  const statusHeight = insets.top;
   const notificationHeight = statusHeight + navBarHeight;
 
   return { statusHeight, notificationHeight };