@gearbox-protocol/ui-kit 4.0.0-next.6 → 4.0.0-next.60

package/dist/esm/components/simple-dropdown/simple-dropdown-menu-item.js

@@ -1,26 +1,18 @@
 import { jsx as t } from "react/jsx-runtime";
 import * as p from "react";
 import "../dropdown-menu/dropdown-menu.js";
-import "../dropdown-menu/dropdown-menu-checkbox-item.js";
 import "../dropdown-menu/dropdown-menu-content.js";
-import { DropdownMenuItem as i } from "../dropdown-menu/dropdown-menu-item.js";
+import { DropdownMenuItem as e } from "../dropdown-menu/dropdown-menu-item.js";
 import "../dropdown-menu/dropdown-menu-label.js";
-import "../dropdown-menu/dropdown-menu-radio-item.js";
-import "../dropdown-menu/dropdown-menu-separator.js";
-import "../dropdown-menu/dropdown-menu-shortcut.js";
-import "../dropdown-menu/dropdown-menu-sub-content.js";
-import "../dropdown-menu/dropdown-menu-sub-trigger.js";
-import "@gearbox-protocol/sdk";
-import { cn as e } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
+import "@gearbox-protocol/sdk/onchain";
+import { cn as i } from "../../utils/cn.js";
 import "luxon";
 import "../../utils/z-index.js";
 const n = "cursor-pointer gap-0 rounded-lg px-3 py-3 text-sm font-normal leading-[17px] text-foreground hover:bg-gray-80 focus:bg-gray-80", a = p.forwardRef(({ className: o, ...r }, m) => /* @__PURE__ */ t(
-  i,
+  e,
   {
     ref: m,
-    className: e(n, o),
+    className: i(n, o),
     ...r
   }
 ));

package/dist/esm/components/simple-dropdown/simple-dropdown.js

@@ -1,16 +1,14 @@
-import { jsxs as R, jsx as r } from "react/jsx-runtime";
+import { jsxs as R, jsx as a } from "react/jsx-runtime";
 import * as t from "@radix-ui/react-dropdown-menu";
 import { useRef as j } from "react";
