origam 2.16.0 → 2.17.1

package/dist/src/utils/Commons/goTo.util.cjs

@@ -9,7 +9,8 @@ exports.getContainer = getContainer;
 exports.getLocationOffset = getLocationOffset;
 exports.getTarget = getTarget;
 exports.scrollTo = scrollTo;
-var _utils = require("../../utils/index.cjs");
+var _commons = require("./commons.util.cjs");
+var _console = require("./console.util.cjs");
 function genDefaults() {
   return {
     container: void 0,
@@ -38,7 +39,7 @@ function getContainer(el) {
   return getTarget(el) ?? (document.scrollingElement || document.body);
 }
 function getTarget(el) {
-  return typeof el === "string" ? document.querySelector(el) : (0, _utils.refElement)(el);
+  return typeof el === "string" ? document.querySelector(el) : (0, _commons.refElement)(el);
 }
 function getLocationOffset(target, horizontal, rtl) {
   if (typeof target === "number") return horizontal && rtl ? -target : target;
@@ -70,7 +71,7 @@ function clampTarget(container, value, horizontal) {
 async function scrollTo(_target, _options, horizontal, goTo) {
   const rtl = goTo?.rtl.value;
   const property = horizontal ? "scrollLeft" : "scrollTop";
-  const options = (0, _utils.mergeDeep)(goTo?.options ?? genDefaults(), _options);
+  const options = (0, _commons.mergeDeep)(goTo?.options ?? genDefaults(), _options);
   const target = (typeof _target === "number" ? _target : getTarget(_target)) ?? 0;
   const container = options.container === "parent" && target instanceof HTMLElement ? target.parentElement : getContainer(options.container);
   const patterns = options.patterns;
@@ -85,7 +86,7 @@ async function scrollTo(_target, _options, horizontal, goTo) {
     if (options.layout) {
       const styles = window.getComputedStyle(target);
       const layoutOffset = styles.getPropertyValue("--origam-layout-top");
-      if (layoutOffset) targetLocation -= (0, _utils.int)(layoutOffset);
+      if (layoutOffset) targetLocation -= (0, _commons.int)(layoutOffset);
     }
   }
   targetLocation += options.offset;
@@ -97,12 +98,12 @@ async function scrollTo(_target, _options, horizontal, goTo) {
   return new Promise(resolve => requestAnimationFrame(function step(currentTime) {
     const timeElapsed = currentTime - startTime;
     const progress = timeElapsed / duration;
-    const location = Math.floor(startLocation + (targetLocation - startLocation) * ease((0, _utils.clamp)(progress, 0, 1)));
+    const location = Math.floor(startLocation + (targetLocation - startLocation) * ease((0, _commons.clamp)(progress, 0, 1)));
     container[property] = location;
     if (progress >= 1 && Math.abs(location - container[property]) < 10) {
       return resolve(targetLocation);
     } else if (progress > 2) {
-      (0, _utils.consoleWarn)("Scroll target is not reachable");
+      (0, _console.consoleWarn)("Scroll target is not reachable");
       return resolve(container[property]);
     }
     requestAnimationFrame(step);

package/dist/src/utils/Commons/goTo.util.d.ts

@@ -1,5 +1,5 @@
 import { ComponentPublicInstance } from 'vue';
-import type { IGoToInstance, IGoToOptions } from '../../interfaces';
+import type { IGoToInstance, IGoToOptions } from '../../interfaces/Commons/goTo.interface';
 /**
  * Gen defaults.
  *

package/dist/src/utils/Commons/goTo.util.js

@@ -1,4 +1,5 @@
-import { clamp, consoleWarn, int, mergeDeep, refElement } from "../../utils/index.js";
+import { clamp, int, mergeDeep, refElement } from "./commons.util.js";
+import { consoleWarn } from "./console.util.js";
 export function genDefaults() {
   return {
     container: void 0,

package/dist/src/utils/Commons/gradient.util.d.ts

@@ -1,5 +1,5 @@
 import type { IGradient } from '../../interfaces/Commons/gradient.interface';
-import type { TColor } from '../../types';
+import type { TColor } from '../../types/Commons/color.type';
 /**
  * Type guard: does `value` carry gradient semantics?
  *

package/dist/src/utils/Commons/group.util.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getIds = getIds;
 exports.getItemIndex = getItemIndex;
 exports.getValues = getValues;
-var _utils = require("../../utils/index.cjs");
+var _commons = require("./commons.util.cjs");
 function getItemIndex(items, value) {
   const ids = getIds(items, [value]);
   if (!ids.length) return -1;
@@ -15,7 +15,7 @@ function getItemIndex(items, value) {
 function getIds(items, modelValue) {
   const ids = [];
   modelValue.forEach(value => {
-    const item = items.find(item2 => (0, _utils.deepEqual)(value, item2.value));
+    const item = items.find(item2 => (0, _commons.deepEqual)(value, item2.value));
     const itemByIndex = items[value];
     if (item?.value != null) {
       ids.push(item.id);

package/dist/src/utils/Commons/group.util.d.ts

@@ -1,5 +1,5 @@
 import { UnwrapRef } from 'vue';
-import type { IGroupItem } from '../../interfaces';
+import type { IGroupItem } from '../../interfaces/Commons/group.interface';
 /**
  * Get item index.
  *

package/dist/src/utils/Commons/group.util.js

@@ -1,4 +1,4 @@
-import { deepEqual } from "../../utils/index.js";
+import { deepEqual } from "./commons.util.js";
 export function getItemIndex(items, value) {
   const ids = getIds(items, [value]);
   if (!ids.length) return -1;

package/dist/src/utils/Commons/hotkey.util.cjs

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.normalizeKey = normalizeKey;
 exports.splitKeyCombination = splitKeyCombination;
 exports.splitKeySequence = splitKeySequence;
-var _consts = require("../../consts/index.cjs");
-var _utils = require("../../utils/index.cjs");
+var _hotkey = require("../../consts/Commons/hotkey.const.cjs");
+var _console = require("./console.util.cjs");
 function splitKeyCombination(combination, isInternal = false) {
   if (!combination) {
-    if (!isInternal) (0, _utils.consoleWarn)("Invalid hotkey combination: empty string provided");
+    if (!isInternal) (0, _console.consoleWarn)("Invalid hotkey combination: empty string provided");
     return [];
   }
   const startsWithPlusOrUnderscore = combination.startsWith("+") || combination.startsWith("_");
@@ -27,7 +27,7 @@ function splitKeyCombination(combination, isInternal = false) {
   // Stand-alone doubled separators (dangling)
   combination === "++" || combination === "--" || combination === "__";
   if (hasInvalidStructure) {
-    if (!isInternal) (0, _utils.consoleWarn)(`Invalid hotkey combination: "${combination}" has invalid structure`);
+    if (!isInternal) (0, _console.consoleWarn)(`Invalid hotkey combination: "${combination}" has invalid structure`);
     return [];
   }
   const keys = [];
@@ -58,7 +58,7 @@ function splitKeyCombination(combination, isInternal = false) {
   flushBuffer();
   const hasInvalidMinus = keys.some(key => key.length > 1 && key.includes("-") && key !== "--");
   if (hasInvalidMinus) {
-    if (!isInternal) (0, _utils.consoleWarn)(`Invalid hotkey combination: "${combination}" has invalid structure`);
+    if (!isInternal) (0, _console.consoleWarn)(`Invalid hotkey combination: "${combination}" has invalid structure`);
     return [];
   }
   if (keys.length === 0 && combination) {
@@ -68,13 +68,13 @@ function splitKeyCombination(combination, isInternal = false) {
 }
 function splitKeySequence(str) {
   if (!str) {
-    (0, _utils.consoleWarn)("Invalid hotkey sequence: empty string provided");
+    (0, _console.consoleWarn)("Invalid hotkey sequence: empty string provided");
     return [];
   }
   const hasInvalidStart = str.startsWith("-") && !["---", "--+"].includes(str);
   const hasInvalidEnd = str.endsWith("-") && !str.endsWith("+-") && !str.endsWith("_-") && str !== "-" && str !== "---";
   if (hasInvalidStart || hasInvalidEnd) {
-    (0, _utils.consoleWarn)(`Invalid hotkey sequence: "${str}" contains invalid combinations`);
+    (0, _console.consoleWarn)(`Invalid hotkey sequence: "${str}" contains invalid combinations`);
     return [];
   }
   const result = [];
@@ -119,12 +119,12 @@ function splitKeySequence(str) {
   }
   const areAllValid = collapsed.every(s => splitKeyCombination(s, true).length > 0);
   if (!areAllValid) {
-    (0, _utils.consoleWarn)(`Invalid hotkey sequence: "${str}" contains invalid combinations`);
+    (0, _console.consoleWarn)(`Invalid hotkey sequence: "${str}" contains invalid combinations`);
     return [];
   }
   return collapsed;
 }
 function normalizeKey(key) {
   const lowerKey = key.toLowerCase();
-  return _consts.KEYBOARD_ALIASES[lowerKey] || lowerKey;
+  return _hotkey.KEYBOARD_ALIASES[lowerKey] || lowerKey;
 }

package/dist/src/utils/Commons/hotkey.util.js

@@ -1,5 +1,5 @@
-import { KEYBOARD_ALIASES } from "../../consts/index.js";
-import { consoleWarn } from "../../utils/index.js";
+import { KEYBOARD_ALIASES } from "../../consts/Commons/hotkey.const.js";
+import { consoleWarn } from "./console.util.js";
 export function splitKeyCombination(combination, isInternal = false) {
   if (!combination) {
     if (!isInternal) consoleWarn("Invalid hotkey combination: empty string provided");

package/dist/src/utils/Commons/hover.util.cjs

@@ -9,8 +9,9 @@ exports.hoverShow = hoverShow;
 exports.hoverStop = hoverStop;
 exports.isHoverEnabled = isHoverEnabled;
 exports.updateHover = updateHover;
-var _consts = require("../../consts/index.cjs");
-var _utils = require("../../utils/index.cjs");
+var _hover = require("../../consts/Commons/hover.const.cjs");
+var _commons = require("./commons.util.cjs");
+var _ripple = require("./ripple.util.cjs");
 function updateHover(el, binding, wasEnabled, name) {
   const {
     value,
@@ -20,16 +21,16 @@ function updateHover(el, binding, wasEnabled, name) {
   const options = {
     class: `${name}--hover`
   };
-  if ((0, _utils.isObject)(value) && typeof value.class === "string") {
+  if ((0, _commons.isObject)(value) && typeof value.class === "string") {
     options.class = value.class;
   }
   el._hover = el._hover ?? {};
   el._hover.enabled = enabled;
   el._hover.class = options.class;
-  el._hover.mouseenter = (0, _utils.isObject)(value) ? value.mouseenter : void 0;
-  el._hover.mouseleave = (0, _utils.isObject)(value) ? value.mouseleave : void 0;
+  el._hover.mouseenter = (0, _commons.isObject)(value) ? value.mouseenter : void 0;
+  el._hover.mouseleave = (0, _commons.isObject)(value) ? value.mouseleave : void 0;
   if (!enabled) {
-    _consts.HOVER.hide(el, options);
+    _hover.HOVER.hide(el, options);
   }
   if (enabled && !wasEnabled) {
     if (modifiers.stop) {
@@ -60,9 +61,9 @@ function hoverShow(e) {
     class: ""
   };
   const element = e.currentTarget;
-  if (!element?._hover || element._hover.touched || e[_consts.ORIGAM_HOVER_STOP_KEY]) return;
-  e[_consts.ORIGAM_HOVER_STOP_KEY] = true;
-  if ((0, _utils.isTouchEvent)(e)) {
+  if (!element?._hover || element._hover.touched || e[_hover.ORIGAM_HOVER_STOP_KEY]) return;
+  e[_hover.ORIGAM_HOVER_STOP_KEY] = true;
+  if ((0, _ripple.isTouchEvent)(e)) {
     element._hover.touched = true;
     element._hover.isTouch = true;
   } else {
@@ -71,11 +72,11 @@ function hoverShow(e) {
   if (element._hover.class) {
     value.class = element._hover.class;
   }
-  _consts.HOVER.show(e, element, value);
+  _hover.HOVER.show(e, element, value);
   element._hover.mouseenter?.(element, e);
 }
 function hoverStop(e) {
-  e[_consts.ORIGAM_HOVER_STOP_KEY] = true;
+  e[_hover.ORIGAM_HOVER_STOP_KEY] = true;
 }
 function hoverHide(e) {
   const value = {
@@ -86,7 +87,7 @@ function hoverHide(e) {
   if (element._hover.class) {
     value.class = element._hover.class;
   }
-  _consts.HOVER.hide(element, value);
+  _hover.HOVER.hide(element, value);
   element._hover.mouseleave?.(element, e);
 }
 function hoverRemoveListeners(el) {

package/dist/src/utils/Commons/hover.util.d.ts

@@ -1,5 +1,5 @@
-import type { IHoverDirectiveBinding, IHoverHtmlElement } from '../../interfaces';
-import type { THoverEvent } from '../../types';
+import type { IHoverDirectiveBinding, IHoverHtmlElement } from '../../interfaces/Commons/hover.interface';
+import type { THoverEvent } from '../../types/Commons/hover.type';
 /**
  * Update hover.
  *

package/dist/src/utils/Commons/hover.util.js

@@ -1,5 +1,6 @@
-import { HOVER, ORIGAM_HOVER_STOP_KEY } from "../../consts/index.js";
-import { isObject, isTouchEvent } from "../../utils/index.js";
+import { HOVER, ORIGAM_HOVER_STOP_KEY } from "../../consts/Commons/hover.const.js";
+import { isObject } from "./commons.util.js";
+import { isTouchEvent } from "./ripple.util.js";
 export function updateHover(el, binding, wasEnabled, name) {
   const { value, modifiers } = binding;
   const enabled = isHoverEnabled(value);

package/dist/src/utils/Commons/intersect.util.d.ts

@@ -1,4 +1,4 @@
-import type { IIntersectDirectiveBinding, IIntersectHtmlElement } from '../../interfaces';
+import type { IIntersectDirectiveBinding, IIntersectHtmlElement } from '../../interfaces/Commons/intersect.interface';
 /**
  * Unmount intersect.
  *

package/dist/src/utils/Commons/layout.util.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateLayers = generateLayers;
-var _utils = require("../../utils/index.cjs");
+var _commons = require("./commons.util.cjs");
 function generateLayers(layout, positions, layoutSizes, activeItems) {
   let previousLayer = {
     top: 0,
@@ -25,7 +25,7 @@ function generateLayers(layout, positions, layoutSizes, activeItems) {
     if (!position || !amount || !active) continue;
     const layer = {
       ...previousLayer,
-      [position.value]: (0, _utils.int)(previousLayer[position.value]) + (active.value ? (0, _utils.int)(amount.value) : 0)
+      [position.value]: (0, _commons.int)(previousLayer[position.value]) + (active.value ? (0, _commons.int)(amount.value) : 0)
     };
     layers.push({
       id,

package/dist/src/utils/Commons/layout.util.d.ts

@@ -1,6 +1,6 @@
 import type { Ref } from 'vue';
-import type { ILayer } from '../../interfaces';
-import type { TDirectionBoth } from '../../types';
+import type { ILayer } from '../../interfaces/Commons/layout.interface';
+import type { TDirectionBoth } from '../../types/Commons/anchor.type';
 /**
  * Generate layers.
  *

package/dist/src/utils/Commons/layout.util.js

@@ -1,4 +1,4 @@
-import { int } from "../../utils/index.js";
+import { int } from "./commons.util.js";
 export function generateLayers(layout, positions, layoutSizes, activeItems) {
   let previousLayer = { top: 0, left: 0, right: 0, bottom: 0 };
   const layers = [{ id: "", layer: { ...previousLayer } }];

package/dist/src/utils/Commons/locale.util.cjs

@@ -8,7 +8,7 @@ exports.createProvideFunction = createProvideFunction;
 exports.createVueI18nAdapter = createVueI18nAdapter;
 exports.useProvided = useProvided;
 var _vue = require("vue");
-var _composables = require("../../composables/index.cjs");
+var _vModel = require("../../composables/Commons/vModel.composable.cjs");
 function callI18nT(fn, key, params) {
   if (typeof key !== "string" || !key) return key;
   if (!params.length) return fn(key);
@@ -70,13 +70,18 @@ function createProvideFunction(data) {
   };
 }
 function useProvided(props, prop, provided) {
-  const internal = (0, _composables.useVModel)(props, prop);
+  const internal = (0, _vModel.useVModel)(props, prop);
   internal.value = props[prop] ?? provided.value;
   (0, _vue.watch)(provided, v => {
     if (props[prop] == null) {
       internal.value = v;
     }
   });
+  (0, _vue.watch)(() => props[prop], v => {
+    if (v == null) {
+      internal.value = provided.value;
+    }
+  });
   return internal;
 }
 function resolveKey(messages, key) {
@@ -107,13 +112,47 @@ function interpolate(template, params) {
     return stringifyParam(lookup(token));
   });
 }
+function selectPluralCategory(locale, count) {
+  try {
+    return new Intl.PluralRules(locale).select(count);
+  } catch {
+    return "other";
+  }
+}
+function resolvePlural(lookup, key, locale, params) {
+  const count = params[0];
+  if (typeof count !== "number" || !Number.isFinite(count)) return void 0;
+  const category = selectPluralCategory(locale, count);
+  const template = lookup(`${key}_${category}`) ?? lookup(`${key}_other`);
+  if (template === void 0) return void 0;
+  const named = {
+    count,
+    0: count
+  };
+  params.forEach((value, index) => {
+    if (index > 0) named[String(index)] = value;
+  });
+  const extra = params.length > 1 ? params[params.length - 1] : void 0;
+  if (extra !== null && typeof extra === "object" && !Array.isArray(extra)) {
+    Object.assign(named, extra, {
+      count,
+      0: count
+    });
+  }
+  return interpolate(template, [named]);
+}
 function createBuiltinAdapter(data) {
   const translate = (key, ...params) => {
     if (typeof key !== "string" || !key) return key;
     const all = data.messages.value;
-    const template = resolveKey(all?.[data.current.value] ?? {}, key) ?? resolveKey(all?.[data.fallback.value] ?? {}, key);
-    if (template === void 0) return key;
-    return params.length ? interpolate(template, params) : template;
+    const lookup = candidate => resolveKey(all?.[data.current.value] ?? {}, candidate) ?? resolveKey(all?.[data.fallback.value] ?? {}, candidate);
+    const template = lookup(key);
+    if (template !== void 0) {
+      return params.length ? interpolate(template, params) : template;
+    }
+    const plural = resolvePlural(lookup, key, data.current.value, params);
+    if (plural !== void 0) return plural;
+    return key;
   };
   return {
     name: "origam-builtin",

package/dist/src/utils/Commons/locale.util.d.ts

@@ -1,5 +1,5 @@
 import { ComputedRef, Ref } from "vue";
-import type { ILocaleI18n, ILocaleInstance, ILocaleMessages, ILocaleProps, TUseI18nLike } from "../../interfaces";
+import type { ILocaleI18n, ILocaleInstance, ILocaleMessages, ILocaleProps, TUseI18nLike } from '../../interfaces/Commons/locale.interface';
 /**
  * Create vue i 18 n adapter.
  *
@@ -18,14 +18,34 @@ export declare function createProvideFunction(data: {
     messages: ComputedRef<ILocaleMessages>;
     useI18n: TUseI18nLike;
 }): (props: ILocaleProps) => ILocaleInstance;
-/**
- * Use provided.
+/*********************************************************
+ * useProvided
  *
- * @param props    …
- * @param prop     …
- * @param provided …
- * @returns …
- */
+ * @description
+ * Resout une valeur qui peut venir de DEUX sources : la prop du consommateur,
+ * qui l'emporte, ou la valeur heritee d'un ancetre. Les deux peuvent changer
+ * apres le montage, et les deux doivent etre suivies.
+ *
+ * @description
+ * ⛔ Le troisieme cas — la prop qui REPASSE a nullish — a longtemps rendu la
+ * chaine « undefined » a l'ecran. Le watch de `useVModel` recopie fidelement la
+ * nouvelle valeur de la prop dans le ref interne, `undefined` compris, et le
+ * watch sur `provided` ci-dessous ne se declenche pas : c'est la PROP qui a
+ * bouge, pas l'heritage. Un consommateur ecrivant `:locale="choix || undefined"`
+ * pour dire « reprends celle du parent » obtenait donc le mot undefined.
+ * Mesure dans `TU/composables/Commons/provide-locale-reactivity.spec.ts`.
+ *
+ * @description
+ * L'ordre des deux watchers n'est pas un detail : celui de `useVModel` est
+ * enregistre en premier, a la ligne au-dessus, donc il ecrit `undefined` avant
+ * que celui-ci ne retablisse l'heritage. Inverser les deux lignes reintroduirait
+ * le defaut.
+ *
+ * @param props    Les props du composant hote.
+ * @param prop     Le nom de la prop a resoudre.
+ * @param provided La valeur heritee, utilisee quand la prop est absente.
+ * @returns Un ref suivant la source active des deux.
+ ********************************************************/
 export declare function useProvided<T>(props: any, prop: string, provided: Ref<T>): Ref<T>;
 export declare function createBuiltinAdapter(data: {
     current: Ref<string>;

package/dist/src/utils/Commons/locale.util.js

@@ -1,5 +1,5 @@
 import { watch } from "vue";
-import { useVModel } from "../../composables/index.js";
+import { useVModel } from "../../composables/Commons/vModel.composable.js";
 function callI18nT(fn, key, params) {
   if (typeof key !== "string" || !key) return key;
   if (!params.length) return fn(key);
@@ -55,6 +55,11 @@ export function useProvided(props, prop, provided) {
       internal.value = v;
     }
   });
+  watch(() => props[prop], (v) => {
+    if (v == null) {
+      internal.value = provided.value;
+    }
+  });
   return internal;
 }
 function resolveKey(messages, key) {
@@ -88,13 +93,41 @@ function interpolate(template, params) {
     return stringifyParam(lookup(token));
   });
 }
+function selectPluralCategory(locale, count) {
+  try {
+    return new Intl.PluralRules(locale).select(count);
+  } catch {
+    return "other";
+  }
+}
+function resolvePlural(lookup, key, locale, params) {
+  const count = params[0];
+  if (typeof count !== "number" || !Number.isFinite(count)) return void 0;
+  const category = selectPluralCategory(locale, count);
+  const template = lookup(`${key}_${category}`) ?? lookup(`${key}_other`);
+  if (template === void 0) return void 0;
+  const named = { count, 0: count };
+  params.forEach((value, index) => {
+    if (index > 0) named[String(index)] = value;
+  });
+  const extra = params.length > 1 ? params[params.length - 1] : void 0;
+  if (extra !== null && typeof extra === "object" && !Array.isArray(extra)) {
+    Object.assign(named, extra, { count, 0: count });
+  }
+  return interpolate(template, [named]);
+}
 export function createBuiltinAdapter(data) {
   const translate = (key, ...params) => {
     if (typeof key !== "string" || !key) return key;
     const all = data.messages.value;
-    const template = resolveKey(all?.[data.current.value] ?? {}, key) ?? resolveKey(all?.[data.fallback.value] ?? {}, key);
-    if (template === void 0) return key;
-    return params.length ? interpolate(template, params) : template;
+    const lookup = (candidate) => resolveKey(all?.[data.current.value] ?? {}, candidate) ?? resolveKey(all?.[data.fallback.value] ?? {}, candidate);
+    const template = lookup(key);
+    if (template !== void 0) {
+      return params.length ? interpolate(template, params) : template;
+    }
+    const plural = resolvePlural(lookup, key, data.current.value, params);
+    if (plural !== void 0) return plural;
+    return key;
   };
   return {
     name: "origam-builtin",