@nutui/nutui 4.3.14 → 4.3.15-beta.2

package/dist/packages/swiper/Swiper.js

@@ -1,8 +1,30 @@
-import { ref, reactive, computed, provide, onDeactivated, onBeforeUnmount, watch, nextTick, onMounted, onUnmounted, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, renderSlot, Fragment, renderList, createCommentVNode } from "vue";
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { ref, reactive, computed, provide, onDeactivated, onBeforeUnmount, watch, onMounted, onUnmounted, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createTextVNode, Fragment, renderList, createCommentVNode } from "vue";
 import { c as createComponent } from "../component-DQf3CENX.js";
-import { e as clamp } from "../util-D1pvnUYu.js";
+import { c as clamp } from "../util-2G3mRQeF.js";
 import { u as useTouch } from "../index-I8tfW3Kf.js";
-import { r as requestAniFrame } from "../raf-c01wDYCo.js";
+import { u as useTaroRect } from "../index-m0Wcof-q.js";
+import { r as requestAniFrame } from "../raf-CzJhCkQo.js";
+import Taro, { eventCenter, getCurrentInstance } from "@tarojs/taro";
 import { S as SWIPER_KEY } from "../types-DUkJysbi.js";
 import { _ as _export_sfc } from "../_plugin-vue_export-helper-1tPrXgE0.js";
 const { create, componentName } = createComponent("swiper");
