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

package/dist/packages/backtop/Backtop.js

@@ -17,32 +17,31 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, ref, computed, onMounted, onUnmounted, onActivated, onDeactivated, openBlock, createElementBlock, normalizeClass, normalizeStyle, withModifiers, renderSlot, createVNode, unref } from "vue";
-import { r as requestAniFrame, c as cancelRaf } from "../raf-c01wDYCo.js";
-import { Top } from "@nutui/icons-vue";
+import { defineComponent, ref, computed, openBlock, createElementBlock, createVNode, normalizeStyle, withCtx, renderSlot, createTextVNode, createElementVNode, normalizeClass, withModifiers, unref } from "vue";
+import { _ as _sfc_main$1 } from "../index.taro.vue_vue_type_script_setup_true_lang-JJ7hr71Y.js";
+import { Top } from "@nutui/icons-vue-taro";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutBacktop"
 }), {
-  __name: "backtop",
+  __name: "backtop.taro",
   props: {
+    height: { default: "100vh" },
     bottom: { default: 20 },
     right: { default: 10 },
-    elId: { default: "body" },
     distance: { default: 200 },
-    zIndex: { default: 10 },
-    isAnimation: { type: Boolean, default: true },
-    duration: { default: 1e3 }
+    zIndex: { default: 10 }
   },
   emits: ["click"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const backTop = ref(false);
-    const scrollTop = ref(0);
-    const scrollEl = ref(window);
-    const startTime = ref(0);
-    const keepAlive = ref(false);
+    const scrollTop = ref(1);
+    const scroll = (e) => {
+      scrollTop.value = 2;
+      backTop.value = e.detail.scrollTop >= props.distance;
+    };
     const classes = computed(() => {
       const prefixCls = "nut-backtop";
       return {
@@ -57,84 +56,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         zIndex: props.zIndex
       };
     });
-    function scrollListener() {
-      if (scrollEl.value instanceof Window) {
-        scrollTop.value = scrollEl.value.scrollY;
-      } else {
-        scrollTop.value = scrollEl.value.scrollTop;
-      }
-      backTop.value = scrollTop.value >= props.distance;
-    }
-    function scroll(y = 0) {
-      if (scrollEl.value instanceof Window) {
-        window.scrollTo(0, y);
-      } else {
-        scrollEl.value.scrollTop = y;
-      }
-    }
-    function scrollAnimation() {
-      let cid = requestAniFrame(function fn() {
-        var t = props.duration - Math.max(0, startTime.value - +/* @__PURE__ */ new Date() + props.duration);
-        var y = t * -scrollTop.value / props.duration + scrollTop.value;
-        scroll(y);
-        cid = requestAniFrame(fn);
-        if (t == props.duration || y == 0) {
-          cancelRaf(cid);
-        }
-      });
-    }
-    function addEventListener() {
-      scrollEl.value.addEventListener("scroll", scrollListener, false);
-      scrollEl.value.addEventListener("resize", scrollListener, false);
-    }
-    function removeEventListener() {
-      scrollEl.value.removeEventListener("scroll", scrollListener, false);
-      scrollEl.value.removeEventListener("resize", scrollListener, false);
-    }
-    function handleClick(e) {
-      startTime.value = +/* @__PURE__ */ new Date();
-      props.isAnimation && props.duration > 0 ? scrollAnimation() : scroll();
+    const handleClick = (e) => {
+      scrollTop.value = 1;
       emit("click", e);
-    }
-    function init() {
-      if (props.elId && document.getElementById(props.elId)) {
-        scrollEl.value = document.getElementById(props.elId);
-      }
-      addEventListener();
-    }
-    onMounted(() => {
-      if (props.distance == 0) {
-        backTop.value = true;
-      }
-      init();
-    });
-    onUnmounted(() => {
-      removeEventListener();
-    });
-    onActivated(() => {
-      if (keepAlive.value) {
-        keepAlive.value = false;
-        init();
-      }
-    });
-    onDeactivated(() => {
-      keepAlive.value = true;
-      removeEventListener();
-    });
+    };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        class: normalizeClass(classes.value),
-        style: normalizeStyle(style.value),
-        onClick: withModifiers(handleClick, ["stop"])
-      }, [
-        renderSlot(_ctx.$slots, "default", {}, () => [
-          createVNode(unref(Top), {
-            width: "19px",
-            height: "19px",
-            class: "nut-backtop-main"
-          })
-        ])
-      ], 6);
+      return openBlock(), createElementBlock("view", null, [
+        createVNode(_sfc_main$1, {
+          "scroll-y": true,
+          style: normalizeStyle({ height: _ctx.height }),
+          "scroll-top": scrollTop.value,
+          "scroll-with-animation": "true",
+          onScroll: scroll
+        }, {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "content")
+          ]),
+          _: 3
+        }, 8, ["style", "scroll-top"]),
+        _cache[0] || (_cache[0] = createTextVNode()),
+        createElementVNode("view", {
+          class: normalizeClass(classes.value),
+          style: normalizeStyle(style.value),
+          onClick: withModifiers(handleClick, ["stop"])
+        }, [
+          renderSlot(_ctx.$slots, "icon", {}, () => [
+            createVNode(unref(Top), {
+              width: "19px",
+              height: "19px",
+              class: "nut-backtop-main"
+            })
+          ])
+        ], 6)
+      ]);
     };
   }
 }));

