vevet 2.2.0 → 2.5.0

package/build/types/utils/scroll/to.d.ts

@@ -0,0 +1,28 @@
+import { ScrollLike } from '../types/general';
+interface Props {
+    /**
+     * @default window
+     */
+    container?: Window | Element | ScrollLike;
+    /**
+     * top padding
+     * @default 0
+     */
+    top?: number;
+    /**
+     * left padding
+     * @default 0
+     */
+    left?: number;
+    /**
+     * scroll duration
+     * @default 250
+     */
+    duration?: number;
+}
+/**
+ * Scroll to coordinates
+ */
+export default function scrollTo({ container, top, left, duration, }: Props): Promise<void>;
+export {};
+//# sourceMappingURL=to.d.ts.map

package/build/types/utils/scroll/to.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"to.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/scroll/to.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,UAAU,KAAK;IACX;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;IAC1C;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAE,EAC9B,SAAkB,EAClB,GAAO,EACP,IAAQ,EACR,QAAc,GACjB,EAAE,KAAK,iBA8BP"}

package/build/types/utils/types/general.d.ts

@@ -4,4 +4,10 @@ export interface IRemovable {
 export interface IDestroyable {
     destroy: () => void;
 }
+export interface ScrollLike {
+    scrollTop: number;
+    scrollLeft: number;
+    scrollTo(options: ScrollToOptions): void;
+    scrollTo(x: number, y: number): void;
+}
 //# sourceMappingURL=general.d.ts.map

package/build/types/utils/types/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/types/general.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/types/general.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vevet",
-  "version": "2.2.0",
+  "version": "2.5.0",
   "description": "VEVET - A JavaScript library",
   "browserslist": [
     "since 2015"

package/src/ts/app/events/Viewport.ts

@@ -323,7 +323,12 @@ export class Viewport extends Callbacks<
     /**
      * Launch callbacks on resize.
      */
-    protected _onResize () {
+    protected _onResize (
+        /**
+         * force all callbacks
+         */
+        force = false,
+    ) {
         // copy previous values
         const prevWidth = this._prevSize.w;
         const prevHeight = this._prevSize.h;
@@ -342,29 +347,36 @@ export class Viewport extends Callbacks<
         };
 
         // only when width is changed
-        if (width !== prevWidth && height === prevHeight) {
+        if (force || (width !== prevWidth && height === prevHeight)) {
             this.tbt('w_', changes);
         }
         // only when height is changed
-        if (height !== prevHeight && width === prevWidth) {
+        if (force || (height !== prevHeight && width === prevWidth)) {
             this.tbt('h_', changes);
         }
         // when height & width are changed
-        if (width !== prevWidth && height !== prevHeight) {
+        if (force || (width !== prevWidth && height !== prevHeight)) {
             this.tbt('wh', changes);
             this.tbt('hw', changes);
         }
         // when width is changed
-        if (width !== prevWidth) {
+        if (force || width !== prevWidth) {
             this.tbt('w', changes);
         }
         // when height changed
-        if (height !== prevHeight) {
+        if (force || height !== prevHeight) {
             this.tbt('h', changes);
         }
 
         // on any change
         this.tbt('', changes);
     }
+
+    /**
+     * Force launching all callbacks
+     */
+    public forceResize () {
+        this._onResize(true);
+    }
 }
 

package/src/ts/components/scroll/section/ScrollSectionProgress.ts

@@ -0,0 +1,344 @@
+import { selectOne } from 'vevet-dom';
+import PCancelable from 'p-cancelable';
+import { IRemovable } from '../../../utils/types/general';
+import { RequiredModuleProp } from '../../../utils/types/utility';
+import onScroll from '../../../utils/listeners/onScroll';
+import { Component, NComponent } from '../../../base/Component';
+import { NViewport } from '../../../app/events/Viewport';
+import { SmoothScroll } from '../smooth-scroll/SmoothScroll';
+import clampScope from '../../../utils/math/clampScope';
+import getScrollValues from '../../../utils/scroll/getScrollValues';
+
+
+
+export namespace NScrollSectionProgress {
+
+    /**
+     * Static properties
+     */
+    export interface StaticProp extends NComponent.StaticProp {
+        /**
+         * The scrollable container
+         * @default window
+         */
+        container?: string | Element | SmoothScroll | Window;
+        /**
+         * The scrollable element
+         */
+        section: string | Element;
+        /**
+         * Update sizes on resize
+         * @default false
+         */
+        viewportTarget?: keyof NViewport.CallbacksTypes;
+        /**
+         * @default 0
+         */
+        resizeTimeout?: number;
+    }
+
+    /**
+     * Changeable properties
+     */
+    export interface ChangeableProp extends NComponent.ChangeableProp { }
+
+    /**
+     * Available callbacks
+     */
+    export interface CallbacksTypes extends NComponent.CallbacksTypes {
+        'render': false;
+        'resize': false;
+    }
+
+}
+
+
+
+/**
+ * Elements into viewport
+ */
+export class ScrollSectionProgress <
+    StaticProp extends NScrollSectionProgress.StaticProp
+        = NScrollSectionProgress.StaticProp,
+    ChangeableProp extends NScrollSectionProgress.ChangeableProp
+        = NScrollSectionProgress.ChangeableProp,
+    CallbacksTypes extends NScrollSectionProgress.CallbacksTypes
+        = NScrollSectionProgress.CallbacksTypes,
+> extends Component <
+    StaticProp,
+    ChangeableProp,
+    CallbacksTypes
+> {
+    protected _getDefaultProp <
+        T extends RequiredModuleProp<StaticProp & ChangeableProp>
+    > (): T {
+        return {
+            ...super._getDefaultProp(),
+            container: window,
+            updateOnResize: '',
+            resizeTimeout: 0,
+        };
+    }
+
+    /**
+     * Scroll container
+     */
+    protected _scrollContainer: Element | SmoothScroll | Window;
+    get scrollContainer () {
+        return this._scrollContainer;
+    }
+
+    /**
+     * Section element
+     */
+    protected _section: Element;
+    get section () {
+        return this._section;
+    }
+
+    /**
+     * Scroll event
+     */
+    protected _scrollEvent?: IRemovable;
+    /**
+     * Loaded event
+     */
+    protected _loadedEvent?: PCancelable<any>;
+
+    /**
+     * Scrolling scope
+     */
+    protected _scopeScroll: [number, number];
+    get scopeScroll () {
+        return this._scopeScroll;
+    }
+
+    /**
+     * 'In' scope relative to the global progress
+     */
+    protected _scopeIn: [number, number];
+    protected get scopeIn () {
+        return this._scopeIn;
+    }
+
+    /**
+     * 'Move' scope relative to the global progress
+     */
+    protected _scopeMove: [number, number];
+    get scopeMove () {
+        return this._scopeMove;
+    }
+
+    /**
+     * 'Move' scope relative to the global progress
+     */
+    protected _scopeOut: [number, number];
+    get scopeOut () {
+        return this._scopeOut;
+    }
+
+    protected _progress: number;
+    /**
+     * Global progress
+     */
+    get progress () {
+        return this._progress;
+    }
+    set progress (val) {
+        this._progress = val;
+    }
+
+
+
+    constructor (
+        initialProp?: (StaticProp & ChangeableProp),
+        init = true,
+    ) {
+        super(initialProp, false);
+
+        // get scroll container
+        if (typeof this.prop.container === 'string') {
+            this._scrollContainer = selectOne(this.prop.container) as Element;
+        } else {
+            this._scrollContainer = this.prop.container;
+        }
+
+        // get section element
+        if (typeof this.prop.section === 'string') {
+            this._section = selectOne(this.prop.section) as Element;
+        } else {
+            this._section = this.prop.section;
+        }
+
+        // set defaults
+        this._progress = -0.001;
+        this._scopeScroll = [0, 0];
+        this._scopeIn = [0, 0];
+        this._scopeMove = [0, 0];
+        this._scopeOut = [0, 0];
+
+        // initialize the class
+        if (init) {
+            this.init();
+        }
+    }
+
+    public init () {
+        super.init();
+    }
+
+    // Set Module Events
+    protected _setEvents () {
+        super._setEvents();
+
+        // set resize events
+        this.addViewportCallback(this.prop.viewportTarget, () => {
+            this.resize();
+        }, {
+            timeout: this.prop.resizeTimeout,
+        });
+
+        // resize on page loaded
+        this._loadedEvent = this._app.onPageLoaded();
+        this._loadedEvent.then(() => {
+            this.resize();
+        }).catch(() => {});
+
+        // set scroll events
+        this._scrollEvent = onScroll({
+            container: this.prop.container,
+            callback: this._handleScroll.bind(this),
+        });
+    }
+
+    protected _onPropMutate () {
+        super._onPropMutate();
+        this.resize();
+    }
+
+
+
+    /**
+     * 'in' progress
+     */
+    get progressIn () {
+        return clampScope(
+            this.progress,
+            this.scopeIn,
+        ) || 0;
+    }
+
+    /**
+     * 'out' progress
+     */
+    get progressOut () {
+        return clampScope(
+            this.progress,
+            this.scopeOut,
+        ) || 0;
+    }
+
+    /**
+     * 'move' progress
+     */
+    get progressMove () {
+        return clampScope(
+            this.progress,
+            this.scopeMove,
+        ) || 0;
+    }
+
+
+
+    /**
+     * Handle scroll event
+     */
+    protected _handleScroll () {
+        // calculate scopes
+        const scrollData = getScrollValues(this.scrollContainer);
+        if (!scrollData) {
+            return;
+        }
+        this._render(scrollData);
+    }
+
+
+
+    /**
+     * Resize the scene
+     */
+    public resize () {
+        // calculate scopes
+        const scrollData = getScrollValues(this.scrollContainer);
+        if (!scrollData) {
+            return;
+        }
+
+        // get sizes
+        const bounding = this.section.getBoundingClientRect();
+        const vHeight = this._app.viewport.height;
+
+        // calculate scroll scope
+        const inStart = scrollData.scrollTop + bounding.top - vHeight;
+        const moveEnd = scrollData.scrollTop + bounding.top + bounding.height;
+        const scrollLine = moveEnd - inStart;
+        this._scopeScroll = [inStart, moveEnd];
+
+        // calculate scopes
+        this._scopeIn = [0, vHeight / scrollLine];
+        this._scopeOut = [1 - vHeight / scrollLine, 1];
+        this._scopeMove = [this._scopeIn[1], this._scopeOut[0]];
+
+        // launch callbacks
+        this.callbacks.tbt('resize', false);
+
+        // render the scene
+        this._render(scrollData, true);
+    }
+
+    /**
+     * Render the scene
+     */
+    protected _render (
+        scrollData: ReturnType<typeof getScrollValues>,
+        force = false,
+    ) {
+        const canRender = this._canRender(scrollData, force);
+        if (!canRender) {
+            return;
+        }
+        this.callbacks.tbt('render', false);
+    }
+
+    /**
+     * Check if the section can be rendered
+     */
+    protected _canRender (
+        scrollData: ReturnType<typeof getScrollValues>,
+        force = false,
+    ) {
+        if (!scrollData) {
+            return false;
+        }
+        const { scrollTop } = scrollData;
+        const prevProgress = this.progress;
+
+        const progress = clampScope(
+            scrollTop,
+            [this._scopeScroll[0], this._scopeScroll[1]],
+        ) || 0;
+        this.progress = progress;
+
+        return force || (progress !== prevProgress);
+    }
+
+
+    /**
+     * Destroy the module
+     */
+    protected _destroy () {
+        super._destroy();
+        this._scrollEvent?.remove();
+        this._loadedEvent?.cancel();
+    }
+}

package/src/ts/components/scroll/types.ts

@@ -1,8 +1,6 @@
-export interface ScrollableElement {
-    scrollTop: number;
-    scrollTo(options: ScrollToOptions): void;
-    scrollTo(x: number, y: number): void;
-    scrollLeft: number;
+import { ScrollLike } from '../../utils/types/general';
+
+export interface ScrollableElement extends ScrollLike {
     scrollWidth: number;
     scrollHeight: number;
     clientWidth: number;

package/src/ts/index.ts

@@ -1,6 +1,7 @@
 import * as common from './utils/common';
 import * as listeners from './utils/listeners';
 import * as math from './utils/math';
+import * as scroll from './utils/scroll';
 
 import * as GeneralTypes from './utils/types/general';
 
@@ -39,6 +40,7 @@ import { ScrollEventsBase, NScrollEventsBase } from './components/scroll/scrolla
 import { ScrollView, NScrollView } from './components/scroll/scrollable/ScrollView';
 import { SmoothScrollKeyboardPlugin, NSmoothScrollKeyboardPlugin } from './components/scroll/plugins/SmoothScrollKeyboardPlugin';
 import { SmoothScrollDragPlugin, NSmoothScrollDragPlugin } from './components/scroll/plugins/SmoothScrollDragPlugin';
+import { ScrollSectionProgress, NScrollSectionProgress } from './components/scroll/section/ScrollSectionProgress';
 
 import { SplitText, NSplitText } from './components/text/SplitText';
 
@@ -48,6 +50,7 @@ const utils = {
     common,
     listeners,
     math,
+    scroll,
 };
 
 
@@ -91,6 +94,7 @@ export {
     ScrollView, NScrollView,
     SmoothScrollKeyboardPlugin, NSmoothScrollKeyboardPlugin,
     SmoothScrollDragPlugin, NSmoothScrollDragPlugin,
+    ScrollSectionProgress, NScrollSectionProgress,
 
     SplitText, NSplitText,
 

package/src/ts/utils/scroll/getScrollValues.ts

@@ -0,0 +1,20 @@
+import { ScrollLike } from '../types/general';
+
+/**
+ * Get scroll values of a certain element
+ */
+export default function getScrollValues (
+    selector: (Window | Element | ScrollLike | undefined) = window,
+) {
+    if (selector) {
+        const scrollTop = selector instanceof Window
+            ? selector.pageYOffset : selector.scrollTop;
+        const scrollLeft = selector instanceof Window
+            ? selector.pageXOffset : selector.scrollLeft;
+        return {
+            scrollTop,
+            scrollLeft,
+        };
+    }
+    return undefined;
+}

package/src/ts/utils/scroll/index.ts

@@ -0,0 +1,9 @@
+import getValues from './getScrollValues';
+import scrollTo from './scrollTo';
+import scrollToElement from './scrollToElement';
+
+export {
+    getValues,
+    scrollTo as to,
+    scrollToElement as toElement,
+};

package/src/ts/utils/scroll/scrollTo.ts

@@ -0,0 +1,65 @@
+import { Timeline } from '../../components/timeline/Timeline';
+import { ScrollLike } from '../types/general';
+import getScrollValues from './getScrollValues';
+
+interface Props {
+    /**
+     * @default window
+     */
+    container?: Window | Element | ScrollLike;
+    /**
+     * top padding
+     * @default 0
+     */
+    top?: number;
+    /**
+     * left padding
+     * @default 0
+     */
+    left?: number;
+    /**
+     * scroll duration
+     * @default 250
+     */
+    duration?: number;
+}
+
+/**
+ * Scroll to coordinates
+ */
+export default function scrollTo ({
+    container = window,
+    top = 0,
+    left = 0,
+    duration = 250,
+}: Props) {
+    return new Promise<void>((
+        resolve, reject,
+    ) => {
+        // save start values
+        const startValues = getScrollValues(container);
+        if (startValues) {
+            // create animation
+            const timeline = new Timeline({
+                duration,
+            });
+            timeline.addCallback('progress', (data) => {
+                if (container) {
+                    container.scrollTo({
+                        top: startValues.scrollTop
+                            + (top - startValues.scrollTop) * data.easing,
+                        left: startValues.scrollLeft
+                            + (left - startValues.scrollLeft) * data.easing,
+                        behavior: 'auto',
+                    });
+                }
+            });
+            timeline.addCallback('end', () => {
+                resolve();
+            });
+            timeline.play();
+            return;
+        }
+        reject();
+    });
+}

package/src/ts/utils/scroll/scrollToElement.ts

@@ -0,0 +1,74 @@
+import { selectOne } from 'vevet-dom';
+import { ScrollLike } from '../types/general';
+import getScrollValues from './getScrollValues';
+import clamp from '../math/clamp';
+import scrollTo from './scrollTo';
+
+interface Props {
+    /**
+     * @default window
+     */
+    container?: Window | Element | ScrollLike;
+    /**
+     * The target element
+     */
+    el: Element | string;
+    /**
+     * top padding
+     * @default 0
+     */
+    top?: number;
+    /**
+     * left padding
+     * @default 0
+     */
+    left?: number;
+    /**
+     * scroll duration
+     * @default 250
+     */
+    duration?: number;
+}
+
+/**
+ * Scroll to element
+ */
+export default function scrollToElement ({
+    container = window,
+    el,
+    top = 0,
+    left = 0,
+    duration = 250,
+}: Props) {
+    return new Promise<void>((
+        resolve, reject,
+    ) => {
+        const startValues = getScrollValues(container);
+        if (startValues) {
+            const element = selectOne(el);
+            if (element) {
+                const bounding = element.getBoundingClientRect();
+                const toTop = clamp(
+                    bounding.top + startValues.scrollTop - top,
+                    [0, Infinity],
+                );
+                const toLeft = clamp(
+                    bounding.left + startValues.scrollLeft - left,
+                    [0, Infinity],
+                );
+                scrollTo({
+                    container,
+                    top: toTop,
+                    left: toLeft,
+                    duration,
+                }).then(() => {
+                    resolve();
+                }).catch(() => {
+                    reject();
+                });
+            }
+            return;
+        }
+        reject();
+    });
+}

package/src/ts/utils/types/general.ts

@@ -5,3 +5,10 @@ export interface IRemovable {
 export interface IDestroyable {
     destroy: () => void;
 }
+
+export interface ScrollLike {
+    scrollTop: number;
+    scrollLeft: number;
+    scrollTo(options: ScrollToOptions): void;
+    scrollTo(x: number, y: number): void;
+}