@@ -63,6 +85,7 @@ const _sfc_main = create({
   emits: ["change"],
   setup(props, { emit, slots, expose }) {
     const container = ref();
+    const refRandomId = Math.random().toString(36).slice(-8);
     const state = reactive({
       active: 0,
       num: 0,
@@ -247,27 +270,33 @@ const _sfc_main = create({
       });
     };
     const autoplay = () => {
-      if (+props.autoPlay <= 0 || childCount.value <= 1) return;
+      if (Number(props.autoPlay) <= 0 || childCount.value <= 1) return;
       stopAutoPlay();
       state.autoplayTimer = setTimeout(() => {
         next();
         autoplay();
       }, Number(props.autoPlay));
     };
-    const init = (active = +props.initPage) => {
+    const init = (..._0) => __async(this, [..._0], function* (active = +props.initPage) {
+      if (!container.value) return;
       stopAutoPlay();
-      state.rect = container.value.getBoundingClientRect();
-      active = Math.min(childCount.value - 1, active);
-      state.width = props.width ? +props.width : state.rect.width;
-      state.height = props.height ? +props.height : state.rect.height;
-      state.active = active;
-      state.offset = getOffset(state.active);
-      state.moving = true;
-      getStyle();
-      autoplay();
-    };
+      useTaroRect(container).then(
+        (rect) => {
+          state.rect = rect;
+          active = Math.min(childCount.value - 1, active);
+          state.width = props.width ? +props.width : rect == null ? void 0 : rect.width;
+          state.height = props.height ? +props.height : rect == null ? void 0 : rect.height;
+          state.active = active;
+          state.offset = getOffset(state.active);
+          state.moving = true;
+          getStyle();
+          autoplay();
+        },
+        () => {
+        }
+      );
+    });
     const onTouchStart = (e) => {
-      if (props.isPreventDefault) e.preventDefault();
       if (props.isStopPropagation) e.stopPropagation();
       if (!props.touchable) return;
       touch.start(e);
@@ -327,15 +356,21 @@ const _sfc_main = create({
     watch(
       () => props.initPage,
       (val) => {
-        nextTick(() => {
-          init(Number(val));
+        Taro.nextTick(() => {
+          init(+val);
+        });
+        eventCenter.once(getCurrentInstance().router.onReady, () => {
+          init(+val);
         });
       }
     );
     watch(
       () => props.height,
       () => {
-        nextTick(() => {
+        Taro.nextTick(() => {
+          init();
+        });
+        eventCenter.once(getCurrentInstance().router.onReady, () => {
           init();
         });
       }
@@ -343,15 +378,20 @@ const _sfc_main = create({
     watch(
       () => state.children.length,
       () => {
-        nextTick(() => {
+        Taro.nextTick(() => {
           init();
         });
+        eventCenter.once(getCurrentInstance().router.onReady, () => {
+          Taro.nextTick(() => {
+            init();
+          });
+        });
       }
     );
     watch(
       () => props.autoPlay,
       (val) => {
-        +val > 0 ? autoplay() : stopAutoPlay();
+        Number(val) > 0 ? autoplay() : stopAutoPlay();
       }
     );
     const width = ref(window.innerWidth);
@@ -361,7 +401,10 @@ const _sfc_main = create({
       height.value = window.innerHeight;
     };
     watch([width, height], () => {
-      nextTick(() => {
+      Taro.nextTick(() => {
+        init();
+      });
+      eventCenter.once(getCurrentInstance().router.onReady, () => {
         init();
       });
     });
@@ -374,8 +417,9 @@ const _sfc_main = create({
     });
     return {
       state,
-      classesInner,
+      refRandomId,
       classesPagination,
+      classesInner,
       container,
       activePagination,
       onTouchStart,
@@ -384,10 +428,13 @@ const _sfc_main = create({
     };
   }
 });
+const _hoisted_1 = ["id", "catch-move"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
+    id: "container-" + _ctx.refRandomId,
     ref: "container",
     class: "nut-swiper",
+    "catch-move": _ctx.isPreventDefault,
     onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args)),
     onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchMove && _ctx.onTouchMove(...args)),
     onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
@@ -399,7 +446,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, [
       renderSlot(_ctx.$slots, "default")
     ], 6),
+    _cache[4] || (_cache[4] = createTextVNode()),
     renderSlot(_ctx.$slots, "page"),
+    _cache[5] || (_cache[5] = createTextVNode()),
     _ctx.paginationVisible && !_ctx.$slots.page ? (openBlock(), createElementBlock("view", {
       key: 0,
       class: normalizeClass(_ctx.classesPagination)
@@ -414,7 +463,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 6);
       }), 128))
     ], 2)) : createCommentVNode("", true)
-  ], 544);
+  ], 40, _hoisted_1);
 }
 const NutSwiper = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/dist/packages/switch/Switch.js

@@ -17,15 +17,15 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, computed, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createVNode, unref, createCommentVNode, Fragment, withDirectives, toDisplayString, vShow } from "vue";
-import { Loading1 } from "@nutui/icons-vue";
+import { defineComponent, computed, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createVNode, unref, createCommentVNode, createTextVNode, Fragment, withDirectives, toDisplayString, vShow } from "vue";
+import { Loading1 } from "@nutui/icons-vue-taro";
 import { u as useFormDisabled } from "../common-BH7uB7Cn.js";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
 const _hoisted_1 = { class: "nut-switch-button" };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutSwitch"
 }), {
-  __name: "switch",
+  __name: "switch.taro",
   props: {
     modelValue: { type: [String, Number, Boolean], default: false },
     disabled: { type: Boolean, default: false },
@@ -86,14 +86,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         createElementVNode("view", _hoisted_1, [
           _ctx.loading ? renderSlot(_ctx.$slots, "icon", { key: 0 }, () => [
             createVNode(unref(Loading1), {
-              name: "loading",
+              name: "loading1",
               color: _ctx.activeColor
             }, null, 8, ["color"])
           ]) : createCommentVNode("", true),
+          _cache[1] || (_cache[1] = createTextVNode()),
           _ctx.activeText ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
             withDirectives(createElementVNode("view", { class: "nut-switch-label open" }, toDisplayString(_ctx.activeText), 513), [
               [vShow, isActive.value]
             ]),
+            _cache[0] || (_cache[0] = createTextVNode()),
             withDirectives(createElementVNode("view", { class: "nut-switch-label close" }, toDisplayString(_ctx.inactiveText), 513), [
               [vShow, !isActive.value]
             ])

package/dist/packages/tabbar/Tabbar.js

@@ -37,14 +37,17 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, computed, watch, onMounted, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, nextTick } from "vue";
+import { defineComponent, ref, watch, onMounted, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, unref, renderSlot } from "vue";
+import Taro from "@tarojs/taro";
+import { u as useTaroRect } from "../index-m0Wcof-q.js";
 import { u as useChildren } from "../useChildren-BZ4-J79J.js";
 import { T as TABBAR_KEY } from "../types-MuhxzCWc.js";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
+const _hoisted_1 = ["id"];
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutTabbar"
 }), {
-  __name: "tabbar",
+  __name: "tabbar.taro",
   props: {
     modelValue: { default: 0 },
     bottom: { type: Boolean, default: false },
@@ -58,17 +61,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const height = ref();
-    const nutTabbar = ref(null);
+    const refRandomId = Math.random().toString(36).slice(-8);
+    const height = ref("auto");
+    const nutTabbarRef = ref(null);
     const activeIndex = ref(props.modelValue);
-    const classes = computed(() => {
-      const prefixCls = "nut-tabbar";
-      return {
-        [prefixCls]: true,
-        "nut-tabbar-bottom": props.bottom,
-        "nut-tabbar-safebottom": props.safeAreaInsetBottom
-      };
-    });
     const { children, linkChildren } = useChildren(TABBAR_KEY);
     const changeIndex = (index, active) => __async(this, null, function* () {
       const res = yield props.beforeSwitch(children[index], active);
@@ -88,28 +84,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     );
     const updateHeight = () => {
       if (props.bottom && props.placeholder) {
-        nextTick(() => {
-          var _a;
-          const nutTabbarHeight = (_a = nutTabbar.value) == null ? void 0 : _a.getBoundingClientRect().height;
-          if (nutTabbarHeight) {
-            height.value = nutTabbarHeight;
-          }
+        Taro.nextTick(() => {
+          useTaroRect(nutTabbarRef).then(
+            (rect) => {
+              height.value = `${rect.height}px`;
+            },
+            () => {
+            }
+          );
         });
       }
     };
     onMounted(updateHeight);
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
+      return openBlock(), createElementBlock("view", {
         class: normalizeClass({ "nut-tabbar__placeholder": _ctx.bottom && _ctx.placeholder }),
-        style: normalizeStyle({ height: height.value + "px" })
+        style: normalizeStyle({ height: height.value })
       }, [
         createElementVNode("view", {
-          ref_key: "nutTabbar",
-          ref: nutTabbar,
-          class: normalizeClass(classes.value)
+          id: `nut-tabbar-${unref(refRandomId)}`,
+          ref_key: "nutTabbarRef",
+          ref: nutTabbarRef,
+          class: normalizeClass(["nut-tabbar", { "nut-tabbar-bottom": _ctx.bottom, "nut-tabbar-safebottom": _ctx.safeAreaInsetBottom }])
         }, [
           renderSlot(_ctx.$slots, "default")
-        ], 2)
+        ], 10, _hoisted_1)
       ], 6);
     };
   }

package/dist/packages/tabbaritem/TabbarItem.js

@@ -37,13 +37,16 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createVNode, unref, normalizeProps, guardReactiveProps, withCtx, createElementVNode, renderSlot, createCommentVNode, createBlock, resolveDynamicComponent, toDisplayString } from "vue";
+import { getCurrentInstance, defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createVNode, unref, normalizeProps, guardReactiveProps, withCtx, createElementVNode, renderSlot, createCommentVNode, createTextVNode, createBlock, resolveDynamicComponent, toDisplayString } from "vue";
 import { r as renderIcon } from "../renderIcon-CfE94nuJ.js";
-import { u as useRouter } from "../index-aiGQ-EiA.js";
 import { u as useParent } from "../useParent-D6DiuxZZ.js";
 import { T as TABBAR_KEY } from "../types-MuhxzCWc.js";
 import { Badge as _sfc_main$1 } from "../badge/Badge.js";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
+function useRouter() {
+  const proxy = getCurrentInstance().proxy;
+  return proxy.$router || null;
+}
 const _hoisted_1 = { class: "nut-tabbar-item_icon-box" };
 const _hoisted_2 = {
   key: 0,
@@ -54,7 +57,7 @@ const _hoisted_4 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutTabbarItem"
 }), {
-  __name: "tabbar-item",
+  __name: "tabbar-item.taro",
   props: {
     tabTitle: { default: "" },
     name: {},
@@ -105,9 +108,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
               _ctx.$slots.icon ? (openBlock(), createElementBlock("div", _hoisted_2, [
                 renderSlot(_ctx.$slots, "icon", { active: active.value })
               ])) : createCommentVNode("", true),
+              _cache[0] || (_cache[0] = createTextVNode()),
               _ctx.icon && !_ctx.$slots.icon ? (openBlock(), createElementBlock("view", _hoisted_3, [
                 (openBlock(), createBlock(resolveDynamicComponent(unref(renderIcon)(_ctx.icon)), { class: "nut-popover-item-img" }))
               ])) : createCommentVNode("", true),
+              _cache[1] || (_cache[1] = createTextVNode()),
               createElementVNode("view", {
                 class: normalizeClass(["nut-tabbar-item_icon-box_nav-word", { "nut-tabbar-item_icon-box_big-word": !_ctx.icon && !_ctx.$slots.icon }])
               }, [

package/dist/packages/table/Table.js

@@ -19,8 +19,8 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { defineComponent, h, reactive, watch, toRefs, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, Fragment, renderList, normalizeStyle, createTextVNode, toDisplayString, renderSlot, createBlock, createCommentVNode } from "vue";
 import { c as createComponent } from "../component-DQf3CENX.js";
-import { DownArrow } from "@nutui/icons-vue";
-import { u as useLocale } from "../index-BOB4ytqZ.js";
+import { DownArrow } from "@nutui/icons-vue-taro";
+import { u as useLocale } from "../index-IxPZmHlb.js";
 import { _ as _export_sfc } from "../_plugin-vue_export-helper-1tPrXgE0.js";
 const RenderColumn = defineComponent({
   props: {
@@ -157,15 +157,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             }, [
               createTextVNode(toDisplayString(item.title) + " ", 1),
               renderSlot(_ctx.$slots, "icon"),
+              _cache[0] || (_cache[0] = createTextVNode()),
               !_ctx.$slots.icon && item.sorter ? (openBlock(), createBlock(_component_DownArrow, {
                 key: 0,
-                width: "12px",
-                height: "12px"
+                size: "12px"
               })) : createCommentVNode("", true)
             ], 14, _hoisted_4);
           }), 128))
         ])
       ]),
+      _cache[1] || (_cache[1] = createTextVNode()),
       createElementVNode("view", _hoisted_5, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.curData, (item) => {
           return openBlock(), createElementBlock("view", {
@@ -189,14 +190,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }), 128))
       ])
     ], 2),
+    _cache[3] || (_cache[3] = createTextVNode()),
     !_ctx.curData.length ? (openBlock(), createElementBlock("view", _hoisted_7, [
       createElementVNode("div", {
         class: normalizeClass(["nut-table__nodata", { "nut-table__nodata--border": _ctx.bordered }])
       }, [
         renderSlot(_ctx.$slots, "nodata"),
+        _cache[2] || (_cache[2] = createTextVNode()),
         !_ctx.$slots.nodata ? (openBlock(), createElementBlock("div", _hoisted_8, toDisplayString(_ctx.translate("noData")), 1)) : createCommentVNode("", true)
       ], 2)
     ])) : createCommentVNode("", true),
+    _cache[4] || (_cache[4] = createTextVNode()),
     _ctx.summary ? (openBlock(), createElementBlock("view", _hoisted_9, [
       createElementVNode("span", {
         class: "nut-table__summary__text",
@@ -205,7 +209,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+const index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {
-  index as default
+  index_taro as default
 };