@flemo/core 1.1.0 → 1.1.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { create as D } from "zustand";
-import { pathToRegexp as w, match as U } from "path-to-regexp";
-class Y {
+import { pathToRegexp as S, match as Y } from "path-to-regexp";
+class B {
   tasks = /* @__PURE__ */ new Map();
   instanceId = Date.now().toString();
   isLocked = !1;
@@ -173,7 +173,7 @@ class Y {
     await Promise.all(t.map((e) => this.resolveTask(e.id)));
   }
 }
-const dt = new Y(), mt = D((n) => ({
+const pt = new B(), yt = D((n) => ({
   index: -1,
   histories: [],
   addHistory: (t) => n((e) => ({
@@ -188,17 +188,17 @@ const dt = new Y(), mt = D((n) => ({
     index: e.index - 1,
     histories: e.histories.filter((a, s) => s !== t)
   }))
-})), ht = D((n) => ({
+})), gt = D((n) => ({
   status: "IDLE",
   transitionTaskId: null,
   setStatus: (t) => n({ status: t }),
   setTransitionTaskId: (t) => n({ transitionTaskId: t })
 }));
 let N = 0;
-function pt() {
+function Pt() {
   N += 1;
 }
-function yt() {
+function Et() {
   return N > 0 ? (N -= 1, !0) : !1;
 }
 function k({
@@ -229,7 +229,7 @@ function k({
     ...c
   };
 }
-function gt({
+function It({
   name: n,
   initial: t,
   idle: e,
@@ -261,12 +261,12 @@ function gt({
     ...m
   };
 }
-const B = (n, t, e) => {
+const Q = (n, t, e) => {
   const [a, s] = t, [r, o] = e;
   if (s === a) return r;
   const c = (n - a) / (s - a);
   return r + c * (o - r);
-}, Q = k({
+}, X = k({
   name: "cupertino",
   initial: {
     x: "100%"
@@ -320,7 +320,7 @@ const B = (n, t, e) => {
     swipeDirection: "x",
     onSwipeStart: async () => !0,
     onSwipe: (n, t, { animate: e, currentScreen: a, prevScreen: s, onProgress: r }) => {
-      const { offset: o } = t, c = o.x, l = B(c, [0, window.innerWidth], [0, 100]);
+      const { offset: o } = t, c = o.x, l = Q(c, [0, window.innerWidth], [0, 100]);
       return r?.(!0, l), e(
         a,
         {
@@ -365,12 +365,12 @@ const B = (n, t, e) => {
       ]), u;
     }
   }
-}), X = (n, t, e) => {
+}), F = (n, t, e) => {
   const [a, s] = t, [r, o] = e;
   if (s === a) return r;
   const c = (n - a) / (s - a);
   return r + c * (o - r);
-}, F = k({
+}, z = k({
   name: "layout",
   initial: {
     opacity: 0.97
@@ -420,7 +420,7 @@ const B = (n, t, e) => {
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, t, { animate: e, currentScreen: a, onProgress: s }) => {
-      const { offset: r } = t, o = r.y, c = Math.max(0, Math.min(56, o)), l = X(c, [0, 56], [1, 0.96]), u = Math.max(0, o - 56), d = Math.min(1, u / 160), m = Math.sqrt(d) * 12, i = Math.max(0, c + m), h = Math.min(56, i);
+      const { offset: r } = t, o = r.y, c = Math.max(0, Math.min(56, o)), l = F(c, [0, 56], [1, 0.96]), u = Math.max(0, o - 56), d = Math.min(1, u / 160), m = Math.sqrt(d) * 12, i = Math.max(0, c + m), h = Math.min(56, i);
       return s?.(!0, 100), e(
         a,
         {
@@ -458,7 +458,7 @@ const B = (n, t, e) => {
       ]), u;
     }
   }
-}), z = k({
+}), V = k({
   name: "material",
   initial: {
     y: "100%"
@@ -554,7 +554,7 @@ const B = (n, t, e) => {
       ]), u;
     }
   }
-}), V = k({
+}), Z = k({
   name: "none",
   initial: {},
   idle: {
@@ -587,16 +587,16 @@ const B = (n, t, e) => {
       duration: 0
     }
   }
-}), Pt = /* @__PURE__ */ new Map([
-  ["none", V],
-  ["cupertino", Q],
-  ["material", z],
-  ["layout", F]
-]), Et = D((n) => ({
+}), kt = /* @__PURE__ */ new Map([
+  ["none", Z],
+  ["cupertino", X],
+  ["material", V],
+  ["layout", z]
+]), Tt = D((n) => ({
   defaultTransitionName: "cupertino",
   setDefaultTransitionName: (t) => n({ defaultTransitionName: t })
 }));
-function Z({
+function j({
   name: n,
   initial: t,
   idle: e,
@@ -622,7 +622,7 @@ function Z({
     ...r
   };
 }
-function It({
+function Nt({
   name: n,
   initial: t,
   idle: e,
@@ -654,7 +654,7 @@ function It({
     ...m
   };
 }
-const j = Z({
+const K = j({
   name: "overlay",
   initial: {
     opacity: 0,
@@ -721,7 +721,7 @@ const j = Z({
       }
     )
   }
-}), kt = /* @__PURE__ */ new Map([["overlay", j]]), I = {
+}), Lt = /* @__PURE__ */ new Map([["overlay", K]]), I = {
   "IDLE-true": "self",
   "IDLE-false": "self",
   "PUSHING-true": "initial",
@@ -732,7 +732,7 @@ const j = Z({
   "POPPING-false": "PUSHING-false",
   "COMPLETED-true": "self",
   "COMPLETED-false": "self"
-}, C = Object.keys(I), K = C, q = (n) => n.replace(/[^a-zA-Z0-9_-]/g, "_"), G = (n) => typeof n == "object" && n !== null && !Array.isArray(n), W = /* @__PURE__ */ new Set([
+}, G = Object.keys(I), q = G, W = (n) => n.replace(/[^a-zA-Z0-9_-]/g, "_"), O = (n) => typeof n == "object" && n !== null && !Array.isArray(n), J = /* @__PURE__ */ new Set([
   "opacity",
   "scale",
   "scaleX",
@@ -769,7 +769,7 @@ const j = Z({
   "strokeDashoffset",
   "strokeMiterlimit",
   "strokeWidth"
-]), J = (n, t) => t.startsWith("--") ? `${n}` : W.has(t) ? `${n}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${n}deg` : `${n}px`, O = (n, t) => typeof t == "number" ? J(t, n) : typeof t == "string" ? t : "", b = (n) => n.replace(/[A-Z]/g, (t) => `-${t.toLowerCase()}`), $ = /* @__PURE__ */ new Set([
+]), tt = (n, t) => t.startsWith("--") ? `${n}` : J.has(t) ? `${n}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${n}deg` : `${n}px`, b = (n, t) => typeof t == "number" ? tt(t, n) : typeof t == "string" ? t : "", $ = (n) => n.replace(/[A-Z]/g, (t) => `-${t.toLowerCase()}`), R = /* @__PURE__ */ new Set([
   "x",
   "y",
   "z",
@@ -780,7 +780,7 @@ const j = Z({
   "rotateX",
   "rotateY",
   "rotateZ"
-]), tt = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, et = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, nt = /^1(\.0+)?$/, at = (n, t) => n === "scale" || n === "scaleX" || n === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? nt.test(t.trim()) : !1 : n === "rotate" || n === "rotateX" || n === "rotateY" || n === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? et.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? tt.test(t.trim()) : !1, st = (n, t) => {
+]), et = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, nt = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, at = /^1(\.0+)?$/, st = (n, t) => n === "scale" || n === "scaleX" || n === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? at.test(t.trim()) : !1 : n === "rotate" || n === "rotateX" || n === "rotateY" || n === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? nt.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? et.test(t.trim()) : !1, rt = (n, t) => {
   switch (n) {
     case "x":
       return `translateX(${t})`;
@@ -804,14 +804,14 @@ const j = Z({
     default:
       return "";
   }
-}, Tt = (n) => {
+}, Dt = (n) => {
   const t = /* @__PURE__ */ new Set();
   let e = !1;
   const a = (s) => {
-    if (G(s))
+    if (O(s))
       for (const r of Object.keys(s)) {
         const o = s[r];
-        O(r, o) !== "" && ($.has(r) ? e = !0 : t.add(b(r)));
+        b(r, o) !== "" && (R.has(r) ? e = !0 : t.add($(r)));
       }
   };
   a(n.initial);
@@ -819,20 +819,20 @@ const j = Z({
     a(s.value);
   return e && t.add("transform"), Array.from(t);
 }, P = (n) => {
-  if (!G(n)) return [];
+  if (!O(n)) return [];
   const t = [];
   let e = !0;
   const a = [];
   for (const s of Object.keys(n)) {
-    const r = n[s], o = O(s, r);
-    o !== "" && ($.has(s) ? (t.push(st(s, o)), at(s, r) || (e = !1)) : a.push({ property: b(s), value: o }));
+    const r = n[s], o = b(s, r);
+    o !== "" && (R.has(s) ? (t.push(rt(s, o)), st(s, r) || (e = !1)) : a.push({ property: $(s), value: o }));
   }
   return t.length > 0 && a.push({
     property: "transform",
     value: e ? "none" : t.join(" ")
   }), a;
 }, E = (n) => n.map((t) => `  ${t.property}: ${t.value};`).join(`
-`), rt = (n) => Array.isArray(n) ? n.length === 4 && n.every((t) => typeof t == "number") ? `cubic-bezier(${n.join(", ")})` : "linear" : typeof n == "string" ? {
+`), ot = (n) => Array.isArray(n) ? n.length === 4 && n.every((t) => typeof t == "number") ? `cubic-bezier(${n.join(", ")})` : "linear" : typeof n == "string" ? {
   linear: "linear",
   easeIn: "ease-in",
   easeOut: "ease-out",
@@ -842,22 +842,22 @@ const j = Z({
   backIn: "cubic-bezier(0.31, 0.01, 0.66, -0.59)",
   backOut: "cubic-bezier(0.33, 1.53, 0.69, 0.99)",
   anticipate: "cubic-bezier(0.36, 0, 0.66, -0.56)"
-}[n] ?? "ease" : "ease", R = (n) => {
+}[n] ?? "ease" : "ease", _ = (n) => {
   if (!n) return 0;
   const t = n.duration;
   return typeof t == "number" && t >= 0 ? t : 0;
-}, _ = (n) => n && typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, S = (n, t) => {
+}, H = (n) => n && typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, v = (n, t) => {
   const [e, a] = t.split("-");
   return `[data-flemo-screen][data-flemo-transition="${n}"][data-flemo-status="${e}"][data-flemo-active="${a}"]`;
-}, v = (n, t) => {
+}, A = (n, t) => {
   const [e, a] = t.split("-");
   return `[data-flemo-decorator][data-flemo-decorator-name="${n}"][data-flemo-status="${e}"][data-flemo-active="${a}"]`;
-}, ot = (n, t) => {
+}, it = (n, t) => {
   const [e, a] = t.split("-");
   return `[data-flemo-bar][data-flemo-bar-transition="${n}"][data-flemo-bar-status="${e}"][data-flemo-bar-active="${a}"][data-flemo-bar-riding="true"]`;
-}, it = (n, t, e) => `flemo-${n}-${q(t)}-${e}`, A = (n, t, e, a, s, r) => {
-  const o = P(a), c = P(s.value), l = R(s.options), u = _(s.options), d = rt(s.options?.ease), m = r(t, e), i = n === "screen" ? `${m},
-${ot(t, e)}` : m;
+}, ct = (n, t, e) => `flemo-${n}-${W(t)}-${e}`, M = (n, t, e, a, s, r) => {
+  const o = P(a), c = P(s.value), l = _(s.options), u = H(s.options), d = ot(s.options?.ease), m = r(t, e), i = n === "screen" ? `${m},
+${it(t, e)}` : m;
   if (c.length === 0 && o.length === 0)
     return "";
   if (l <= 0 && u <= 0)
@@ -865,7 +865,7 @@ ${ot(t, e)}` : m;
 ${E(c)}
   animation: none;
 }`;
-  const h = it(n, t, e), g = [
+  const h = ct(n, t, e), g = [
     `@keyframes ${h} {`,
     "  from {",
     E(o).replace(/^/gm, "  "),
@@ -884,49 +884,51 @@ ${E(c)}
   ].filter(Boolean).join(" "), f = Array.from(
     /* @__PURE__ */ new Set([...o.map((T) => T.property), ...c.map((T) => T.property)])
   ), y = f.length > 0 ? `  will-change: ${f.join(", ")};
-` : "", H = `${i} {
+` : "", w = e.split("-")[0], U = `${i} {
   animation: ${p};
-${y}}`;
+${y}${w === "PUSHING" || w === "REPLACING" ? `  contain: layout;
+  pointer-events: none;
+` : ""}}`;
   return `${g}
-${H}`;
-}, M = (n, t, e, a) => {
+${U}`;
+}, x = (n, t, e, a) => {
   const s = P(a.value);
   return s.length === 0 ? "" : `${n(t, e)} {
 ${E(s)}
 }`;
-}, Nt = (n, t) => {
+}, wt = (n, t) => {
   const e = [];
   for (const a of n) {
     const s = a.name;
-    for (const r of C) {
+    for (const r of G) {
       const o = a.variants[r], c = I[r];
       if (c === "self") {
-        e.push(M(S, s, r, o));
+        e.push(x(v, s, r, o));
         continue;
       }
       const l = c === "initial" ? a.initial : a.variants[c].value;
       e.push(
-        A("screen", s, r, l, o, S)
+        M("screen", s, r, l, o, v)
       );
     }
   }
   for (const a of t) {
     const s = a.name;
-    for (const r of K) {
+    for (const r of q) {
       const o = a.variants[r], c = I[r];
       if (c === "self") {
-        e.push(M(v, s, r, o));
+        e.push(x(A, s, r, o));
         continue;
       }
       const l = c === "initial" ? a.initial : a.variants[c].value;
       e.push(
-        A(
+        M(
           "decorator",
           s,
           r,
           l,
           o,
-          v
+          A
         )
       );
     }
@@ -934,44 +936,44 @@ ${E(s)}
   return e.filter((a) => a.length > 0).join(`
 
 `);
-}, Lt = (n, t) => {
+}, St = (n, t) => {
   const e = I[t];
   if (e === "self") return !1;
-  const a = n.variants[t], s = R(a.options), r = _(a.options);
+  const a = n.variants[t], s = _(a.options), r = H(a.options);
   if (s <= 0 && r <= 0) return !1;
   const o = e === "initial" ? n.initial : n.variants[e].value, c = P(o), l = P(a.value);
   return c.length > 0 || l.length > 0;
 };
-function Dt() {
+function vt() {
   return typeof document > "u";
 }
-function ct(n, t) {
-  return Array.isArray(n) ? n.find((e) => w(e).regexp.test(t)) ?? "" : w(n).regexp.test(t) ? n : "";
+function ut(n, t) {
+  return Array.isArray(n) ? n.find((e) => S(e).regexp.test(t)) ?? "" : S(n).regexp.test(t) ? n : "";
 }
-function wt(n, t, e) {
-  const a = ct(n, t), s = U(a)(t), r = new URLSearchParams(e), o = Object.fromEntries(r.entries());
+function At(n, t, e) {
+  const a = ut(n, t), s = Y(a)(t), r = new URLSearchParams(e), o = Object.fromEntries(r.entries());
   return s ? { ...s.params, ...o } : {};
 }
-function St(n, t) {
+function Mt(n, t) {
   const {
     direction: e = "x",
     markerSelector: a = "[data-swipe-at-edge]",
     depthLimit: s = 24,
     verifyByScroll: r = !1
-  } = t ?? {}, o = ut(n);
+  } = t ?? {}, o = lt(n);
   if (!o) return { element: null, hasMarker: !1 };
   const c = o.closest?.(a);
-  if (c instanceof HTMLElement && L(c, e) && (!r || x(c, e)))
+  if (c instanceof HTMLElement && L(c, e) && (!r || C(c, e)))
     return { element: c, hasMarker: !0 };
   let l = o, u = 0;
   for (; l && u < s; ) {
-    if (L(l, e) && (!r || x(l, e)))
+    if (L(l, e) && (!r || C(l, e)))
       return { element: l, hasMarker: !1 };
     l = l.parentElement, u++;
   }
   return { element: null, hasMarker: !1 };
 }
-function ut(n) {
+function lt(n) {
   if (!n) return null;
   const t = n, e = typeof t.composedPath == "function" ? t.composedPath() : void 0;
   if (e && e.length) {
@@ -983,39 +985,39 @@ function ut(n) {
 function L(n, t) {
   return t === "y" ? n.scrollHeight - n.clientHeight > 1 : n.scrollWidth - n.clientWidth > 1;
 }
-function x(n, t) {
+function C(n, t) {
   if (!L(n, t) || typeof window > "u") return !1;
   const e = window.getComputedStyle(n), a = t === "y" ? e.overflowY : e.overflowX;
   return a === "auto" || a === "scroll" || a === "overlay";
 }
 export {
-  dt as TaskManger,
-  it as animationName,
-  x as canProgrammaticallyScroll,
-  Tt as collectAnimatedProperties,
-  Nt as compileTransitionStyles,
-  yt as consumeSelfInducedPop,
-  Z as createDecorator,
-  It as createRawDecorator,
-  gt as createRawTransition,
+  pt as TaskManger,
+  ct as animationName,
+  C as canProgrammaticallyScroll,
+  Dt as collectAnimatedProperties,
+  wt as compileTransitionStyles,
+  Et as consumeSelfInducedPop,
+  j as createDecorator,
+  Nt as createRawDecorator,
+  It as createRawTransition,
   k as createTransition,
-  Q as cupertino,
-  kt as decoratorMap,
-  rt as easingToCss,
-  St as findScrollable,
-  ct as getMatchedPathPattern,
-  wt as getParams,
-  Dt as isServer,
-  F as layout,
-  pt as markSelfInducedPop,
-  z as material,
-  V as none,
+  X as cupertino,
+  Lt as decoratorMap,
+  ot as easingToCss,
+  Mt as findScrollable,
+  ut as getMatchedPathPattern,
+  At as getParams,
+  vt as isServer,
+  z as layout,
+  Pt as markSelfInducedPop,
+  V as material,
+  Z as none,
   L as overflowsAxis,
-  j as overlay,
+  K as overlay,
   P as targetToDecls,
-  Pt as transitionMap,
-  mt as useHistoryStore,
-  ht as useNavigateStore,
-  Et as useTransitionStore,
-  Lt as variantHasAnimation
+  kt as transitionMap,
+  yt as useHistoryStore,
+  gt as useNavigateStore,
+  Tt as useTransitionStore,
+  St as variantHasAnimation
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/core",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Framework-agnostic primitives for flemo: history, navigation, transitions, task manager.",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",