ordering-ui-react-native 0.16.33 → 0.16.34-release

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

@@ -1,33 +1,45 @@
 import React from 'react'
-import { Modal, TouchableWithoutFeedback, Dimensions, StyleSheet, View, Text, Platform, StatusBar } from 'react-native'
+import { Modal, TouchableWithoutFeedback, TouchableOpacity, Dimensions, StyleSheet, View, Text, Platform, StatusBar } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { OIcon } from '.';
 const deviceHeight = Dimensions.get('window').height
 
 interface Props {
 	open: boolean;
+	transparent?: boolean;
 	title?: string;
 	children?: any;
 	onClose?: any;
 	isStatusBar?: boolean;
+	bottomContainerStyle?: any;
+	titleStyle?: any;
+	closeIcon?: any;
+	presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen" | undefined
 }
 const OBottomPopup = (props: Props) => {
 	const {
 		open,
+		transparent,
 		title,
 		onClose,
 		children,
-		isStatusBar
+		isStatusBar,
+		titleStyle,
+		bottomContainerStyle,
+		closeIcon,
+		presentationStyle
 	} = props
 	const { top, bottom } = useSafeAreaInsets();
+	
 	return (
 		<Modal
-			animationType='slide'
-			transparent={false}
+			animationType='fade'
+			transparent={transparent}
 			visible={open}
 			onRequestClose={() => onClose()}
-			presentationStyle={'fullScreen'}
+			presentationStyle={presentationStyle || 'fullScreen'}
 		>
-		  {isStatusBar && <StatusBar translucent={false} />}
+			{isStatusBar && <StatusBar translucent={false} />}
 			<View style={styles.container}>
 				<TouchableWithoutFeedback
 					style={styles.touchableOutsideStyle}
@@ -35,13 +47,24 @@ const OBottomPopup = (props: Props) => {
 				>
 					<View style={styles.touchableOutsideStyle} />
 				</TouchableWithoutFeedback>
-				<View style={styles.bottomContainer}>
+				<View style={{ ...styles.bottomContainer, ...bottomContainerStyle }}>
 					<View style={{ paddingTop: top, paddingBottom: bottom }}>
-						{title != '' && (
-							<Text style={styles.titleStyle}>
-								{title}
-							</Text>
-						)}
+						<View style={styles.modalTitleStyle}>
+							{closeIcon && (
+								<TouchableOpacity onPress={() => onClose()} style={styles.closeIconStyle}>
+									<OIcon
+										src={closeIcon}
+										width={20}
+										height={20}
+									/>
+								</TouchableOpacity>
+							)}
+							{!!title && (
+								<Text style={{ ...styles.titleStyle, ...titleStyle }}>
+									{title}
+								</Text>
+							)}
+						</View>
 						{children}
 					</View>
 				</View>
@@ -54,7 +77,7 @@ const styles = StyleSheet.create({
 	container: {
 		flex: 1,
 		backgroundColor: '#000000AA',
-		justifyContent: 'flex-end',
+		justifyContent: 'flex-end'
 	},
 	touchableOutsideStyle: {
 		flex: 1,
@@ -68,8 +91,18 @@ const styles = StyleSheet.create({
 	},
 	titleStyle: {
 		fontSize: 20,
-		fontWeight: 'bold',
-		marginVertical: 15
+		fontWeight: 'bold'
+	},
+	closeIconStyle: {
+		position: 'absolute',
+		left: 25,
+		top: 25,
+		zIndex: 100
+	},
+	modalTitleStyle: {
+		position: 'relative',
+		paddingHorizontal: 10,
+		paddingVertical: 20
 	}
 })
 

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

@@ -78,6 +78,9 @@ interface Props {
 	borderColor?: string;
 	loadingStyle?: ViewStyle;
 	showNextIcon?: boolean;
+	isDisabledWithSameStyles?: boolean;
+	icon?: any;
+	iconProps?: any
 }
 
 const OButton = (props: Props): React.ReactElement => {
@@ -110,8 +113,12 @@ const OButton = (props: Props): React.ReactElement => {
 			activeOpacity={props.activeOpacity}
 			onPress={props.onClick}
 			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}>
+				{props.icon ? (
+					<props.icon {...props.iconProps} />
+				) : null}
 				{props.imgLeftSrc ? (
 					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} />
 				) : null}
@@ -120,9 +127,9 @@ const OButton = (props: Props): React.ReactElement => {
 				) : null}
 				{props.imgRightSrc ? (
 					<EndImage style={props.imgRightStyle} source={props.imgRightSrc} />
-				) : props.showNextIcon ? 
-					<EndImage source={theme.images.general.arrow_left} 
-					style={{width: 16, tintColor: 'white', transform: [{rotate: I18nManager.isRTL ? '0deg' : '180deg'}]}} /> : null }
+				) : props.showNextIcon ?
+					<EndImage source={theme.images.general.arrow_left}
+						style={{ width: 16, tintColor: 'white', transform: [{ rotate: I18nManager.isRTL ? '0deg' : '180deg' }] }} /> : null}
 			</StyledButton>
 		</TouchableOpacity>
 	);

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()}}
+			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 ? (
@@ -75,6 +81,7 @@ const OInput = (props: Props): React.ReactElement => {
 				<MaterialIcon name={props?.vertorIcon} size={20} color={props?.vectorIconColor} style={{ marginHorizontal: 10 }} />
 			)}
 			<Input
