@studiometa/ui 0.2.9 → 0.2.12

package/molecules/Slider/Slider.cjs

@@ -53,6 +53,7 @@ var Slider = class extends import_js_toolkit.Base {
     center: 0,
     right: 0
   };
+  hasFocus = false;
   get currentState() {
     return this.states[this.currentIndex];
   }
@@ -82,15 +83,46 @@ var Slider = class extends import_js_toolkit.Base {
       center: originRect.x + originRect.width / 2,
       right: originRect.x + originRect.width
     };
-    return this.$children.SliderItem.map((item) => {
-      return {
-        x: {
-          left: (item.rect.x - this.origins.left) * -1,
-          center: (item.rect.x + item.rect.width / 2 - this.origins.center) * -1,
-          right: (item.rect.x + item.rect.width - this.origins.right) * -1
+    const states = this.$children.SliderItem.map((item) => ({
+      x: {
+        left: (item.rect.x - this.origins.left) * -1,
+        center: (item.rect.x + item.rect.width / 2 - this.origins.center) * -1,
+        right: (item.rect.x + item.rect.width - this.origins.right) * -1
+      }
+    }));
+    if (this.$options.contain) {
+      const { mode } = this.$options;
+      if (mode === "left") {
+        const lastChild = this.$children.SliderItem.at(-1);
+        const maxState = states.find((state) => {
+          const lastChildPosition = lastChild.rect.x - this.origins.left + lastChild.rect.width + state.x.left;
+          const diffWithWrapperBound = originRect.width - lastChildPosition;
+          if (diffWithWrapperBound > 0) {
+            state.x.left = Math.min(state.x.left + diffWithWrapperBound, 0);
+            return true;
+          }
+          return false;
+        });
+        if (maxState) {
+          return states.map((state) => {
+            state.x.left = Math.max(state.x.left, maxState.x.left);
+            return state;
+          });
         }
-      };
-    });
+      }
+      if (mode === "right") {
+        const maxStateIndex = states.findIndex((state) => state.x.right <= 0);
+        const maxState = maxStateIndex < 0 ? states.at(-1) : states[maxStateIndex - 1];
+        return states.map((state) => {
+          state.x.right = maxStateIndex < 0 ? maxState.x.right : Math.min(state.x.right, 0);
+          return state;
+        });
+      }
+      if (mode === "center" && import_utils.isDev) {
+        console.warn(`[${this.$id}]`, "The `center` mode is not yet compatible with the `contain` mode.");
+      }
+    }
+    return states;
   }
   getOriginByMode(mode) {
     return this.origins[mode ?? this.$options.mode];
@@ -124,25 +156,23 @@ var Slider = class extends import_js_toolkit.Base {
     }
     this.goTo(this.currentIndex - 1);
   }
