ordering-ui-react-native 0.16.6 → 0.16.7

package/package.json

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

package/src/components/DriverTips/index.tsx

@@ -49,7 +49,7 @@ const DriverTipsUI = (props: any) => {
   const [{ configs }] = useConfig();
   const [{loading}] = useOrder()
 
-  const [value, setvalue] = useState(0);
+  const [value, setvalue] = useState('');
   const [valueOption,setValueOption] = useState(0)
 
   const placeholderCurrency = (configs?.currency_position?.value || 'left') === 'left'
@@ -57,9 +57,12 @@ const DriverTipsUI = (props: any) => {
     : `0${configs?.format_number_currency?.value}`
 
   const handleChangeDriverTip = (val: any) => {
-    let tip = parseFloat(val)
-    tip = isNaN(tip) ? 0 : tip
-    setvalue(tip)
+    const tip = Number(val)
+    if ((isNaN(tip) || tip < 0)) {
+      setvalue(value)
+      return
+    }
+    setvalue(val)
   }
 
   const handleChangeOptionCustom = (val : any) => {
@@ -110,6 +113,8 @@ const DriverTipsUI = (props: any) => {
             <OInput
               placeholder={placeholderCurrency}
               style={style.inputStyle}
+              value={value}
+              type={'numeric'}
               onChange={handleChangeDriverTip}
               autoCapitalize='none'
               autoCorrect={false}
@@ -121,10 +126,10 @@ const DriverTipsUI = (props: any) => {
               textStyle={{ color: 'white', fontSize: 18, maxWidth: 110, minWidth: 60 }}
               imgRightSrc={null}
               textProps={{numberOfLines: 1}}
-              isDisabled={!(value > 0 && value !== driverTip) || !value}
+              isDisabled={parseFloat(value || '0') < 0 || parseFloat(value || '0') === driverTip || value === ''}
               onClick={() => {
                 handlerChangeOption(value)
-                setvalue(0)
+                setvalue('')
               }}
             />
           </DTWrapperInput>

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

@@ -305,9 +305,9 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 								onCancel={() => handleChangeSearch('')}
 								placeholder={t('SEARCH', 'Search')}
 								height={26}
-								isDisabled={configs?.advanced_business_search_enabled?.value === '1' || !businessTypes}
+								isDisabled={!businessTypes}
 								inputStyle={{ ...styles.searchInput, ...Platform.OS === 'ios' ? {} : { paddingBottom: 4 } }}
-								onPress={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes }) }}
+								onSubmitEditing={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes, defaultTerm: searchValue }) }}
 							/>
 						)}
 

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

@@ -48,16 +48,19 @@ const DriverTipsUI = (props: any) => {
 		}
 	})
 
-	const [value, setvalue] = useState(0);
+	const [value, setvalue] = useState('');
 
 	const placeholderCurrency = (configs?.currency_position?.value || 'left') === 'left'
 		? `${configs?.format_number_currency?.value}0`
 		: `0${configs?.format_number_currency?.value}`
 
 	const handleChangeDriverTip = (val: any) => {
-		let tip = parseFloat(val)
-		tip = isNaN(tip) ? 0 : tip
-		setvalue(tip)
+		const tip = Number(val)
+		if ((isNaN(tip) || tip < 0)) {
+		  setvalue(value)
+		  return
+		}
+		setvalue(val)
 	}
 	
 	return (
@@ -97,6 +100,8 @@ const DriverTipsUI = (props: any) => {
 						<OInput
 							placeholder={placeholderCurrency}
 							style={style.inputStyle}
+							value={value}
+							type={'numeric'}
 							onChange={handleChangeDriverTip}
 							autoCapitalize='none'
 							autoCorrect={false}
@@ -108,10 +113,10 @@ const DriverTipsUI = (props: any) => {
 							textStyle={{ color: 'white', fontSize: 14 }}
 							imgRightSrc={null}
 							style={{ borderRadius: 5, height: 44 }}
-							isDisabled={!(value > 0 && value !== driverTip) || !value}
+							isDisabled={parseFloat(value || '0') < 0 || parseFloat(value || '0') === driverTip || value === ''}
 							onClick={() => {
 								handlerChangeOption(value)
-								setvalue(0)
+								setvalue('')
 							}}
 						/>
 					</DTWrapperInput>

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

@@ -20,7 +20,9 @@ export const SearchBar = (props: any) => {
 		inputStyle,
 		onPress,
 		isDisabled,
-		iconCustomRight
+		iconCustomRight,
+		onSubmitEditing,
+		blurOnSubmit
 	} = props
 
 	const theme = useTheme();
@@ -88,6 +90,7 @@ export const SearchBar = (props: any) => {
 				inputStyle={{padding: 0, paddingTop: Platform.OS == 'android' ? 2 : 0, ...inputStyle}}
 				onPress={() => onPress && onPress()}
 				iconCustomRight={iconCustomRight}
+				onSubmitEditing={() => onSubmitEditing && onSubmitEditing()}
 			/>
 			{isCancelButtonShow && (
 				<OButton

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

@@ -21,7 +21,6 @@ interface Props extends TextInputProps {
 	isSecured?: boolean;
 	style?: ViewStyle;
 	placeholder?: string;
-	placeholderTextColor?:string;
 	icon?: ImageSourcePropType | string;
 	iconRight?: ImageSourcePropType;
 	iconColor?: string;
@@ -81,7 +80,6 @@ const OInput = (props: Props): React.ReactElement => {
 				onChangeText={(txt: any) => props.name ? props.onChange({ target: { name: props.name, value: txt } }) : props.onChange(txt)}
 				defaultValue={props.value}
 				placeholder={props.placeholder ? props.placeholder : ''}
-				placeholderTextColor={props?.placeholderTextColor ? props?.placeholderTextColor : 'initial'}
 				keyboardType={props.type || 'default'}
 				multiline={props.multiline}
 				scrollEnabled={props.multiline}

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

@@ -581,7 +581,6 @@ export interface BusinessSearchParams {
 	setFilters: (filters: any) => void,
 	lazySearch?: boolean,
 	brandList?: any;
-	tags?: any;
 }
 
 export interface NoNetworkParams {