clean up

Author: erm500

Tags/Input.js

@@ -6,6 +6,9 @@ import styles from "./styles";
 const Input = (props) => {
 
   const {
+    value,
+    onChangeText,
+    onSubmitEditing,
     inputStyle,
     inputContainerStyle,
     textInputProps
@@ -16,15 +19,14 @@ const Input = (props) => {
       <TextInput
         {...textInputProps}
         style={[styles.textInput, inputStyle]}
-
-        value={props.value}
-        onChangeText={props.onChangeText}
-        onSubmitEditing={props.onSubmitEditing}
-        
+        value={value}
+        onChangeText={onChangeText}
+        onSubmitEditing={onSubmitEditing}
         underlineColorAndroid="transparent"
       />
     </View>
   );
+  
 };
 
 export {Input};

Tags/index.js

@@ -14,7 +14,7 @@ class Tags extends React.Component {
       tags: props.initialTags,
       text: props.initialText
     };
-  }
+  };
 
   showLastTag = () => {
     this.setState(state =>
@@ -38,13 +38,12 @@ class Tags extends React.Component {
   };
 
   onChangeText = text => {
-    const regex = new RegExp(`^[${this.props.createTagOnString.join("")}]+$`, 'g');
     if (text.length === 0) {
       this.showLastTag();
     } else if (
       text.length > 1 &&
-      !text.match(regex) &&
       this.props.createTagOnString.includes(text.slice(-1)) &&
+      !text.match(new RegExp(`^[${this.props.createTagOnString.join("")}]+$`, 'g')) &&
       !(this.state.tags.indexOf(text.slice(0, -1).trim()) > -1)
     ) {
       this.addTag(text.slice(0, -1));
@@ -66,73 +65,63 @@ class Tags extends React.Component {
       containerStyle,
       style,
       readonly,
-      maxNumberOfTags
+      maxNumberOfTags,
+      tagContainerStyle,
+      tagTextStyle,
+      deleteTagOnPress,
+      onTagPress,
+      renderTag
     } = this.props;
 
     return (
       <View style={[styles.container, containerStyle, style]}>
 
-        {this.state.tags.map(this._renderTag)}
+        {this.state.tags.map((tag, index) => {
+
+          const tagProps = {
+            tag,
+            index,
+            deleteTagOnPress,
+            onPress: event => {
+              event.persist();
+              if (deleteTagOnPress && !readonly) {
+                this.setState(state =>
+                  ({
+                    tags: [
+                      ...state.tags.slice(0, index),
+                      ...state.tags.slice(index + 1)
+                    ]
+                  }),
+                  () => {
+                    this.props.onChangeTags &&
+                      this.props.onChangeTags(this.state.tags);
+                    onTagPress && onTagPress(index, tag, event, true);
+                  }
+                );
+              } else {
+                onTagPress && onTagPress(index, tag, event, false);
+              }
+            },
+            tagContainerStyle,
+            tagTextStyle
+          };
+
+          return renderTag(tagProps);
+        })}
 
         {!readonly 
           && maxNumberOfTags > this.state.tags.length 
-          && (
-          <Input 
-            value={this.state.text}
-            onChangeText={this.onChangeText} 
-            onSubmitEditing={this.onSubmitEditing}
-            {...this.props}
-          />)
+          && 
+            <Input 
+              value={this.state.text}
+              onChangeText={this.onChangeText} 
+              onSubmitEditing={this.onSubmitEditing}
+              {...this.props}
+            />
         }
 
       </View>
     );
-
-  }
-
-  _renderTag = (tag, index) => {
-
-    const {
-      tagContainerStyle,
-      tagTextStyle,
-      deleteTagOnPress,
-      onTagPress,
-      readonly,
-      renderTag
-    } = this.props;
-
-    const onPress = event => {
-      event.persist();
-      if (deleteTagOnPress && !readonly) {
-        this.setState(state =>
-          ({
-            tags: [
-              ...state.tags.slice(0, index),
-              ...state.tags.slice(index + 1)
-            ]
-          }),
-          () => {
-            this.props.onChangeTags &&
-              this.props.onChangeTags(this.state.tags);
-            onTagPress && onTagPress(index, tag, event, true);
-          }
-        );
-      } else {
-        onTagPress && onTagPress(index, tag, event, false);
-      }
-    };
-
-    const tagProps = {
-      tag,
-      index,
-      deleteTagOnPress,
-      onPress,
-      tagContainerStyle,
-      tagTextStyle
-    };
-
-    return renderTag(tagProps);
-
   };
 
 }