-import "@gearbox-protocol/sdk";
+import "@gearbox-protocol/sdk/onchain";
 import { cn as l } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
 import "luxon";
 import { Z_INDEX as y } from "../../utils/z-index.js";
 function E({
-  children: p,
-  title: f,
-  asChild: a = !1,
+  children: f,
+  title: p,
+  asChild: r = !1,
   placement: m = "bottom",
   align: u = "start",
   sideOffset: c = 4,
@@ -51,19 +49,19 @@ function E({
       } : e,
       modal: w,
       children: [
-        /* @__PURE__ */ r(
+        /* @__PURE__ */ a(
           t.Trigger,
           {
             ref: s,
-            asChild: a,
-            className: a ? void 0 : l(
+            asChild: r,
+            className: r ? void 0 : l(
               "inline-flex appearance-none border-0 bg-transparent p-0 text-inherit font-inherit cursor-pointer",
               v
             ),
-            children: f
+            children: p
           }
         ),
-        /* @__PURE__ */ r(t.Portal, { children: /* @__PURE__ */ r(
+        /* @__PURE__ */ a(t.Portal, { children: /* @__PURE__ */ a(
           t.Content,
           {
             side: m,
@@ -77,7 +75,7 @@ function E({
             },
             onPointerDownOutside: o ? x : void 0,
             onEscapeKeyDown: o ? () => e?.(!1) : void 0,
-            children: p
+            children: f
           }
         ) })
       ]

package/dist/esm/components/skeleton/skeleton-stack.js

@@ -1,34 +1,32 @@
 import { jsx as m } from "react/jsx-runtime";
 import { useMemo as c } from "react";
-import "@gearbox-protocol/sdk";
+import "@gearbox-protocol/sdk/onchain";
 import { cn as r } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
 import "luxon";
 import "../../utils/z-index.js";
-import { Skeleton as i } from "./skeleton.js";
-const n = {
+import { Skeleton as n } from "./skeleton.js";
+const l = {
   sm: "space-y-2",
   md: "space-y-3",
   lg: "space-y-4"
 };
-function w({
+function h({
   lines: o = 5,
   className: t,
   gap: e = "md"
 }) {
-  const p = c(
+  const s = c(
     () => Array.from({ length: o }, () => crypto.randomUUID()),
     [o]
   );
-  return /* @__PURE__ */ m("div", { className: r(n[e], t), children: p.map((s, a) => /* @__PURE__ */ m(
-    i,
+  return /* @__PURE__ */ m("div", { className: r(l[e], t), children: s.map((p, a) => /* @__PURE__ */ m(
+    n,
     {
       className: r("h-4 w-full", a === o - 1 && "w-3/4")
     },
-    s
+    p
   )) });
 }
 export {
-  w as SkeletonStack
+  h as SkeletonStack
 };

package/dist/esm/components/skeleton/skeleton.js

@@ -1,13 +1,10 @@
-import { jsx as a, Fragment as p } from "react/jsx-runtime";
-import { cva as f } from "class-variance-authority";
-import "react";
-import "@gearbox-protocol/sdk";
+import { jsx as a, Fragment as f } from "react/jsx-runtime";
+import { cva as p } from "class-variance-authority";
+import "@gearbox-protocol/sdk/onchain";
 import { cn as w } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
 import "luxon";
 import "../../utils/z-index.js";
-const c = f("animate-pulse rounded-md bg-muted", {
+const c = p("animate-pulse rounded-md bg-muted", {
   variants: {
     variant: {
       default: "",
@@ -51,21 +48,21 @@ const c = f("animate-pulse rounded-md bg-muted", {
     height: "md"
   }
 });
-function j({
+function S({
   className: s,
   variant: l,
   speed: n,
   width: t,
   height: e,
-  loading: m = !0,
+  loading: d = !0,
   children: i,
-  style: d,
+  style: m,
   ...h
 }) {
-  if (!m && i !== void 0)
-    return /* @__PURE__ */ a(p, { children: i });
+  if (!d && i !== void 0)
+    return /* @__PURE__ */ a(f, { children: i });
   const r = typeof t == "number", o = typeof e == "number", u = {
-    ...d,
+    ...m,
     ...r && { width: `${t}px` },
     ...o && { height: `${e}px` }
   };
@@ -87,6 +84,6 @@ function j({
   );
 }
 export {
-  j as Skeleton,
+  S as Skeleton,
   c as skeletonVariants
 };

package/dist/esm/components/slider/constants.js

@@ -0,0 +1,6 @@
+class t {
+  static interval = "slider-interval";
+}
+export {
+  t as SliderTest
+};

package/dist/esm/components/slider/index.js

@@ -1,28 +1,29 @@
-import { Slider as o } from "./slider.js";
-import { SliderProvider as i, useSliderContext as a } from "./slider-context.js";
-import { SliderMark as m } from "./slider-mark.js";
-import { SliderTrack as d } from "./slider-track.js";
-import { makeMarkerPoints as n, validateMarkerPoints as p } from "./slider-utils.js";
-import { THEME_COLOR_MAP as M, THUMB_HALF as S, THUMB_SIZE as v, getIntervalBounds as T, getThumbInBoundsOffset as k, resolveColor as u } from "./types.js";
-import { decimalsToStep as c, findClosestPoint as B, formatWithDecimals as C, formatWithoutDecimals as H, splitInterval as I, validateMinMax as _ } from "../../utils/math.js";
+import { SliderTest as o } from "./constants.js";
+import { Slider as i } from "./slider.js";
+import { SliderProvider as a, useSliderContext as s } from "./slider-context.js";
+import { SliderMark as f } from "./slider-mark.js";
+import { SliderTrack as n } from "./slider-track.js";
+import { makeMarkerPoints as x, resolveSnap as M, validateMarkerPoints as S } from "./slider-utils.js";
+import { THEME_COLOR_MAP as T, THUMB_HALF as k, THUMB_SIZE as u, getIntervalBounds as P, getThumbInBoundsOffset as B, resolveColor as C } from "./types.js";
+import { findClosestPoint as I, formatWithoutDecimals as _, splitInterval as E, validateMinMax as O } from "../../utils/math.js";
 export {
-  o as Slider,
-  m as SliderMark,
-  i as SliderProvider,
-  d as SliderTrack,
-  M as THEME_COLOR_MAP,
-  S as THUMB_HALF,
-  v as THUMB_SIZE,
-  c as decimalsToStep,
-  B as findClosestPoint,
-  C as formatWithDecimals,
-  H as formatWithoutDecimals,
-  T as getIntervalBounds,
-  k as getThumbInBoundsOffset,
-  n as makeMarkerPoints,
-  u as resolveColor,
-  I as splitInterval,
-  a as useSliderContext,
-  p as validateMarkerPoints,
-  _ as validateMinMax
+  i as Slider,
+  f as SliderMark,
+  a as SliderProvider,
+  o as SliderTest,
+  n as SliderTrack,
+  T as THEME_COLOR_MAP,
+  k as THUMB_HALF,
+  u as THUMB_SIZE,
+  I as findClosestPoint,
+  _ as formatWithoutDecimals,
+  P as getIntervalBounds,
+  B as getThumbInBoundsOffset,
+  x as makeMarkerPoints,
+  C as resolveColor,
+  M as resolveSnap,
+  E as splitInterval,
+  s as useSliderContext,
+  S as validateMarkerPoints,
+  O as validateMinMax
 };

package/dist/esm/components/slider/slider-track.js

@@ -1,40 +1,42 @@
 import { jsx as s, Fragment as m } from "react/jsx-runtime";
-import { useMemo as f } from "react";
-import { useSliderContext as d } from "./slider-context.js";
-import { getIntervalBounds as v, resolveColor as h } from "./types.js";
-function k() {
-  const r = d();
+import { useMemo as d } from "react";
+import { SliderTest as f } from "./constants.js";
+import { useSliderContext as v } from "./slider-context.js";
+import { getIntervalBounds as p, resolveColor as h } from "./types.js";
+function C() {
+  const r = v();
   if (!r) return null;
-  const { colorIntervals: t, min: n, max: o } = r;
+  const { colorIntervals: t, min: o, max: n } = r;
   if (!t?.length) return null;
-  const e = o - n;
-  return e <= 0 ? null : /* @__PURE__ */ s(p, { intervals: t, range: e, min: n });
+  const e = n - o;
+  return e <= 0 ? null : /* @__PURE__ */ s(x, { intervals: t, range: e, min: o });
 }
-function p({
+function x({
   intervals: r,
   range: t,
-  min: n
+  min: o
 }) {
-  const o = f(
+  const n = d(
     () => [...r || []].reverse(),
     [r]
   );
-  return /* @__PURE__ */ s(m, { children: o.map((e, u) => {
-    const { start: l, end: c } = v(e), i = (l - n) / t * 100, a = (c - l) / t * 100;
+  return /* @__PURE__ */ s(m, { children: n.map((e, c) => {
+    const { start: l, end: i } = p(e), a = (l - o) / t * 100, u = (i - l) / t * 100;
     return /* @__PURE__ */ s(
       "div",
       {
+        "data-testid": f.interval,
         className: "absolute h-full",
         style: {
-          left: `${i}%`,
-          width: `${a}%`,
+          left: `${a}%`,
+          width: `${u}%`,
           backgroundColor: h(e.color) ?? "hsl(var(--success))"
         }
       },
-      `interval-${u}-${l}-${c}`
+      `interval-${c}-${l}-${i}`
     );
   }) });
 }
 export {
-  k as SliderTrack
+  C as SliderTrack
 };

package/dist/esm/components/slider/slider-utils.js

@@ -1,32 +1,47 @@
-import { splitInterval as m, formatWithoutDecimals as a } from "../../utils/math.js";
-import { decimalsToStep as l, findClosestPoint as y, formatWithDecimals as u, validateMinMax as x } from "../../utils/math.js";
-function f(t, i, e) {
+import { splitInterval as h, findClosestPoint as M, formatWithoutDecimals as d } from "../../utils/math.js";
+import { validateMinMax as l } from "../../utils/math.js";
+function k(t, e, r) {
   if (t.length === 0) return t;
-  const o = t.length - 1, r = {
-    point: Math.max(t[0].point, i),
+  const o = t.length - 1, s = {
+    point: Math.max(t[0].point, e),
     type: t[0].type
-  }, s = {
-    point: Math.min(t[o].point, e),
+  }, c = {
+    point: Math.min(t[o].point, r),
     type: t[o].type
-  }, c = t.slice(1, o).reduce((p, n) => (n.point !== r.point && n.point !== s.point && (p[n.point] = n), p), {});
-  return [r, ...Object.values(c), s];
+  }, p = t.slice(1, o).reduce((i, n) => (n.point !== s.point && n.point !== c.point && (i[n.point] = n), i), {});
+  return [s, ...Object.values(p), c];
 }
-function d(t, i, e, o, r) {
-  const s = a(t, e, 1), p = m(s, i, r).map(
+function y(t, e, r, o, s) {
+  const c = d(t, r, 1), i = h(c, e, s).map(
     (n) => ({
-      point: a(n, e, o),
+      point: d(n, r, o),
       type: "base"
     })
   );
-  return f(p, t, i);
+  return k(i, t, e);
+}
+function x(t, { snapPoints: e, intervals: r, epsilon: o, decimals: s }) {
+  const { minDistance: c, minPoint: p } = M(
+    t,
+    [...e],
+    s
+  );
+  if (c >= o)
+    return t;
+  let i, n = o;
+  for (const a of e) {
+    const f = Math.abs(a - t);
+    f < n && (i = a, n = f);
+  }
+  const m = r?.some((a) => p >= a.start && p <= a.end);
+  return i !== void 0 && !m ? i : p;
 }
 export {
-  l as decimalsToStep,
-  y as findClosestPoint,
-  u as formatWithDecimals,
-  a as formatWithoutDecimals,
-  d as makeMarkerPoints,
-  m as splitInterval,
-  f as validateMarkerPoints,
-  x as validateMinMax
+  M as findClosestPoint,
+  d as formatWithoutDecimals,
+  y as makeMarkerPoints,
+  x as resolveSnap,
+  h as splitInterval,
+  k as validateMarkerPoints,
+  l as validateMinMax
 };

package/dist/esm/components/slider/slider.js

@@ -1,19 +1,17 @@
-import { jsx as r, jsxs as T } from "react/jsx-runtime";
-import { LEVERAGE_DECIMALS as F } from "@gearbox-protocol/sdk";
+import { jsx as o, jsxs as W } from "react/jsx-runtime";
+import { LEVERAGE_DECIMALS as F } from "@gearbox-protocol/sdk/onchain";
 import * as P from "@radix-ui/react-slider";
 import * as H from "react";
 import { useMemo as m, useRef as w, useCallback as J, useState as K, useLayoutEffect as Q } from "react";
 import { cn as y } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
-import { findClosestPoint as X, validateMinMax as Y } from "../../utils/math.js";
+import { validateMinMax as X } from "../../utils/math.js";
 import "luxon";
 import "../../utils/z-index.js";
-import { SliderProvider as Z } from "./slider-context.js";
-import { SliderMark as I } from "./slider-mark.js";
-import { SliderTrack as ee } from "./slider-track.js";
-import { makeMarkerPoints as te } from "./slider-utils.js";
-import { getIntervalBounds as ne, getThumbInBoundsOffset as W } from "./types.js";
+import { SliderProvider as Y } from "./slider-context.js";
+import { SliderMark as Z } from "./slider-mark.js";
+import { SliderTrack as I } from "./slider-track.js";
+import { makeMarkerPoints as ee, resolveSnap as te } from "./slider-utils.js";
+import { getIntervalBounds as ne, getThumbInBoundsOffset as D } from "./types.js";
 const M = Number(F), re = H.forwardRef(
   ({
     className: O,
@@ -22,67 +20,69 @@ const M = Number(F), re = H.forwardRef(
     value: _,
     onChangeValue: N,
     onSubmitValue: g,
-    colorIntervals: o,
+    colorIntervals: n,
     precision: h = 10,
     markerStep: v = 100,
     epsilon: j = 8,
-    colorIntervalLabel: C,
+    colorIntervalLabel: L,
     ...z
   }, B) => {
-    const [n, i] = u > p ? [p, u] : [u, p], d = Array.isArray(h) ? h[0] : h, $ = m(() => M / d, [d]), G = m(
-      () => o?.flatMap((e) => [e.start, e.end]) || [],
-      [o]
-    ), L = (e) => {
-      const { minDistance: t, minPoint: s } = X(
-        e,
-        G,
-        M
-      );
-      return t < j ? Y(s, n, i) : e;
-    }, U = (e) => {
-      e.length > 0 && N(L(e[0]));
+    const [r, s] = u > p ? [p, u] : [u, p], d = Array.isArray(h) ? h[0] : h, $ = m(() => M / d, [d]), G = m(
+      () => n?.flatMap((e) => [e.start, e.end]) || [],
+      [n]
+    ), C = (e) => X(
+      te(e, {
+        snapPoints: G,
+        intervals: n,
+        epsilon: j,
+        decimals: M
+      }),
+      r,
+      s
+    ), U = (e) => {
+      e.length > 0 && N(C(e[0]));
     }, V = (e) => {
-      g && e.length > 0 && g(L(e[0]));
-    }, b = m(() => v ? te(
-      n,
-      i,
+      g && e.length > 0 && g(C(e[0]));
+    }, b = m(() => v ? ee(
+      r,
+      s,
       M,
       d,
       v
-    ).map((t) => t.point) : void 0, [n, i, d, v]), E = w(null), q = J(() => {
+    ).map((t) => t.point) : void 0, [r, s, d, v]), E = w(null), q = J(() => {
       const e = E.current;
       if (!e) return;
       const t = () => {
         e.dataset.dragging = "";
-      }, s = () => {
+      }, a = () => {
         document.removeEventListener("pointermove", t), delete e.dataset.dragging;
       };
-      document.addEventListener("pointermove", t, { once: !0 }), document.addEventListener("pointerup", s, { once: !0 });
+      document.addEventListener("pointermove", t, { once: !0 }), document.addEventListener("pointerup", a, { once: !0 });
     }, []), R = w(null), k = w(null), [S, A] = K(void 0), f = m(() => {
-      if (!o?.length) return;
-      const e = o[o.length - 1], { start: t, end: s } = ne(e), a = i - n;
-      if (a <= 0) return;
-      const c = (t - n) / a * 100, l = (s - n) / a * 100, D = W(c), x = W(l);
+      if (!n?.length) return;
+      const e = n[n.length - 1], { start: t, end: a } = ne(e), i = s - r;
+      if (i <= 0) return;
+      const c = (t - r) / i * 100, l = (a - r) / i * 100, T = D(c), x = D(l);
       return {
         pct: (c + l) / 2,
-        offsetPx: (D + x) / 2
+        offsetPx: (T + x) / 2
       };
-    }, [o, n, i]);
+    }, [n, r, s]);
     return Q(() => {
       const e = R.current, t = k.current;
       if (!f || !e || !t) {
         A(void 0);
         return;
       }
-      const s = () => {
+      const a = () => {
         const c = e.offsetWidth, l = t.offsetWidth, x = f.pct / 100 * c + f.offsetPx - l / 2;
         A(Math.max(0, Math.min(x, c - l)));
       };
-      s();
-      const a = new ResizeObserver(s);
-      return a.observe(e), () => a.disconnect();
-    }, [f]), /* @__PURE__ */ r(Z, { colorIntervals: o, min: n, max: i, children: /* @__PURE__ */ T("div", { className: "relative w-full px-[9px] pb-3", children: [
-      /* @__PURE__ */ r(
+      a();
+      const i = new ResizeObserver(a);
+      return i.observe(e), () => i.disconnect();
+    }, [f]), /* @__PURE__ */ o(Y, { colorIntervals: n, min: r, max: s, children: /* @__PURE__ */ W("div", { className: "relative w-full px-[9px] pb-3", children: [
+      /* @__PURE__ */ o(
         "div",
         {
           ref: E,
@@ -93,7 +93,7 @@ const M = Number(F), re = H.forwardRef(
             "[&:not([data-dragging])_span[style]]:[transition-timing-function:cubic-bezier(0.25,0.1,0.25,1)]"
           ),
           onPointerDown: q,
-          children: /* @__PURE__ */ T(
+          children: /* @__PURE__ */ W(
             P.Root,
             {
               ref: B,
@@ -101,28 +101,28 @@ const M = Number(F), re = H.forwardRef(
                 "relative flex w-full touch-none select-none items-center",
                 O
               ),
-              min: n,
-              max: i,
+              min: r,
+              max: s,
               step: $,
               value: [_],
               onValueChange: U,
               onValueCommit: V,
               ...z,
               children: [
-                /* @__PURE__ */ r(P.Track, { className: "relative h-1 grow overflow-hidden bg-gray-40 mx-[9px] cursor-pointer", children: /* @__PURE__ */ r(ee, {}) }),
-                b && b.length > 0 && /* @__PURE__ */ r("div", { className: "absolute inset-0 pointer-events-none flex items-center", children: /* @__PURE__ */ r("div", { className: "relative w-full", children: b.map((e) => /* @__PURE__ */ r(
-                  I,
+                /* @__PURE__ */ o(P.Track, { className: "relative h-1 grow overflow-hidden bg-gray-40 mx-[9px] cursor-pointer", children: /* @__PURE__ */ o(I, {}) }),
+                b && b.length > 0 && /* @__PURE__ */ o("div", { className: "absolute inset-0 pointer-events-none flex items-center", children: /* @__PURE__ */ o("div", { className: "relative w-full", children: b.map((e) => /* @__PURE__ */ o(
+                  Z,
                   {
                     value: e,
-                    min: n,
-                    max: i,
+                    min: r,
+                    max: s,
                     onSelect: (t) => {
                       N(t), g?.(t);
                     }
                   },
                   `mark-${e}`
                 )) }) }),
-                /* @__PURE__ */ r(
+                /* @__PURE__ */ o(
                   P.Thumb,
                   {
                     className: y(
@@ -140,13 +140,13 @@ const M = Number(F), re = H.forwardRef(
           )
         }
       ),
-      C && o && o.length > 0 && /* @__PURE__ */ r("div", { ref: R, className: "relative h-[14px] mt-2.5", children: /* @__PURE__ */ r(
+      L && n && n.length > 0 && /* @__PURE__ */ o("div", { ref: R, className: "relative h-[14px] mt-2.5", children: /* @__PURE__ */ o(
         "div",
         {
           ref: k,
           className: "absolute text-[11px] font-medium leading-[126%] text-success whitespace-nowrap",
           style: S !== void 0 ? { left: `${S}px` } : void 0,
-          children: C
+          children: L
         }
       ) })
     ] }) });

package/dist/esm/components/spinner/spinner.js

@@ -1,10 +1,8 @@
 import { jsxs as f, jsx as t } from "react/jsx-runtime";
 import { IconPending as c } from "@gearbox-protocol/static";
 import * as i from "react";
-import "@gearbox-protocol/sdk";
+import "@gearbox-protocol/sdk/onchain";
 import { cn as a } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
 import "luxon";
 import { Z_INDEX as d } from "../../utils/z-index.js";
 const m = i.forwardRef(

package/dist/esm/components/spinner-loader/spinner-loader.js

@@ -1,28 +1,26 @@
-import { jsx as m } from "react/jsx-runtime";
-import * as p from "react";
-import "@gearbox-protocol/sdk";
-import { cn as d } from "../../utils/cn.js";
-import "sonner";
-import "@gearbox-protocol/sdk/common-utils";
+import { jsx as d } from "react/jsx-runtime";
+import * as m from "react";
+import "@gearbox-protocol/sdk/onchain";
+import { cn as p } from "../../utils/cn.js";
 import "luxon";
 import "../../utils/z-index.js";
-const s = p.forwardRef(
-  ({ size: r = 40, speed: o = "1s", width: i = 4, className: t, style: e, ...a }, n) => /* @__PURE__ */ m(
+const s = m.forwardRef(
+  ({ size: r = 40, speed: o = "1s", width: i = 4, className: e, style: a, ...t }, n) => /* @__PURE__ */ d(
     "span",
     {
       ref: n,
-      className: d(
+      className: p(
         "inline-block rounded-full border-solid border-gray-20 border-b-gray-110 animate-spin",
-        t
+        e
       ),
       style: {
         width: r,
         height: r,
         borderWidth: i,
         animationDuration: o,
-        ...e
+        ...a
       },
-      ...a
+      ...t
     }
   )
 );