@aws-amplify/ui-react-native 2.1.2 → 2.1.3

package/dist/Authenticator/common/DefaultFormFields/DefaultRadioFormFields.js

@@ -1,24 +1,19 @@
 import React from 'react';
-import { censorAllButFirstAndLast, censorPhoneNumber } from '@aws-amplify/ui';
+import { censorContactMethod } from '@aws-amplify/ui';
 import { Radio, RadioGroup } from '../../../primitives';
-const censorContactInformation = (name, value) => {
-    let censoredVal = value;
-    if (name === 'email') {
-        const splitEmail = value.split('@');
-        const censoredName = censorAllButFirstAndLast(splitEmail[0]);
-        censoredVal = `${censoredName}@${splitEmail[1]}`;
-    }
-    else if (name === 'phone_number') {
-        censoredVal = censorPhoneNumber(value);
-    }
-    return censoredVal;
+const attributeMap = {
+    email: 'Email',
+    phone_number: 'Phone Number',
 };
 const DefaultRadioFormFields = ({ fields, fieldContainerStyle, fieldLabelStyle, isPending, style, }) => {
     return (<RadioGroup disabled={isPending} style={style}>
-      {(fields ?? []).map(({ name, value, ...props }) => (<Radio {...props} key={value} 
-        // value has to be name, because Auth is only interested in the
-        // string "email" or "phone_number", not the actual value
-        value={name} label={censorContactInformation(name, value)} labelStyle={fieldLabelStyle} style={fieldContainerStyle}/>))}
+      {(fields ?? []).map(({ name, value, ...props }) => {
+            const attributeType = attributeMap[name];
+            return (<Radio {...props} key={value} 
+            // value has to be name, because Auth is only interested in the
+            // string "email" or "phone_number", not the actual value
+            value={name} label={censorContactMethod(attributeType, value)} labelStyle={fieldLabelStyle} style={fieldContainerStyle}/>);
+        })}
     </RadioGroup>);
 };
 DefaultRadioFormFields.displayName = 'FormFields';

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.1.2";
+export declare const VERSION = "2.1.3";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '2.1.2';
+export const VERSION = '2.1.3';

package/lib/Authenticator/common/DefaultFormFields/DefaultRadioFormFields.js

@@ -4,24 +4,19 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const ui_1 = require("@aws-amplify/ui");
 const primitives_1 = require("../../../primitives");
-const censorContactInformation = (name, value) => {
-    let censoredVal = value;
-    if (name === 'email') {
-        const splitEmail = value.split('@');
-        const censoredName = (0, ui_1.censorAllButFirstAndLast)(splitEmail[0]);
-        censoredVal = `${censoredName}@${splitEmail[1]}`;
-    }
-    else if (name === 'phone_number') {
-        censoredVal = (0, ui_1.censorPhoneNumber)(value);
-    }
-    return censoredVal;
+const attributeMap = {
+    email: 'Email',
+    phone_number: 'Phone Number',
 };
 const DefaultRadioFormFields = ({ fields, fieldContainerStyle, fieldLabelStyle, isPending, style, }) => {
     return (<primitives_1.RadioGroup disabled={isPending} style={style}>
-      {(fields ?? []).map(({ name, value, ...props }) => (<primitives_1.Radio {...props} key={value} 
-        // value has to be name, because Auth is only interested in the
-        // string "email" or "phone_number", not the actual value
-        value={name} label={censorContactInformation(name, value)} labelStyle={fieldLabelStyle} style={fieldContainerStyle}/>))}
+      {(fields ?? []).map(({ name, value, ...props }) => {
+            const attributeType = attributeMap[name];
+            return (<primitives_1.Radio {...props} key={value} 
+            // value has to be name, because Auth is only interested in the
+            // string "email" or "phone_number", not the actual value
+            value={name} label={(0, ui_1.censorContactMethod)(attributeType, value)} labelStyle={fieldLabelStyle} style={fieldContainerStyle}/>);
+        })}
     </primitives_1.RadioGroup>);
 };
 DefaultRadioFormFields.displayName = 'FormFields';

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '2.1.2';
+exports.VERSION = '2.1.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-native",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "main": "lib/index.js",
   "module": "dist/index.js",
   "react-native": "src/index.ts",
@@ -29,9 +29,9 @@
     "react-native-safe-area-context": "^4.7.3"
   },
   "dependencies": {
-    "@aws-amplify/ui": "6.0.10",
-    "@aws-amplify/ui-react-core": "3.0.10",
-    "@aws-amplify/ui-react-core-notifications": "2.0.10"
+    "@aws-amplify/ui": "6.0.11",
+    "@aws-amplify/ui-react-core": "3.0.11",
+    "@aws-amplify/ui-react-core-notifications": "2.0.11"
   },
   "peerDependencies": {
     "aws-amplify": "^6.0.2",

package/src/Authenticator/common/DefaultFormFields/DefaultRadioFormFields.tsx

@@ -1,20 +1,17 @@
 import React from 'react';
-import { censorAllButFirstAndLast, censorPhoneNumber } from '@aws-amplify/ui';
+import { censorContactMethod, ContactMethod } from '@aws-amplify/ui';
 
 import { Radio, RadioGroup } from '../../../primitives';
 import { DefaultRadioFormFieldsProps } from './types';
 
-const censorContactInformation = (name: string, value: string): string => {
-  let censoredVal = value;
-  if (name === 'email') {
-    const splitEmail = value.split('@');
-    const censoredName = censorAllButFirstAndLast(splitEmail[0]);
+interface AttributeMap {
+  email: ContactMethod;
+  phone_number: ContactMethod;
+}
 
-    censoredVal = `${censoredName}@${splitEmail[1]}`;
-  } else if (name === 'phone_number') {
-    censoredVal = censorPhoneNumber(value);
-  }
-  return censoredVal;
+const attributeMap: AttributeMap = {
+  email: 'Email',
+  phone_number: 'Phone Number',
 };
 
 const DefaultRadioFormFields = ({
@@ -26,18 +23,22 @@ const DefaultRadioFormFields = ({
 }: DefaultRadioFormFieldsProps): JSX.Element => {
   return (
     <RadioGroup disabled={isPending} style={style}>
-      {(fields ?? []).map(({ name, value, ...props }) => (
-        <Radio
-          {...props}
-          key={value}
-          // value has to be name, because Auth is only interested in the
-          // string "email" or "phone_number", not the actual value
-          value={name}
-          label={censorContactInformation(name, value)}
-          labelStyle={fieldLabelStyle}
-          style={fieldContainerStyle}
-        />
-      ))}
+      {(fields ?? []).map(({ name, value, ...props }) => {
+        const attributeType = attributeMap[name as keyof AttributeMap];
+
+        return (
+          <Radio
+            {...props}
+            key={value}
+            // value has to be name, because Auth is only interested in the
+            // string "email" or "phone_number", not the actual value
+            value={name}
+            label={censorContactMethod(attributeType, value)}
+            labelStyle={fieldLabelStyle}
+            style={fieldContainerStyle}
+          />
+        );
+      })}
     </RadioGroup>
   );
 };

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '2.1.2';
+export const VERSION = '2.1.3';