@kiosinc/commons-rn 0.1.49 → 0.1.50

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 (7) hide show
  1. package/lib/commonjs/auth/screens/ChangePassword.js +24 -9
  2. package/lib/commonjs/auth/screens/ChangePassword.js.map +1 -1
  3. package/lib/module/auth/screens/ChangePassword.js +24 -9
  4. package/lib/module/auth/screens/ChangePassword.js.map +1 -1
  5. package/lib/typescript/src/auth/screens/ChangePassword.d.ts.map +1 -1
  6. package/package.json +1 -1
  7. package/src/auth/screens/ChangePassword.tsx +50 -14
package/lib/commonjs/auth/screens/ChangePassword.js CHANGED
@@ -27,7 +27,8 @@ const ChangePassword = ({
27
27
  handleSubmit,
28
28
  control,
29
29
  formState: {
30
- errors
30
+ errors,
31
+ isSubmitted
31
32
  }
32
33
  } = (0, _reactHookForm.useForm)({
33
34
  criteriaMode: 'all',
@@ -59,6 +60,7 @@ const ChangePassword = ({
59
60
  });
60
61
  }
61
62
  };
63
+ const passwordExpectations = [t('authentication.minLength'), t('authentication.1lowerChar'), t('authentication.1upperChar'), t('authentication.1number'), t('authentication.1special')];
62
64
  return /*#__PURE__*/_react.default.createElement(_components.ParentView, null, /*#__PURE__*/_react.default.createElement(_components.Header, {
63
65
  title: route.params?.backText ?? '',
64
66
  textAlign: "left"
@@ -87,6 +89,7 @@ const ChangePassword = ({
87
89
  }
88
90
  }) => {
89
91
  return /*#__PURE__*/_react.default.createElement(_components.TextInput, {
92
+ autoFocus: true,
90
93
  my: "5",
91
94
  autoCapitalize: "none",
92
95
  mode: "outlined",
@@ -109,23 +112,35 @@ const ChangePassword = ({
109
112
  value
110
113
  }
111
114
  }) => {
112
- return /*#__PURE__*/_react.default.createElement(_components.TextInput, {
115
+ const passwordErrors = Object.values(errors.newPassword?.types ?? []).flat();
116
+ return /*#__PURE__*/_react.default.createElement(_components.View, null, /*#__PURE__*/_react.default.createElement(_components.TextInput, {
117
+ error: !!errors.newPassword?.message,
113
118
  my: "5",
114
- autoCapitalize: "none",
115
- mode: "outlined",
116
119
  secureTextEntry: true,
117
- error: !!errors.newPassword?.message,
118
- errorMessage: errors.newPassword?.message,
120
+ mode: "outlined",
121
+ autoComplete: "new-password",
119
122
  onBlur: onBlur,
120
123
  onChangeText: onChange,
121
124
  value: value,
122
- label: t('authentication.newPassword')
123
- });
125
+ label: t('authentication.password')
126
+ }), /*#__PURE__*/_react.default.createElement(_components.Text, {
127
+ pt: "4"
128
+ }, t('authentication.passwordMustContain')), passwordExpectations.map((expectation, index) => {
129
+ const didExpectationFoundInErrors = passwordErrors?.includes(expectation) ?? false;
130
+ return /*#__PURE__*/_react.default.createElement(_components.View, {
131
+ flexDirection: "row",
132
+ alignItems: "center",
133
+ key: index
134
+ }, /*#__PURE__*/_react.default.createElement(_components.Text, {
135
+ variant: "bodySmall",
136
+ color: isSubmitted ? didExpectationFoundInErrors ? 'error' : 'primary' : 'onBackground'
137
+ }, '• ' + expectation));
138
+ }));
124
139
  },
125
140
  name: "newPassword"
126
141
  }), /*#__PURE__*/_react.default.createElement(_components.Button, {
127
142
  loading: isLoading,
128
- mt: "48",
143
+ mt: "24",
129
144
  onPress: handleSubmit(handleChangePassword),
130
145
  mode: "contained"
131
146
  }, t('authentication.changePassword')))));