+				autoFocus={props?.autoFocus}
 				name={props.name}
 				secureTextEntry={props.isSecured}
 				onChangeText={(txt: any) => props.name ? props.onChange({ target: { name: props.name, value: txt } }) : props.onChange(txt)}
@@ -90,10 +97,12 @@ const OInput = (props: Props): React.ReactElement => {
 				returnKeyType={props.returnKeyType}
 				onSubmitEditing={props.onSubmitEditing}
 				blurOnSubmit={props.blurOnSubmit}
-				ref={(e : any) => {
+				ref={(e: any) => {
 					props.forwardRef && (props.forwardRef.current = e)
 				}}
 				style={props?.inputStyle}
+				onFocus={() => setInputFocused(true)}
+				onBlur={() => setInputFocused(false)}
 			/>
 			{props.iconRight && (
 				<OIcon
@@ -113,6 +122,7 @@ OInput.defaultProps = {
 	iconColor: '#959595',
 	bgColor: 'white',
 	borderColor: 'white',
+	isFocusHighlight: false
 };
 
 export default OInput;

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: 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/layouts/FloatingBottomContainer.tsx

@@ -19,7 +19,11 @@ export const Container = styled.View`
 
 export const FloatingBottomContainer = (props: any) => {
   return (
-    <Container style={{ width: windowWidth }}>
+    <Container style={{
+      width: windowWidth,
+      borderTopWidth: props?.borderTopWidth ?? 1,
+      borderRadius: props?.borderRadius ?? 0
+    }}>
       {props.children}
     </Container>
   )

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

@@ -47,6 +47,8 @@ export interface ProfileParams {
 	isVerifiedPhone?: any;
 	handleRemoveAccount?: any;
 	removeAccountState?: any;
+	handleChangePromotions?: any;
+	notificationsGroup?: any;
 }
 
 export interface AddressListParams {
@@ -80,6 +82,7 @@ export interface AddressFormParams {
 	saveAddress?: any,
 	userCustomerSetup?: boolean,
 	isRequiredField?: (field: string) => {},
+	showField?: (field: string) => {},
 	isGuestUser?: boolean,
 	useValidationFileds?: boolean,
 	isSelectedAfterAdd?: boolean,
@@ -110,9 +113,20 @@ export interface SignupParams {
 	handleSendVerifyCode?: any;
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
+	signUpTab?: string;
+	useSignUpFullDetails?: boolean;
+	useSignUpOtpEmail?: boolean;
+	useSignUpOtpCellphone?: boolean;
+	willVerifyOtpState?: boolean;
+	numOtpInputs?: number;
 	handleChangePromotions: () => void;
+	handleChangeInput?: (in1: any, in2: any) => void;
 	enableReCaptcha?: boolean;
-	handleReCaptcha?: () => void;
+	generateOtpCode?: (in1?: any) => void;
+	handleReCaptcha?: (token?: any) => void;
+	setSignUpTab?: (in1: string) => void;
+	setWillVerifyOtpState?: (in1: boolean) => void;
+	setOtpState?: (in1: string) => void;
 }
 
 export interface PhoneInputParams {
@@ -158,6 +172,7 @@ export interface BusinessesListingParams {
 	priceLevelSelected?: any;
 	handleChangePriceLevel?: any;
 	businessTypeSelected?: any;
+	logosLayout?: boolean;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -202,6 +217,8 @@ export interface BusinessControllerParams {
 	handleFavoriteBusiness?: any,
 	setFavoriteIds?: any;
 	handleUpdateBusinessList?: any;
+	enableIntersection?: boolean;
+	handleCustomUpdate?: (businessId: number, changes: any) => {};
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -275,18 +292,24 @@ export interface BusinessProductsListParams {
 	onClickCategory?: any,
 	lazyLoadProductsRecommended?: boolean,
 	isFiltMode?: boolean,
-	handleUpdateProducts?: any
+	handleUpdateProducts?: any,
+	navigation?: any;
+	previouslyProducts?: any;
 }
 export interface SingleProductCardParams {
-	businessId: any,
+	businessId: any;
 	product: any;
 	isSoldOut: boolean;
 	onProductClick: any;
 	productAddedToCartLength: number;
-	style?: ViewStyle,
-	categoryState?: any,
-	handleFavoriteProduct?: any,
-	handleUpdateProducts?: any
+	style?: ViewStyle;
+	categoryState?: any;
+	handleFavoriteProduct?: any;
+	handleUpdateProducts?: any;
+	enableIntersection?: boolean;
+	navigation?: any;
+	isPreviously?: any;
+	isProductId?: any;
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -341,6 +364,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,
@@ -348,6 +373,8 @@ export interface OrdersOptionParams {
 	businessesSearchList?: any,
 	hideOrders?: boolean,
 	BusinessControllerSkeletons?: any,
+	businessPaginationProps?: any,
+	businesses?: any
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -369,6 +396,7 @@ export interface PreviousOrdersParams {
 	getOrderStatus?: any,
 	orderID?: number
 	reorderLoading?: boolean,
+	loading?: boolean,
 	loadMoreOrders?: () => {},
 	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
@@ -404,25 +432,26 @@ export interface ProductItemAccordionParams {
 	isFromCheckout?: any
 }
 export interface ReviewOrderParams {
-	order?: { id: number, businessId: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any },
-	stars?: any,
-	handleChangeInput?: any,
-	handleChangeRating?: any,
-	handleSendReview?: any,
-	formState?: any,
-	navigation?: any,
-	setIsReviewed?: (isReviewed: boolean) => {},
-	handleReviewState?: any,
-	setStars?: any,
-	onNavigationRedirect?: any
+	order?: { id: number, business_id: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any };
+	stars?: any;
+	defaultStar?: number;
+	handleChangeInput?: any;
+	handleChangeRating?: any;
+	handleSendReview?: any;
+	formState?: any;
+	navigation?: any;
+	setIsReviewed?: (isReviewed: boolean) => void;
+	handleReviewState?: any;
+	setStars?: any;
+	onNavigationRedirect?: any;
 }
 export interface ReviewProductParams {
 	navigation?: any,
 	onNavigationRedirect?: any,
-	order?: { orderId: number, businessId: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any },
+	order?: { orderId: number, business_id: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any },
 	formState?: any,
 	handleChangeFormState?: any,
-	handleSendProductReview?: any
+	handleSendProductReview?: any;
 }
 export interface SingleProductReviewParams {
 	product: any,
@@ -432,12 +461,12 @@ export interface SingleProductReviewParams {
 export interface ReviewDriverParams {
 	navigation?: any,
 	onNavigationRedirect?: any,
-	order?: { orderId: number, businessId: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any },
+	order?: { orderId: number, business_id: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any },
 	formState?: any,
 	setIsDriverReviewed?: (isReviewed: boolean) => {},
 	dirverReviews?: any,
 	setDriverReviews?: any,
-	handleSendDriverReview?: any
+	handleSendDriverReview?: any;
 }
 export interface MessagesParams {
 	type?: string,
@@ -535,7 +564,9 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
-	setOrderTypeValue?: (value: number) => any
+	setOrderTypeValue?: (value: number) => any,
+	isChewLayout?: boolean;
+	chewOrderTypes?: any;
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -621,12 +652,20 @@ export interface NoNetworkParams {
 }
 
 export interface PlaceSpotParams {
-	isOpenPlaceSpot?: boolean,
+	isCheckout?: any,
+	isInputMode?: any,
 	cart?: any,
+	spotNumberDefault?: any,
+	vehicleDefault?: any,
+	spotNumber?: any,
+	setSpotNumber?: any,
+	orderTypes?: any,
 	placesState?: any,
 	handleChangePlace?: any,
-	getPlacesList?: any,
-	setOpenPlaceModal?: any
+	spotState?: any,
+	vehicle?: any,
+	setVehicle?: any,
+	handleChangeSpot?: any
 }
 
 export interface PromotionParams {
@@ -651,7 +690,8 @@ export interface otpParams {
 	setWillVerifyOtpState: (val: boolean) => void,
 	onSubmit: () => void,
 	handleLoginOtp: (code: string) => void,
-	setAlertState: any
+	setAlertState: any;
+	pinCount: number;
 }
 
 export interface FavoriteParams {
@@ -677,7 +717,9 @@ export interface SingleOrderCardParams {
 	onNavigationRedirect?: (route: string, params?: any) => {},
 	pastOrders: any,
 	isMessageView?: any,
-	handleClickOrder: (value: any) => {}
+	handleClickOrder: (value: any) => {},
+	handleRemoveCart: () => {},
+	cartState: any
 }
 
 export interface PreviousBusinessOrderedParams {
@@ -687,7 +729,9 @@ export interface PreviousBusinessOrderedParams {
 	businessId?: number,
 	onNavigationRedirect?: any,
 	isBusinessesSearchList?: any,
-	businessLoading?: boolean
+	businessLoading?: boolean,
+	businesses?: any
+  handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {
@@ -699,7 +743,11 @@ export interface ServiceFormParams {
 	isSoldOut: boolean,
 	maxProductQuantity: any,
 	businessSlug?: string,
-	onClose: any
+	onClose: any,
+	professionalList: any,
+	productObject?: any,
+	professionalListState?: any,
+	isCartProduct?: any
 }
 
 export interface ProfessionalFilterParams {
@@ -714,8 +762,21 @@ export interface ProfessionalProfileParams {
 	onClose: any
 }
 
+export interface OrderItAgainParams {
+	onProductClick: any,
+	productList: any,
+	businessId: any,
+	categoryState: any,
+	currentCart: any,
+	handleUpdateProducts: any,
+	navigation: any,
+	searchValue?: string
+}
+
 export interface PreviousProductsOrderedParams {
 	products?: any,
+	isProductId?: boolean
 	onProductClick?: any,
 	isBusinessesSearchList?: boolean
+	handleUpdateProducts?: any
 }