npm - ordering-ui-react-native - Versions diffs - 0.22.24 → 0.22.26 - Mend

ordering-ui-react-native 0.22.24 → 0.22.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.22.24",
+  "version": "0.22.26",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/LanguageSelector/index.tsx CHANGED Viewed

@@ -25,8 +25,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
       value: language?.code,
       label: language?.name,
       inputLabel: language?.code.toUpperCase(),
-      countryCode: langCountries.find(item => item.value == language?.code)
-        ?.countryCode,
+      countryCode: langCountries.find(item => item.value == language?.code)?.countryCode,
     };
   });
@@ -50,6 +49,9 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
     },
   });
+  console.log('_languages', _languages);
   return (
     <Container style={{ backgroundColor: theme.colors.inputChat }}>
       {languagesState?.languages && (

package/themes/business/src/components/LanguageSelector/lang_country.json CHANGED Viewed

@@ -5,18 +5,6 @@
     "value": "en",
     "countryCode": "US"
   },
-  {
-    "inputLabel": "DE",
-    "label": "German",
-    "value": "de",
-    "countryCode": "DE"
-  },
-  {
-    "inputLabel": "ES",
-    "label": "Spanish",
-    "value": "es",
-    "countryCode": "ES"
-  },
   {
     "inputLabel": "MX",
     "label": "Spanish",
@@ -30,22 +18,70 @@
     "countryCode": "GT"
   },
   {
-    "inputLabel": "DA",
-    "label": "Danish",
-    "value": "da",
-    "countryCode": "DK"
+    "inputLabel": "AF",
+    "label": "Afghanistan",
+    "value": "af",
+    "countryCode": "AF"
   },
   {
-    "inputLabel": "NL",
-    "label": "Dutch",
-    "value": "nl",
-    "countryCode": "NL"
+    "inputLabel": "AL",
+    "label": "Albania",
+    "value": "sq",
+    "countryCode": "AL"
   },
   {
-    "inputLabel": "PT",
-    "label": "Portuguese",
-    "value": "pt",
-    "countryCode": "PT"
+    "inputLabel": "AD",
+    "label": "Andorra",
+    "value": "ca",
+    "countryCode": "AD"
+  },
+  {
+    "inputLabel": "AM",
+    "label": "Armenia",
+    "value": "hy",
+    "countryCode": "AM"
+  },
+  {
+    "inputLabel": "AZ",
+    "label": "Azerbaijan",
+    "value": "az",
+    "countryCode": "AZ"
+  },
+  {
+    "inputLabel": "BD",
+    "label": "Bangladesh",
+    "value": "bn",
+    "countryCode": "BD"
+  },
+  {
+    "inputLabel": "BY",
+    "label": "Belarus",
+    "value": "be",
+    "countryCode": "BY"
+  },
+  {
+    "inputLabel": "BT",
+    "label": "Bhutan",
+    "value": "dz",
+    "countryCode": "BT"
+  },
+  {
+    "inputLabel": "BA",
+    "label": "Bosnia and Herzegovina",
+    "value": "bs",
+    "countryCode": "BA"
+  },
+  {
+    "inputLabel": "BG",
+    "label": "Bulgaria",
+    "value": "bg",
+    "countryCode": "BG"
+  },
+  {
+    "inputLabel": "BI",
+    "label": "Burundi",
+    "value": "rn",
+    "countryCode": "BI"
   },
   {
     "inputLabel": "CA",
@@ -53,42 +89,174 @@
     "value": "ca",
     "countryCode": "ES"
   },
+  {
+    "inputLabel": "KH",
+    "label": "Cambodia",
+    "value": "km",
+    "countryCode": "KH"
+  },
+  {
+    "inputLabel": "CN",
+    "label": "China",
+    "value": "zh",
+    "countryCode": "CN"
+  },
+  {
+    "inputLabel": "HR",
+    "label": "Croatia",
+    "value": "hr",
+    "countryCode": "HR"
+  },
+  {
+    "inputLabel": "CZ",
+    "label": "Czechia",
+    "value": "cs",
+    "countryCode": "CZ"
+  },
+  {
+    "inputLabel": "DK",
+    "label": "Denmark",
+    "value": "da",
+    "countryCode": "DK"
+  },
+  {
+    "inputLabel": "DJ",
+    "label": "Djibouti",
+    "value": "aa",
+    "countryCode": "DJ"
+  },
+  {
+    "inputLabel": "EE",
+    "label": "Estonia",
+    "value": "et",
+    "countryCode": "EE"
+  },
+  {
+    "inputLabel": "SZ",
+    "label": "Eswatini",
+    "value": "ss",
+    "countryCode": "SZ"
+  },
+  {
+    "inputLabel": "ET",
+    "label": "Ethiopia",
+    "value": "am",
+    "countryCode": "ET"
+  },
+  {
+    "inputLabel": "FO",
+    "label": "Faroe Islands",
+    "value": "fo",
+    "countryCode": "FO"
+  },
+  {
+    "inputLabel": "FJ",
+    "label": "Fiji",
+    "value": "fj",
+    "countryCode": "FJ"
+  },
+  {
+    "inputLabel": "FI",
+    "label": "Finland",
+    "value": "fi",
+    "countryCode": "FI"
+  },
   {
     "inputLabel": "FR",
-    "label": "French",
+    "label": "France",
     "value": "fr",
     "countryCode": "FR"
   },
   {
-    "inputLabel": "TR",
-    "label": "Turkish",
-    "value": "tr",
-    "countryCode": "TR"
+    "inputLabel": "GE",
+    "label": "Georgia",
+    "value": "ka",
+    "countryCode": "GE"
   },
   {
-    "inputLabel": "KM",
-    "label": "Cambodian",
-    "value": "km",
-    "countryCode": "KH"
+    "inputLabel": "DE",
+    "label": "Germany",
+    "value": "de",
+    "countryCode": "DE"
   },
   {
-    "inputLabel": "ZH-CN",
-    "label": "Chinese Simplified",
-    "value": "zh-CN",
-    "countryCode": "CN"
+    "inputLabel": "GH",
+    "label": "Ghana",
+    "value": "ak",
+    "countryCode": "GH"
+  },
+  {
+    "inputLabel": "GR",
+    "label": "Greece",
+    "value": "el",
+    "countryCode": "GR"
+  },
+  {
+    "inputLabel": "GL",
+    "label": "Greenland",
+    "value": "kl",
+    "countryCode": "GL"
+  },
+  {
+    "inputLabel": "HT",
+    "label": "Haiti",
+    "value": "ht",
+    "countryCode": "HT"
   },
   {
-    "inputLabel": "HI",
-    "label": "Hindi",
+    "inputLabel": "HU",
+    "label": "Hungary",
+    "value": "hu",
+    "countryCode": "HU"
+  },
+  {
+    "inputLabel": "IS",
+    "label": "Iceland",
+    "value": "is",
+    "countryCode": "IS"
+  },
+  {
+    "inputLabel": "IN",
+    "label": "India",
     "value": "hi",
     "countryCode": "IN"
   },
   {
     "inputLabel": "ID",
-    "label": "Indonesian",
+    "label": "Indonesia",
     "value": "id",
     "countryCode": "ID"
   },
+  {
+    "inputLabel": "IR",
+    "label": "Iran",
+    "value": "fa",
+    "countryCode": "IR"
+  },
+  {
+    "inputLabel": "IE",
+    "label": "Ireland",
+    "value": "ga",
+    "countryCode": "IE"
+  },
+  {
+    "inputLabel": "IL",
+    "label": "Israel",
+    "value": "he",
+    "countryCode": "IL"
+  },
+  {
+    "inputLabel": "IT",
+    "label": "Italy",
+    "value": "it",
+    "countryCode": "IT"
+  },
+  {
+    "inputLabel": "JP",
+    "label": "Japan",
+    "value": "ja",
+    "countryCode": "JP"
+  },
   {
     "inputLabel": "KN",
     "label": "Kannad",
@@ -96,11 +264,222 @@
     "countryCode": "IN"
   },
   {
-    "inputLabel": "MS",
-    "label": "Malay",
+    "inputLabel": "KZ",
+    "label": "Kazakhstan",
+    "value": "kk",
+    "countryCode": "KZ"
+  },
+  {
+    "inputLabel": "KG",
+    "label": "Kyrgyzstan",
+    "value": "ky",
+    "countryCode": "KG"
+  },
+  {
+    "inputLabel": "LA",
+    "label": "Laos",
+    "value": "lo",
+    "countryCode": "LA"
+  },
+  {
+    "inputLabel": "LV",
+    "label": "Latvia",
+    "value": "lv",
+    "countryCode": "LV"
+  },
+  {
+    "inputLabel": "LT",
+    "label": "Lithuania",
+    "value": "lt",
+    "countryCode": "LT"
+  },
+  {
+    "inputLabel": "LU",
+    "label": "Luxembourg",
+    "value": "lb",
+    "countryCode": "LU"
+  },
+  {
+    "inputLabel": "MK",
+    "label": "North Macedonia",
+    "value": "mk",
+    "countryCode": "MK"
+  },
+  {
+    "inputLabel": "MG",
+    "label": "Madagascar",
+    "value": "mg",
+    "countryCode": "MG"
+  },
+  {
+    "inputLabel": "MW",
+    "label": "Malawi",
+    "value": "ny",
+    "countryCode": "MW"
+  },
+  {
+    "inputLabel": "MY",
+    "label": "Malaysia",
     "value": "ms",
     "countryCode": "MY"
   },
+  {
+    "inputLabel": "MV",
+    "label": "Maldives",
+    "value": "dv",
+    "countryCode": "MV"
+  },
+  {
+    "inputLabel": "ML",
+    "label": "Mali",
+    "value": "bm",
+    "countryCode": "ML"
+  },
+  {
+    "inputLabel": "MT",
+    "label": "Malta",
+    "value": "mt",
+    "countryCode": "MT"
+  },
+  {
+    "inputLabel": "MH",
+    "label": "Marshall Islands",
+    "value": "mh",
+    "countryCode": "MH"
+  },
+  {
+    "inputLabel": "MN",
+    "label": "Mongolia",
+    "value": "mn",
+    "countryCode": "MN"
+  },
+  {
+    "inputLabel": "NR",
+    "label": "Nauru",
+    "value": "na",
+    "countryCode": "NR"
+  },
+  {
+    "inputLabel": "NP",
+    "label": "Nepal",
+    "value": "ne",
+    "countryCode": "NP"
+  },
+  {
+    "inputLabel": "NL",
+    "label": "Netherlands",
+    "value": "nl",
+    "countryCode": "NL"
+  },
+  {
+    "inputLabel": "NU",
+    "label": "Niue",
+    "value": "ni",
+    "countryCode": "NU"
+  },
+  {
+    "inputLabel": "NO",
+    "label": "Norway",
+    "value": "no",
+    "countryCode": "NO"
+  },
+  {
+    "inputLabel": "PK",
+    "label": "Pakistan",
+    "value": "ur",
+    "countryCode": "PK"
+  },
+  {
+    "inputLabel": "PW",
+    "label": "Palau",
+    "value": "pau",
+    "countryCode": "PW"
+  },
+  {
+    "inputLabel": "PY",
+    "label": "Paraguay",
+    "value": "gn",
+    "countryCode": "PY"
+  },
+  {
+    "inputLabel": "PH",
+    "label": "Philippines",
+    "value": "tl",
+    "countryCode": "PH"
+  },
+  {
+    "inputLabel": "PL",
+    "label": "Poland",
+    "value": "pl",
+    "countryCode": "PL"
+  },
+  {
+    "inputLabel": "PT",
+    "label": "Portugal",
+    "value": "pt",
+    "countryCode": "PT"
+  },
+  {
+    "inputLabel": "RO",
+    "label": "Romania",
+    "value": "ro",
+    "countryCode": "RO"
+  },
+  {
+    "inputLabel": "RU",
+    "label": "Russia",
+    "value": "ru",
+    "countryCode": "RU"
+  },
+  {
+    "inputLabel": "RW",
+    "label": "Rwanda",
+    "value": "rw",
+    "countryCode": "RW"
+  },
+  {
+    "inputLabel": "WS",
+    "label": "Samoa",
+    "value": "sm",
+    "countryCode": "WS"
+  },
+  {
+    "inputLabel": "RS",
+    "label": "Serbia",
+    "value": "sr",
+    "countryCode": "RS"
+  },
+  {
+    "inputLabel": "SA",
+    "label": "Saudi Arabia",
+    "value": "ar",
+    "countryCode": "SA"
+  },
+  {
+    "inputLabel": "SC",
+    "label": "Seychelles",
+    "value": "crs",
+    "countryCode": "SC"
+  },
+  {
+    "inputLabel": "SK",
+    "label": "Slovakia",
+    "value": "sk",
+    "countryCode": "SK"
+  },
+  {
+    "inputLabel": "SI",
+    "label": "Slovenia",
+    "value": "sl",
+    "countryCode": "SI"
+  },
+  {
+    "inputLabel": "SO",
+    "label": "Somalia",
+    "value": "so",
+    "countryCode": "SO"
+  },
   {
     "inputLabel": "TA",
     "label": "Tamil",
@@ -108,45 +487,111 @@
     "countryCode": "IN"
   },
   {
-    "inputLabel": "AR",
-    "label": "Arabic",
-    "value": "ar",
-    "countryCode": "EG"
+    "inputLabel": "ZA",
+    "label": "South Africa",
+    "value": "zu",
+    "countryCode": "ZA"
   },
   {
-    "inputLabel": "RU",
-    "label": "Russian",
-    "value": "ru",
-    "countryCode": "RU"
+    "inputLabel": "KR",
+    "label": "South Korea",
+    "value": "ko",
+    "countryCode": "KR"
   },
   {
-    "inputLabel": "JA",
-    "label": "Japanese",
-    "value": "ja",
-    "countryCode": "JP"
+    "inputLabel": "ES",
+    "label": "Spain",
+    "value": "es",
+    "countryCode": "ES"
   },
   {
-    "inputLabel": "BN",
-    "label": "Bengali",
-    "value": "bn",
-    "countryCode": "BD"
+    "inputLabel": "LK",
+    "label": "Sri Lanka",
+    "value": "si",
+    "countryCode": "LK"
   },
   {
-    "inputLabel": "IT",
-    "label": "Italian",
-    "value": "it",
-    "countryCode": "IT"
+    "inputLabel": "SE",
+    "label": "Sweden",
+    "value": "sv",
+    "countryCode": "SE"
   },
   {
-    "inputLabel": "EL",
-    "label": "Greek",
-    "value": "el",
-    "countryCode": "GR"
+    "inputLabel": "TJ",
+    "label": "Tajikistan",
+    "value": "tg",
+    "countryCode": "TJ"
   },
   {
-    "inputLabel": "BG",
-    "label": "Bulgarian Translation",
-    "value": "bg",
-    "countryCode": "BG"
+    "inputLabel": "TZ",
+    "label": "Tanzania",
+    "value": "sw",
+    "countryCode": "TZ"
+  },
+  {
+    "inputLabel": "TH",
+    "label": "Thailand",
+    "value": "th",
+    "countryCode": "TH"
+  },
+  {
+    "inputLabel": "TK",
+    "label": "Tokelau",
+    "value": "tkl",
+    "countryCode": "TK"
+  },
+  {
+    "inputLabel": "TO",
+    "label": "Tonga",
+    "value": "to",
+    "countryCode": "TO"
+  },
+  {
+    "inputLabel": "TR",
+    "label": "Turkey",
+    "value": "tr",
+    "countryCode": "TR"
+  },
+  {
+    "inputLabel": "TM",
+    "label": "Turkmenistan",
+    "value": "tk",
+    "countryCode": "TM"
+  },
+  {
+    "inputLabel": "UA",
+    "label": "Ukraine",
+    "value": "uk",
+    "countryCode": "UA"
+  },
+  {
+    "inputLabel": "UZ",
+    "label": "Uzbekistan",
+    "value": "uz",
+    "countryCode": "UZ"
+  },
+  {
+    "inputLabel": "VU",
+    "label": "Vanuatu",
+    "value": "bi",
+    "countryCode": "VU"
+  },
+  {
+    "inputLabel": "VN",
+    "label": "Vietnam",
+    "value": "vi",
+    "countryCode": "VN"
+  },
+  {
+    "inputLabel": "ZW",
+    "label": "Zimbabwe",
+    "value": "sn",
+    "countryCode": "ZW"
+  },
+  {
+    "inputLabel": "ZH-CN",
+    "label": "Chinese Simplified",
+    "value": "zh-CN",
+    "countryCode": "CN"
   }
 ]

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

@@ -1,5 +1,5 @@
-import React, { useState } from 'react'
-import { View, Animated, StyleSheet, Platform, TouchableOpacity } from 'react-native'
+import React, { useEffect, useState } from 'react'
+import { View, Animated, StyleSheet, TouchableOpacity } from 'react-native'
 import { useUtils, useLanguage, useOrder } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
@@ -47,25 +47,34 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	const pickerStyle = StyleSheet.create({
 		inputAndroid: {
-			width: 34,
+			width: 45,
 			textAlign: 'center',
 			overflow: 'visible',
 			fontSize: 12,
-			height: 20,
-			padding: 0,
-			color: theme.colors.textNormal
+			height: 30,
+			color: theme.colors.textNormal,
+			backgroundColor: theme.colors.backgroundGray100,
+			paddingVertical: 8,
+			paddingRight: 10,
+			paddingLeft: 0,
+			borderRadius: 7.6,
 		},
 		inputIOS: {
-			width: 34,
+			width: 45,
 			textAlign: 'center',
 			overflow: 'visible',
 			fontSize: 12,
+			backgroundColor: theme.colors.backgroundGray100,
+			paddingVertical: 8,
+			paddingRight: 15,
+			paddingLeft: 0,
+			borderRadius: 7.6,
 		},
 		icon: {
 			position: 'absolute',
 			zIndex: 1,
-			top: -4,
-			end: -4,
+			top: 0,
+			end: 8,
 		},
 		placeholder: {
 			color: theme.colors.secundaryContrast
@@ -79,9 +88,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	const [isActive, setActiveState] = useState(false)
 	const [isServiceOpen, setIsServiceOpen] = useState(false)
-	const [productQuantityState, setProductQuantityState] = useState(product.quantity.toString())
-	// const [setHeight, setHeightState] = useState({ height: new Animated.Value(0) })
-	// const [setRotate, setRotateState] = useState({ angle: new Animated.Value(0) })
+	const [productQuantityState, setProductQuantityState] = useState<any>(product.quantity.toString())
 	const productInfo = () => {
 		if (isCartProduct) {
@@ -109,20 +116,6 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 		setIsServiceOpen(true)
 	}
-	/* const toggleAccordion = () => {
-		if ((!product?.valid_menu && isCartProduct)) return
-		if (isActive) {
-			Animated.timing(setHeight.height, {
-			 toValue: 100,
-			 duration: 500,
-			 easing: Easing.linear,
-			 useNativeDriver: false,
-			}).start()
-		} else {
-			setHeightState({height: new Animated.Value(0)})
-		}
-	 }*/
 	const handleChangeQuantity = (value: string) => {
 		if (!orderState.loading) {
 			setProductQuantityState(value)
@@ -139,10 +132,6 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 		return `${quantity} x ${name} ${pos} +${price}`
 	}
-	/*useEffect(() => {
-		toggleAccordion()
-	}, [isActive])*/
 	const productOptions = getProductMax && [...Array(getProductMax(product) + 1),].map((_: any, opt: number) => {
 		return {
 			label: opt === 0 ? t('REMOVE', 'Remove') : opt.toString(),
@@ -150,15 +139,23 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 		}
 	})
+	useEffect(() => {
+		if (product.quantity.toString() === productQuantityState || productQuantityState) {
+			setProductQuantityState(null)
+		}
+	}, [product.quantity])
 	return (
 		<>
 			<AccordionSection>
 				<Accordion
-					isValid={product?.valid ?? true}
-					onPress={() => (!product?.valid_menu && isCartProduct)
-						? {}
-						: setActiveState(!isActive)}
 					activeOpacity={1}
+					isValid={product?.valid ?? true}
+					onPress={
+						(!product?.valid_menu && isCartProduct) ||
+						!(productInfo().ingredients.length > 0 || productInfo().options.length > 0 || !!product.comment)
+						? null : () => setActiveState(!isActive)
+					}
 				>
 					<View style={{ flexDirection: 'row', alignItems: 'flex-start' }}>
 						<ContentInfo>
@@ -215,16 +212,20 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 											<RNPickerSelect
 												items={productOptions}
 												onValueChange={handleChangeQuantity}
-												value={productQuantityState}
+												value={productQuantityState ?? product.quantity.toString()}
 												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>}
+												touchableWrapperProps={{ style: { width: 45 } }}
+												Icon={() => (
+													<View style={pickerStyle.icon}>
+														<OIcon
+															src={theme.images.general.arrow_down}
+															color={theme.colors.textNormal}
+															width={8}
+														/>
+													</View>
+												)}
 												disabled={orderState.loading}
 											/>
 										</ProductInfo>

package/themes/original/src/components/ProductItemAccordion/styles.tsx CHANGED Viewed

@@ -17,9 +17,6 @@ export const Accordion = styled.TouchableOpacity`
 export const ProductInfo = styled.View`
 	margin-horizontal: 7px;
-	background-color: ${(props: any) => props.theme.colors.backgroundGray100};
-	padding: 4px 12px 4px 0px;
-	border-radius: 7.6px;
 `
 export const ProductQuantity = styled.View`