inviton-powerduck 0.0.71 → 0.0.72

package/common/base-component.tsx

@@ -10,6 +10,7 @@ import { isNullOrEmpty } from "./utils/is-null-or-empty";
 import NotificationProvider from './../components/ui/notification';
 import PowerduckState from "../app/powerduck-state";
 import { IValidation, ValidationState } from './static-wrappers/interfaces/validation-interface';
+import ScrollUtils from "./scroll-utils";
 
 export abstract class PowerduckViewModelBase extends Vue {
     blockRoot: boolean = true;
@@ -19,8 +20,8 @@ export abstract class PowerduckViewModelBase extends Vue {
     constructor(optionBuilder: OptionBuilder, vueInstance: any) {
         super(optionBuilder, vueInstance);
         this.v$ = useVuelidate({
-			$scope: vueInstance
-		}) as any as Validation;
+            $scope: vueInstance
+        }) as any as Validation;
     }
 
     /**
@@ -228,25 +229,7 @@ export abstract class PowerduckViewModelBase extends Vue {
     }
 
     scrollToFirstPossibleError(context: JQuery) {
-        setTimeout(() => {
-            var scrollContext = context.find(".form-group.has-danger, .input-group.has-danger").first();
-            if (scrollContext.length == 0) {
-                scrollContext = $(".modal.show .form-group.has-danger, .modal.show .input-group.has-danger").first();
-            }
-
-            if (scrollContext.length > 0) {
-                //Prevents multiple scrolling in one run
-                let lastScroll = (PowerduckState as any)._lastValidationScroll || 0;
-                let now = new Date().getTime();
-                if (now - lastScroll < 800) {
-                    return;
-                } else {
-                    (PowerduckState as any)._lastValidationScroll = now;
-                }
-
-                this.scrollToElem(scrollContext.first()[0]);
-            }
-        }, 10);
+        ScrollUtils.scrollToFirstPossibleError(context);
     }
 
     /**
@@ -254,40 +237,7 @@ export abstract class PowerduckViewModelBase extends Vue {
      * @param elem
      */
     scrollToElem(elem: typeof Vue | Element | typeof Vue[] | Element[], mobileOffset?: boolean | number, mobileOffsetSmoothing?: boolean, animated?: boolean, instant?: boolean): void {
-        if (elem == null) {
-            return;
-        }
-
-		let offset = 0;
-		let otherHeaderHeight = $("nav.navbar.fixed-top").height();
-        if (otherHeaderHeight == null) {
-            otherHeaderHeight = $("header").height();
-        }
-
-        if (($(window).width() as number < 768 && mobileOffset != false) || otherHeaderHeight > 0) {
-            if ((mobileOffset as number) > 1) {
-                offset = mobileOffset as number;
-            } else {
-                offset = $(".topnavbar-wrap").height();
-                if (offset == 0 || offset == null || isNaN(offset)) {
-                    offset = otherHeaderHeight;
-                }
-            }
-        }
-
-        let itemTop = $(elem).first().offset()?.top;
-        let modalParent = $(elem as HTMLElement).closest(".modal");
-        if (modalParent.length == 0) {
-            modalParent = null;
-        } else {
-            itemTop = modalParent.scrollTop() + itemTop - 95;
-        }
-
-        if (isNaN(offset)) {
-            offset = 0;
-        }
-
-        this.scrollToPos(itemTop - offset, modalParent, animated, instant);
+        ScrollUtils.scrollToElem(elem, mobileOffset, mobileOffsetSmoothing, animated, instant);
     }
 
     /**
@@ -295,19 +245,7 @@ export abstract class PowerduckViewModelBase extends Vue {
      * @param elem
      */
     scrollToPos(position: number, context?: JQuery, animated?: boolean, instant?: boolean): void {
-		if (instant != true) {
-			setTimeout(() => {
-             (context?.length > 0 ? context[0] : window).scrollTo({
-                    top: position,
-                    behavior: (animated != false ? 'smooth' : 'instant') as any
-                });
-            });
-		} else {
-			(context?.length > 0 ? context[0] : window).scrollTo({
-                top: position,
-                behavior: (animated != false ? 'smooth' : 'instant') as any
-            });
-		}
+        ScrollUtils.scrollToPos(position, context, animated, instant);
     }
 
     /**

package/common/scroll-utils.ts

@@ -0,0 +1,87 @@
+import { Vue } from "vue-facing-decorator";
+import PowerduckState from "../app/powerduck-state";
+
+export default class ScrollUtils {
+    static scrollToFirstPossibleError(context: JQuery) {
+        setTimeout(() => {
+            var scrollContext = context.find(".form-group.has-danger, .input-group.has-danger").first();
+            if (scrollContext.length == 0) {
+                scrollContext = $(".modal.show .form-group.has-danger, .modal.show .input-group.has-danger").first();
+            }
+
+            if (scrollContext.length > 0) {
+                //Prevents multiple scrolling in one run
+                let lastScroll = (PowerduckState as any)._lastValidationScroll || 0;
+                let now = new Date().getTime();
+                if (now - lastScroll < 800) {
+                    return;
+                } else {
+                    (PowerduckState as any)._lastValidationScroll = now;
+                }
+
+                this.scrollToElem(scrollContext.first()[0]);
+            }
+        }, 10);
+    }
+
+    /**
+     * Scrolls to element
+     * @param elem
+     */
+    static scrollToElem(elem: typeof Vue | Element | typeof Vue[] | Element[], mobileOffset?: boolean | number, mobileOffsetSmoothing?: boolean, animated?: boolean, instant?: boolean): void {
+        if (elem == null) {
+            return;
+        }
+
+        let offset = 0;
+        let otherHeaderHeight = $("nav.navbar.fixed-top").height();
+        if (otherHeaderHeight == null) {
+            otherHeaderHeight = $("header").height();
+        }
+
+        if (($(window).width() as number < 768 && mobileOffset != false) || otherHeaderHeight > 0) {
+            if ((mobileOffset as number) > 1) {
+                offset = mobileOffset as number;
+            } else {
+                offset = $(".topnavbar-wrap").height();
+                if (offset == 0 || offset == null || isNaN(offset)) {
+                    offset = otherHeaderHeight;
+                }
+            }
+        }
+
+        let itemTop = $(elem).first().offset()?.top;
+        let modalParent = $(elem as HTMLElement).closest(".modal");
+        if (modalParent.length == 0) {
+            modalParent = null;
+        } else {
+            itemTop = modalParent.scrollTop() + itemTop - 95;
+        }
+
+        if (isNaN(offset)) {
+            offset = 0;
+        }
+
+        this.scrollToPos(itemTop - offset, modalParent, animated, instant);
+    }
+
+    /**
+     * Scrolls to position
+     * @param elem
+     */
+    static scrollToPos(position: number, context?: JQuery, animated?: boolean, instant?: boolean): void {
+        if (instant != true) {
+            setTimeout(() => {
+                (context?.length > 0 ? context[0] : window).scrollTo({
+                    top: position,
+                    behavior: (animated != false ? 'smooth' : 'instant') as any
+                });
+            });
+        } else {
+            (context?.length > 0 ? context[0] : window).scrollTo({
+                top: position,
+                behavior: (animated != false ? 'smooth' : 'instant') as any
+            });
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inviton-powerduck",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "module",
   "scripts": {
     "build": " vite build && vue-tsc  --declaration --emitDeclarationOnly",