muba-input-text 3.0.3 → 4.1.1

package/InputText.js

@@ -35,6 +35,7 @@ export default class InputText extends React.Component {
 			minValueError: false,
 			maxValueError: false,
 			emailBadFormat: false,
+			urlAllowingError: false,
 			customizedError: false,
 			customizedErrorMessage: undefined,
 			inputFont: props.inputFont,
@@ -57,6 +58,11 @@ export default class InputText extends React.Component {
 		this.setState({ fontLoaded: true });
 	}
 
+	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,
@@ -64,18 +70,30 @@ export default class InputText extends React.Component {
 			onlyNumbersError: false,
 			minValueError: false,
 			maxValueError: false,
-			emailBadFormat: false
+			emailBadFormat: false,
+			urlAllowingError: false
 		});
 
+		let result = true;
 		if (this.props.required && (this.props.value == null || this.props.value.toString().trim() === '')) {
 			if (this.props.scroll) {
 				this.props.scroll(this.inputTextView);
 			}
 
 			this.setState({ fieldError: true, requiredError: true });
-			return false;
+			result = false;
+		} else {
+			if (this.props.notUrl) {
+				result = this.isValidUrl(this.props.value);
+
+				this.showError();
+				this.setState({ urlAllowingError: true });
+			}
+
+			result = this.validateType() && result;
 		}
-		return this.validateType();
+
+		return result;
 	}
 
 	showError() {
@@ -114,7 +132,8 @@ export default class InputText extends React.Component {
 					return false;
 				} else {
 					const pattern = new RegExp("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])", 'i');
-					const success = !!pattern.test(this.props.value);
+					const patternSpaces = new RegExp(/\s/);
+					const success = !!pattern.test(this.props.value) && !patternSpaces.test(this.props.value);
 
 					if (!success) {
 						// It's invalid
@@ -161,6 +180,7 @@ export default class InputText extends React.Component {
 			minValueError: false,
 			maxValueError: false,
 			emailBadFormat: false,
+			urlAllowingError: false,
 			customizedError: false,
 			customizedErrorMessage: undefined
 		});
@@ -207,6 +227,7 @@ export default class InputText extends React.Component {
 							{this.state.maxValueError && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {strings('maxValueError', { maxValue: this.props.maxValue })}</OutputText> : null}
 							{this.state.minValueError && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {strings('minValueError', { minValue: this.props.minValue })}</OutputText> : null}
 							{this.state.emailBadFormat && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {strings('emailBadFormat')}</OutputText> : null}
+							{this.state.urlAllowingError && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {strings('urlAllowingError')}</OutputText> : null}
 							{this.state.maxCharacters && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {strings('maxCharacters', { maxCharacters: this.props.maxCharacters })}</OutputText> : null}
 							{this.state.customizedError && (this.props.showErrorText == null || this.props.showErrorText) ? <OutputText style={[inputTextStyles.subNote, inputTextStyles.redText]}> {this.state.customizedErrorMessage}</OutputText> : null}
 						</View>

package/locales/ar.json

@@ -4,5 +4,6 @@
 	"minValueError": "الحد الأدنى للقيمة المسموح بها هو {{minValue}}",
 	"maxValueError": "الحد الأقصى للقيمة المسموح بها هو {{maxValue}}",
 	"emailBadFormat": "رجاء قم بإدخال بريد إكتروني صحيح",
-	"maxCharacters": "الحد الأقصى للحروف {{maxCharacters}}"
+	"maxCharacters": "الحد الأقصى للحروف {{maxCharacters}}",
+	"urlAllowingError": "غير مسموح بإدخال عناوين URL"
 }

package/locales/en.json

@@ -4,5 +4,6 @@
 	"minValueError": "The minimum value allowed is {{minValue}}",
 	"maxValueError": "The maximum value allowed is {{maxValue}}",
 	"emailBadFormat": "Please enter a valid email address",
-	"maxCharacters": "{{maxCharacters}} characters max."
+	"maxCharacters": "{{maxCharacters}} characters max.",
+	"urlAllowingError": "It is not allowed to enter URL's"
 }

package/locales/es.json

@@ -4,5 +4,6 @@
 	"minValueError": "El valor mínimo permitido es {{minValue}}",
 	"maxValueError": "El valor máximo permitido es {{maxValue}}",
 	"emailBadFormat": "Por favor, introduce una dirección de correo electrónico válida",
-	"maxCharacters": "{{maxCharacters}} caracteres máx."
+	"maxCharacters": "{{maxCharacters}} caracteres máx.",
+	"urlAllowingError": "No está permitido introducir URL's"
 }

package/locales/fr.json

@@ -4,5 +4,6 @@
 	"minValueError": "La valeur minimale autorisée est {{minValue}}",
 	"maxValueError": "La valeur maximale autorisée est {{maxValue}}",
 	"emailBadFormat": "S'il vous plaît, mettez une adresse email valide",
-	"maxCharacters": "{{maxCharacters}} caractères max."
+	"maxCharacters": "{{maxCharacters}} caractères max.",
+	"urlAllowingError": "Il n'est pas permis d'entrer des URL"
 }

package/locales/it.json

@@ -4,5 +4,6 @@
 	"minValueError": "Il valore minimo permesso è {{minValue}}",
 	"maxValueError": "Il valore massimo permesso è {{maxValue}}",
 	"emailBadFormat": "Inserisci un indirizzo e-mail valido",
-	"maxCharacters": "{{maxCharacters}} caratteri massimi"
+	"maxCharacters": "{{maxCharacters}} caratteri massimi",
+	"urlAllowingError": "Non è permesso inserire URL"
 }

package/locales/nl.json

@@ -4,5 +4,6 @@
 	"minValueError": "De minimale toegestane waarde is {minValue}}",
 	"maxValueError": "De maximale toegestane waarde is {maxValue}}",
 	"emailBadFormat": "Voer een geldig e-mailadres in",
-	"maxCharacters": "Maximaal {{maxCharacters} tekens"
+	"maxCharacters": "Maximaal {{maxCharacters} tekens",
+	"urlAllowingError": "Het is niet toegestaan URL's in te voeren"
 }

package/package.json

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