package/lib/commonjs/auth/screens/ChangePassword.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_components","_auth","_interopRequireDefault","_reactHookForm","_yup","_reactI18next","_native","_validators","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ChangePassword","route","useTranslation","navigation","useNavigation","isLoading","setIsLoading","useState","handleSubmit","control","formState","errors","useForm","criteriaMode","resolver","yupResolver","changePasswordSchema","defaultValues","currentPassword","newPassword","handleChangePassword","data","user","auth","currentUser","email","credential","EmailAuthProvider","reauthenticateWithCredential","updatePassword","Snackbar","show","title","goBack","error","Alert","description","createElement","ParentView","Header","params","backText","textAlign","View","flex","px","KeyboardAvoidingView","behavior","width","phone","tablet","alignItems","Text","pb","variant","Controller","render","field","onChange","onBlur","value","TextInput","my","autoCapitalize","mode","secureTextEntry","message","errorMessage","onChangeText","label","name","Button","loading","mt","onPress","exports"],"sourceRoot":"../../../../src","sources":["auth/screens/ChangePassword.tsx"],"mappings":"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"}
1
+ {"version":3,"names":["_react","_interopRequireWildcard","require","_components","_auth","_interopRequireDefault","_reactHookForm","_yup","_reactI18next","_native","_validators","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ChangePassword","route","useTranslation","navigation","useNavigation","isLoading","setIsLoading","useState","handleSubmit","control","formState","errors","isSubmitted","useForm","criteriaMode","resolver","yupResolver","changePasswordSchema","defaultValues","currentPassword","newPassword","handleChangePassword","data","user","auth","currentUser","email","credential","EmailAuthProvider","reauthenticateWithCredential","updatePassword","Snackbar","show","title","goBack","error","Alert","description","passwordExpectations","createElement","ParentView","Header","params","backText","textAlign","View","flex","px","KeyboardAvoidingView","behavior","width","phone","tablet","alignItems","Text","pb","variant","Controller","render","field","onChange","onBlur","value","TextInput","autoFocus","my","autoCapitalize","mode","secureTextEntry","message","errorMessage","onChangeText","label","name","passwordErrors","values","types","flat","autoComplete","pt","map","expectation","index","didExpectationFoundInErrors","includes","flexDirection","key","color","Button","loading","mt","onPress","exports"],"sourceRoot":"../../../../src","sources":["auth/screens/ChangePassword.tsx"],"mappings":"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"}
package/lib/module/auth/screens/ChangePassword.js CHANGED
@@ -18,7 +18,8 @@ export const ChangePassword = ({
18
18
  handleSubmit,
19
19
  control,
20
20
  formState: {
21
- errors
21
+ errors,
22
+ isSubmitted
22
23
  }
23
24
  } = useForm({
24
25
  criteriaMode: 'all',
@@ -50,6 +51,7 @@ export const ChangePassword = ({
50
51
  });
51
52
  }
52
53
  };
54
+ const passwordExpectations = [t('authentication.minLength'), t('authentication.1lowerChar'), t('authentication.1upperChar'), t('authentication.1number'), t('authentication.1special')];
53
55
  return /*#__PURE__*/React.createElement(ParentView, null, /*#__PURE__*/React.createElement(Header, {
54
56
  title: route.params?.backText ?? '',
55
57
  textAlign: "left"
@@ -78,6 +80,7 @@ export const ChangePassword = ({
78
80
  }
79
81
  }) => {
80
82
  return /*#__PURE__*/React.createElement(TextInput, {
83
+ autoFocus: true,
81
84
  my: "5",
82
85
  autoCapitalize: "none",
83
86
  mode: "outlined",
@@ -100,23 +103,35 @@ export const ChangePassword = ({
100
103
  value
101
104
  }
102
105
  }) => {
103
- return /*#__PURE__*/React.createElement(TextInput, {
106
+ const passwordErrors = Object.values(errors.newPassword?.types ?? []).flat();
107
+ return /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(TextInput, {
108
+ error: !!errors.newPassword?.message,
104
109
  my: "5",
105
- autoCapitalize: "none",
106
- mode: "outlined",
107
110
  secureTextEntry: true,
108
- error: !!errors.newPassword?.message,
109
- errorMessage: errors.newPassword?.message,
111
+ mode: "outlined",
112
+ autoComplete: "new-password",
110
113
  onBlur: onBlur,
111
114
  onChangeText: onChange,
112
115
  value: value,
113
- label: t('authentication.newPassword')
114
- });
116
+ label: t('authentication.password')
117
+ }), /*#__PURE__*/React.createElement(Text, {
118
+ pt: "4"
119
+ }, t('authentication.passwordMustContain')), passwordExpectations.map((expectation, index) => {
120
+ const didExpectationFoundInErrors = passwordErrors?.includes(expectation) ?? false;
121
+ return /*#__PURE__*/React.createElement(View, {
122
+ flexDirection: "row",
123
+ alignItems: "center",
124
+ key: index
125
+ }, /*#__PURE__*/React.createElement(Text, {
126
+ variant: "bodySmall",
127
+ color: isSubmitted ? didExpectationFoundInErrors ? 'error' : 'primary' : 'onBackground'
128
+ }, '• ' + expectation));
129
+ }));
115
130
  },
116
131
  name: "newPassword"
117
132
  }), /*#__PURE__*/React.createElement(Button, {
118
133
  loading: isLoading,
119
- mt: "48",
134
+ mt: "24",
120
135
  onPress: handleSubmit(handleChangePassword),
121
136
  mode: "contained"
122
137
  }, t('authentication.changePassword')))));
