muba-input-text 5.0.4 → 6.0.0

package/InputText.js

@@ -62,11 +62,6 @@ export default class InputText extends React.Component {
 		}
 	}
 
-	isValidUrl(url) {
-		const pattern = new RegExp('^(https?://)?(www\\.)?([-a-z0-9À-ú]{1,63}\\.)*?[a-z0-9À-ú][-a-z0-9À-ú]{0,61}[a-z0-9À-ú]\\.[a-zÀ-ú]{2,6}', 'i');
-		return !!pattern.test(url);
-	}
-
 	onSubmitValidate() {
 		this.setState({
 			fieldError: false,
@@ -87,16 +82,7 @@ export default class InputText extends React.Component {
 			this.setState({ fieldError: true, requiredError: true });
 			result = false;
 		} else {
-			if (this.props.notUrl) {
-				result = this.isValidUrl(this.props.value);
-
-				if (!result) {
-					this.showError();
-					this.setState({ urlAllowingError: true });
-				}
-			}
-
-			if (this.props.required || this.props.value != null) {
+			if (this.props.required || (this.props.value != null && this.props.value !== '')) {
 				result = this.validateType() && result;
 			}
 		}
@@ -124,6 +110,8 @@ export default class InputText extends React.Component {
 			return this.isValidEmail();
 		} else if (this.props.type === 'number') {
 			return this.isValidNumber();
+		} else if (this.props.type === 'url') {
+			return this.isValidUrl();
 		}
 		return true;
 	}
@@ -176,6 +164,16 @@ export default class InputText extends React.Component {
 		return true;
 	}
 
+	isValidUrl() {
+		const pattern = new RegExp('^(https?://)?(www\\.)?([-a-z0-9À-ú]{1,63}\\.)*?[a-z0-9À-ú][-a-z0-9À-ú]{0,61}[a-z0-9À-ú]\\.[a-zÀ-ú]{2,6}', 'i');
+		if (!pattern.test(this.props.value)) {
+			this.showError();
+			this.setState({ urlAllowingError: true });
+			return false;
+		}
+		return true;
+	}
+
 	showCustomizedError(messageError) {
 		this.setState({ fieldError: true, customizedError: true, customizedErrorMessage: messageError });
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-input-text",
-  "version": "5.0.4",
+  "version": "6.0.0",
   "description": "Input text",
   "main": "InputText.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "homepage": "https://github.com/Mubawab/muba-input-text#readme",
   "dependencies": {
-    "muba-font": "5",
-    "muba-i18n": "5",
-    "muba-output-text": "5"
+    "muba-font": "6",
+    "muba-i18n": "6",
+    "muba-output-text": "6"
   }
 }