x-next 1.5.0 → 1.7.0

package/dist/es/components/image/ImagePreviewGroup.vue2.js

@@ -1,12 +1,13 @@
-import { defineComponent as T, toRefs as q, reactive as b, computed as r, ref as D, watch as E, provide as F } from "vue";
+import { defineComponent as q, toRefs as D, reactive as b, computed as r, ref as E, watch as F, provide as H } from "vue";
 import C from "../../_hooks/use-merge-state.js";
-import H from "./ImagePreview.vue.js";
-import { PreviewGroupInjectionKey as J } from "./context.js";
+import J from "./ImagePreview.vue.js";
+import { PreviewGroupInjectionKey as Q } from "./context.js";
 import { isArray as A, isUndefined as s } from "../../_utils/is.js";
-const $ = /* @__PURE__ */ T({
+import { useLocale as W } from "../../locale/index.js";
+const re = /* @__PURE__ */ q({
   name: "ImagePreviewGroup",
   components: {
-    ImagePreview: H
+    ImagePreview: J
   },
   inheritAttrs: !1,
   props: {
@@ -120,21 +121,23 @@ const $ = /* @__PURE__ */ T({
     emit: m
   }) {
     const {
+      t: U
+    } = W(), {
       srcList: n,
-      visible: U,
-      defaultVisible: M,
-      current: S,
+      visible: M,
+      defaultVisible: S,
+      current: L,
       defaultCurrent: N,
       infinite: w
-    } = q(B), [h, O] = C(M.value, b({
-      value: U
+    } = D(B), [h, O] = C(S.value, b({
+      value: M
     })), g = (e) => {
       e !== h.value && (m("visible-change", e), m("update:visible", e), O(e));
     }, k = r(() => new Map(A(n == null ? void 0 : n.value) ? n == null ? void 0 : n.value.map((e, t) => [t, {
       url: e,
       canPreview: !0
-    }]) : [])), x = r(() => A(n == null ? void 0 : n.value)), c = D(/* @__PURE__ */ new Map()), f = r(() => x.value ? k.value : c.value), z = r(() => Array.from(c.value.keys())), d = r(() => Array.from(f.value.keys())), i = r(() => d.value.length);
-    function L(e, t, u) {
+    }]) : [])), x = r(() => A(n == null ? void 0 : n.value)), c = E(/* @__PURE__ */ new Map()), f = r(() => x.value ? k.value : c.value), z = r(() => Array.from(c.value.keys())), d = r(() => Array.from(f.value.keys())), o = r(() => d.value.length);
+    function R(e, t, u) {
       return c.value.set(e, {
         url: t,
         canPreview: u
@@ -142,21 +145,21 @@ const $ = /* @__PURE__ */ T({
         c.value.delete(e);
       };
     }
-    const [a, R] = C(N.value, b({
-      value: S
+    const [a, _] = C(N.value, b({
+      value: L
     })), v = (e) => {
-      e !== a.value && (m("change", e), m("update:current", e), R(e));
-    }, _ = r(() => d.value[a.value]), j = (e) => {
+      e !== a.value && (m("change", e), m("update:current", e), _(e));
+    }, j = r(() => d.value[a.value]), G = (e) => {
       const t = d.value.indexOf(e);
       t >= 0 && t !== a.value && v(t);
-    }, G = r(() => {
+    }, V = r(() => {
       var e;
-      return (e = f.value.get(_.value)) == null ? void 0 : e.url;
+      return (e = f.value.get(j.value)) == null ? void 0 : e.url;
     });
-    E(
-      [i, a],
+    F(
+      [o, a],
       () => {
-        if (i.value === 0) {
+        if (o.value === 0) {
           g(!1);
           return;
         }
@@ -164,64 +167,67 @@ const $ = /* @__PURE__ */ T({
           v(0);
           return;
         }
-        a.value >= i.value && v(i.value - 1);
+        a.value >= o.value && v(o.value - 1);
       },
       // 自动收集模式须等子图片注册；显式列表在 setup 时即可检查边界。
       {
         immediate: x.value
       }
-    ), F(J, b({
-      registerImageUrl: L,
+    ), H(Q, b({
+      registerImageUrl: R,
       preview: (e) => {
         if (x.value) {
-          const u = c.value.get(e), o = u != null && u.canPreview ? z.value.indexOf(e) : -1;
-          o >= 0 && o < i.value && (v(o), g(!0));
+          const u = c.value.get(e), i = u != null && u.canPreview ? z.value.indexOf(e) : -1;
+          i >= 0 && i < o.value && (v(i), g(!0));
           return;
         }
         const t = f.value.get(e);
-        t != null && t.canPreview && (j(e), g(!0));
+        t != null && t.canPreview && (G(e), g(!0));
       }
     }));
     const y = r(() => {
-      const e = (u, o) => {
+      const e = (u, i) => {
         var p;
-        for (let l = u; l <= o; l++) {
+        for (let l = u; l <= i; l++) {
           const P = d.value[l];
           if ((p = f.value.get(P)) != null && p.canPreview)
             return l;
         }
-      }, t = e(a.value + 1, i.value - 1);
+      }, t = e(a.value + 1, o.value - 1);
       return s(t) && w.value ? e(0, a.value - 1) : t;
     }), I = r(() => {
-      const e = (u, o) => {
+      const e = (u, i) => {
         var p;
-        for (let l = u; l >= o; l--) {
+        for (let l = u; l >= i; l--) {
           const P = d.value[l];
           if ((p = f.value.get(P)) != null && p.canPreview)
             return l;
         }
       }, t = e(a.value - 1, 0);
-      return s(t) && w.value ? e(i.value - 1, a.value + 1) : t;
-    }), V = r(() => s(I.value) ? void 0 : () => {
+      return s(t) && w.value ? e(o.value - 1, a.value + 1) : t;
+    }), K = r(() => s(I.value) ? void 0 : () => {
       !s(I.value) && v(I.value);
-    }), K = r(() => s(y.value) ? void 0 : () => {
+    }), T = r(() => s(y.value) ? void 0 : () => {
       !s(y.value) && v(y.value);
     });
     return {
+      t: U,
+      currentIndex: a,
+      imageCount: o,
       mergedVisible: h,
-      currentUrl: G,
+      currentUrl: V,
       prevIndex: I,
       nextIndex: y,
       onClose() {
         g(!1);
       },
       groupArrowProps: b({
-        onPrev: V,
-        onNext: K
+        onPrev: K,
+        onNext: T
       })
     };
   }
 });
 export {
-  $ as default
+  re as default
 };

package/dist/es/components/image/hooks/use-image-drag.js

@@ -2,39 +2,41 @@ import { toRefs as E, ref as x, watchEffect as R, watch as X, nextTick as Y } fr
 import { on as s, off as f } from "../../../_utils/dom.js";
 import h from "../utils/get-fix-translate.js";
 function B(D) {
-  const { wrapperEl: v, imageEl: a, scale: n } = E(D), t = x([0, 0]), u = x(!1);
-  let i = 0, c = 0, l = [0, 0];
+  const { wrapperEl: v, imageEl: l, scale: n } = E(D), t = x([0, 0]), o = x(!1);
+  let i = 0, c = 0, r = [0, 0];
   const T = () => {
-    if (!v.value || !a.value) return;
-    const e = v.value.getBoundingClientRect(), r = a.value.getBoundingClientRect(), [o, d] = h(
+    if (!v.value || !l.value) return;
+    const e = v.value.getBoundingClientRect(), a = l.value.getBoundingClientRect(), [u, d] = h(
       e,
-      r,
+      a,
       t.value[0],
       t.value[1],
       n.value
     );
-    (o !== t.value[0] || d !== t.value[1]) && (t.value = [o, d]);
+    (u !== t.value[0] || d !== t.value[1]) && (t.value = [u, d]);
   }, p = (e) => {
     e.preventDefault && e.preventDefault();
-    const r = l[0] + (e.pageX - i) / n.value, o = l[1] + (e.pageY - c) / n.value;
-    t.value = [r, o];
+    const a = r[0] + (e.pageX - i) / n.value, u = r[1] + (e.pageY - c) / n.value;
+    t.value = [a, u];
   }, g = (e) => {
-    e.preventDefault && e.preventDefault(), u.value = !1, w();
+    e.preventDefault && e.preventDefault(), o.value = !1, w();
   }, m = (e) => {
-    e.target === e.currentTarget && (e.preventDefault && e.preventDefault(), u.value = !0, i = e.pageX, c = e.pageY, l = [...t.value], s(window, "mousemove", p, !1), s(window, "mouseup", g, !1));
+    e.target === e.currentTarget && (e.preventDefault && e.preventDefault(), o.value = !0, i = e.pageX, c = e.pageY, r = [...t.value], s(window, "mousemove", p, !1), s(window, "mouseup", g, !1));
   };
   function w() {
     typeof window > "u" || (f(window, "mousemove", p, !1), f(window, "mouseup", g, !1));
   }
   return R((e) => {
-    typeof window > "u" || (a.value && s(a.value, "mousedown", m), e(() => {
-      a.value && f(a.value, "mousedown", m), w();
-    }));
+    if (typeof window > "u") return;
+    const a = l.value;
+    a && s(a, "mousedown", m), e(() => {
+      a && f(a, "mousedown", m), o.value = !1, w();
+    });
   }), X([n], () => {
     Y(() => T());
   }), {
     translate: t,
-    moving: u,
+    moving: o,
     resetTranslate() {
       t.value = [0, 0];
     }

package/dist/es/components/index.js

@@ -4,159 +4,165 @@ import { ConfigProvider as x } from "./config-provider/index.js";
 import { Dialog as n } from "./dialog/index.js";
 import { Drawer as u } from "./drawer/index.js";
 import { Dropdown as c, DropdownButton as d, DropdownGroup as T, DropdownOption as S, DropdownSubmenu as g } from "./dropdown/index.js";
-import { Empty as P } from "./empty/index.js";
-import { DatePicker as b, MonthPicker as s, QuarterPicker as w, RangePicker as L, WeekPicker as D, YearPicker as y } from "./date-picker/index.js";
+import { Empty as I } from "./empty/index.js";
+import { DatePicker as b, MonthPicker as s, QuarterPicker as w, RangePicker as L, WeekPicker as C, YearPicker as D } from "./date-picker/index.js";
 import { Form as G, FormItem as h } from "./form/index.js";
 import { Checkbox as M, CheckboxGroup as R } from "./form-checkbox/index.js";
 import { Input as B, InputGroup as E, InputPassword as _, InputSearch as N } from "./form-input/index.js";
 import { InputNumber as j } from "./form-input-number/index.js";
-import { InputTag as K } from "./form-input-tag/index.js";
-import { Radio as H, RadioGroup as z } from "./form-radio/index.js";
-import { Select as U, SelectDropdown as Y, SelectOption as Z, SelectOptionGroup as q } from "./form-select/index.js";
+import { InputTag as H } from "./form-input-tag/index.js";
+import { Radio as W, RadioGroup as U } from "./form-radio/index.js";
+import { Select as Q, SelectDropdown as Y, SelectOption as Z, SelectOptionGroup as q } from "./form-select/index.js";
 import { Slider as V } from "./form-slider/index.js";
 import { Switch as $ } from "./form-switch/index.js";
 import { Textarea as ro } from "./form-textarea/index.js";
-import { Draggable as to } from "./draggable/index.js";
-import { Col as mo, Grid as fo, GridItem as xo, Row as ao } from "./grid/index.js";
-import { Image as io, ImagePreview as uo, ImagePreviewAction as lo, ImagePreviewGroup as co } from "./image/index.js";
-import { Layout as So, LayoutContent as go, LayoutFooter as Io, LayoutHeader as Po, LayoutSidebar as ko } from "./layout/index.js";
-import { Link as so } from "./link/index.js";
-import { Menu as Lo, MenuItem as Do, MenuItemGroup as yo, MenuSubMenu as Co } from "./menu/index.js";
-import { Message as ho } from "./message/index.js";
-import { Network as Mo } from "./network/index.js";
-import { Notification as Ao } from "./notification/index.js";
-import { Pagination as Eo } from "./pagination/index.js";
-import { Popconfirm as No } from "./popconfirm/index.js";
-import { Popover as jo } from "./popover/index.js";
-import { Popup as Ko } from "./popup/index.js";
-import { Progress as Ho } from "./progress/index.js";
-import { Rate as Qo } from "./rate/index.js";
-import { ResizeBox as Yo } from "./resize-box/index.js";
-import { Scrollbar as qo } from "./scrollbar-v2/index.js";
-import { Skeleton as Vo, SkeletonLine as Xo, SkeletonShape as $o } from "./skeleton/index.js";
-import { Space as rr } from "./space/index.js";
-import { Spin as tr } from "./spin/index.js";
-import { Step as mr, Steps as fr } from "./steps/index.js";
-import { Table as ar, TableColumn as nr } from "./table/index.js";
-import { TabPane as ur, Tabs as lr } from "./tabs/index.js";
-import { Tag as dr } from "./tag/index.js";
-import { TimePicker as Sr } from "./time-picker/index.js";
-import { TimeRangeSelector as Ir } from "./time-range-selector/index.js";
-import { Timeline as kr } from "./timeline/index.js";
-import { TimelineItem as sr } from "./timeline-item/index.js";
-import { Tooltip as Lr } from "./tooltip/index.js";
-import { TrendChart as yr } from "./trend-chart/index.js";
-import { Trigger as Gr } from "./trigger/index.js";
-import { Watermark as vr } from "./watermark/index.js";
-import { TABLE_LOCALE_EN_US as Rr, TABLE_LOCALE_ZH_CN as Ar, formatLocaleText as Br } from "./table/locale.js";
-import { default as _r } from "./table/table-tbody.js";
-import { default as Or } from "./table/table-td.js";
-import { default as Fr } from "./table/table-th.js";
-import { default as Wr } from "./table/table-thead.js";
-import { default as zr } from "./table/table-tr.js";
-import { configProviderInjectionKey as Ur } from "./config-provider/context.js";
-import { formInjectionKey as Zr, formItemInjectionKey as qr } from "./form/context.js";
-import { vDraggable as Vr } from "./draggable/directive.js";
-import { vWatermark as $r } from "./watermark/directive.js";
+import { ColorPicker as to } from "./color-picker/index.js";
+import { Draggable as mo } from "./draggable/index.js";
+import { Col as xo, Grid as ao, GridItem as no, Row as io } from "./grid/index.js";
+import { Heatmap as lo } from "./heatmap/index.js";
+import { Image as To, ImagePreview as So, ImagePreviewAction as go, ImagePreviewGroup as Po } from "./image/index.js";
+import { Layout as ko, LayoutContent as bo, LayoutFooter as so, LayoutHeader as wo, LayoutSidebar as Lo } from "./layout/index.js";
+import { Link as Do } from "./link/index.js";
+import { Menu as Go, MenuItem as ho, MenuItemGroup as vo, MenuSubMenu as Mo } from "./menu/index.js";
+import { Message as Ao } from "./message/index.js";
+import { Network as Eo } from "./network/index.js";
+import { Notification as No } from "./notification/index.js";
+import { Pagination as jo } from "./pagination/index.js";
+import { Popconfirm as Ho } from "./popconfirm/index.js";
+import { Popover as Wo } from "./popover/index.js";
+import { Popup as zo } from "./popup/index.js";
+import { Progress as Yo } from "./progress/index.js";
+import { Rate as qo } from "./rate/index.js";
+import { ResizeBox as Vo } from "./resize-box/index.js";
+import { Scrollbar as $o } from "./scrollbar-v2/index.js";
+import { Skeleton as rr, SkeletonLine as er, SkeletonShape as tr } from "./skeleton/index.js";
+import { Space as mr } from "./space/index.js";
+import { Spin as xr } from "./spin/index.js";
+import { Step as nr, Steps as ir } from "./steps/index.js";
+import { Table as lr, TableColumn as cr } from "./table/index.js";
+import { TabPane as Tr, Tabs as Sr } from "./tabs/index.js";
+import { Tag as Pr } from "./tag/index.js";
+import { TimePicker as kr } from "./time-picker/index.js";
+import { TimeRangeSelector as sr } from "./time-range-selector/index.js";
+import { Timeline as Lr } from "./timeline/index.js";
+import { TimelineItem as Dr } from "./timeline-item/index.js";
+import { Tooltip as Gr } from "./tooltip/index.js";
+import { TrendChart as vr } from "./trend-chart/index.js";
+import { Trigger as Rr } from "./trigger/index.js";
+import { Upload as Br } from "./upload/index.js";
+import { Watermark as _r } from "./watermark/index.js";
+import { TABLE_LOCALE_EN_US as Or, TABLE_LOCALE_ZH_CN as jr, formatLocaleText as Fr } from "./table/locale.js";
+import { default as Kr } from "./table/table-tbody.js";
+import { default as Ur } from "./table/table-td.js";
+import { default as Qr } from "./table/table-th.js";
+import { default as Zr } from "./table/table-thead.js";
+import { default as Jr } from "./table/table-tr.js";
+import { configProviderInjectionKey as Xr } from "./config-provider/context.js";
+import { formInjectionKey as oe, formItemInjectionKey as re } from "./form/context.js";
+import { vDraggable as te } from "./draggable/directive.js";
+import { vWatermark as me } from "./watermark/directive.js";
 export {
   e as Alert,
   p as Button,
   m as ButtonGroup,
   M as Checkbox,
   R as CheckboxGroup,
-  mo as Col,
+  xo as Col,
+  to as ColorPicker,
   x as ConfigProvider,
   b as DatePicker,
   n as Dialog,
-  to as Draggable,
+  mo as Draggable,
   u as Drawer,
   c as Dropdown,
   d as DropdownButton,
   T as DropdownGroup,
   S as DropdownOption,
   g as DropdownSubmenu,
-  P as Empty,
+  I as Empty,
   G as Form,
   h as FormItem,
-  fo as Grid,
-  xo as GridItem,
-  io as Image,
-  uo as ImagePreview,
-  lo as ImagePreviewAction,
-  co as ImagePreviewGroup,
+  ao as Grid,
+  no as GridItem,
+  lo as Heatmap,
+  To as Image,
+  So as ImagePreview,
+  go as ImagePreviewAction,
+  Po as ImagePreviewGroup,
   B as Input,
   E as InputGroup,
   j as InputNumber,
   _ as InputPassword,
   N as InputSearch,
-  K as InputTag,
-  So as Layout,
-  go as LayoutContent,
-  Io as LayoutFooter,
-  Po as LayoutHeader,
-  ko as LayoutSidebar,
-  so as Link,
-  Lo as Menu,
-  Do as MenuItem,
-  yo as MenuItemGroup,
-  Co as MenuSubMenu,
-  ho as Message,
+  H as InputTag,
+  ko as Layout,
+  bo as LayoutContent,
+  so as LayoutFooter,
+  wo as LayoutHeader,
+  Lo as LayoutSidebar,
+  Do as Link,
+  Go as Menu,
+  ho as MenuItem,
+  vo as MenuItemGroup,
+  Mo as MenuSubMenu,
+  Ao as Message,
   s as MonthPicker,
-  Mo as Network,
-  Ao as Notification,
-  Eo as Pagination,
-  No as Popconfirm,
-  jo as Popover,
-  Ko as Popup,
-  Ho as Progress,
+  Eo as Network,
+  No as Notification,
+  jo as Pagination,
+  Ho as Popconfirm,
+  Wo as Popover,
+  zo as Popup,
+  Yo as Progress,
   w as QuarterPicker,
-  H as Radio,
-  z as RadioGroup,
+  W as Radio,
+  U as RadioGroup,
   L as RangePicker,
-  Qo as Rate,
-  Yo as ResizeBox,
-  ao as Row,
-  qo as Scrollbar,
-  U as Select,
+  qo as Rate,
+  Vo as ResizeBox,
+  io as Row,
+  $o as Scrollbar,
+  Q as Select,
   Y as SelectDropdown,
   Z as SelectOption,
   q as SelectOptionGroup,
-  Vo as Skeleton,
-  Xo as SkeletonLine,
-  $o as SkeletonShape,
+  rr as Skeleton,
+  er as SkeletonLine,
+  tr as SkeletonShape,
   V as Slider,
-  rr as Space,
-  tr as Spin,
-  mr as Step,
-  fr as Steps,
+  mr as Space,
+  xr as Spin,
+  nr as Step,
+  ir as Steps,
   $ as Switch,
-  Rr as TABLE_LOCALE_EN_US,
-  Ar as TABLE_LOCALE_ZH_CN,
-  ur as TabPane,
-  ar as Table,
-  nr as TableColumn,
-  lr as Tabs,
-  dr as Tag,
-  _r as Tbody,
-  Or as Td,
+  Or as TABLE_LOCALE_EN_US,
+  jr as TABLE_LOCALE_ZH_CN,
+  Tr as TabPane,
+  lr as Table,
+  cr as TableColumn,
+  Sr as Tabs,
+  Pr as Tag,
+  Kr as Tbody,
+  Ur as Td,
   ro as Textarea,
-  Fr as Th,
-  Wr as Thead,
-  Sr as TimePicker,
-  Ir as TimeRangeSelector,
-  kr as Timeline,
-  sr as TimelineItem,
-  Lr as Tooltip,
-  zr as Tr,
-  yr as TrendChart,
-  Gr as Trigger,
-  vr as Watermark,
-  D as WeekPicker,
-  y as YearPicker,
-  Ur as configProviderInjectionKey,
-  Zr as formInjectionKey,
-  qr as formItemInjectionKey,
-  Br as formatLocaleText,
-  Vr as vDraggable,
-  $r as vWatermark
+  Qr as Th,
+  Zr as Thead,
+  kr as TimePicker,
+  sr as TimeRangeSelector,
+  Lr as Timeline,
+  Dr as TimelineItem,
+  Gr as Tooltip,
+  Jr as Tr,
+  vr as TrendChart,
+  Rr as Trigger,
+  Br as Upload,
+  _r as Watermark,
+  C as WeekPicker,
+  D as YearPicker,
+  Xr as configProviderInjectionKey,
+  oe as formInjectionKey,
+  re as formItemInjectionKey,
+  Fr as formatLocaleText,
+  te as vDraggable,
+  me as vWatermark
 };

package/dist/es/components/menu/sub-menu-pop.vue2.js

@@ -40,16 +40,16 @@ const Q = S({
     }
   },
   setup(s) {
-    const { key: l } = N(), { level: a } = _(), { selectable: u, disabled: p, isChildrenSelected: C, popupMaxHeight: x } = B(s), t = V(), { onSubMenuClick: r, onMenuItemClick: n } = t, m = o(() => t.prefixCls), c = o(() => t.mode), f = o(() => t.selectedKeys || []), i = o(() => `${m.value}-pop`), v = o(
-      () => u.value && f.value.includes(l.value) || C.value
+    const { key: l } = N(), { level: a } = _(), { selectable: u, disabled: p, isChildrenSelected: C, popupMaxHeight: x } = B(s), t = V(), { onSubMenuClick: r, onMenuItemClick: n } = t, m = o(() => t.prefixCls), f = o(() => t.mode), v = o(() => t.selectedKeys || []), i = o(() => `${m.value}-pop`), d = o(
+      () => u.value && v.value.includes(l.value) || C.value
     ), M = o(() => [
       `${i.value}`,
       `${i.value}-header`,
       {
-        [`${m.value}-selected`]: v.value
+        [`${m.value}-selected`]: d.value
       }
-    ]), h = o(() => c.value === "horizontal" && !t.inTrigger), d = P(!1), g = (e) => {
-      d.value = e;
+    ]), h = o(() => f.value === "horizontal" && !t.inTrigger), g = P(!1), c = (e) => {
+      g.value = e;
     }, y = w("trigger"), k = o(() => {
       var e;
       return [
@@ -63,14 +63,14 @@ const Q = S({
     }), b = o(() => I(t.triggerProps || {}, ["class"]));
     return {
       menuPrefixCls: m,
-      mode: c,
+      mode: f,
       level: a,
       classNames: M,
-      isSelected: v,
+      isSelected: d,
       disabled: p,
-      selectedKeys: f,
+      selectedKeys: v,
       needPopOnBottom: h,
-      popVisible: d,
+      popVisible: g,
       className: y,
       triggerClassNames: k,
       triggerProps: b,
@@ -83,13 +83,13 @@ const Q = S({
         p.value || s._internalSkipCollect || (r && r(l.value, a.value), u.value && n && n(l.value));
       },
       onKeydown: (e) => {
-        p.value || s._internalSkipCollect || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, a.value), u.value && n && n(l.value));
+        p.value || s._internalSkipCollect || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, a.value), c(!0), u.value && n && n(l.value));
       },
       onMenuItemClick: (e) => {
-        n && n(e), g(!1);
+        n && n(e), c(!1);
       },
       onVisibleChange: (e) => {
-        g(e);
+        c(e);
       }
     };
   }