package/lib/module/auth/screens/ChangePassword.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["React","useState","Alert","Button","Header","KeyboardAvoidingView","ParentView","Snackbar","Text","TextInput","View","auth","Controller","useForm","yupResolver","useTranslation","useNavigation","changePasswordSchema","ChangePassword","route","t","navigation","isLoading","setIsLoading","handleSubmit","control","formState","errors","criteriaMode","resolver","defaultValues","currentPassword","newPassword","handleChangePassword","data","user","currentUser","email","credential","EmailAuthProvider","reauthenticateWithCredential","updatePassword","show","title","goBack","error","description","createElement","params","backText","textAlign","flex","px","behavior","width","phone","tablet","alignItems","pb","variant","render","field","onChange","onBlur","value","my","autoCapitalize","mode","secureTextEntry","message","errorMessage","onChangeText","label","name","loading","mt","onPress"],"sourceRoot":"../../../../src","sources":["auth/screens/ChangePassword.tsx"],"mappings":"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"}
1
+ {"version":3,"names":["React","useState","Alert","Button","Header","KeyboardAvoidingView","ParentView","Snackbar","Text","TextInput","View","auth","Controller","useForm","yupResolver","useTranslation","useNavigation","changePasswordSchema","ChangePassword","route","t","navigation","isLoading","setIsLoading","handleSubmit","control","formState","errors","isSubmitted","criteriaMode","resolver","defaultValues","currentPassword","newPassword","handleChangePassword","data","user","currentUser","email","credential","EmailAuthProvider","reauthenticateWithCredential","updatePassword","show","title","goBack","error","description","passwordExpectations","createElement","params","backText","textAlign","flex","px","behavior","width","phone","tablet","alignItems","pb","variant","render","field","onChange","onBlur","value","autoFocus","my","autoCapitalize","mode","secureTextEntry","message","errorMessage","onChangeText","label","name","passwordErrors","Object","values","types","flat","autoComplete","pt","map","expectation","index","didExpectationFoundInErrors","includes","flexDirection","key","color","loading","mt","onPress"],"sourceRoot":"../../../../src","sources":["auth/screens/ChangePassword.tsx"],"mappings":"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"}
package/lib/typescript/src/auth/screens/ChangePassword.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ChangePassword.d.ts","sourceRoot":"","sources":["../../../../../src/auth/screens/ChangePassword.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAgBxC,OAAO,EAAE,SAAS,EAAiB,MAAM,0BAA0B,CAAC;AAIpE,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA4GxD,CAAC"}
1
+ {"version":3,"file":"ChangePassword.d.ts","sourceRoot":"","sources":["../../../../../src/auth/screens/ChangePassword.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAgBxC,OAAO,EAAE,SAAS,EAAiB,MAAM,0BAA0B,CAAC;AAIpE,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAgJxD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kiosinc/commons-rn",
3
- "version": "0.1.49",
3
+ "version": "0.1.50",
4
4
  "description": "Common Code",
5
5
  "main": "lib/commonjs/index",
6
6
  "module": "lib/module/index",
package/src/auth/screens/ChangePassword.tsx CHANGED
@@ -34,7 +34,7 @@ export const ChangePassword: React.FC<ChangePasswordProps> = ({ route }) => {
34
34
  const {
35
35
  handleSubmit,
36
36
  control,
37
- formState: { errors },
37
+ formState: { errors, isSubmitted },
38
38
  } = useForm<TPasswordForm>({
39
39
  criteriaMode: 'all',
40
40
  resolver: yupResolver(changePasswordSchema(t)),
@@ -68,6 +68,14 @@ export const ChangePassword: React.FC<ChangePasswordProps> = ({ route }) => {
68
68
  }
69
69
  };
70
70
 
71
+ const passwordExpectations = [
72
+ t('authentication.minLength'),
73
+ t('authentication.1lowerChar'),
74
+ t('authentication.1upperChar'),
75
+ t('authentication.1number'),
76
+ t('authentication.1special'),
77
+ ];
78
+
71
79
  return (
72
80
  <ParentView>
73
81
  <Header title={route.params?.backText ?? ''} textAlign="left" />
@@ -87,6 +95,7 @@ export const ChangePassword: React.FC<ChangePasswordProps> = ({ route }) => {
87
95
  render={({ field: { onChange, onBlur, value } }) => {
88
96
  return (
89
97
  <TextInput
98
+ autoFocus
90
99
  my="5"
91
100
  autoCapitalize="none"
92
101
  mode="outlined"
@@ -105,19 +114,46 @@ export const ChangePassword: React.FC<ChangePasswordProps> = ({ route }) => {
105
114
  <Controller
106
115
  control={control}
107
116
  render={({ field: { onChange, onBlur, value } }) => {
117
+ const passwordErrors = Object.values(
118
+ errors.newPassword?.types ?? []
119
+ ).flat();
120
+
108
121
  return (
109
- <TextInput
110
- my="5"
111
- autoCapitalize="none"
112
- mode="outlined"
113
- secureTextEntry={true}
114
- error={!!errors.newPassword?.message}
115
- errorMessage={errors.newPassword?.message}
116
- onBlur={onBlur}
117
- onChangeText={onChange}
118
- value={value}
119
- label={t('authentication.newPassword')}
120
- />
122
+ <View>
123
+ <TextInput
124
+ error={!!errors.newPassword?.message}
125
+ my="5"
126
+ secureTextEntry={true}
127
+ mode="outlined"
128
+ autoComplete="new-password"
129
+ onBlur={onBlur}
130
+ onChangeText={onChange}
131
+ value={value}
132
+ label={t('authentication.password')}
133
+ />
134
+ <Text pt="4">{t('authentication.passwordMustContain')}</Text>
135
+ {passwordExpectations.map((expectation, index) => {
136
+ const didExpectationFoundInErrors =
137
+ passwordErrors?.includes(expectation) ?? false;
138
+
139
+ return (
140
+ <View flexDirection="row" alignItems="center" key={index}>
141
+ <Text
142
+ variant="bodySmall"
143
+ color={
144
+ isSubmitted
145
+ ? didExpectationFoundInErrors
146
+ ? 'error'
147
+ : 'primary'
148
+ : 'onBackground'
149
+ }
150
+ >
151
+ {'• ' + expectation}
152
+ </Text>
153
+ </View>
154
+ );
155
+ })}
156
+ </View>
121
157
  );
122
158
  }}
123
159
  name="newPassword"
@@ -125,7 +161,7 @@ export const ChangePassword: React.FC<ChangePasswordProps> = ({ route }) => {
125
161
 
126
162
  <Button
127
163
  loading={isLoading}
128
- mt="48"
164
+ mt="24"
129
165
  onPress={handleSubmit(handleChangePassword)}
130
166
  mode="contained"
131
167
  >