@nutui/nutui 3.2.6-beta.1 → 3.2.6-beta.2

package/dist/packages/_es/Sticky.js

@@ -1,12 +1,11 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, reactive, computed, watch, h, unref } from "vue";
-import Taro, { usePageScroll, useReady } from "@tarojs/taro";
+import { ref, reactive, computed, watch, onMounted, onUnmounted, h, unref } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useTaroRect } from "./index.js";
+import { u as useRect } from "./index2.js";
 import "../locale/lang";
 const { componentName, create } = createComponent("sticky");
 const _sfc_main = create({
@@ -34,8 +33,6 @@ const _sfc_main = create({
   emits: ["change", "scroll"],
   setup(props, { emit, slots }) {
     const root = ref();
-    const query = Taro.createSelectorQuery();
-    const refRandomId = Math.random().toString(36).slice(-8);
     const state = reactive({
       width: 0,
       height: 0,
@@ -71,25 +68,19 @@ const _sfc_main = create({
       const el = unref(elementRef);
       if (!el)
         return false;
-      return new Promise((resolve, reject) => {
-        query.select(`#${el.id}`).fields(
-          {
-            computedStyle: ["display", "position"]
-          },
-          (res) => {
-            const hidden = res.display === "none";
-            const parentHidden = el.offsetParent === null && res.position !== "fixed";
-            resolve(hidden || parentHidden);
-          }
-        ).exec();
-      });
+      const style = window.getComputedStyle(el);
+      const hidden = style.display === "none";
+      const parentHidden = el.offsetParent === null && style.position !== "fixed";
+      return hidden || parentHidden;
     };
-    const isExistRoot = async () => {
-      const hidden = await isHidden(root);
-      if (!root.value || hidden)
+    const isExistRoot = () => {
+      if (!root.value || isHidden(root))
         return false;
       return true;
     };
+    const getScrollTop = (el) => {
+      return Math.max(0, "scrollTop" in el ? el.scrollTop : el.pageYOffset);
+    };
     const renderFixed = () => {
       var _a;
       return h(
@@ -101,18 +92,19 @@ const _sfc_main = create({
         (_a = slots.default) == null ? void 0 : _a.call(slots)
       );
     };
-    const onScroll = async (scrollTop) => {
+    const onScroll = () => {
       if (!isExistRoot())
         return;
       const { container, position } = props;
-      const rootRect = await useTaroRect(root, Taro);
+      const scrollTop = getScrollTop(window);
+      const rootRect = useRect(root);
       if (rootRect.width || rootRect.height) {
         state.width = rootRect.width;
         state.height = rootRect.height;
       }
       if (position === "top") {
         if (container) {
-          const containerRect = await useTaroRect(container, Taro);
+          const containerRect = useRect(container);
           const diff = containerRect.bottom - +offset.value - state.height;
           state.fixed = +offset.value > rootRect.top && containerRect.bottom > 0;
           state.transform = diff < 0 ? diff : 0;
@@ -120,9 +112,9 @@ const _sfc_main = create({
           state.fixed = offset.value > rootRect.top;
         }
       } else if (position === "bottom") {
-        const clientHeight = Taro.getSystemInfoSync().windowHeight;
+        const clientHeight = document.documentElement.clientHeight;
         if (container) {
-          const containerRect = await useTaroRect(container, Taro);
+          const containerRect = useRect(container);
           const diff = clientHeight - containerRect.top - +offset.value - state.height;
           state.fixed = clientHeight - +offset.value < rootRect.bottom && clientHeight > containerRect.top;
           state.transform = diff < 0 ? -diff : 0;
@@ -141,20 +133,18 @@ const _sfc_main = create({
         emit("change", val);
       }
     );
-    usePageScroll((res) => {
-      onScroll(res.scrollTop);
+    onMounted(() => {
+      window.addEventListener("scroll", onScroll);
+      onScroll();
     });
-    useReady(() => {
-      Taro.nextTick(() => {
-        onScroll(0);
-      });
+    onUnmounted(() => {
+      window.removeEventListener("scroll", onScroll);
     });
     return () => {
       return h(
         "view",
         {
           style: rootStyle.value,
-          id: `root-${refRandomId}`,
           ref: root
         },
         [renderFixed()]

package/dist/packages/_es/SubSideNavBar.js

@@ -1,9 +1,9 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { reactive, computed, onMounted, toRefs, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, withModifiers, toDisplayString, createTextVNode, createVNode, normalizeStyle, renderSlot } from "vue";
+import { reactive, computed, onMounted, toRefs, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, withModifiers, toDisplayString, createVNode, normalizeStyle, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
@@ -68,7 +68,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onClick: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.handleClick && _ctx.handleClick(...args), ["stop"]))
     }, [
       createElementVNode("span", _hoisted_2, toDisplayString(_ctx.title), 1),
-      createTextVNode(),
       createElementVNode("span", _hoisted_3, [
         createVNode(_component_nut_icon, {
           name: "down-arrow",
@@ -76,7 +75,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 8, ["class"])
       ])
     ]),
-    createTextVNode(),
     createElementVNode("view", {
       class: normalizeClass(["nut-subsidenavbar__list", !_ctx.direction ? "nutFadeIn" : "nutFadeOut"]),
       style: normalizeStyle(_ctx.style)

package/dist/packages/_es/Swipe.js

@@ -1,13 +1,11 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import Taro from "@tarojs/taro";
-import { u as useTouch } from "./index3.js";
-import { computed, ref, onMounted, reactive, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createTextVNode } from "vue";
+import { u as useTouch } from "./index4.js";
+import { computed, ref, reactive, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useTaroRect } from "./index.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const { componentName, create } = createComponent("swipe");
@@ -32,29 +30,21 @@ const _sfc_main = create({
   },
   emits: ["open", "close"],
   setup(props, { emit }) {
-    const refRandomId = Math.random().toString(36).slice(-8);
     const classes = computed(() => {
       const prefixCls = componentName;
       return {
         [prefixCls]: true
       };
     });
-    const getRefWidth = async (ref2) => {
-      let rect = await useTaroRect(ref2, Taro);
-      return rect.width || 0;
+    const getRefWidth = (ref2) => {
+      var _a;
+      return ((_a = ref2.value) == null ? void 0 : _a.clientWidth) || 0;
     };
-    const leftRef = ref();
-    const leftRefWidth = ref(0);
-    const rightRef = ref();
-    const rightRefWidth = ref(0);
-    const initWidth = async () => {
-      leftRefWidth.value = await getRefWidth(leftRef);
-      rightRefWidth.value = await getRefWidth(rightRef);
-    };
-    onMounted(() => {
-      setTimeout(() => {
-        initWidth();
-      }, 100);
+    const leftRef = ref(), leftRefWidth = computed(() => {
+      return getRefWidth(leftRef);
+    });
+    const rightRef = ref(), rightRefWidth = computed(() => {
+      return getRefWidth(rightRef);
     });
     let opened = false;
     let position = "";
@@ -114,7 +104,7 @@ const _sfc_main = create({
           return;
         touch.start(event);
       },
-      async onTouchMove(event) {
+      onTouchMove(event) {
         if (props.disabled)
           return;
         touch.move(event);
@@ -160,15 +150,20 @@ const _sfc_main = create({
       ...touchMethods,
       leftRef,
       rightRef,
-      refRandomId,
       open,
       close
     };
   }
 });
-const _hoisted_1 = ["id"];
+const _hoisted_1 = {
+  class: "nut-swipe__left",
+  ref: "leftRef"
+};
 const _hoisted_2 = { class: "nut-swipe__content" };
-const _hoisted_3 = ["id"];
+const _hoisted_3 = {
+  class: "nut-swipe__right",
+  ref: "rightRef"
+};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes),
@@ -178,26 +173,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
     onTouchcancel: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
   }, [
-    createElementVNode("view", {
-      class: "nut-swipe__left",
-      ref: "leftRef",
-      id: "leftRef-" + _ctx.refRandomId
-    }, [
+    createElementVNode("view", _hoisted_1, [
       renderSlot(_ctx.$slots, "left")
-    ], 8, _hoisted_1),
-    createTextVNode(),
+    ], 512),
     createElementVNode("view", _hoisted_2, [
       renderSlot(_ctx.$slots, "default")
     ]),
-    createTextVNode(),
-    createElementVNode("view", {
-      class: "nut-swipe__right",
-      ref: "rightRef",
-      id: "rightRef-" + _ctx.refRandomId
-    }, [
+    createElementVNode("view", _hoisted_3, [
       renderSlot(_ctx.$slots, "right")
-    ], 8, _hoisted_3)
+    ], 512)
   ], 38);
 }
-var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index_taro as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };

package/dist/packages/_es/Swiper.js

@@ -1,13 +1,11 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { reactive, ref, computed, provide, onDeactivated, onBeforeUnmount, watch, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, renderSlot, createTextVNode, Fragment, renderList, createCommentVNode } from "vue";
+import { reactive, ref, computed, provide, onDeactivated, onBeforeUnmount, watch, nextTick, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, renderSlot, Fragment, renderList, createCommentVNode } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useTaroRect } from "./index.js";
-import { u as useExpose } from "./index2.js";
-import Taro, { eventCenter, getCurrentInstance } from "@tarojs/taro";
+import { u as useExpose } from "./index3.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const DISTANCE = 5;
@@ -117,7 +115,6 @@ const _sfc_main = create({
   emits: ["change"],
   setup(props, { emit, slots }) {
     const container = ref();
-    const refRandomId = Math.random().toString(36).slice(-8);
     const state = reactive({
       active: 0,
       num: 0,
@@ -208,7 +205,7 @@ const _sfc_main = create({
       return Math.min(Math.max(num, min), max);
     };
     const requestFrame = (fn) => {
-      requestAnimationFrame.call(null, fn);
+      window.requestAnimationFrame.call(window, fn);
     };
     const getOffset = (active, offset = 0) => {
       let currentPosition = active * size.value;
@@ -320,21 +317,21 @@ const _sfc_main = create({
         autoplay();
       }, Number(props.autoPlay));
     };
-    const init = async (active = +props.initPage) => {
+    const init = (active = +props.initPage) => {
       stopAutoPlay();
-      state.rect = await useTaroRect(container, Taro);
-      if (state.rect) {
-        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();
-      }
+      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();
     };
     const onTouchStart = (e) => {
+      if (props.isPreventDefault)
+        e.preventDefault();
       if (props.isStopPropagation)
         e.stopPropagation();
       if (!props.touchable)
@@ -397,25 +394,17 @@ const _sfc_main = create({
     watch(
       () => props.initPage,
       (val) => {
-        Taro.nextTick(() => {
-          init(+val);
-        });
-        eventCenter.once(getCurrentInstance().router.onReady, () => {
-          init(+val);
+        nextTick(() => {
+          init(Number(val));
         });
       }
     );
     watch(
       () => state.children.length,
       () => {
-        Taro.nextTick(() => {
+        nextTick(() => {
           init();
         });
-        eventCenter.once(getCurrentInstance().router.onReady, () => {
-          Taro.nextTick(() => {
-            init();
-          });
-        });
       }
     );
     watch(
@@ -426,7 +415,6 @@ const _sfc_main = create({
     );
     return {
       state,
-      refRandomId,
       classes,
       container,
       componentName,
@@ -439,17 +427,14 @@ const _sfc_main = create({
     };
   }
 });
-const _hoisted_1 = ["id", "catch-move"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
     ref: "container",
-    id: "container-" + _ctx.refRandomId,
     class: normalizeClass(_ctx.classes),
     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)),
-    onTouchcancel: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
-    "catch-move": _ctx.isPreventDefault
+    onTouchcancel: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
   }, [
     createElementVNode("view", {
       class: normalizeClass({
@@ -460,9 +445,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, [
       renderSlot(_ctx.$slots, "default")
     ], 6),
-    createTextVNode(),
     renderSlot(_ctx.$slots, "page"),
-    createTextVNode(),
     _ctx.paginationVisible && !_ctx.slots.page ? (openBlock(), createElementBlock("view", {
       key: 0,
       class: normalizeClass({
@@ -480,7 +463,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 6);
       }), 128))
     ], 2)) : createCommentVNode("", true)
-  ], 42, _hoisted_1);
+  ], 34);
 }
 var Swiper = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { Swiper as default };

package/dist/packages/_es/SwiperItem.js

@@ -1,11 +1,11 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
 import { inject, getCurrentInstance, reactive, computed, onUnmounted, openBlock, createElementBlock, normalizeClass, normalizeStyle, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useExpose } from "./index2.js";
+import { u as useExpose } from "./index3.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const { create, componentName } = createComponent("swiper-item");

package/dist/packages/_es/Switch.js

@@ -1,9 +1,9 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { computed, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, createBlock, mergeProps, createCommentVNode, createTextVNode, Fragment, withDirectives, toDisplayString, vShow } from "vue";
+import { computed, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, createBlock, mergeProps, createCommentVNode, Fragment, withDirectives, toDisplayString, vShow } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
@@ -111,17 +111,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     style: normalizeStyle(_ctx.style)
   }, [
     createElementVNode("view", _hoisted_1, [
-      _ctx.loading ? (openBlock(), createBlock(_component_nut_icon, mergeProps({ key: 0 }, _ctx.$attrs, {
-        name: _ctx.name,
+      _ctx.loading ? (openBlock(), createBlock(_component_nut_icon, mergeProps({
+        key: 0,
+        name: _ctx.name
+      }, _ctx.$attrs, {
         size: _ctx.size,
         color: _ctx.color
       }), null, 16, ["name", "size", "color"])) : createCommentVNode("", true),
-      createTextVNode(),
       _ctx.activeText ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
         withDirectives(createElementVNode("view", { class: "nut-switch-label open" }, toDisplayString(_ctx.activeText), 513), [
           [vShow, _ctx.modelValue]
         ]),
-        createTextVNode(),
         withDirectives(createElementVNode("view", { class: "nut-switch-label close" }, toDisplayString(_ctx.inactiveText), 513), [
           [vShow, !_ctx.modelValue]
         ])
@@ -129,5 +129,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 6);
 }
-var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index_taro as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };

package/dist/packages/_es/TabPane.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Tabbar.js

@@ -1,11 +1,10 @@
 /*!
-* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.2 Fri Nov 04 2022 17:24:29 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { toRefs, reactive, ref, provide, watch, onMounted, openBlock, createElementBlock, normalizeStyle, createElementVNode, normalizeClass, renderSlot } from "vue";
+import { toRefs, ref, reactive, provide, watch, onMounted, nextTick, openBlock, createElementBlock, normalizeStyle, createElementVNode, normalizeClass, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
-import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const { create } = createComponent("tabbar");
@@ -47,15 +46,16 @@ const _sfc_main = create({
   emits: ["tab-switch", "update:visible"],
   setup(props, { emit, slots }) {
     const { bottom, placeholder } = toRefs(props);
+    const height = ref();
     const mdValue = reactive({
       val: props.visible,
       children: []
     });
-    const height = ref();
-    function changeIndex(index, active) {
+    const nutTabbar = ref(null);
+    function changeIndex(index2, active) {
       emit("update:visible", active);
       parentData.modelValue = active;
-      emit("tab-switch", parentData.children[index], active);
+      emit("tab-switch", parentData.children[index2], active);
     }
     let parentData = reactive({
       children: mdValue.children,
@@ -74,17 +74,15 @@ const _sfc_main = create({
     );
     onMounted(() => {
       if (bottom.value && placeholder.value) {
-        setTimeout(() => {
-          const query = Taro.createSelectorQuery();
-          query.select(".nut-tabbar").boundingClientRect();
-          query.exec((res) => {
-            height.value = res[0].height;
-          });
-        }, 500);
+        nextTick(() => {
+          var _a;
+          height.value = (_a = nutTabbar == null ? void 0 : nutTabbar.value) == null ? void 0 : _a.getBoundingClientRect().height;
+        });
       }
     });
     return {
       changeIndex,
+      nutTabbar,
       height
     };
   }
@@ -108,5 +106,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     renderSlot(_ctx.$slots, "default")
   ], 2));
 }
-var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index_taro as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };