@klippa/ngx-enhancy-forms 14.22.7 → 14.22.9

package/fesm2020/klippa-ngx-enhancy-forms.mjs

@@ -390,7 +390,7 @@ class FormComponent {
     }
     handleSubmission(originalDisabledStates, renderedAndEnabledValues, renderedButDisabledValues, formGroupValue) {
         if (this.formGroup.invalid) {
-            this.activeControls.find((e) => !e.formControl.valid)?.formElement?.scrollTo();
+            this.activeControls.find((e) => e.formControl.invalid)?.formElement?.scrollTo();
             this.setDisabledStatesForAllControls(originalDisabledStates);
             return Promise.reject(invalidFieldsSymbol);
         }
@@ -679,20 +679,16 @@ class FormElementComponent {
             return this.getScrollableParent(node.parentNode);
         }
     }
-    getPageOffset(elem) {
-        let topOffset = elem.getBoundingClientRect().top;
-        while (elem !== document.documentElement) {
-            elem = elem.parentElement;
-            topOffset += elem.scrollTop;
-        }
-        return topOffset;
-    }
     scrollTo() {
         const parent = this.getScrollableParent(this.internalComponentRef.nativeElement);
-        const pageOffsetElement = this.getPageOffset(this.internalComponentRef.nativeElement);
-        const pageOffsetParent = parent === window.document.documentElement ? 0 : this.getPageOffset(parent);
+        const parentTop = parent === window.document.documentElement ? 0 : parent.getBoundingClientRect().top;
+        const elementTop = this.internalComponentRef.nativeElement.getBoundingClientRect().top;
+        const parentScrollTop = parent.scrollTop;
+        const answer = elementTop - parentTop + parentScrollTop;
+        console.log('answer', parentTop, elementTop, parentScrollTop, answer);
+        console.log(parent, this.internalComponentRef.nativeElement);
         parent.scrollTo({
-            top: pageOffsetElement - pageOffsetParent - 30,
+            top: answer - 30,
             behavior: 'smooth'
         });
     }