ordering-ui-react-native 0.16.98 → 0.16.99-release

package/themes/original/src/components/shared/HeaderTitle.tsx

@@ -1,16 +1,21 @@
 import React from 'react';
 import { Platform } from 'react-native';
 import OText from './OText';
+import { useTheme } from 'styled-components/native'
 
 const HeaderTitle = (props: any) => {
   const { text, style } = props
+	const theme = useTheme();
+
   return (
     <OText
-      size={24}
+      size={20}
+      weight={Platform.OS === 'ios' ? '600' : 'bold'}
       style={style ?? {
         marginTop: Platform.OS === 'android' ? 50 : 30,
-        paddingHorizontal: 40,
-        textTransform: 'capitalize'
+        paddingHorizontal: props.ph ?? 40,
+        textTransform: 'capitalize',
+        color: props.titleColor || theme.colors.textNormal,
       }}
     >
       {text}

package/themes/original/src/components/shared/OBottomPopup.tsx

@@ -33,7 +33,7 @@ const OBottomPopup = (props: Props) => {
 	
 	return (
 		<Modal
-			animationType='slide'
+			animationType='fade'
 			transparent={transparent}
 			visible={open}
 			onRequestClose={() => onClose()}

package/themes/original/src/components/shared/OButton.tsx

@@ -12,6 +12,7 @@ import {
 import * as React from 'react';
 import styled, { useTheme } from 'styled-components/native';
 import { OIcon } from './';
+import { css } from 'styled-components';
 
 const StyledButton = styled.View<Props>`
 	background-color: ${(props: any) => props.theme.colors.primary};
@@ -26,6 +27,9 @@ const StyledButton = styled.View<Props>`
 	padding-left: 20px;
 	padding-right: 20px;
 	position: relative;
+	${(props: any) => props?.theme?.general?.components?.buttons?.borderRadius && css`
+      border-radius: ${props?.theme?.general?.components?.buttons?.borderRadius}px;
+  `}
 `
 const StyledButtonDisabled = styled(StyledButton)`
 	background-color: ${(props: any) => props.theme.colors.disabled};
@@ -115,12 +119,12 @@ const OButton = (props: Props): React.ReactElement => {
 			style={{ width: props.isCircle ? 52 : props.style?.width, ...props.parentStyle }}
 			disabled={props.isDisabledWithSameStyles}
 		>
-			<StyledButton style={props.bgColor ? { ...props.style, backgroundColor: props.bgColor, borderColor: props.borderColor } : props.style}>
+			<StyledButton style={props.bgColor ? { ...props.style, backgroundColor: props.bgColor, borderColor: props.borderColor, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius } : { ...props.style, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius }}>
 				{props.icon ? (
 					<props.icon {...props.iconProps} />
 				) : null}
 				{props.imgLeftSrc ? (
-					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} />
+					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} color={theme.colors.textNormal} />
 				) : null}
 				{props.text ? (
 					<StyledText style={props.textStyle}>{props.text}</StyledText>

package/themes/original/src/components/shared/OIcon.tsx

@@ -26,7 +26,14 @@ const OImage = (props: Props): React.ReactElement => {
 	return (
 		<Wrapper style={{ borderRadius: props.style?.borderRadius, overflow: 'hidden', marginHorizontal: props.style?.marginHorizontal }}>
 			<SImage
-				source={props.src ? props.src : props.url ? { uri: props.url } : props.dummy}
+				source={
+					props.src
+						? props.src
+						: props.url
+							? typeof props.url === 'number'
+								? props.url
+								: { uri: props.url }
+							: props.dummy}
 				style={{
 					tintColor: props.color,
 					flex: props.isWrap ? 1 : 0,

package/themes/original/src/components/shared/OInput.tsx

@@ -3,6 +3,7 @@ import { ImageSourcePropType, ImageStyle, ViewStyle, TextInputProps, TextStyle }
 import styled from 'styled-components/native';
 import OIcon from './OIcon';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
+import { useTheme } from 'styled-components/native';
 
 const Input = styled.TextInput`
   flex-grow: 1;
@@ -39,6 +40,7 @@ interface Props extends TextInputProps {
 	inputStyle?: TextStyle;
 	wrapperRef?: any;
 	onPress?: any;
+	isFocusHighlight?: boolean
 }
 
 const Wrapper = styled.Pressable`
@@ -54,12 +56,16 @@ const Wrapper = styled.Pressable`
 `;
 
 const OInput = (props: Props): React.ReactElement => {
+	const theme = useTheme();
+	const [inputFocused, setInputFocused] = React.useState(false)
 	return (
 		<Wrapper
 			onPress={() => { props.forwardRef?.current?.focus?.(); props.onPress && props.onPress() }}
 			style={{
 				backgroundColor: props.bgColor,
-				borderColor: props.borderColor,
+				borderColor: !props.isFocusHighlight
+					? props.borderColor
+					: inputFocused ? theme.colors.primary : theme.colors.border,
 				...props.style,
 			}}>
 			{props.icon ? (
@@ -95,6 +101,8 @@ const OInput = (props: Props): React.ReactElement => {
 					props.forwardRef && (props.forwardRef.current = e)
 				}}
 				style={props?.inputStyle}
+				onFocus={() => setInputFocused(true)}
+				onBlur={() => setInputFocused(false)}
 			/>
 			{props.iconRight && (
 				<OIcon
@@ -114,6 +122,7 @@ OInput.defaultProps = {
 	iconColor: '#959595',
 	bgColor: 'white',
 	borderColor: 'white',
+	isFocusHighlight: false
 };
 
 export default OInput;

package/themes/original/src/components/shared/OModal.tsx

@@ -52,7 +52,7 @@ const OModal = (props: Props): React.ReactElement => {
 
 	const theme = useTheme();
 
-	const RenderSafeAreaView = () => (
+	const renderSafeAreaView = () => (
 		<SafeAreaView style={styles.container}>
 			{!entireModal ? (
 				<View style={styles.centeredView}>
@@ -101,10 +101,10 @@ const OModal = (props: Props): React.ReactElement => {
 					enabled
 					behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
 				>
-					<RenderSafeAreaView/>
+					{renderSafeAreaView()}
 				</KeyboardView>
 			) : (
-				<RenderSafeAreaView/>
+				renderSafeAreaView()
 			)}
 		</Modal>
 	);

package/themes/original/src/layouts/Container.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import styled, { css } from 'styled-components/native';
-import { Platform } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import styled, { css, useTheme } from 'styled-components/native';
+import { Platform, View } from 'react-native';
 
 const ContainerStyled = styled.ScrollView`
   flex: 1;
@@ -10,17 +11,20 @@ const ContainerStyled = styled.ScrollView`
   background-color: ${(props: any) => props.theme.colors.backgroundPage};
 `;
 
-const SafeAreaStyled = styled.SafeAreaView`
-  flex: 1;
-  background-color: ${(props: any) => props.theme.colors.backgroundPage};
-`;
-
 export const Container = (props: any) => {
+  const theme = useTheme()
+  const insets = useSafeAreaInsets()
   return (
-    <SafeAreaStyled>
+    <View
+      style={{
+        flex: 1,
+        paddingTop: props.pt ?? insets.top,
+        backgroundColor: theme.colors.backgroundPage
+      }}
+    >
       <ContainerStyled {...props} ref={props?.forwardRef} keyboardShouldPersistTaps='handled' style={{...props.style}}>
         {props.children}
       </ContainerStyled>
-    </SafeAreaStyled>
+    </View>
   )
 }

package/themes/original/src/types/index.tsx

@@ -19,6 +19,7 @@ export interface LoginParams {
 	notificationState?: any;
 	handleReCaptcha?: any;
 	enableReCaptcha?: any;
+	isGuest?: any;
 	otpType?: string,
 	setOtpType: (type: string) => void,
 	generateOtpCode: (values?: any) => void,
@@ -47,6 +48,8 @@ export interface ProfileParams {
 	isVerifiedPhone?: any;
 	handleRemoveAccount?: any;
 	removeAccountState?: any;
+	handleChangePromotions?: any;
+	notificationsGroup?: any;
 }
 
 export interface AddressListParams {
@@ -80,6 +83,7 @@ export interface AddressFormParams {
 	saveAddress?: any,
 	userCustomerSetup?: boolean,
 	isRequiredField?: (field: string) => {},
+	showField?: (field: string) => {},
 	isGuestUser?: boolean,
 	useValidationFileds?: boolean,
 	isSelectedAfterAdd?: boolean,
@@ -88,7 +92,8 @@ export interface AddressFormParams {
 	hasAddressDefault?: any,
 	isFromCheckout?: boolean
 	afterSignup?: boolean
-	isGuestFromStore?: boolean
+	isGuestFromStore?: boolean,
+	businessSlug?: number | string
 }
 export interface SignupParams {
 	navigation?: any;
@@ -115,6 +120,7 @@ export interface SignupParams {
 	useSignUpOtpEmail?: boolean;
 	useSignUpOtpCellphone?: boolean;
 	willVerifyOtpState?: boolean;
+	isGuest?: any;
 	numOtpInputs?: number;
 	handleChangePromotions: () => void;
 	handleChangeInput?: (in1: any, in2: any) => void;
@@ -170,6 +176,9 @@ export interface BusinessesListingParams {
 	handleChangePriceLevel?: any;
 	businessTypeSelected?: any;
 	logosLayout?: boolean;
+	isCustomLayout?: boolean;
+	citiesState?: any;
+	actualSlug?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -215,6 +224,9 @@ export interface BusinessControllerParams {
 	setFavoriteIds?: any;
 	handleUpdateBusinessList?: any;
 	enableIntersection?: boolean;
+	isCustomLayout?: boolean;
+	getBusinessOffer?: any;
+	handleCustomUpdate?: (businessId: number, changes: any) => {};
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -240,6 +252,10 @@ export interface BusinessProductsListingParams {
 	handleUpdateProducts?: any;
 	professionalSelected?: any;
 	handleChangeProfessionalSelected?: any;
+	handleUpdateProfessionals?: any;
+	onBusinessClick?: any;
+	onNavigationRedirect?: any;
+	businessSingleId?: number | string
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -291,6 +307,7 @@ export interface BusinessProductsListParams {
 	handleUpdateProducts?: any,
 	navigation?: any;
 	previouslyProducts?: any;
+	businessSingleId?: number | string
 }
 export interface SingleProductCardParams {
 	businessId: any;
@@ -305,6 +322,9 @@ export interface SingleProductCardParams {
 	enableIntersection?: boolean;
 	navigation?: any;
 	isPreviously?: any;
+	isProductId?: any;
+	viewString?: string;
+	businessSingleId?: number
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -359,6 +379,8 @@ export interface OrdersOptionParams {
 	refreshOrders?: boolean,
 	setRefreshOrders?: (value: boolean) => void,
 	handleUpdateOrderList?: (orderId: number, changes: any) => {},
+	handleUpdateProducts?: (productId: number, changes: any) => {},
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 	isBusiness?: boolean,
 	isProducts?: boolean,
 	businessOrderIds?: any,
@@ -389,6 +411,7 @@ export interface PreviousOrdersParams {
 	getOrderStatus?: any,
 	orderID?: number
 	reorderLoading?: boolean,
+	loading?: boolean,
 	loadMoreOrders?: () => {},
 	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
@@ -520,6 +543,7 @@ export interface FloatingButtonParams {
 }
 export interface MomentOptionParams {
 	navigation: any;
+	isCart?: any;
 	nopadding?: boolean;
 	datesList: Array<any>;
 	hoursList: Array<any>;
@@ -566,7 +590,7 @@ export interface UpsellingProductsParams {
 	business?: any;
 	businessId?: number;
 	cartProducts?: Array<any>;
-	handleUpsellingPage: () => void;
+	handleUpsellingPage: (cart ?: any) => void;
 	openUpselling: boolean;
 	canOpenUpselling?: boolean;
 	setCanOpenUpselling?: (value: any) => void;
@@ -577,6 +601,8 @@ export interface UpsellingProductsParams {
 	products?: any;
 	onNavigationRedirect?: any;
 	onGoBack?: any;
+	singleBusiness?: any;
+	isFranchiseApp?: any;
 }
 
 export interface GoogleMapsParams {
@@ -637,6 +663,7 @@ export interface BusinessSearchParams {
 	onNavigationRedirect?: any,
 	handleUpdateProducts: any,
 	handleUpdateBusinessList?: any;
+	brandId?: number
 }
 
 export interface NoNetworkParams {
@@ -650,14 +677,15 @@ export interface PlaceSpotParams {
 	spotNumberDefault?: any,
 	vehicleDefault?: any,
 	spotNumber?: any,
-    setSpotNumber?: any,
+	setSpotNumber?: any,
 	orderTypes?: any,
 	placesState?: any,
-	handleChangePlace? : any,
+	handleChangePlace?: any,
 	spotState?: any,
 	vehicle?: any,
 	setVehicle?: any,
 	handleChangeSpot?: any
+	setPlaceSpotNumber?: any
 }
 
 export interface PromotionParams {
@@ -723,6 +751,7 @@ export interface PreviousBusinessOrderedParams {
 	isBusinessesSearchList?: any,
 	businessLoading?: boolean,
 	businesses?: any
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {
@@ -735,13 +764,19 @@ export interface ServiceFormParams {
 	maxProductQuantity: any,
 	businessSlug?: string,
 	onClose: any,
-	professionalList: any
+	professionalList: any,
+	productObject?: any,
+	professionalListState?: any,
+	isCartProduct?: any,
+	actionStatus?: any,
+	handleCreateGuestUser?: any
 }
 
 export interface ProfessionalFilterParams {
 	professionals?: any,
 	professionalSelected?: any,
-	handleChangeProfessionalSelected: any
+	handleChangeProfessionalSelected: any,
+	handleUpdateProfessionals?: any
 }
 
 export interface ProfessionalProfileParams {
@@ -758,11 +793,14 @@ export interface OrderItAgainParams {
 	currentCart: any,
 	handleUpdateProducts: any,
 	navigation: any,
-	searchValue?: string
+	searchValue?: string,
+	businessSingleId?: number | string
 }
 
 export interface PreviousProductsOrderedParams {
 	products?: any,
+	isProductId?: boolean
 	onProductClick?: any,
 	isBusinessesSearchList?: boolean
+	handleUpdateProducts?: any
 }