adt-js-components 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adt-js-components",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "JavaScript components for Nette framework",
   "main": "index.js",
   "scripts": {

package/src/ComponentLoader.js

@@ -21,12 +21,12 @@ const init = (selector, path) => {
 
 		if (path.includes('/')) {
 			import('JsComponents/' + path + '/index.js').then(component => {
-				component.default.run(componentsConfig[selector] || {}, $el);
+				component.default.run(componentsConfig[selector] || {});
 			});
 
 		} else {
 			import('adt-js-components/src/' + path + '/index.js').then(component => {
-				component.default.run(componentsConfig[selector] || {}, $el);
+				component.default.run(componentsConfig[selector] || {});
 			});
 		}
 	});

package/src/SubmitForm/index.js

@@ -1,11 +1,11 @@
 const Scrollparent = require("scrollparent");
 
 function isList(el) {
-	return el.name.endsWith('[]') || el.type === 'radio';
+	return el.type === 'checkbox' && el.name.endsWith('[]') || el.type === 'radio';
 }
 
 function getErrorElementId(el) {
-	return el.type === 'checkbox' && el.name.endsWith('[]') || el.type === 'radio'
+	return isList(el) ? el.id.split('-').slice(0, -1).join('-') : el.id;
 }
 
 function scrollToFirstError(form) {
@@ -21,10 +21,9 @@ function scrollToFirstError(form) {
 	scrollParent.scrollBy({top: el.getBoundingClientRect().top - 100, behavior: 'smooth'});
 }
 
-function run(options) {
-
-	function applyEventHandlers($el) {
-		$el.find('input, textarea, select').on('input', function(e) {
+function run(options, $el) {
+	function applyEventHandlers(el) {
+		$(this).find('input, textarea, select').on('input', function(e) {
 			this.classList.remove('is-invalid');
 			if (isList(this)) {
 				$(this).parent().parent().find('.is-invalid').removeClass('is-invalid');
@@ -32,19 +31,23 @@ function run(options) {
 		});
 	}
 
-	const observer = new MutationObserver(function(mutationsList, observer) {
-		mutationsList.forEach(function(mutation) {
-			if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
-				$(mutation.addedNodes).each(function() {
-					applyEventHandlers($(this));
+	$.nette.ext('live').after(function($el) {
+		$el.find('[data-adt-submit-form]').each(function(e) {
+			const observer = new MutationObserver(function(mutationsList, observer) {
+				mutationsList.forEach(function(mutation) {
+					if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
+						$(mutation.addedNodes).each(function() {
+							applyEventHandlers(this);
+						});
+					}
 				});
-			}
-		});
-	});
+			});
 
-	observer.observe($el.get(0), { childList: true, subtree: true });
+			observer.observe(this, { childList: true, subtree: true });
 
-	applyEventHandlers($el);
+			applyEventHandlers(this);
+		});
+	});
 
 	if (typeof Nette !== "undefined") {
 		Nette.showFormErrors = function(form, errors) {