Merge pull request #6501 from anthony-hull/anthony--toggle-show-passw…

…ord2 add show password toggle to secureTextInput
Expensify · Nov 30, 2021 · c9f4292 · c9f4292
2 parents ff3625f + 44b1789
commit c9f4292
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 22 deletions.
diff --git a/assets/images/eye-disabled.svg b/assets/images/eye-disabled.svg
diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js
@@ -1,13 +1,15 @@
 import _ from 'underscore';
 import React, {Component} from 'react';
 import {
-    Animated, TextInput, View, TouchableWithoutFeedback,
+    Animated, TextInput, View, TouchableWithoutFeedback, Pressable,
 } from 'react-native';
 import Str from 'expensify-common/lib/str';
 import ExpensiTextInputLabel from './ExpensiTextInputLabel';
 import {propTypes, defaultProps} from './baseExpensiTextInputPropTypes';
 import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
 import InlineErrorText from '../InlineErrorText';
 
 const ACTIVE_LABEL_TRANSLATE_Y = -12;
@@ -31,6 +33,7 @@ class BaseExpensiTextInput extends Component {
             labelTranslateX: new Animated.Value(activeLabel
                 ? ACTIVE_LABEL_TRANSLATE_X(props.translateX) : INACTIVE_LABEL_TRANSLATE_X),
             labelScale: new Animated.Value(activeLabel ? ACTIVE_LABEL_SCALE : INACTIVE_LABEL_SCALE),
+            passwordHidden: props.secureTextEntry,
         };
 
         this.input = null;
@@ -39,6 +42,7 @@ class BaseExpensiTextInput extends Component {
         this.onFocus = this.onFocus.bind(this);
         this.onBlur = this.onBlur.bind(this);
         this.setValue = this.setValue.bind(this);
+        this.togglePasswordVisibility = this.togglePasswordVisibility.bind(this);
     }
 
     componentDidMount() {
@@ -145,6 +149,10 @@ class BaseExpensiTextInput extends Component {
         ]).start();
     }
 