package/dist/packages/badge/Badge.js

@@ -17,13 +17,13 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, computed, openBlock, createElementBlock, withDirectives, createElementVNode, normalizeStyle, renderSlot, vShow, normalizeClass, toDisplayString } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, withDirectives, createElementVNode, normalizeStyle, renderSlot, vShow, createTextVNode, normalizeClass, toDisplayString } from "vue";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
 const _hoisted_1 = { class: "nut-badge" };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutBadge"
 }), {
-  __name: "badge",
+  __name: "badge.taro",
   props: {
     value: {},
     max: { default: 1e4 },
@@ -64,7 +64,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
         ], 4), [
           [vShow, !_ctx.hidden && !_ctx.dot && _ctx.$slots.icon]
         ]),
+        _cache[0] || (_cache[0] = createTextVNode()),
         renderSlot(_ctx.$slots, "default"),
+        _cache[1] || (_cache[1] = createTextVNode()),
         withDirectives(createElementVNode("view", {
           class: normalizeClass(["nut-badge__content nut-badge__content--sup", { "nut-badge__content--dot": _ctx.dot, "nut-badge__content--bubble": !_ctx.dot && _ctx.bubble }]),
           style: normalizeStyle(style.value)

package/dist/packages/barrage/Barrage.js

@@ -1,9 +1,9 @@
-import { useSlots, ref, onMounted, onUnmounted, watch, nextTick, openBlock, createElementBlock, createElementVNode, normalizeClass, renderSlot, createCommentVNode } from "vue";
+import { useSlots, ref, computed, onMounted, watch, reactive, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, normalizeStyle, toDisplayString } from "vue";
 import { c as createComponent } from "../component-DQf3CENX.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "../_plugin-vue_export-helper-1tPrXgE0.js";
-const { create } = createComponent("barrage");
+const { componentName, create } = createComponent("barrage");
 const _sfc_main = create({
-  name: "barrage",
   props: {
     danmu: {
       type: Array,
@@ -30,160 +30,106 @@ const _sfc_main = create({
       default: true
     }
   },
+  emits: ["click"],
   setup(props) {
     const classTime = (/* @__PURE__ */ new Date()).getTime();
     const slotDefault = !!useSlots().default;
-    let dmBody = ref(document.createElement("div"));
-    let dmContainer = ref(document.createElement("div"));
-    let timer = null;
+    const timeId = ref((/* @__PURE__ */ new Date()).getTime());
     const danmuList = ref(props.danmu);
+    const danmuListSlots = ref([]);
     const rows = ref(props.rows);
     const top = ref(props.top);
-    const index2 = ref(0);
     const speeds = props.speeds;
-    const danmuCWidth = ref(0);
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true,
+        ["nut-barrage--dmBody" + timeId.value]: true
+      };
+    });
     onMounted(() => {
-      init();
+      var _a;
       if (slotDefault) {
-        document.addEventListener("visibilitychange", function() {
-          if (document.visibilityState === "hidden") {
-            clearTime();
-            index2.value = 0;
-            eleSlot("hidden");
-          } else if (document.visibilityState === "visible") {
-            init();
-          }
-        });
+        const list = document.getElementsByClassName("nut-barrage__slotBody" + classTime)[0].getElementsByClassName("nut-barrage__item");
+        let childrens = ((_a = list == null ? void 0 : list[0]) == null ? void 0 : _a.children) || [];
+        danmuList.value = childrens;
       }
+      runStep();
     });
-    onUnmounted(() => {
-      danmuList.value = [];
-      clearTime();
-    });
-    const init = () => {
-      danmuCWidth.value = dmBody.value.offsetWidth;
-      if (slotDefault) {
-        eleSlot("init");
-      }
-      setTimeout(() => {
-        var _a;
-        (_a = dmBody.value) == null ? void 0 : _a.style.setProperty("--move-distance", `-${danmuCWidth.value}px`);
-        run();
-      }, 300);
-    };
-    const eleSlot = (flag) => {
-      var _a;
-      const list = document.getElementsByClassName("slotBody" + classTime);
-      let childrens = ((_a = list == null ? void 0 : list[0]) == null ? void 0 : _a.children) || [];
-      const dmList = [];
-      if (childrens) {
-        Array.from(childrens).forEach((item) => {
-          if (flag == "init") {
-            item.style.opacity = "0";
-            dmList.push(item);
-          } else {
-            item.classList = "";
-            item.style = {};
-          }
-        });
-      }
-      if (flag == "init") {
-        danmuList.value = dmList;
-      }
-    };
-    const clearTime = () => {
-      if (timer) {
-        clearTimeout(timer);
-        timer = null;
-      }
-    };
     watch(
       () => props.danmu,
       (newValue) => {
-        if (props.danmu.length > 0) {
-          danmuList.value = [...newValue];
-        }
+        danmuList.value = [...newValue];
       }
     );
     const add = (word) => {
-      const _index = index2.value % danmuList.value.length;
-      if (!props.loop && index2.value === danmuList.value.length) {
-        danmuList.value.splice(danmuList.value.length, 0, word);
-      } else {
-        danmuList.value.splice(_index, 0, word);
-      }
+      danmuList.value = [...danmuList.value, word];
+      runStep();
+    };
+    const getNode = (index) => {
+      const query = Taro.createSelectorQuery();
+      setTimeout(() => {
+        let width = 100;
+        query.select(".nut-barrage--dmBody" + timeId.value).boundingClientRect((rec) => {
+          width = (rec == null ? void 0 : rec.width) || 300;
+        });
+        query.select(".nut-barrage__item" + index).boundingClientRect((recs) => {
+          let height = recs == null ? void 0 : recs.height;
+          let nodeTop = index % rows.value * (height + top.value) + 20 + "px";
+          styleInfo(index, nodeTop, width);
+        }).exec();
+      }, 500);
     };
-    const run = () => {
-      clearTime();
-      timer = setTimeout(() => {
-        play();
-      }, props.frequency);
+    const runStep = () => {
+      danmuList.value.forEach((item, index) => {
+        getNode(index);
+      });
     };
-    const play = () => {
+    let styleList = reactive([]);
+    const styleInfo = (index, nodeTop, width) => {
       var _a;
-      const _index = props.loop ? index2.value % danmuList.value.length : index2.value;
-      let el = document.createElement(`view`);
-      if (slotDefault && typeof danmuList.value[_index] == "object") {
-        el = danmuList.value[_index];
-        (_a = el == null ? void 0 : el.classList) == null ? void 0 : _a.add("nut-barrage__item");
+      let timeIndex = index - rows.value > 0 ? index - rows.value : 0;
+      let list = styleList;
+      let time = list[timeIndex] ? Number(list[timeIndex]["--time"]) : 0;
+      let obj = {
+        top: nodeTop,
+        "--time": `${props.frequency * index + time}`,
+        animationDuration: `${speeds}ms`,
+        animationIterationCount: `${props.loop ? "infinite" : 1}`,
+        animationDelay: `${props.frequency * index + time}ms`,
+        "--move-distance": `-${width}px`
+      };
+      if (slotDefault && ((_a = danmuList.value[index]) == null ? void 0 : _a.el)) {
+        let orginalSty = danmuList.value[index].el.style;
+        danmuList.value[index].el.style = Object.assign(orginalSty, obj);
       } else {
-        el.innerHTML = danmuList.value[_index];
-        el.classList.add("nut-barrage__item");
-        dmContainer.value.appendChild(el);
+        styleList.push(obj);
       }
-      nextTick(() => {
-        var _a2;
-        const height = el.offsetHeight;
-        (_a2 = el == null ? void 0 : el.classList) == null ? void 0 : _a2.add("move");
-        el.style.animationDuration = `${speeds}ms`;
-        el.style.top = _index % rows.value * (height + top.value) + 20 + "px";
-        el.style.opacity = "1";
-        if (!slotDefault) {
-          const width = el.offsetWidth;
-          el.style.width = width + 20 + "px";
-        }
-        el.addEventListener("animationend", () => {
-          if (slotDefault) {
-            el.classList.remove("move");
-          } else {
-            dmContainer.value.removeChild(el);
-          }
-        });
-        if (!props.loop && index2.value >= danmuList.value.length - 1) {
-          return;
-        }
-        index2.value++;
-        if (index2.value >= danmuList.value.length) {
-          index2.value = 0;
-        }
-        el.removeEventListener("animationend", () => {
-        });
-        run();
-      });
     };
-    return { classTime, danmuList, dmBody, dmContainer, add };
+    return { classTime, classes, danmuList, add, styleList, danmuListSlots };
   }
 });
-const _hoisted_1 = {
-  ref: "dmBody",
-  class: "nut-barrage"
-};
+const _hoisted_1 = { ref: "dmContainer" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createElementBlock("div", _hoisted_1, [
-    createElementVNode("div", {
-      ref: "dmContainer",
-      class: normalizeClass(["dmContainer", _ctx.$slots.default && "slotContainer"])
-    }, [
-      _ctx.$slots.default ? (openBlock(), createElementBlock("div", {
-        key: 0,
-        class: normalizeClass(["slotBody", "slotBody" + _ctx.classTime])
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes)
+  }, [
+    createElementVNode("div", _hoisted_1, [
+      createElementVNode("div", {
+        class: normalizeClass(["nut-barrage__slotBody" + _ctx.classTime])
       }, [
-        renderSlot(_ctx.$slots, "default")
-      ], 2)) : createCommentVNode("", true)
-    ], 2)
-  ], 512);
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.danmuList, (item, index) => {
+          return openBlock(), createElementBlock("view", {
+            key: "danmu" + index,
+            class: normalizeClass(["nut-barrage__item", "nut-barrage__item" + index, "move"]),
+            style: normalizeStyle(_ctx.styleList[index])
+          }, toDisplayString(item.length > 8 ? item.substr(0, 8) + "..." : item), 7);
+        }), 128))
+      ], 2)
+    ], 512)
+  ], 2);
 }
