@dodlhuat/basix 1.2.0 → 1.2.2

package/js/request.js

@@ -1,51 +1,51 @@
-class Request {
-    constructor(url, parameters, success, error) {
-        this.url = url;
-        this.parameters = parameters;
-        this.success = success;
-        this.error = error;
-    }
-
-    get() {
-        const checked = this.#checkSuccessError(this.success, this.error);
-        if (this.parameters.data !== undefined) {
-            this.url += '?' + new URLSearchParams(this.parameters.data);
-        }
-        fetch(this.url)
-            .then(function(response) {
-                return response.json();
-            })
-            .then(checked.success)
-            .catch(checked.error);
-    }
-    post() {
-        const checked = this.#checkSuccessError(this.success, this.error);
-        fetch(this.url,
-            {
-                method: 'post',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(this.parameters.data)
-            })
-            .then(checked.success)
-            .catch(checked.error);
-    }
-
-    #checkSuccessError(success, error) {
-        if (success === undefined) {
-            success = function(data) {
-                console.log(data);
-            };
-        }
-        if (error === undefined) {
-            error = function(error) {
-                console.error(error);
-            }
-        }
-        return {success, error};
-    }
-}
-
+class Request {
+    constructor(url, parameters, success, error) {
+        this.url = url;
+        this.parameters = parameters;
+        this.success = success;
+        this.error = error;
+    }
+
+    get() {
+        const checked = this.#checkSuccessError(this.success, this.error);
+        if (this.parameters.data !== undefined) {
+            this.url += '?' + new URLSearchParams(this.parameters.data);
+        }
+        fetch(this.url)
+            .then(function(response) {
+                return response.json();
+            })
+            .then(checked.success)
+            .catch(checked.error);
+    }
+    post() {
+        const checked = this.#checkSuccessError(this.success, this.error);
+        fetch(this.url,
+            {
+                method: 'post',
+                headers: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(this.parameters.data)
+            })
+            .then(checked.success)
+            .catch(checked.error);
+    }
+
+    #checkSuccessError(success, error) {
+        if (success === undefined) {
+            success = function(data) {
+                console.log(data);
+            };
+        }
+        if (error === undefined) {
+            error = function(error) {
+                console.error(error);
+            }
+        }
+        return {success, error};
+    }
+}
+
 export {Request}

package/js/scroll.ts

@@ -1,47 +1,47 @@
-interface ScrollOptions {
-    behavior?: ScrollBehavior;
-    offset?: number;
-    block?: ScrollLogicalPosition;
-}
-
-class Scroll {
-    public static to(target: string | Element, options: ScrollOptions = {}): void {
-        const fixed_header = document.querySelector('.main-header') as HTMLElement | null;
-        const offset = fixed_header ? fixed_header.offsetHeight : 0;
-
-        const settings: Required<ScrollOptions> = {
-            behavior: "smooth",
-            offset: offset,
-            block: "start",
-            ...options
-        };
-
-        let el: Element | null = target instanceof Element ? target : null;
-
-        if (typeof target === "string") {
-            el = document.querySelector(target);
-        }
-
-        if (!el) return;
-
-        const rect = el.getBoundingClientRect();
-        const scrollTop = window.scrollY;
-        const offsetTop = rect.top + scrollTop - settings.offset;
-
-        window.scrollTo({
-            top: offsetTop,
-            behavior: settings.behavior
-        });
-    }
-}
-
-declare global {
-    interface Window {
-        Scroll: typeof Scroll;
-    }
-}
-
-window.Scroll = Scroll;
-
-export { Scroll };
-export type { ScrollOptions };
+interface ScrollOptions {
+    behavior?: ScrollBehavior;
+    offset?: number;
+    block?: ScrollLogicalPosition;
+}
+
+class Scroll {
+    public static to(target: string | Element, options: ScrollOptions = {}): void {
+        const fixed_header = document.querySelector('.main-header') as HTMLElement | null;
+        const offset = fixed_header ? fixed_header.offsetHeight : 0;
+
+        const settings: Required<ScrollOptions> = {
+            behavior: "smooth",
+            offset: offset,
+            block: "start",
+            ...options
+        };
+
+        let el: Element | null = target instanceof Element ? target : null;
+
+        if (typeof target === "string") {
+            el = document.querySelector(target);
+        }
+
+        if (!el) return;
+
+        const rect = el.getBoundingClientRect();
+        const scrollTop = window.scrollY;
+        const offsetTop = rect.top + scrollTop - settings.offset;
+
+        window.scrollTo({
+            top: offsetTop,
+            behavior: settings.behavior
+        });
+    }
+}
+
+declare global {
+    interface Window {
+        Scroll: typeof Scroll;
+    }
+}
+
+window.Scroll = Scroll;
+
+export { Scroll };
+export type { ScrollOptions };

package/js/scrollbar.js

@@ -31,6 +31,7 @@ class Scrollbar {
         this.boundTrackClick = this.handleTrackClick.bind(this);
         this.boundViewportScroll = this.updateThumb.bind(this);
         this.boundUpdateThumb = this.updateThumb.bind(this);
+        this.boundContainerWheel = this.handleContainerWheel.bind(this);
         // Setup ResizeObserver
         this.ro = new ResizeObserver(this.boundUpdateThumb);
         // Initialize
@@ -80,6 +81,7 @@ class Scrollbar {
         this.viewport.addEventListener('scroll', this.boundViewportScroll, { passive: true });
         this.thumb.addEventListener('pointerdown', this.boundThumbPointerDown);
         this.track.addEventListener('click', this.boundTrackClick);
+        this.container.addEventListener('wheel', this.boundContainerWheel, { passive: false });
         // Observe size changes
         this.ro.observe(this.viewport);
         this.ro.observe(this.content);
@@ -182,11 +184,22 @@ class Scrollbar {
         const scrollTop = scrollRatio * (maxScroll || 0);
         this.viewport.scrollTo({ top: scrollTop, behavior: 'smooth' });
     }
+    handleContainerWheel(e) {
+        const { scrollTop, scrollHeight, clientHeight } = this.viewport;
+        const scrollable = scrollHeight > clientHeight;
+        const atTop = scrollTop === 0 && e.deltaY < 0;
+        const atBottom = scrollTop + clientHeight >= scrollHeight - 1 && e.deltaY > 0;
+        if (scrollable && !atTop && !atBottom) {
+            e.preventDefault();
+        }
+        this.viewport.scrollTop += e.deltaY;
+    }
     destroy() {
         // Remove event listeners
         this.viewport.removeEventListener('scroll', this.boundViewportScroll);
         this.thumb.removeEventListener('pointerdown', this.boundThumbPointerDown);
         this.track.removeEventListener('click', this.boundTrackClick);
+        this.container.removeEventListener('wheel', this.boundContainerWheel);
         window.removeEventListener('resize', this.boundUpdateThumb);
         // Disconnect observer
         this.ro.disconnect();