+    togglePasswordVisibility() {
+        this.setState(prevState => ({passwordHidden: !prevState.passwordHidden}));
+    }
+
     render() {
         const inputProps = _.omit(this.props, _.keys(propTypes));
         const hasLabel = Boolean(this.props.label.length);
@@ -167,8 +175,8 @@ class BaseExpensiTextInput extends Component {
                             {hasLabel ? (
                                 <>
                                     {/* Adding this background to the label only for multiline text input,
-                                    to prevent text overlaping with label when scrolling */}
-                                    {this.props.multiline && <View style={styles.expensiTextInputLabelBackground} />}
+                                    to prevent text overlapping with label when scrolling */}
+                                    {this.props.multiline && <View style={styles.expensiTextInputLabelBackground} pointerEvents="none" />}
                                     <ExpensiTextInputLabel
                                         label={this.props.label}
                                         labelTranslateX={
@@ -181,25 +189,40 @@ class BaseExpensiTextInput extends Component {
                                     />
                                 </>
                             ) : null}
-                            <TextInput
-                                ref={(ref) => {
-                                    if (typeof this.props.innerRef === 'function') { this.props.innerRef(ref); }
-                                    this.input = ref;
-                                }}
-                                // eslint-disable-next-line
-                                {...inputProps}
-                                value={this.value}
-                                placeholder={(this.state.isFocused || !this.props.label) ? this.props.placeholder : null}
-                                placeholderTextColor={themeColors.placeholderText}
-                                underlineColorAndroid="transparent"
-                                style={[this.props.inputStyle, !hasLabel && styles.pv0]}
-                                multiline={this.props.multiline}
-                                onFocus={this.onFocus}
-                                onBlur={this.onBlur}
-                                onChangeText={this.setValue}
-                                onPressOut={this.props.onPress}
-                                translateX={this.props.translateX}
-                            />
+                            <View style={[styles.expensiTextInputAndIconContainer]}>
+                                <TextInput
+                                    ref={(ref) => {
+                                        if (typeof this.props.innerRef === 'function') { this.props.innerRef(ref); }
+                                        this.input = ref;
+                                    }}
+                                    // eslint-disable-next-line
+                                    {...inputProps}
+                                    value={this.value}
+                                    placeholder={(this.state.isFocused || !this.props.label) ? this.props.placeholder : null}
+                                    placeholderTextColor={themeColors.placeholderText}
+                                    underlineColorAndroid="transparent"
+                                    style={[this.props.inputStyle, styles.flex1, styles.w100, !hasLabel && styles.pv0, this.props.secureTextEntry && styles.pr2]}
+                                    multiline={this.props.multiline}
+                                    onFocus={this.onFocus}
+                                    onBlur={this.onBlur}
+                                    onChangeText={this.setValue}
+                                    secureTextEntry={this.state.passwordHidden}
+                                    onPressOut={this.props.onPress}
+                                    translateX={this.props.translateX}
+                                />
+                                {this.props.secureTextEntry && (
+                                <Pressable
+                                    accessibilityRole="button"
+                                    style={styles.secureInputEyeButton}
+                                    onPress={this.togglePasswordVisibility}
+                                >
+                                    <Icon
+                                        src={this.state.passwordHidden ? Expensicons.Eye : Expensicons.EyeDisabled}
+                                        fill={themeColors.icon}
+                                    />
+                                </Pressable>
+                                )}
+                            </View>
                         </View>
                     </TouchableWithoutFeedback>
                 </View>

diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js
@@ -21,6 +21,7 @@ import Download from '../../../assets/images/download.svg';
 import Emoji from '../../../assets/images/emoji.svg';
 import Exclamation from '../../../assets/images/exclamation.svg';
 import Eye from '../../../assets/images/eye.svg';
+import EyeDisabled from '../../../assets/images/eye-disabled.svg';
 import ExpensifyCard from '../../../assets/images/expensifycard.svg';
 import Gallery from '../../../assets/images/gallery.svg';
 import Gear from '../../../assets/images/gear.svg';
@@ -87,6 +88,7 @@ export {
     Emoji,
     Exclamation,
     Eye,
+    EyeDisabled,
     ExpensifyCard,
     Gallery,
     Gear,

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -583,6 +583,7 @@ const styles = {
     componentHeightLarge: {
         height: variables.componentSizeLarge,
     },
+
     expensiTextInputContainer: {
         flex: 1,
         borderWidth: 1,
@@ -593,6 +594,7 @@ const styles = {
         backgroundColor: themeColors.componentBG,
         overflow: 'hidden',
     },
+
     expensiTextInputLabel: {
         position: 'absolute',
         left: 11.5,
@@ -602,6 +604,7 @@ const styles = {
         fontFamily: fontFamily.GTA,
         width: '100%',
     },
+
     expensiTextInputLabelBackground: {
         position: 'absolute',
         top: 0,
@@ -611,16 +614,19 @@ const styles = {
         borderTopRightRadius: variables.componentBorderRadiusNormal,
         borderTopLeftRadius: variables.componentBorderRadiusNormal,
     },
+
     expensiTextInputLabelDesktop: {
         transformOrigin: 'left center',
     },
+
     expensiTextInputLabelTransformation: (translateY, translateX, scale) => ({
         transform: [
             {translateY},
             {translateX},
             {scale},
         ],
     }),
+
     expensiTextInput: {
         fontFamily: fontFamily.GTA,
         fontSize: variables.fontSizeNormal,
@@ -630,13 +636,25 @@ const styles = {
         paddingBottom: 8,
         paddingHorizontal: 11.5,
         borderRadius: variables.componentBorderRadiusNormal,
+    },
+
+    expensiTextInputAndIconContainer: {
         zIndex: -1,
+        flexDirection: 'row',
     },
+
     expensiTextInputDesktop: addOutlineWidth({}, 0),
+
     expensiTextInputAndroid: left => ({
         padding: 0,
         left,
     }),
+
+    secureInputEyeButton: {
+        paddingRight: 11.5,
+        justifyContent: 'center',
+    },
+
     textInput: {
         backgroundColor: themeColors.componentBG,
         borderRadius: variables.componentBorderRadiusNormal,

diff --git a/web/index.html b/web/index.html
@@ -40,6 +40,9 @@
             outline: 0;
             box-shadow: 0px 0px 0px 1px #0185ff;
         }
+        ::-ms-reveal {
+            display: none;
+        }
     </style>
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
     <link rel="shortcut icon" id="favicon" href="/favicon.png">