-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
 };

package/dist/packages/button/Button.js

@@ -17,14 +17,16 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, createBlock, unref, createCommentVNode, renderSlot } from "vue";
-import { Loading } from "@nutui/icons-vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, unref, createElementVNode, createBlock, createCommentVNode, createTextVNode, renderSlot } from "vue";
+import { Loading } from "@nutui/icons-vue-taro";
+import Taro from "@tarojs/taro";
 import { w as withInstall } from "../with-install-Ch3FF0uS.js";
-const _hoisted_1 = { class: "nut-button__wrap" };
+const _hoisted_1 = ["type", "formType"];
+const _hoisted_2 = { class: "nut-button__wrap" };
 const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "NutButton"
 }), {
-  __name: "button",
+  __name: "button.taro",
   props: {
     color: { default: "" },
     shape: { default: "round" },
@@ -33,7 +35,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
     disabled: { type: Boolean, default: false },
     type: { default: "default" },
     size: { default: "normal" },
-    block: { type: Boolean, default: false }
+    block: { type: Boolean, default: false },
+    formType: { default: "button" }
   },
   emits: ["click"],
   setup(__props, { emit: __emit }) {
@@ -73,17 +76,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
       return style;
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("view", {
+      return openBlock(), createElementBlock("button", {
         class: normalizeClass(classes.value),
         style: normalizeStyle(getStyle.value),
+        type: unref(Taro).getEnv() === unref(Taro).ENV_TYPE.WEB ? _ctx.formType : void 0,
+        formType: _ctx.formType === "button" ? void 0 : _ctx.formType,
         onClick: handleClick
       }, [
-        createElementVNode("view", _hoisted_1, [
+        createElementVNode("view", _hoisted_2, [
           _ctx.loading ? (openBlock(), createBlock(unref(Loading), {
             key: 0,
             class: "nut-icon-loading"
           })) : createCommentVNode("", true),
+          _cache[0] || (_cache[0] = createTextVNode()),
           _ctx.$slots.icon && !_ctx.loading ? renderSlot(_ctx.$slots, "icon", { key: 1 }) : createCommentVNode("", true),
+          _cache[1] || (_cache[1] = createTextVNode()),
           _ctx.$slots.default ? (openBlock(), createElementBlock("view", {
             key: 2,
             class: normalizeClass({ "nut-button__text": _ctx.$slots.icon || _ctx.loading })
@@ -91,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({
             renderSlot(_ctx.$slots, "default")
           ], 2)) : createCommentVNode("", true)
         ])
-      ], 6);
+      ], 14, _hoisted_1);
     };
   }
 }));