@klippa/ngx-enhancy-forms 14.22.6 → 14.22.7

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

@@ -668,20 +668,33 @@ class FormElementComponent {
         return this.getErrorToShow() === error && !this.customErrorHandlers.some((e) => e.error === error);
     }
     getScrollableParent(node) {
-        if (node == null) {
-            return null;
+        if (node === window.document.documentElement) {
+            return window.document.documentElement;
         }
-        if (node.scrollHeight > node.clientHeight) {
+        const overflowY = getComputedStyle(node).overflowY;
+        if (node.clientHeight < node.scrollHeight && (overflowY === 'auto' || overflowY === 'scroll')) {
             return node;
         }
         else {
             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() {
-        this.internalComponentRef.nativeElement.scrollIntoView(true);
-        // to give some breathing room, we scroll 100px more to the top
-        this.getScrollableParent(this.internalComponentRef.nativeElement)?.scrollBy(0, -100);
+        const parent = this.getScrollableParent(this.internalComponentRef.nativeElement);
+        const pageOffsetElement = this.getPageOffset(this.internalComponentRef.nativeElement);
+        const pageOffsetParent = parent === window.document.documentElement ? 0 : this.getPageOffset(parent);
+        parent.scrollTo({
+            top: pageOffsetElement - pageOffsetParent - 30,
+            behavior: 'smooth'
+        });
     }
     isRequired() {
         if (isValueSet(this.input)) {