@nutui/nutui 4.0.11 → 4.0.12

package/dist/packages/_es/Indicator.js

@@ -1,22 +1,23 @@
-import { toRefs as i, computed as m, openBlock as r, createElementBlock as o, normalizeClass as l, Fragment as u, renderList as d, toDisplayString as f } from "vue";
-import { p as y, c as $ } from "./component-234624bc.js";
-import { _ as k } from "./_plugin-vue_export-helper-dad06003.js";
+import { toRefs, computed, openBlock, createElementBlock, normalizeClass, Fragment, renderList, toDisplayString } from "vue";
+import { p as padZero, c as createComponent } from "./component-81a4c1d0.js";
+import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const { componentName: c, create: v } = $("indicator"), b = v({
+const { componentName, create } = createComponent("indicator");
+const _sfc_main = create({
   props: {
     size: {
       type: Number,
       default: 3,
-      required: !0
+      required: true
     },
     current: {
       type: Number,
       default: 1,
-      required: !0
+      required: true
     },
     block: {
       type: Boolean,
-      default: !1
+      default: false
     },
     align: {
       type: String,
@@ -24,37 +25,40 @@ const { componentName: c, create: v } = $("indicator"), b = v({
     },
     fillZero: {
       type: Boolean,
-      default: !0
+      default: true
     }
   },
-  setup(e) {
-    const { block: a, align: s } = i(e);
-    return { classes: m(() => {
-      const t = c;
+  setup(props) {
+    const { block, align } = toRefs(props);
+    const classes = computed(() => {
+      const prefixCls = componentName;
       return {
-        [t]: !0,
-        [`${t}--block`]: a.value,
-        [`${t}--align__${s.value}`]: a.value && s.value
+        [prefixCls]: true,
+        [`${prefixCls}--block`]: block.value,
+        [`${prefixCls}--align__${align.value}`]: block.value && align.value
       };
-    }), componentName: c, padZero: y };
+    });
+    return { classes, componentName, padZero };
   }
 });
-function g(e, a, s, p, t, N) {
-  return r(), o("view", {
-    class: l(e.classes)
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes)
   }, [
-    (r(!0), o(u, null, d(e.size, (n) => (r(), o(u, { key: n }, [
-      n === e.current ? (r(), o("view", {
-        key: 0,
-        class: l(`${e.componentName}--number`)
-      }, f(e.fillZero && e.padZero(n) || n), 3)) : (r(), o("view", {
-        key: 1,
-        class: l(`${e.componentName}--dot`)
-      }, null, 2))
-    ], 64))), 128))
+    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.size, (item) => {
+      return openBlock(), createElementBlock(Fragment, { key: item }, [
+        item === _ctx.current ? (openBlock(), createElementBlock("view", {
+          key: 0,
+          class: normalizeClass(`${_ctx.componentName}--number`)
+        }, toDisplayString(_ctx.fillZero && _ctx.padZero(item) || item), 3)) : (openBlock(), createElementBlock("view", {
+          key: 1,
+          class: normalizeClass(`${_ctx.componentName}--dot`)
+        }, null, 2))
+      ], 64);
+    }), 128))
   ], 2);
 }
-const z = /* @__PURE__ */ k(b, [["render", g]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {
-  z as default
+  index as default
 };

package/dist/packages/_es/InfiniteLoading.js

@@ -1,31 +1,39 @@
-var x = Object.defineProperty, B = Object.defineProperties;
-var k = Object.getOwnPropertyDescriptors;
-var w = Object.getOwnPropertySymbols;
-var I = Object.prototype.hasOwnProperty, N = Object.prototype.propertyIsEnumerable;
-var T = (e, o, t) => o in e ? x(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, S = (e, o) => {
-  for (var t in o || (o = {}))
-    I.call(o, t) && T(e, t, o[t]);
-  if (w)
-    for (var t of w(o))
-      N.call(o, t) && T(e, t, o[t]);
-  return e;
-}, b = (e, o) => B(e, k(o));
-import { ref as y, reactive as A, computed as E, onMounted as H, onUnmounted as P, onActivated as D, onDeactivated as R, watch as q, toRefs as z, nextTick as F, resolveComponent as K, openBlock as C, createElementBlock as $, normalizeClass as U, createElementVNode as c, renderSlot as u, createVNode as j, toDisplayString as L, createCommentVNode as G } from "vue";
-import { c as J, l as O } from "./component-234624bc.js";
-import { u as Q } from "./index-496e6e05.js";
-import { r as W } from "./raf-a74f1a06.js";
-import { Loading as X } from "@nutui/icons-vue";
-import { _ as Y } from "./_plugin-vue_export-helper-dad06003.js";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { ref, reactive, computed, onMounted, onUnmounted, onActivated, onDeactivated, watch, toRefs, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, renderSlot, createVNode, toDisplayString, createCommentVNode } from "vue";
+import { c as createComponent, l as getScrollTopRoot } from "./component-81a4c1d0.js";
+import { u as useScrollParent } from "./index-43c34ac6.js";
+import { r as requestAniFrame } from "./raf-729dad54.js";
+import { Loading } from "@nutui/icons-vue";
+import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const { componentName: Z, create: ee, translate: oe } = J("infinite-loading"), te = ee({
+const { componentName, create, translate } = createComponent("infinite-loading");
+const _sfc_main = create({
   props: {
     modelValue: {
       type: Boolean,
-      default: !1
+      default: false
     },
     hasMore: {
       type: Boolean,
-      default: !0
+      default: true
     },
     threshold: {
       type: Number,
@@ -41,94 +49,139 @@ const { componentName: Z, create: ee, translate: oe } = J("infinite-loading"), t
     },
     useCapture: {
       type: Boolean,
-      default: !1
+      default: false
     }
   },
   emits: ["scroll-change", "load-more", "update:modelValue"],
   components: {
-    Loading: X
+    Loading
   },
-  setup(e, { emit: o, slots: t }) {
-    const i = y(), l = Q(i), s = A({
+  setup(props, { emit, slots }) {
+    const scroller = ref();
+    const scrollParent = useScrollParent(scroller);
+    const state = reactive({
       beforeScrollTop: 0,
-      isInfiniting: !1,
+      isInfiniting: false,
       y: 0,
       x: 0,
       distance: 0
-    }), d = E(() => ({
-      [Z]: !0
-    })), p = (n) => n ? n.offsetTop + p(n.offsetParent) : 0, M = () => {
-      let n = 0, a = 0, m = "down";
-      if (l.value == window) {
-        const r = O();
-        i.value && (n = p(i.value) + i.value.offsetHeight - r - window.innerHeight), a = r;
+    });
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true
+      };
+    });
+    const calculateTopPosition = (el) => {
+      return !el ? 0 : el.offsetTop + calculateTopPosition(el.offsetParent);
+    };
+    const isScrollAtBottom = () => {
+      let offsetDistance = 0;
+      let resScrollTop = 0;
+      let direction = "down";
+      if (scrollParent.value == window) {
+        const windowScrollTop = getScrollTopRoot();
+        if (scroller.value) {
+          offsetDistance = calculateTopPosition(scroller.value) + scroller.value.offsetHeight - windowScrollTop - window.innerHeight;
+        }
+        resScrollTop = windowScrollTop;
+      } else {
+        const { scrollHeight, clientHeight, scrollTop } = scrollParent.value;
+        offsetDistance = scrollHeight - clientHeight - scrollTop;
+        resScrollTop = scrollTop;
+      }
+      if (state.beforeScrollTop > resScrollTop) {
+        direction = "up";
       } else {
-        const { scrollHeight: r, clientHeight: V, scrollTop: h } = l.value;
-        n = r - V - h, a = h;
+        direction = "down";
       }
-      return s.beforeScrollTop > a ? m = "up" : m = "down", s.beforeScrollTop = a, o("scroll-change", a), n <= e.threshold && m == "down";
-    }, v = () => {
-      W(() => {
-        if (!M() || !e.hasMore || s.isInfiniting)
-          return !1;
-        s.isInfiniting = !0, o("update:modelValue", !0), F(() => o("load-more"));
+      state.beforeScrollTop = resScrollTop;
+      emit("scroll-change", resScrollTop);
+      return offsetDistance <= props.threshold && direction == "down";
+    };
+    const handleScroll = () => {
+      requestAniFrame(() => {
+        if (!isScrollAtBottom() || !props.hasMore || state.isInfiniting) {
+          return false;
+        } else {
+          state.isInfiniting = true;
+          emit("update:modelValue", true);
+          nextTick(() => emit("load-more"));
+        }
       });
-    }, _ = () => {
-      l.value && l.value.addEventListener("scroll", v, e.useCapture);
-    }, g = () => {
-      l.value && l.value.removeEventListener("scroll", v, e.useCapture);
     };
-    H(() => {
-      _();
-    }), P(() => {
-      g();
+    const scrollListener = () => {
+      scrollParent.value && scrollParent.value.addEventListener("scroll", handleScroll, props.useCapture);
+    };
+    const removeScrollListener = () => {
+      scrollParent.value && scrollParent.value.removeEventListener("scroll", handleScroll, props.useCapture);
+    };
+    onMounted(() => {
+      scrollListener();
     });
-    const f = y(!1);
-    return D(() => {
-      f.value && (f.value = !1, _());
-    }), R(() => {
-      f.value = !0, g();
-    }), q(
-      () => e.modelValue,
-      (n) => {
-        n || (s.isInfiniting = !1);
+    onUnmounted(() => {
+      removeScrollListener();
+    });
+    const isKeepAlive = ref(false);
+    onActivated(() => {
+      if (isKeepAlive.value) {
+        isKeepAlive.value = false;
+        scrollListener();
       }
-    ), b(S({
-      classes: d,
-      scroller: i
-    }, z(s)), {
-      translate: oe,
-      slots: t
+    });
+    onDeactivated(() => {
+      isKeepAlive.value = true;
+      removeScrollListener();
+    });
+    watch(
+      () => props.modelValue,
+      (val) => {
+        if (!val) {
+          state.isInfiniting = false;
+        }
+      }
+    );
+    return __spreadProps(__spreadValues({
+      classes,
+      scroller
+    }, toRefs(state)), {
+      translate,
+      slots
     });
   }
-}), ne = { class: "nut-infinite__container" }, le = { class: "nut-infinite__bottom" }, se = {
+});
+const _hoisted_1 = { class: "nut-infinite__container" };
+const _hoisted_2 = { class: "nut-infinite__bottom" };
+const _hoisted_3 = {
   key: 0,
   class: "nut-infinite__bottom-box"
-}, ie = { class: "nut-infinite__bottom-box__text" }, ae = { class: "nut-infinite__bottom-tips" };
-function re(e, o, t, i, l, s) {
-  const d = K("Loading");
-  return C(), $("view", {
-    class: U(e.classes),
+};
+const _hoisted_4 = { class: "nut-infinite__bottom-box__text" };
+const _hoisted_5 = { class: "nut-infinite__bottom-tips" };
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_Loading = resolveComponent("Loading");
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes),
     ref: "scroller"
   }, [
-    c("view", ne, [
-      u(e.$slots, "default")
+    createElementVNode("view", _hoisted_1, [
+      renderSlot(_ctx.$slots, "default")
     ]),
-    c("view", le, [
-      e.isInfiniting ? (C(), $("view", se, [
-        u(e.$slots, "loading", {}, () => [
-          u(e.$slots, "loading-icon", {}, () => [
-            j(d, { class: "nut-icon-loading nut-infinite__bottom-box__img" })
+    createElementVNode("view", _hoisted_2, [
+      _ctx.isInfiniting ? (openBlock(), createElementBlock("view", _hoisted_3, [
+        renderSlot(_ctx.$slots, "loading", {}, () => [
+          renderSlot(_ctx.$slots, "loading-icon", {}, () => [
+            createVNode(_component_Loading, { class: "nut-icon-loading nut-infinite__bottom-box__img" })
           ]),
-          c("view", ie, L(e.loadTxt || e.translate("loading")), 1)
+          createElementVNode("view", _hoisted_4, toDisplayString(_ctx.loadTxt || _ctx.translate("loading")), 1)
         ])
-      ])) : e.hasMore ? G("", !0) : u(e.$slots, "finished", { key: 1 }, () => [
-        c("view", ae, L(e.loadMoreTxt || e.translate("loadMoreTxt")), 1)
-      ])
+      ])) : !_ctx.hasMore ? renderSlot(_ctx.$slots, "finished", { key: 1 }, () => [
+        createElementVNode("view", _hoisted_5, toDisplayString(_ctx.loadMoreTxt || _ctx.translate("loadMoreTxt")), 1)
+      ]) : createCommentVNode("", true)
     ])
   ], 2);
 }
-const ge = /* @__PURE__ */ Y(te, [["render", re]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {
-  ge as default
+  index as default
 };