-  goTo(index) {
+  goTo(index, { withInstantMove = true } = {}) {
     if (index < 0 || index > this.indexMax) {
       throw new Error("Index out of bound.");
     }
-    let state = this.getStateValueByMode(this.states[index].x);
-    if (this.$options.contain) {
-      if (this.$children.SliderItem[this.indexMax].willBeFullyVisible(state)) {
-        state = this.getStateValueByMode(this.lastState.x, "right");
-      } else if (this.$children.SliderItem[0].willBeFullyVisible(state)) {
-        state = this.getStateValueByMode(this.firstState.x, "left");
-      }
-    }
+    const currentState = this.getStateValueByMode(this.currentState.x);
+    const state = this.getStateValueByMode(this.states[index].x);
     const itemsToMove = this.getVisibleItems(state);
-    if (index < this.currentIndex) {
-      itemsToMove.reverse();
-    }
+    const invisibleItemsToMoveInstantly = this.getInvisibleItems(state);
     itemsToMove.forEach((item) => {
+      if (currentState !== state && withInstantMove) {
+        item.moveInstantly(currentState);
+      }
       (0, import_utils.nextFrame)(() => item.move(state));
     });
+    invisibleItemsToMoveInstantly.forEach((item) => {
+      item.moveInstantly(state);
+    });
     this.currentIndex = index;
     this.$emit("goto", index);
   }
@@ -162,12 +192,12 @@ var Slider = class extends import_js_toolkit.Base {
     if (Math.abs(props.delta.y) > Math.abs(props.delta.x)) {
       return;
     }
-    let finalX = (0, import_utils.clamp)((0, import_utils.inertiaFinalValue)(this.__distanceX, props.delta.x * this.$options.sensitivity), 0, this.getStateValueByMode(this.lastState.x));
+    let finalX = (0, import_utils.clamp)((0, import_utils.inertiaFinalValue)(this.__distanceX, props.delta.x * this.$options.dropSensitivity), 0, this.getStateValueByMode(this.lastState.x));
     const absoluteDifferencesBetweenDistanceAndState = this.states.map((state) => Math.abs(finalX - this.getStateValueByMode(state.x)));
     const minimumDifference = Math.min(...absoluteDifferencesBetweenDistanceAndState);
     const closestIndex = absoluteDifferencesBetweenDistanceAndState.findIndex((number) => number === minimumDifference);
     if (this.$options.fitBounds) {
-      this.goTo(closestIndex);
+      this.goTo(closestIndex, { withInstantMove: false });
     } else {
       if (this.$options.contain) {
         finalX = Math.min(this.containMinState, finalX);
@@ -179,6 +209,21 @@ var Slider = class extends import_js_toolkit.Base {
       this.currentIndex = closestIndex;
     }
   }
+  onWrapperFocus() {
+    this.hasFocus = true;
+  }
+  onWrapperBlur() {
+    this.hasFocus = false;
+  }
+  keyed({ LEFT, RIGHT, isDown }) {
+    if (this.hasFocus && isDown) {
+      if (LEFT) {
+        this.goPrev();
+      } else if (RIGHT) {
+        this.goNext();
+      }
+    }
+  }
   prepareInvisibleItems() {
     const state = this.states[this.currentIndex];
     const nextItemsToPrepare = [];
@@ -222,7 +267,7 @@ var Slider = class extends import_js_toolkit.Base {
 };
 __publicField(Slider, "config", {
   name: "Slider",
-  refs: ["wrapper"],
+  refs: ["wrapper", "debug"],
   emits: ["goto", "index"],
   components: {
     SliderItem: import_SliderItem.default,
@@ -232,7 +277,8 @@ __publicField(Slider, "config", {
     mode: { type: String, default: "left" },
     fitBounds: Boolean,
     contain: Boolean,
-    sensitivity: { type: Number, default: 1 }
+    sensitivity: { type: Number, default: 1 },
+    dropSensitivity: { type: Number, default: 2 }
   }
 });
 if (module.exports.default) module.exports = module.exports.default;

package/molecules/Slider/Slider.d.ts

@@ -25,7 +25,6 @@
 /**
  * Orchestrate the slider items state transition.
  * @todo a11y
- * @todo better state management with `mode` option
  */
 export default class Slider extends Base {
     /**
@@ -50,6 +49,10 @@ export default class Slider extends Base {
                 type: NumberConstructor;
                 default: number;
             };
+            dropSensitivity: {
+                type: NumberConstructor;
+                default: number;
+            };
         };
     };
     __distanceX: number;
@@ -80,6 +83,11 @@ export default class Slider extends Base {
      * @type {Record<SliderModes, number>}
      */
     origins: Record<SliderModes, number>;
+    /**
+     * Wether or not the wrapper is focused.
+     * @type {boolean}
+     */
+    hasFocus: boolean;
     /**
      * Get the current state.
      * @returns {SliderState}
@@ -122,7 +130,6 @@ export default class Slider extends Base {
     /**
      * Get the states for each SliderItem.
      *
-     * @todo save value for every available modes to avoid recalculation when switching
      * @this {SliderInterface}
      */
     getStates(this: SliderInterface): {
@@ -175,9 +182,12 @@ export default class Slider extends Base {
      *
      * @this  {SliderInterface}
      * @param {number} index
+     * @param {{ withInstantMove?: boolean }} [options]
      * @returns {void}
      */
-    goTo(this: SliderInterface, index: number): void;
+    goTo(this: SliderInterface, index: number, { withInstantMove }?: {
+        withInstantMove?: boolean;
+    }): void;
     /**
      * Listen to the Draggable `start` event.
      *
@@ -199,6 +209,22 @@ export default class Slider extends Base {
      * @returns {void}
      */
     onSliderDragDrop(this: SliderInterface, props: import('@studiometa/js-toolkit/services/drag').DragServiceProps): void;
+    /**
+     * Enable focus.
+     * @returns {void}
+     */
+    onWrapperFocus(): void;
+    /**
+     * Disable focus.
+     * @returns {void}
+     */
+    onWrapperBlur(): void;
+    /**
+     * Go prev or next when focus is on the wrapper and pressing arrow keys.
+     * @param   {import('@studiometa/js-toolkit/services/key').KeyServiceProps} props
+     * @returns {void}
+     */
+    keyed({ LEFT, RIGHT, isDown }: import('@studiometa/js-toolkit/services/key').KeyServiceProps): void;
     /**
      * Prepare invisible items.
      * @returns {void}

package/molecules/Slider/Slider.js

@@ -1 +1 @@
-import{Base as o}from"@studiometa/js-toolkit";import{clamp as d,inertiaFinalValue as c,nextFrame as h}from"@studiometa/js-toolkit/utils";import u from"./SliderDrag.js";import g from"./SliderItem.js";class x extends o{static config={name:"Slider",refs:["wrapper"],emits:["goto","index"],components:{SliderItem:g,SliderDrag:u},options:{mode:{type:String,default:"left"},fitBounds:Boolean,contain:Boolean,sensitivity:{type:Number,default:1}}};__distanceX=0;__initialX=0;__currentIndex=0;get currentIndex(){return this.__currentIndex}set currentIndex(e){this.currentSliderItem.disactivate(),this.$emit("index",e),this.__currentIndex=e,this.currentSliderItem.activate()}states=[];origins={left:0,center:0,right:0};get currentState(){return this.states[this.currentIndex]}get firstState(){return this.states[0]}get lastState(){return this.states[this.states.length-1]}get containMinState(){return this.getStateValueByMode(this.firstState.x,"left")}get containMaxState(){return this.getStateValueByMode(this.lastState.x,"right")}get indexMax(){return this.$children.SliderItem.length-1}get currentSliderItem(){return this.$children.SliderItem[this.currentIndex]}getStates(){const{wrapper:e}=this.$refs,t=e.getBoundingClientRect();return this.origins={left:t.left,center:t.x+t.width/2,right:t.x+t.width},this.$children.SliderItem.map(i=>({x:{left:(i.rect.x-this.origins.left)*-1,center:(i.rect.x+i.rect.width/2-this.origins.center)*-1,right:(i.rect.x+i.rect.width-this.origins.right)*-1}}))}getOriginByMode(e){return this.origins[e??this.$options.mode]}getStateValueByMode(e,t){return e[t??this.$options.mode]}mounted(){this.states=this.getStates(),this.prepareInvisibleItems(),this.goTo(this.currentIndex)}resized(){h(()=>{this.states=this.getStates(),h(()=>{this.prepareInvisibleItems(),this.goTo(this.currentIndex)})})}goNext(){this.currentIndex+1>this.indexMax||this.goTo(this.currentIndex+1)}goPrev(){this.currentIndex-1<0||this.goTo(this.currentIndex-1)}goTo(e){if(e<0||e>this.indexMax)throw new Error("Index out of bound.");let t=this.getStateValueByMode(this.states[e].x);this.$options.contain&&(this.$children.SliderItem[this.indexMax].willBeFullyVisible(t)?t=this.getStateValueByMode(this.lastState.x,"right"):this.$children.SliderItem[0].willBeFullyVisible(t)&&(t=this.getStateValueByMode(this.firstState.x,"left")));const i=this.getVisibleItems(t);e<this.currentIndex&&i.reverse(),i.forEach(s=>{h(()=>s.move(t))}),this.currentIndex=e,this.$emit("goto",e)}onSliderDragStart(){this.__initialX=this.currentSliderItem?this.currentSliderItem.x:0}onSliderDragDrag(e){Math.abs(e.delta.y)>Math.abs(e.delta.x)||(this.__distanceX=this.__initialX+e.distance.x*this.$options.sensitivity,this.getVisibleItems(this.__distanceX).forEach(t=>{t.moveInstantly(this.__distanceX)}))}onSliderDragDrop(e){if(Math.abs(e.delta.y)>Math.abs(e.delta.x))return;let t=d(c(this.__distanceX,e.delta.x*this.$options.sensitivity),0,this.getStateValueByMode(this.lastState.x));const i=this.states.map(n=>Math.abs(t-this.getStateValueByMode(n.x))),s=Math.min(...i),r=i.findIndex(n=>n===s);this.$options.fitBounds?this.goTo(r):(this.$options.contain&&(t=Math.min(this.containMinState,t),t=Math.max(this.containMaxState,t)),this.$children.SliderItem.forEach(n=>{n.move(t)}),this.currentIndex=r)}prepareInvisibleItems(){const e=this.states[this.currentIndex],t=[],i=[];this.getInvisibleItems(this.getStateValueByMode(e.x)).forEach((s,r)=>{if(r>this.currentIndex){t.push(s);return}r<this.currentIndex&&i.push(s)}),t.forEach(s=>{const r=this.getStateWhereItemWillBeInvisible(s);r&&s.moveInstantly(this.getStateValueByMode(r.x))}),i.forEach(s=>{const r=this.getStateWhereItemWillBeInvisible(s,{reversed:!0});r&&s.moveInstantly(this.getStateValueByMode(r.x))})}getStateWhereItemWillBeInvisible(e,{reversed:t=!1}={}){const i=this.states.filter(a=>e.willBeVisible(this.getStateValueByMode(a.x))),s=i[0],r=i[i.length-1],n=this.states.findIndex(a=>this.getStateValueByMode(a.x)===this.getStateValueByMode(s.x)),l=this.states.findIndex(a=>a.x===r.x);return t?this.states[l+1]:this.states[n-1]}getVisibleItems(e){return this.$children.SliderItem.filter(t=>t.isVisible||t.willBeVisible(e))}getInvisibleItems(e){return this.$children.SliderItem.filter(t=>!t.isVisible&&!t.willBeVisible(e))}}export{x as default};
+import{Base as d}from"@studiometa/js-toolkit";import{clamp as c,inertiaFinalValue as u,nextFrame as h,isDev as f}from"@studiometa/js-toolkit/utils";import x from"./SliderDrag.js";import g from"./SliderItem.js";class I extends d{static config={name:"Slider",refs:["wrapper","debug"],emits:["goto","index"],components:{SliderItem:g,SliderDrag:x},options:{mode:{type:String,default:"left"},fitBounds:Boolean,contain:Boolean,sensitivity:{type:Number,default:1},dropSensitivity:{type:Number,default:2}}};__distanceX=0;__initialX=0;__currentIndex=0;get currentIndex(){return this.__currentIndex}set currentIndex(t){this.currentSliderItem.disactivate(),this.$emit("index",t),this.__currentIndex=t,this.currentSliderItem.activate()}states=[];origins={left:0,center:0,right:0};hasFocus=!1;get currentState(){return this.states[this.currentIndex]}get firstState(){return this.states[0]}get lastState(){return this.states[this.states.length-1]}get containMinState(){return this.getStateValueByMode(this.firstState.x,"left")}get containMaxState(){return this.getStateValueByMode(this.lastState.x,"right")}get indexMax(){return this.$children.SliderItem.length-1}get currentSliderItem(){return this.$children.SliderItem[this.currentIndex]}getStates(){const{wrapper:t}=this.$refs,e=t.getBoundingClientRect();this.origins={left:e.left,center:e.x+e.width/2,right:e.x+e.width};const s=this.$children.SliderItem.map(i=>({x:{left:(i.rect.x-this.origins.left)*-1,center:(i.rect.x+i.rect.width/2-this.origins.center)*-1,right:(i.rect.x+i.rect.width-this.origins.right)*-1}}));if(this.$options.contain){const{mode:i}=this.$options;if(i==="left"){const n=this.$children.SliderItem.at(-1),a=s.find(r=>{const o=n.rect.x-this.origins.left+n.rect.width+r.x.left,l=e.width-o;return l>0?(r.x.left=Math.min(r.x.left+l,0),!0):!1});if(a)return s.map(r=>(r.x.left=Math.max(r.x.left,a.x.left),r))}if(i==="right"){const n=s.findIndex(r=>r.x.right<=0),a=n<0?s.at(-1):s[n-1];return s.map(r=>(r.x.right=n<0?a.x.right:Math.min(r.x.right,0),r))}i==="center"&&f&&console.warn(`[${this.$id}]`,"The `center` mode is not yet compatible with the `contain` mode.")}return s}getOriginByMode(t){return this.origins[t??this.$options.mode]}getStateValueByMode(t,e){return t[e??this.$options.mode]}mounted(){this.states=this.getStates(),this.prepareInvisibleItems(),this.goTo(this.currentIndex)}resized(){h(()=>{this.states=this.getStates(),h(()=>{this.prepareInvisibleItems(),this.goTo(this.currentIndex)})})}goNext(){this.currentIndex+1>this.indexMax||this.goTo(this.currentIndex+1)}goPrev(){this.currentIndex-1<0||this.goTo(this.currentIndex-1)}goTo(t,{withInstantMove:e=!0}={}){if(t<0||t>this.indexMax)throw new Error("Index out of bound.");const s=this.getStateValueByMode(this.currentState.x),i=this.getStateValueByMode(this.states[t].x),n=this.getVisibleItems(i),a=this.getInvisibleItems(i);n.forEach(r=>{s!==i&&e&&r.moveInstantly(s),h(()=>r.move(i))}),a.forEach(r=>{r.moveInstantly(i)}),this.currentIndex=t,this.$emit("goto",t)}onSliderDragStart(){this.__initialX=this.currentSliderItem?this.currentSliderItem.x:0}onSliderDragDrag(t){Math.abs(t.delta.y)>Math.abs(t.delta.x)||(this.__distanceX=this.__initialX+t.distance.x*this.$options.sensitivity,this.getVisibleItems(this.__distanceX).forEach(e=>{e.moveInstantly(this.__distanceX)}))}onSliderDragDrop(t){if(Math.abs(t.delta.y)>Math.abs(t.delta.x))return;let e=c(u(this.__distanceX,t.delta.x*this.$options.dropSensitivity),0,this.getStateValueByMode(this.lastState.x));const s=this.states.map(a=>Math.abs(e-this.getStateValueByMode(a.x))),i=Math.min(...s),n=s.findIndex(a=>a===i);this.$options.fitBounds?this.goTo(n,{withInstantMove:!1}):(this.$options.contain&&(e=Math.min(this.containMinState,e),e=Math.max(this.containMaxState,e)),this.$children.SliderItem.forEach(a=>{a.move(e)}),this.currentIndex=n)}onWrapperFocus(){this.hasFocus=!0}onWrapperBlur(){this.hasFocus=!1}keyed({LEFT:t,RIGHT:e,isDown:s}){this.hasFocus&&s&&(t?this.goPrev():e&&this.goNext())}prepareInvisibleItems(){const t=this.states[this.currentIndex],e=[],s=[];this.getInvisibleItems(this.getStateValueByMode(t.x)).forEach((i,n)=>{if(n>this.currentIndex){e.push(i);return}n<this.currentIndex&&s.push(i)}),e.forEach(i=>{const n=this.getStateWhereItemWillBeInvisible(i);n&&i.moveInstantly(this.getStateValueByMode(n.x))}),s.forEach(i=>{const n=this.getStateWhereItemWillBeInvisible(i,{reversed:!0});n&&i.moveInstantly(this.getStateValueByMode(n.x))})}getStateWhereItemWillBeInvisible(t,{reversed:e=!1}={}){const s=this.states.filter(o=>t.willBeVisible(this.getStateValueByMode(o.x))),i=s[0],n=s[s.length-1],a=this.states.findIndex(o=>this.getStateValueByMode(o.x)===this.getStateValueByMode(i.x)),r=this.states.findIndex(o=>o.x===n.x);return e?this.states[r+1]:this.states[a-1]}getVisibleItems(t){return this.$children.SliderItem.filter(e=>e.isVisible||e.willBeVisible(t))}getInvisibleItems(t){return this.$children.SliderItem.filter(e=>!e.isVisible&&!e.willBeVisible(t))}}export{I as default};

package/molecules/Slider/SliderDots.cjs

@@ -30,12 +30,17 @@ __export(SliderDots_exports, {
   default: () => SliderDots
 });
 module.exports = __toCommonJS(SliderDots_exports);
+var import_decorators = require("../../decorators/index.cjs");
 var import_AbstractSliderChild = __toESM(require("./AbstractSliderChild.cjs"), 1);
-var SliderDots = class extends import_AbstractSliderChild.default {
+var SliderDots = class extends (0, import_decorators.withTransition)(import_AbstractSliderChild.default) {
+  get target() {
+    return this.$refs.dots;
+  }
+  currentIndex = 0;
   update(index) {
-    this.$refs.dots.forEach((dot, i) => {
-      dot.classList.toggle("is-active", index === i);
-    });
+    this.leave(this.$refs.dots[this.currentIndex]);
+    this.enter(this.$refs.dots[index]);
+    this.currentIndex = index;
   }
   onDotsClick(event, index) {
     this.$parent.goTo(index);

package/molecules/Slider/SliderDots.d.ts

@@ -1,3 +1,8 @@
+declare const SliderDots_base: typeof AbstractSliderChild & (new (...a: any[]) => {
+    readonly target: HTMLElement | HTMLElement[];
+    enter(target?: HTMLElement | HTMLElement[]): Promise<void | void[]>;
+    leave(target?: HTMLElement | HTMLElement[]): Promise<void | void[]>;
+});
 /**
  * @typedef {SliderDots & {
  *   $refs: {
@@ -8,7 +13,7 @@
 /**
  * SliderDots class.
  */
-export default class SliderDots extends AbstractSliderChild {
+export default class SliderDots extends SliderDots_base {
     /**
      * Config.
      */
@@ -16,6 +21,17 @@ export default class SliderDots extends AbstractSliderChild {
         name: string;
         refs: string[];
     };
+    /**
+     * Get target.
+     * @this {SliderDotsInterface}
+     * @returns {HTMLButtonElement[]}
+     */
+    get target(): HTMLButtonElement[];
+    /**
+     * The current active index.
+     * @type {number}
+     */
+    currentIndex: number;
     /**
      * Update dots classes according to the new index.
      *
@@ -39,3 +55,4 @@ export type SliderDotsInterface = SliderDots & {
     };
 };
 import AbstractSliderChild from "./AbstractSliderChild.js";
+export {};

package/molecules/Slider/SliderDots.js

@@ -1 +1 @@
-import o from"./AbstractSliderChild.js";class i extends o{static config={name:"SliderDots",refs:["dots[]"]};update(s){this.$refs.dots.forEach((t,e)=>{t.classList.toggle("is-active",s===e)})}onDotsClick(s,t){this.$parent.goTo(t)}}export{i as default};
+import{withTransition as r}from"../../decorators/index.js";import s from"./AbstractSliderChild.js";class i extends r(s){static config={name:"SliderDots",refs:["dots[]"]};get target(){return this.$refs.dots}currentIndex=0;update(t){this.leave(this.$refs.dots[this.currentIndex]),this.enter(this.$refs.dots[t]),this.currentIndex=t}onDotsClick(t,e){this.$parent.goTo(e)}}export{i as default};

package/molecules/Slider/SliderDrag.cjs

@@ -29,6 +29,15 @@ __export(SliderDrag_exports, {
 module.exports = __toCommonJS(SliderDrag_exports);
 var import_js_toolkit = require("@studiometa/js-toolkit");
 var SliderDrag = class extends (0, import_js_toolkit.withDrag)(import_js_toolkit.Base) {
+  get shouldPreventScroll() {
+    const { distance } = this.$services.get("dragged");
+    return Math.abs(distance.x) > this.$options.scrollLockThreshold && Math.abs(distance.x) > Math.abs(distance.y);
+  }
+  onTouchmove(event) {
+    if (this.shouldPreventScroll) {
+      event.preventDefault();
+    }
+  }
   dragged(props) {
     this.$emit(props.mode, props);
   }
@@ -36,9 +45,11 @@ var SliderDrag = class extends (0, import_js_toolkit.withDrag)(import_js_toolkit
 __publicField(SliderDrag, "config", {
   name: "SliderDrag",
   emits: ["start", "drag", "drop", "inertia", "stop"],
-  sensitivity: {
-    type: Number,
-    default: 1
+  options: {
+    scrollLockThreshold: {
+      type: Number,
+      default: 10
+    }
   }
 });
 if (module.exports.default) module.exports = module.exports.default;

package/molecules/Slider/SliderDrag.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @typedef {SliderDrag & {
+ *   $options: {
+ *     scrollLockThreshold: number;
+ *   }
+ * }} SliderDragInterface
+ */
 /**
  * SliderDrag class.
  */
@@ -8,11 +15,27 @@ export default class SliderDrag extends Base {
     static config: {
         name: string;
         emits: string[];
-        sensitivity: {
-            type: NumberConstructor;
-            default: number;
+        options: {
+            scrollLockThreshold: {
+                type: NumberConstructor;
+                default: number;
+            };
         };
     };
+    /**
+     * Test if the scroll should be blocked. Used with the touchmove event to prevent
+     * scrolling vertically when trying to drag the slider.
+     *
+     * @this {SliderDragInterface}
+     * @returns {boolean}
+     */
+    get shouldPreventScroll(): boolean;
+    /**
+     * Touchmove handler.
+     * @param   {TouchEvent} event
+     * @returns {void}
+     */
+    onTouchmove(event: TouchEvent): void;
     /**
      * Emit drag events.
      * @param   {import('@studiometa/js-toolkit/services/drag').DragServiceProps} props
@@ -20,4 +43,9 @@ export default class SliderDrag extends Base {
      */
     dragged(props: import('@studiometa/js-toolkit/services/drag').DragServiceProps): void;
 }
+export type SliderDragInterface = SliderDrag & {
+    $options: {
+        scrollLockThreshold: number;
+    };
+};
 import { Base } from "@studiometa/js-toolkit";

package/molecules/Slider/SliderDrag.js

@@ -1 +1 @@
-import{Base as e,withDrag as i}from"@studiometa/js-toolkit";class a extends i(e){static config={name:"SliderDrag",emits:["start","drag","drop","inertia","stop"],sensitivity:{type:Number,default:1}};dragged(t){this.$emit(t.mode,t)}}export{a as default};
+import{Base as t,withDrag as r}from"@studiometa/js-toolkit";class s extends r(t){static config={name:"SliderDrag",emits:["start","drag","drop","inertia","stop"],options:{scrollLockThreshold:{type:Number,default:10}}};get shouldPreventScroll(){const{distance:e}=this.$services.get("dragged");return Math.abs(e.x)>this.$options.scrollLockThreshold&&Math.abs(e.x)>Math.abs(e.y)}onTouchmove(e){this.shouldPreventScroll&&e.preventDefault()}dragged(e){this.$emit(e.mode,e)}}export{s as default};

package/molecules/Slider/SliderItem.cjs

@@ -56,7 +56,7 @@ var SliderItem = class extends (0, import_js_toolkit.withIntersectionObserver)(i
     this.isVisible = isIntersecting;
   }
   ticked() {
-    this.dampedX = (0, import_utils.damp)(this.x, this.dampedX, 0.2, 1e-5);
+    this.dampedX = (0, import_utils.damp)(this.x, this.dampedX, 0.1, 1e-5);
     this.render();
     if (this.dampedX === this.x) {
       this.$services.disable("ticked");

package/molecules/Slider/SliderItem.js

@@ -1 +1 @@
-import{Base as t,withIntersectionObserver as s}from"@studiometa/js-toolkit";import{damp as d,domScheduler as h,transform as r}from"@studiometa/js-toolkit/utils";class l extends s(t,{threshold:[0,1]}){static config={name:"SliderItem",emits:["is-fully-visible","is-partially-visible","is-hidden"]};isVisible=!1;x=0;dampedX=0;mounted(){this.updateRectAdjustedWithX()}resized(){this.updateRectAdjustedWithX()}destroyed(){this.moveInstantly(0)}intersected([{intersectionRatio:e,isIntersecting:i}]){e>=1?(this.$emit("is-fully-visible"),this.$el.setAttribute("aria-hidden","false")):e>0?(this.$emit("is-partially-visible"),this.$el.setAttribute("aria-hidden","true")):(this.$emit("is-hidden"),this.$el.setAttribute("aria-hidden","true")),this.isVisible=i}ticked(){this.dampedX=d(this.x,this.dampedX,.2,1e-5),this.render(),this.dampedX===this.x&&this.$services.disable("ticked")}activate(){this.$el.classList.add("is-active")}disactivate(){this.$el.classList.remove("is-active")}move(e){this.x=e,this.$services.has("ticked")||this.$services.enable("ticked")}moveInstantly(e){this.x=e,this.dampedX=e,this.render()}render(){h.write(()=>{r(this.$el,{x:this.dampedX})})}willBeVisible(e){return this.rect.x+e<window.innerWidth*1.5&&this.rect.x+e+this.rect.width>window.innerWidth*-.5}willBeFullyVisible(e){return this.rect.x+e<window.innerWidth&&this.rect.x+e>0&&this.rect.x+e+this.rect.width<window.innerWidth&&this.rect.x+e+this.rect.width>0}updateRectAdjustedWithX(){const e=this.x*-1,i=this.$el.getBoundingClientRect().toJSON();this.rect={...i,left:i.left+e,right:i.left+e+i.width,x:i.left+e}}}export{l as default};
+import{Base as t,withIntersectionObserver as s}from"@studiometa/js-toolkit";import{damp as d,domScheduler as h,transform as r}from"@studiometa/js-toolkit/utils";class l extends s(t,{threshold:[0,1]}){static config={name:"SliderItem",emits:["is-fully-visible","is-partially-visible","is-hidden"]};isVisible=!1;x=0;dampedX=0;mounted(){this.updateRectAdjustedWithX()}resized(){this.updateRectAdjustedWithX()}destroyed(){this.moveInstantly(0)}intersected([{intersectionRatio:e,isIntersecting:i}]){e>=1?(this.$emit("is-fully-visible"),this.$el.setAttribute("aria-hidden","false")):e>0?(this.$emit("is-partially-visible"),this.$el.setAttribute("aria-hidden","true")):(this.$emit("is-hidden"),this.$el.setAttribute("aria-hidden","true")),this.isVisible=i}ticked(){this.dampedX=d(this.x,this.dampedX,.1,1e-5),this.render(),this.dampedX===this.x&&this.$services.disable("ticked")}activate(){this.$el.classList.add("is-active")}disactivate(){this.$el.classList.remove("is-active")}move(e){this.x=e,this.$services.has("ticked")||this.$services.enable("ticked")}moveInstantly(e){this.x=e,this.dampedX=e,this.render()}render(){h.write(()=>{r(this.$el,{x:this.dampedX})})}willBeVisible(e){return this.rect.x+e<window.innerWidth*1.5&&this.rect.x+e+this.rect.width>window.innerWidth*-.5}willBeFullyVisible(e){return this.rect.x+e<window.innerWidth&&this.rect.x+e>0&&this.rect.x+e+this.rect.width<window.innerWidth&&this.rect.x+e+this.rect.width>0}updateRectAdjustedWithX(){const e=this.x*-1,i=this.$el.getBoundingClientRect().toJSON();this.rect={...i,left:i.left+e,right:i.left+e+i.width,x:i.left+e}}}export{l as default};

package/molecules/Slider/SliderProgress.cjs

@@ -35,11 +35,10 @@ var import_AbstractSliderChild = __toESM(require("./AbstractSliderChild.cjs"), 1
 var SliderProgress = class extends import_AbstractSliderChild.default {
   update(index) {
     import_utils.domScheduler.read(() => {
-      const unit = this.$refs.progress.clientWidth / (this.$parent.indexMax + 1);
+      const { progress } = this.$refs;
+      const x = (0, import_utils.map)(index, 0, this.$parent.indexMax, progress.clientWidth * -1, 0);
       import_utils.domScheduler.write(() => {
-        this.$refs.progress.style.transform = (0, import_utils.matrix)({
-          translateX: (0, import_utils.map)(index, 0, this.$parent.indexMax, (this.$refs.progress.clientWidth - unit) * -1, 0)
-        });
+        (0, import_utils.transform)(progress, { x });
       });
     });
   }

package/molecules/Slider/SliderProgress.js

@@ -1 +1 @@
-import{matrix as t,map as i,domScheduler as r}from"@studiometa/js-toolkit/utils";import a from"./AbstractSliderChild.js";class o extends a{static config={name:"SliderProgress",refs:["progress"]};update(e){r.read(()=>{const s=this.$refs.progress.clientWidth/(this.$parent.indexMax+1);r.write(()=>{this.$refs.progress.style.transform=t({translateX:i(e,0,this.$parent.indexMax,(this.$refs.progress.clientWidth-s)*-1,0)})})})}}export{o as default};
+import{transform as i,map as o,domScheduler as e}from"@studiometa/js-toolkit/utils";import d from"./AbstractSliderChild.js";class a extends d{static config={name:"SliderProgress",refs:["progress"]};update(s){e.read(()=>{const{progress:r}=this.$refs,t=o(s,0,this.$parent.indexMax,r.clientWidth*-1,0);e.write(()=>{i(r,{x:t})})})}}export{a as default};

package/organisms/Frame/Frame.cjs

@@ -87,11 +87,11 @@ var _Frame = class extends import_js_toolkit.Base {
   onWindowPopstate(event) {
     this.goTo(window.location.href, event.state);
   }
-  onFrameAnchorClick(event, index) {
+  onFrameAnchorClick(index, event) {
     if (!(0, import_js_toolkit.isDirectChild)(this, "Frame", "FrameAnchor", this.$children.FrameAnchor[index])) {
       return;
     }
-    this.$log("onAFrameClick", event, index);
+    this.$log("onAFrameClick", index, event);
     event.preventDefault();
     const anchor = this.$children.FrameAnchor[index];
     if (anchor.href === window.location.href) {
@@ -99,11 +99,11 @@ var _Frame = class extends import_js_toolkit.Base {
     }
     this.goTo(anchor.href);
   }
-  onFrameFormSubmit(event, index) {
+  onFrameFormSubmit(index, event) {
     if (!(0, import_js_toolkit.isDirectChild)(this, "Frame", "FrameForm", this.$children.FrameForm[index])) {
       return;
     }
-    this.$log("onFrameFormFrameSubmit", event);
+    this.$log("onFrameFormFrameSubmit", index, event);
     event.preventDefault();
     const form = this.$children.FrameForm[index];
     const url = new URL(form.action);
@@ -192,7 +192,6 @@ __publicField(Frame, "config", {
     "before-enter",
     "after-enter"
   ],
-  log: true,
   components: {
     FrameAnchor: import_FrameAnchor.default,
     FrameForm: import_FrameForm.default,

package/organisms/Frame/Frame.d.ts

@@ -24,7 +24,6 @@ export default class Frame extends Base {
     static config: {
         name: string;
         emits: string[];
-        log: boolean;
         components: {
             FrameAnchor: typeof FrameAnchor;
             FrameForm: typeof FrameForm;
@@ -86,20 +85,20 @@ export default class Frame extends Base {
      * Prevent click on `FrameAnchor`.
      *
      * @this    {FrameInterface}
-     * @param   {MouseEvent} event
      * @param   {number} index
+     * @param   {MouseEvent} event
      * @returns {void}
      */
-    onFrameAnchorClick(this: FrameInterface, event: MouseEvent, index: number): void;
+    onFrameAnchorClick(this: FrameInterface, index: number, event: MouseEvent): void;
     /**
      * Prevent submit on forms.
      *
      * @this    {FrameInterface}
-     * @param   {SubmitEvent} event
      * @param   {number} index
+     * @param   {SubmitEvent} event
      * @returns {void}
      */
-    onFrameFormSubmit(this: FrameInterface, event: SubmitEvent, index: number): void;
+    onFrameFormSubmit(this: FrameInterface, index: number, event: SubmitEvent): void;
     /**
      * Parge an HTML string into a DOM object.
      * @param   {string} string

package/organisms/Frame/Frame.js

@@ -1 +1 @@
-import{Base as f,isDirectChild as c,getDirectChildren as p}from"@studiometa/js-toolkit";import{nextFrame as m,historyPush as w}from"@studiometa/js-toolkit/utils";import g from"./FrameAnchor.js";import F from"./FrameForm.js";import u from"./FrameTarget.js";function $(){return{left:window.pageXOffset,top:window.pageYOffset}}const a=new Map;class s extends f{static config={name:"Frame",emits:["before-fetch","after-fetch","before-leave","after-leave","before-content","after-content","before-enter","after-enter"],log:!0,components:{FrameAnchor:g,FrameForm:F,FrameTarget:u,Frame:s},options:{history:Boolean}};get id(){return this.$el.id}getDirectChild(e){return this.$children[e]?this.$children.Frame?this.$children[e].filter(t=>this.$children.Frame.every(r=>r.$children[e]?!r.$children[e].includes(t):!0)):this.$children[e]:[]}get directChildrenFrameTarget(){return p(this,"Frame","FrameTarget")}mounted(){this.$options.history&&window.addEventListener("popstate",this)}destroyed(){window.removeEventListener("popstate",this)}handleEvent(e){e.type==="popstate"&&this.onWindowPopstate(e),e.type==="beforeunload"&&this.onWindowUnload()}onWindowUnload(){const{history:e}=window;!e.state||e.replaceState({...e.state,scroll:$()},"")}onWindowPopstate(e){this.goTo(window.location.href,e.state)}onFrameAnchorClick(e,t){if(!c(this,"Frame","FrameAnchor",this.$children.FrameAnchor[t]))return;this.$log("onAFrameClick",e,t),e.preventDefault();const r=this.$children.FrameAnchor[t];r.href!==window.location.href&&this.goTo(r.href)}onFrameFormSubmit(e,t){if(!c(this,"Frame","FrameForm",this.$children.FrameForm[t]))return;this.$log("onFrameFormFrameSubmit",e),e.preventDefault();const r=this.$children.FrameForm[t],i=new URL(r.action);i.search=new URLSearchParams(new FormData(r.$el)).toString(),this.goTo(i.toString())}parseHTML(e=""){return new DOMParser().parseFromString(e,"text/html")}async goTo(e,t=null){this.$log("goTo",e);const r=new URL(e);if(r.origin!==window.location.origin)throw new Error("Cross origin request are not allowed.");this.$emit("before-fetch",e);const i=await this.fetch(e),n=this.parseHTML(i),l=n.querySelector(`#${this.id}`),h=new s(l);h.$children.registerAll(),this.$emit("after-fetch",e,i),this.$emit("before-leave"),await Promise.all(this.directChildrenFrameTarget.map(o=>o.leave())),this.$emit("after-leave"),this.$emit("before-content"),this.directChildrenFrameTarget.map((o,d)=>o.updateContent(h.directChildrenFrameTarget[d])),this.$options.history&&(document.title=n.title,w({path:r.pathname,search:r.searchParams})),t&&(document.scrollingElement.scrollTop=t.top,document.scrollingElement.scrollLeft=t.left),await m(),this.$root.$update(),await m(),this.$emit("after-content"),this.$emit("before-enter"),await Promise.all(this.directChildrenFrameTarget.map(o=>o.enter())),this.$emit("after-enter")}async fetch(e){const t=a.get(e);if(t)return t.status==="pending"?t.promise:t.content;const r=fetch(e);try{a.set(e,{promise:r,status:"pending",content:void 0});const i=await r.then(n=>n.text());return a.set(e,{promise:r,status:"resolved",content:i}),i}catch(i){return a.set(e,{promise:r,status:"error",content:i}),i}}}export{s as default};
+import{Base as f,isDirectChild as c,getDirectChildren as p}from"@studiometa/js-toolkit";import{nextFrame as m,historyPush as w}from"@studiometa/js-toolkit/utils";import g from"./FrameAnchor.js";import F from"./FrameForm.js";import u from"./FrameTarget.js";function $(){return{left:window.pageXOffset,top:window.pageYOffset}}const a=new Map;class s extends f{static config={name:"Frame",emits:["before-fetch","after-fetch","before-leave","after-leave","before-content","after-content","before-enter","after-enter"],components:{FrameAnchor:g,FrameForm:F,FrameTarget:u,Frame:s},options:{history:Boolean}};get id(){return this.$el.id}getDirectChild(e){return this.$children[e]?this.$children.Frame?this.$children[e].filter(r=>this.$children.Frame.every(t=>t.$children[e]?!t.$children[e].includes(r):!0)):this.$children[e]:[]}get directChildrenFrameTarget(){return p(this,"Frame","FrameTarget")}mounted(){this.$options.history&&window.addEventListener("popstate",this)}destroyed(){window.removeEventListener("popstate",this)}handleEvent(e){e.type==="popstate"&&this.onWindowPopstate(e),e.type==="beforeunload"&&this.onWindowUnload()}onWindowUnload(){const{history:e}=window;!e.state||e.replaceState({...e.state,scroll:$()},"")}onWindowPopstate(e){this.goTo(window.location.href,e.state)}onFrameAnchorClick(e,r){if(!c(this,"Frame","FrameAnchor",this.$children.FrameAnchor[e]))return;this.$log("onAFrameClick",e,r),r.preventDefault();const t=this.$children.FrameAnchor[e];t.href!==window.location.href&&this.goTo(t.href)}onFrameFormSubmit(e,r){if(!c(this,"Frame","FrameForm",this.$children.FrameForm[e]))return;this.$log("onFrameFormFrameSubmit",e,r),r.preventDefault();const t=this.$children.FrameForm[e],i=new URL(t.action);i.search=new URLSearchParams(new FormData(t.$el)).toString(),this.goTo(i.toString())}parseHTML(e=""){return new DOMParser().parseFromString(e,"text/html")}async goTo(e,r=null){this.$log("goTo",e);const t=new URL(e);if(t.origin!==window.location.origin)throw new Error("Cross origin request are not allowed.");this.$emit("before-fetch",e);const i=await this.fetch(e),n=this.parseHTML(i),l=n.querySelector(`#${this.id}`),h=new s(l);h.$children.registerAll(),this.$emit("after-fetch",e,i),this.$emit("before-leave"),await Promise.all(this.directChildrenFrameTarget.map(o=>o.leave())),this.$emit("after-leave"),this.$emit("before-content"),this.directChildrenFrameTarget.map((o,d)=>o.updateContent(h.directChildrenFrameTarget[d])),this.$options.history&&(document.title=n.title,w({path:t.pathname,search:t.searchParams})),r&&(document.scrollingElement.scrollTop=r.top,document.scrollingElement.scrollLeft=r.left),await m(),this.$root.$update(),await m(),this.$emit("after-content"),this.$emit("before-enter"),await Promise.all(this.directChildrenFrameTarget.map(o=>o.enter())),this.$emit("after-enter")}async fetch(e){const r=a.get(e);if(r)return r.status==="pending"?r.promise:r.content;const t=fetch(e);try{a.set(e,{promise:t,status:"pending",content:void 0});const i=await t.then(n=>n.text());return a.set(e,{promise:t,status:"resolved",content:i}),i}catch(i){return a.set(e,{promise:t,status:"error",content:i}),i}}}export{s as default};

package/organisms/Frame/FrameTarget.d.ts

@@ -1,7 +1,12 @@
+declare const FrameTarget_base: typeof import("@studiometa/js-toolkit").Base & (new (...a: any[]) => {
+    readonly target: HTMLElement | HTMLElement[];
+    enter(target?: HTMLElement | HTMLElement[]): Promise<void | void[]>;
+    leave(target?: HTMLElement | HTMLElement[]): Promise<void | void[]>;
+});
 /**
  * FrameTarget class.
  */
-export default class FrameTarget extends Transition {
+export default class FrameTarget extends FrameTarget_base {
     /**
      * Config.
      */
@@ -14,15 +19,11 @@ export default class FrameTarget extends Transition {
                 default: string;
             };
             id: StringConstructor;
-            enterFrom: StringConstructor;
-            enterActive: StringConstructor;
-            enterTo: StringConstructor;
-            enterKeep: BooleanConstructor;
-            leaveFrom: StringConstructor;
-            leaveActive: StringConstructor;
-            leaveTo: StringConstructor;
-            leaveKeep: BooleanConstructor;
         };
+        debug?: boolean;
+        refs?: string[];
+        emits?: string[];
+        components?: import("@studiometa/js-toolkit/Base/index.js").BaseConfigComponents;
     };
     /**
      * Insert modes.
@@ -36,6 +37,11 @@ export default class FrameTarget extends Transition {
      * @returns {string}
      */
     get id(): string;
+    /**
+     * Enter transition.
+     * @returns {Promise<void>}
+     */
+    enter(): Promise<void>;
     /**
      * Update the content from the new target.
      *
@@ -44,4 +50,4 @@ export default class FrameTarget extends Transition {
      */
     updateContent(newTarget: FrameTarget): void;
 }
-import { Transition } from "../../primitives/index.js";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/ui",
-  "version": "0.2.9",
+  "version": "0.2.12",
   "description": "A set of opiniated, unstyled and accessible components",
   "publishConfig": {
     "access": "public"