ordering-ui-react-native 0.22.75 → 0.22.76-release

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

@@ -14,33 +14,33 @@ const Input = styled.TextInput`
 `;
 
 interface Props extends TextInputProps {
-	bgColor?: string;
-	borderColor?: string;
-	isRequired?: boolean;
-	requiredMsg?: string;
-	isDisabled?: boolean;
-	isSecured?: boolean;
-	style?: ViewStyle;
-	placeholder?: string;
-	icon?: ImageSourcePropType | string;
-	iconRight?: ImageSourcePropType;
-	iconColor?: string;
-	iconRightColor?: string;
-	iconStyle?: ImageStyle;
-	iconRightStyle?: ImageStyle;
-	iconCustomRight?: any;
-	value?: string;
-	onChange?: any;
-	name?: string;
-	type?: string;
-	multiline?: boolean;
-	vertorIcon?: string;
-	vectorIconColor?: string;
-	forwardRef?: any;
-	inputStyle?: TextStyle;
-	wrapperRef?: any;
-	onPress?: any;
-	isFocusHighlight?: boolean
+  bgColor?: string;
+  borderColor?: string;
+  isRequired?: boolean;
+  requiredMsg?: string;
+  isDisabled?: boolean;
+  isSecured?: boolean;
+  style?: ViewStyle;
+  placeholder?: string;
+  icon?: ImageSourcePropType | string;
+  iconRight?: ImageSourcePropType;
+  iconColor?: string;
+  iconRightColor?: string;
+  iconStyle?: ImageStyle;
+  iconRightStyle?: ImageStyle;
+  iconCustomRight?: any;
+  value?: string;
+  onChange?: any;
+  name?: string;
+  type?: string;
+  multiline?: boolean;
+  vertorIcon?: string;
+  vectorIconColor?: string;
+  forwardRef?: any;
+  inputStyle?: TextStyle;
+  wrapperRef?: any;
+  onPress?: any;
+  isFocusHighlight?: boolean
 }
 
 const Wrapper = styled.Pressable`
@@ -59,79 +59,79 @@ 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.isFocusHighlight
-					? props.borderColor
-					: inputFocused ? theme.colors.primary : theme.colors.border,
-				...props.style,
-				borderRadius: parseInt(theme?.general?.components?.inputs?.borderRadius) || props.style?.borderRadius
-			}}>
-			{props.icon ? (
-				<OIcon
-					src={props.icon}
-					color={props.iconColor}
-					width={16}
-					height={20}
-					style={{ marginRight: 10, ...props.iconStyle }}
-				/>
-			) : null}
-			{props.vertorIcon && (
-				<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)}
-				defaultValue={props.value}
-				placeholder={props.placeholder ? props.placeholder : ''}
-				keyboardType={props.type || 'default'}
-				multiline={props.multiline}
-				scrollEnabled={props.multiline}
-				editable={!props.isDisabled}
-				autoCapitalize={props.autoCapitalize}
-				autoCompleteType={props.autoCompleteType}
-				autoCorrect={props.autoCorrect}
-				returnKeyType={props.returnKeyType}
-				onSubmitEditing={props.onSubmitEditing}
-				blurOnSubmit={props.blurOnSubmit}
-				ref={(e: any) => {
-					props.forwardRef && (props.forwardRef.current = e)
-				}}
-				style={{
-					...(theme?.general?.components?.inputs?.color && {
-						color: theme?.general?.components?.inputs?.color
-					}),
-					...props?.inputStyle
-				}}
-				onFocus={() => setInputFocused(true)}
-				onBlur={() => setInputFocused(false)}
-			/>
-			{props.iconRight && (
-				<OIcon
-					src={props.iconRight}
-					color={props.iconRightColor}
-					width={16}
-					height={16}
-					style={{ ...props.iconRightStyle }}
-				/>
-			)}
-			{props.iconCustomRight}
-		</Wrapper>
-	);
+  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.isFocusHighlight
+          ? props.borderColor
+          : inputFocused ? theme.colors.primary : theme.colors.border,
+        ...props.style,
+        borderRadius: parseInt(theme?.general?.components?.inputs?.borderRadius) || props.style?.borderRadius
+      }}>
+      {props.icon ? (
+        <OIcon
+          src={props.icon}
+          color={props.iconColor}
+          width={16}
+          height={20}
+          style={{ marginRight: 10, ...props.iconStyle }}
+        />
+      ) : null}
+      {props.vertorIcon && (
+        <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)}
+        defaultValue={props.value}
+        placeholder={props.placeholder ? props.placeholder : ''}
+        keyboardType={props.type || 'default'}
+        multiline={props.multiline}
+        scrollEnabled={props.multiline}
+        editable={!props.isDisabled}
+        autoCapitalize={props.autoCapitalize}
+        autoCompleteType={props.autoCompleteType}
+        autoCorrect={props.autoCorrect}
+        returnKeyType={props.returnKeyType}
+        onSubmitEditing={props.onSubmitEditing}
+        blurOnSubmit={props.blurOnSubmit}
+        ref={(e: any) => {
+          props.forwardRef && (props.forwardRef.current = e)
+        }}
+        style={{
+          ...(theme?.general?.components?.inputs?.color && {
+            color: theme?.general?.components?.inputs?.color
+          }),
+          ...props?.inputStyle
+        }}
+        onFocus={() => setInputFocused(true)}
+        onBlur={() => setInputFocused(false)}
+      />
+      {props.iconRight && (
+        <OIcon
+          src={props.iconRight}
+          color={props.iconRightColor}
+          width={16}
+          height={16}
+          style={{ ...props.iconRightStyle }}
+        />
+      )}
+      {props.iconCustomRight}
+    </Wrapper>
+  );
 };
 
 OInput.defaultProps = {
-	iconColor: '#959595',
-	bgColor: 'white',
-	borderColor: 'white',
-	isFocusHighlight: false
+  iconColor: '#959595',
+  bgColor: 'white',
+  borderColor: 'white',
+  isFocusHighlight: false
 };
 
 export default OInput;

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Modal, StyleSheet, Text, SafeAreaView, View, TouchableOpacity, Platform } from "react-native";
 import styled from 'styled-components/native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
+import { Toast } from '../../../../../src/components/shared/OToast'
 interface Props {
 	open?: boolean;
 	title?: string;
@@ -22,6 +22,7 @@ interface Props {
 	styleCloseButton?: any,
 	isAvoidKeyBoardView?: boolean;
 	styleContainerCloseButton?: any;
+	showToastInsideModal?: boolean;
 }
 const KeyboardView = styled.KeyboardAvoidingView`
   flex-grow: 1;
@@ -47,7 +48,8 @@ const OModal = (props: Props): React.ReactElement => {
 		style,
 		styleCloseButton,
 		styleContainerCloseButton,
-		isAvoidKeyBoardView
+		isAvoidKeyBoardView,
+		showToastInsideModal
 	} = props
 
 	const renderSafeAreaView = () => (
@@ -94,6 +96,9 @@ const OModal = (props: Props): React.ReactElement => {
 			onRequestClose={() => onClose && onClose()}
 			style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
 		>
+			{showToastInsideModal && (
+				<Toast />
+			)}
 			{isAvoidKeyBoardView ? (
 				<KeyboardView
 					enabled

package/themes/original/src/providers/AlertProvider.tsx

@@ -28,7 +28,7 @@ const Alert = (props: Props) => {
       show={open}
       showProgress={false}
       title={title}
-      message={getTraduction(content?.[0])}
+      message={getTraduction(content?.[0], t)}
       closeOnTouchOutside={true}
       closeOnHardwareBackPress={false}
       showConfirmButton={true}