ordering-ui-react-native 0.18.3 → 0.18.4-release

package/themes/original/src/components/ProductForm/index.tsx

@@ -9,8 +9,7 @@ import {
 	I18nManager,
 	SafeAreaView,
 	Platform,
-	Button,
-	Vibration
+	Button
 } from 'react-native';
 import {
 	ProductForm as ProductOptions,
@@ -20,7 +19,8 @@ import {
 	useUtils,
 	ToastType,
 	useToast,
-	useConfig
+	useConfig,
+	useEvent
 } from 'ordering-components/native';
 import uuid from 'react-native-uuid';
 import { useTheme } from 'styled-components/native';
@@ -30,6 +30,7 @@ import Swiper from 'react-native-swiper'
 import FastImage from 'react-native-fast-image';
 import IconAntDesign from 'react-native-vector-icons/AntDesign';
 import YoutubePlayer from "react-native-youtube-iframe"
+import ReactNativeHapticFeedback from "react-native-haptic-feedback";
 
 import {
 	WrapHeader,
@@ -55,8 +56,12 @@ import { NotFoundSource } from '../NotFoundSource';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import NavBar from '../NavBar';
 import { orderTypeList } from '../../utils';
+import { ActionButton } from './ActionButton'
+import { ExtraOptions } from './ExtraOptions'
 const windowWidth = Dimensions.get('window').width;
 
+
+
 export const ProductOptionsUI = (props: any) => {
 	const {
 		navigation,
@@ -78,10 +83,10 @@ export const ProductOptionsUI = (props: any) => {
 		actionStatus,
 		handleCreateGuestUser
 	} = props;
-
 	const theme = useTheme();
 	const [, { showToast }] = useToast()
-
+	const [events] = useEvent()
+	const commentRef = useRef()
 	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 
 	const styles = StyleSheet.create({
@@ -135,7 +140,8 @@ export const ProductOptionsUI = (props: any) => {
 		},
 		slide1: {
 			flex: 1,
-			alignItems: 'center'
+			alignItems: 'center',
+			width: '100%'
 		},
 		mainSwiper: {
 			height: 258,
@@ -174,7 +180,7 @@ export const ProductOptionsUI = (props: any) => {
 			marginTop: 10
 		},
 		wrapperNavbar: {
-			paddingHorizontal: 40,
+			paddingHorizontal: 20,
 			paddingTop: 0,
 		}
 	});
@@ -203,9 +209,19 @@ export const ProductOptionsUI = (props: any) => {
 	const [summaryRefHeight, setSummaryRefHeight] = useState(0)
 	const [isScrollAvailable, setIsScrollAvailable] = useState(null)
 	const [editionsLayoutY, setEditionsLayoutY] = useState(null)
-
+	const [viewedProduct, setViewedProduct] = useState<any>(null)
+	const [showTitle, setShowTitle] = useState(false)
+	const productOptionsMounted = useRef(false)
 	const guestCheckoutEnabled = configs?.guest_checkout_enabled?.value === '1'
-  const orderTypeEnabled = !orderTypeList[orderState?.options?.type - 1] || configs?.allowed_order_types_guest_checkout?.value?.includes(orderTypeList[orderState?.options?.type - 1])
+	const orderTypeEnabled = !orderTypeList[orderState?.options?.type - 1] || configs?.allowed_order_types_guest_checkout?.value?.includes(orderTypeList[orderState?.options?.type - 1])
+
+	const vibrateApp = (impact?: string) => {
+		const options = {
+			enableVibrateFallback: true,
+			ignoreAndroidSystemSettings: false
+		};
+		ReactNativeHapticFeedback.trigger(impact || "impactLight", options);
+	}
 
 	const isError = (id: number) => {
 		let bgColor = theme.colors.white;
@@ -222,7 +238,7 @@ export const ProductOptionsUI = (props: any) => {
 	};
 
 	const handleSaveProduct = () => {
-		Vibration.vibrate()
+		vibrateApp()
 		if (!productCart.quantity) {
 			showToast(ToastType.Error, t('VALIDATION_ERROR_REQUIRED', 'The quantity field is required').replace('_attribute_', t('PRODUCT_POTIONS_QUANTITY', 'Quantity')))
 			return
@@ -308,63 +324,19 @@ export const ProductOptionsUI = (props: any) => {
 		if (guestToken) handleCreateGuestUser({ guest_token: guestToken })
 	}
 
-	const handleOnLayout = (event: any, optionId: any) => {
-		const _optionLayout = { ...optionLayout }
+	let _optionLayout: any = {}
+
+	const handleOnLayout = (event: any, optionId: any, lastMounts: boolean) => {
+		_optionLayout = { ..._optionLayout }
 		const optionKey = 'id:' + optionId
 		_optionLayout[optionKey] = { y: event.nativeEvent.layout?.y }
-		setOptionLayout(_optionLayout)
+		if (lastMounts) {
+			setOptionLayout(_optionLayout)
+		}
 	}
 
-	const saveErrors =
-		orderState.loading ||
-		maxProductQuantity === 0 ||
-		Object.keys(errors)?.length > 0;
-
-
-	const ExtraOptions = ({ eID, options }: any) => (
-		<>
-			{options.map(({ id, name, respect_to, suboptions }: any) => (
-				<React.Fragment key={`cont_key_${id}`}>
-					{respect_to == null && suboptions?.length > 0 && (
-						<TouchableOpacity
-							key={`eopt_key_${id}`}
-							onPress={() => {
-								setSelectedOpt(id)
-								scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
-									y: optionLayout[`id:${id}`]?.y + editionsLayoutY - 50,
-									animated: true
-								})
-							}}
-							style={[
-								styles.extraItem,
-								{
-									borderBottomColor:
-										selOpt == id ? theme.colors.textNormal : theme.colors.backgroundPage,
-								},
-							]}>
-							<OText
-								color={
-									selOpt == id ? theme.colors.textNormal : theme.colors.textSecondary
-								}
-								size={12}
-								weight={selOpt == id ? '600' : 'normal'}
-								style={{ maxWidth: 150 }}
-								numberOfLines={1}>
-								{name}
-							</OText>
-						</TouchableOpacity>
-					)}
-				</React.Fragment>
-			))}
-		</>
-	);
-
-	const handleScroll = ({ nativeEvent: { contentOffset, layoutMeasurement } }: any) => {
-
-		const _topOption = Object.keys(optionLayout).find(((option: any) => Math.abs(contentOffset?.y - layoutMeasurement?.height - optionLayout[option]?.y) < 20))
-		if (_topOption) {
-			const _topOptionId = Number(_topOption.replace('id:', ''))
-		}
+	const handleScroll = ({ nativeEvent: { contentOffset } }: any) => {
+		setShowTitle(contentOffset.y > 30)
 	}
 
 	const handleGoBack = navigation?.canGoBack()
@@ -422,90 +394,6 @@ export const ProductOptionsUI = (props: any) => {
 		}
 	}, [product])
 
-	const ActionButton = () => {
-		return (
-			<View
-				style={{
-					width: isHaveWeight ? '100%' : ((isSoldOut || maxProductQuantity <= 0) ? '60%' : '40%'),
-				}}>
-				{((productCart &&
-					auth &&
-					orderState.options?.address_id) || (isSoldOut || maxProductQuantity <= 0)) && (
-						<OButton
-							onClick={() => handleSaveProduct()}
-							imgRightSrc=""
-							text={`${orderState.loading
-								? t('LOADING', 'Loading')
-								: (isSoldOut || maxProductQuantity <= 0)
-									? t('SOLD_OUT', 'Sold out')
-									: editMode
-										? t('UPDATE', 'Update')
-										: t('ADD', 'Add')
-								}`}
-							isDisabled={isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order))}
-							textStyle={{
-								color: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.primary : theme.colors.white,
-								fontSize: orderState.loading || editMode ? 10 : 14
-							}}
-							style={{
-								backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.lightGray : theme.colors.primary,
-								borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.white : theme.colors.primary,
-								opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
-								borderRadius: 7.6,
-								height: 44,
-								shadowOpacity: 0,
-								borderWidth: 1,
-								marginTop: isHaveWeight ? 10 : 0
-							}}
-						/>
-					)}
-				{auth &&
-					!orderState.options?.address_id &&
-					(orderState.loading ? (
-						<OButton
-							isDisabled
-							text={t('LOADING', 'Loading')}
-							imgRightSrc=""
-							textStyle={{ fontSize: 10 }}
-						/>
-					) : (
-						<OButton onClick={navigation.navigate('AddressList')} />
-					))}
-				{!auth && (
-					<OButton
-						isDisabled={isSoldOut || maxProductQuantity <= 0}
-						onClick={() => handleRedirectLogin()}
-						text={
-							isSoldOut || maxProductQuantity <= 0
-								? t('SOLD_OUT', 'Sold out')
-								: t('LOGIN_SIGNUP', 'Login / Sign Up')
-						}
-						imgRightSrc=""
-						textStyle={{ color: theme.colors.primary, fontSize: 13, textAlign: 'center' }}
-						style={{
-							height: 42,
-							borderColor: theme.colors.primary,
-							backgroundColor: theme.colors.white,
-							paddingLeft: 0,
-							paddingRight: 0
-						}}
-					/>
-				)}
-				{!auth && guestCheckoutEnabled && orderTypeEnabled && (
-					<TouchableOpacity style={{ marginTop: 10 }} onPress={handleUpdateGuest}>
-						{actionStatus?.loading ? (
-							<Placeholder Animation={Fade}>
-								<PlaceholderLine width={60} height={20} />
-							</Placeholder>
-						) : (
-							<OText color={theme.colors.primary} size={13} style={{ textAlign: 'center' }}>{t('WITH_GUEST_USER', 'With Guest user')}</OText>
-						)}
-					</TouchableOpacity>
-				)}
-			</View>
-		)
-	}
-
 	useEffect(() => {
 		const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
 			scrollViewRef.current.scrollToEnd({ animated: true })
@@ -515,21 +403,70 @@ export const ProductOptionsUI = (props: any) => {
 		}
 	}, [])
 
+	useEffect(() => {
+		if (!product?.id || product?.id === viewedProduct?.id) return
+		setViewedProduct(product)
+		events.emit('product_viewed', product)
+	}, [product?.id, viewedProduct])
+
+	const actionButtonProps = {
+		navigation,
+		isHaveWeight,
+		isSoldOut,
+		maxProductQuantity,
+		productCart,
+		handleSaveProduct,
+		editMode,
+		product,
+		errors,
+		productAddedToCartLength,
+		handleRedirectLogin,
+		guestCheckoutEnabled,
+		orderTypeEnabled,
+		handleUpdateGuest,
+		actionStatus
+	}
+
+	const extraOptionsProps = {
+		setSelectedOpt,
+		scrollViewRef,
+		optionLayout,
+		editionsLayoutY,
+		styles,
+		selOpt
+	}
+
 	return (
 		<SafeAreaView style={{ flex: 1 }}>
 			<View style={styles.wrapperNavbar}>
-				<NavBar
-					onActionLeft={() => handleGoBack()}
-					showCall={false}
-					btnStyle={{ paddingLeft: 0 }}
-					paddingTop={4}
-				/>
+				<TopHeader>
+					<>
+						<TopActions onPress={() => handleGoBack()}>
+							<IconAntDesign
+								name='arrowleft'
+								size={26}
+							/>
+						</TopActions>
+						{showTitle && (
+							<OText
+								size={16}
+								style={{ flex: 1, textAlign: 'center' }}
+								weight={Platform.OS === 'ios' ? '600' : 'bold'}
+								numberOfLines={2}
+								ellipsizeMode='tail'
+							>
+								{product?.name}
+							</OText>
+						)}
+					</>
+				</TopHeader>
 			</View>
 			{!error && (
 				<ScrollView
 					ref={scrollViewRef}
 					contentContainerStyle={{ paddingBottom: 80 }}
 					stickyHeaderIndices={[2]}
+					scrollEventThrottle={100}
 					onScroll={handleScroll}
 				>
 					<WrapHeader onLayout={(event: any) => setHeaderRefHeight(event.nativeEvent.layout?.height)}>
@@ -604,7 +541,7 @@ export const ProductOptionsUI = (props: any) => {
 								<ScrollView
 									horizontal
 									contentContainerStyle={{
-										paddingHorizontal: 30,
+										paddingHorizontal: 20,
 										paddingVertical: 15
 									}}
 								>
@@ -657,7 +594,7 @@ export const ProductOptionsUI = (props: any) => {
 						)}
 					</WrapHeader>
 					<ProductSummary
-						ph={isChewLayout ? 20 : 40}
+						ph={20}
 						onLayout={(event: any) => setSummaryRefHeight(event.nativeEvent.layout?.height)}
 					>
 						<ProductTitle>
@@ -727,6 +664,7 @@ export const ProductOptionsUI = (props: any) => {
 						</ProductDescription>
 						<ScrollView
 							horizontal
+							scrollEventThrottle={100}
 							showsHorizontalScrollIndicator={false}
 							contentContainerStyle={{ paddingBottom: 30 }}
 						>
@@ -754,12 +692,13 @@ export const ProductOptionsUI = (props: any) => {
 					{(!loading && product) && (
 						<ExtraOptionWrap
 							horizontal
+							scrollEventThrottle={100}
 							showsHorizontalScrollIndicator={false}
 							style={{
 								marginBottom: 20,
 								borderBottomWidth: 1,
 								borderBottomColor: theme.colors.border,
-								marginHorizontal: isChewLayout ? 20 : 30,
+								marginHorizontal: 20,
 								backgroundColor: theme.colors.backgroundPage,
 							}}
 						>
@@ -789,7 +728,7 @@ export const ProductOptionsUI = (props: any) => {
 								</TouchableOpacity>
 							)}
 							{product?.extras?.map((extra: any) =>
-								<ExtraOptions key={extra.id} options={extra.options} />
+								<ExtraOptions key={extra.id} options={extra.options} {...extraOptionsProps} />
 							)}
 						</ExtraOptionWrap>
 					)}
@@ -833,14 +772,14 @@ export const ProductOptionsUI = (props: any) => {
 						</>
 					) : (
 						<ProductEditions
-							style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}
+							style={{ paddingHorizontal: 20 }}
 							onLayout={(event: any) => {
 								setEditionsLayoutY(event.nativeEvent.layout?.y)
 							}}
 						>
 							<>
 								{product?.ingredients?.length > 0 && (
-									<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, 0)}>
+									<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, 0, true)}>
 										<SectionTitle>
 											<OText size={16}>
 												{t('INGREDIENTS', 'Ingredients')}
@@ -862,13 +801,13 @@ export const ProductOptionsUI = (props: any) => {
 									</View>
 								)}
 								{product?.extras?.sort((a: any, b: any) => a.rank - b.rank).map((extra: any) =>
-									extra.options?.sort((a: any, b: any) => a.rank - b.rank).map((option: any) => {
+									extra.options?.sort((a: any, b: any) => a.rank - b.rank).map((option: any, i: number) => {
 										const currentState =
 											productCart.options[`id:${option.id}`] || {};
 										return (
 											<React.Fragment key={`popt_${option.id}`}>
 												{showOption(option) && (
-													<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, option?.id)}>
+													<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, option?.id, extra.options?.length <= i + 2)}>
 														<ProductOption
 															option={option}
 															currentState={currentState}
@@ -880,12 +819,7 @@ export const ProductOptionsUI = (props: any) => {
 																}}>
 																{option?.suboptions?.sort((a: any, b: any) => a.rank - b.rank).map(
 																	(suboption: any) => {
-																		const currentState =
-																			productCart.options[
-																				`id:${option.id}`
-																			]?.suboptions[
-																			`id:${suboption.id}`
-																			] || {};
+																		const currentState = productCart.options[`id:${option.id}`]?.suboptions[`id:${suboption.id}`] || {};
 																		const balance =
 																			productCart.options[
 																				`id:${option.id}`
@@ -900,6 +834,7 @@ export const ProductOptionsUI = (props: any) => {
 																				balance={balance}
 																				option={option}
 																				suboption={suboption}
+																				image={suboption.image}
 																				state={currentState}
 																				disabled={
 																					isSoldOut ||
@@ -924,7 +859,7 @@ export const ProductOptionsUI = (props: any) => {
 								<ProductComment>
 									<SectionTitle>
 										<OText size={16} weight={'600'} lineHeight={24}>
-											{t('SPECIAL_COMMENT', 'Special comment')}
+											{t('COMMENTS', 'Special comment')}
 										</OText>
 									</SectionTitle>
 									<OInput
@@ -938,6 +873,7 @@ export const ProductOptionsUI = (props: any) => {
 											!(productCart && !isSoldOut && maxProductQuantity)
 										}
 										style={styles.comment}
+										forwardRef={commentRef}
 									/>
 								</ProductComment>
 							)}
@@ -1057,9 +993,9 @@ export const ProductOptionsUI = (props: any) => {
 								)}
 							</>
 						)}
-						{!isHaveWeight && <ActionButton />}
+						{!isHaveWeight && <ActionButton {...actionButtonProps} />}
 					</View>
-					{isHaveWeight && <ActionButton />}
+					{isHaveWeight && <ActionButton {...actionButtonProps} />}
 				</ProductActions>
 			)}
 		</SafeAreaView>

package/themes/original/src/components/ProductForm/styles.tsx

@@ -8,8 +8,8 @@ export const WrapHeader = styled.View`
 export const TopActions = styled.TouchableOpacity`
 	height: 60px;
 	justify-content: center;
-  padding-horizontal: 30px;
-  width: 100px;
+  min-width: 30px;
+  padding-right: 15px;
 `;
 
 export const TopHeader = styled.View`
@@ -70,7 +70,7 @@ export const ProductActions = styled.View`
   position: absolute;
   bottom: 0px;
   padding-top: ${(props: any) => props.ios ? '20px' : '0'};
-  padding-horizontal: 40px;
+  padding-horizontal: 30px;
   padding-vertical: 20px;
   width: 100%;
   flex-direction: ${(props: any) => props.isColumn ? 'column' : 'row'};

package/themes/original/src/components/ProductItemAccordion/index.tsx

@@ -77,6 +77,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	const [isServiceOpen, setIsServiceOpen] = useState(false)
 	// const [setHeight, setHeightState] = useState({ height: new Animated.Value(0) })
 	// const [setRotate, setRotateState] = useState({ angle: new Animated.Value(0) })
+	const [productQuantity, setProductQuantity] = useState(product.quantity.toString())
 
 	const productInfo = () => {
 		if (isCartProduct) {
@@ -107,19 +108,20 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	/* const toggleAccordion = () => {
 		if ((!product?.valid_menu && isCartProduct)) return
 		if (isActive) {
-		  Animated.timing(setHeight.height, {
+			Animated.timing(setHeight.height, {
 			 toValue: 100,
 			 duration: 500,
 			 easing: Easing.linear,
 			 useNativeDriver: false,
-		  }).start()
+			}).start()
 		} else {
-		  setHeightState({height: new Animated.Value(0)})
+			setHeightState({height: new Animated.Value(0)})
 		}
 	 }*/
 
 	const handleChangeQuantity = (value: string) => {
 		if (!orderState.loading) {
+			setProductQuantity(value)
 			if (parseInt(value) === 0) {
 				onDeleteProduct && onDeleteProduct(product)
 			} else {
@@ -134,7 +136,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	}
 
 	/*useEffect(() => {
-	  toggleAccordion()
+		toggleAccordion()
 	}, [isActive])*/
 
 	const productOptions = getProductMax && [...Array(getProductMax(product) + 1),].map((_: any, opt: number) => {
@@ -209,10 +211,15 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 											<RNPickerSelect
 												items={productOptions}
 												onValueChange={handleChangeQuantity}
-												value={product.quantity.toString()}
+												value={productQuantity}
 												style={pickerStyle}
 												useNativeAndroidPickerStyle={false}
 												placeholder={{}}
+												touchableWrapperProps={{
+													style: {
+														width: 40,
+													}
+												}}
 												Icon={() => <View style={pickerStyle.icon}><OIcon src={theme.images.general.arrow_down} color={theme.colors.textNormal} width={8} /></View>}
 												disabled={orderState.loading}
 											/>
@@ -287,7 +294,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 							)}
 							{productInfo().options.length > 0 && (
 								<ProductOptionsList>
-									{productInfo().options.map((option: any, i: number) => (
+									{productInfo().options.sort((a: any, b: any) => a.rank - b.rank).map((option: any, i: number) => (
 										<ProductOption key={option.id + i}>
 											<OText size={10} color={theme.colors.textSecondary}>{option.name}</OText>
 											{option.suboptions.map((suboption: any) => (