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

package/dist/packages/_es/Collapse.js

@@ -1,4 +1,4 @@
-import { ref, computed, watch, onMounted, getCurrentInstance, provide, openBlock, createElementBlock, normalizeClass, renderSlot } from "vue";
+import { ref, computed, provide, openBlock, createElementBlock, normalizeClass, renderSlot } from "vue";
 import { c as createComponent } from "./component-81a4c1d0.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
@@ -17,57 +17,47 @@ const _sfc_main = create({
   emits: ["update:modelValue", "change"],
   setup(props, { emit }) {
     const collapseDom = ref(null);
-    const collapseChldren = ref([]);
     const classes = computed(() => {
       const prefixCls = componentName;
       return {
         [prefixCls]: true
       };
     });
-    watch(
-      () => props.modelValue,
-      (newval) => {
-        let doms = collapseChldren.value;
-        Array.from(doms).forEach((item) => {
-          if (typeof newval == "number" || typeof newval == "string") {
-            item.changeOpen(newval == item.name ? true : false);
-          } else if (Object.values(newval) instanceof Array) {
-            const isOpen = newval.indexOf(Number(item.name)) > -1 || newval.indexOf(String(item.name)) > -1;
-            item.changeOpen(isOpen);
-          }
-          item.animation();
-        });
-      }
-    );
-    onMounted(() => {
-      collapseChldren.value = getCurrentInstance().provides.collapseParent.children || [];
-    });
-    const changeVal = (val) => {
+    const changeVal = (val, name, status = true) => {
       emit("update:modelValue", val);
-      emit("change", val);
+      emit("change", val, name, status);
     };
-    const changeValAry = (name) => {
-      const activeItem = props.modelValue instanceof Object ? Object.values(props.modelValue) : props.modelValue;
-      let index2 = -1;
-      activeItem.forEach((item, idx) => {
-        if (String(item) == String(name)) {
-          index2 = idx;
+    const updateVal = (name) => {
+      if (props.accordion) {
+        if (props.modelValue === name) {
+          changeVal("", name, false);
+        } else {
+          changeVal(name, name, true);
         }
-      });
-      index2 > -1 ? activeItem.splice(index2, 1) : activeItem.push(name);
-      changeVal(activeItem);
+      } else {
+        if (Array.isArray(props.modelValue)) {
+          if (props.modelValue.includes(name)) {
+            const newValue = props.modelValue.filter((v) => v !== name);
+            changeVal(newValue, name, false);
+          } else {
+            const newValue = props.modelValue.concat([name]);
+            changeVal(newValue, name, true);
+          }
+        } else {
+          console.warn("[NutUI] <Collapse> 未开启手风琴模式时 v-model 应为数组");
+        }
+      }
     };
     const isExpanded = (name) => {
-      const { accordion, modelValue } = props;
-      if (accordion) {
-        return typeof modelValue === "number" || typeof modelValue === "string" ? modelValue == name : false;
+      if (props.accordion) {
+        return props.modelValue === name;
+      } else if (Array.isArray(props.modelValue)) {
+        return props.modelValue.includes(name);
       }
+      return false;
     };
     provide("collapseParent", {
-      children: [],
-      props,
-      changeValAry,
-      changeVal,
+      updateVal,
       isExpanded
     });
     return { collapseDom, classes };

package/dist/packages/_es/CollapseItem.js

@@ -1,4 +1,4 @@
-import { inject, reactive, computed, getCurrentInstance, ref, watch, onMounted, toRefs, nextTick, openBlock, createElementBlock, normalizeClass, createElementVNode, renderSlot, toDisplayString, createCommentVNode, normalizeStyle, createBlock, resolveDynamicComponent } from "vue";
+import { ref, inject, reactive, computed, watch, openBlock, createElementBlock, normalizeClass, createElementVNode, renderSlot, toDisplayString, createCommentVNode, normalizeStyle, createBlock, resolveDynamicComponent } from "vue";
 import { DownArrow } from "@nutui/icons-vue";
 import { c as createComponent } from "./component-81a4c1d0.js";
 import { r as renderIcon } from "./renderIcon-3d0fd47c.js";
@@ -44,8 +44,9 @@ const _sfc_main = create({
       default: 180
     }
   },
-  // components: { DownArrow },
-  setup(props, ctx) {
+  setup(props) {
+    const wrapperRef = ref(null);
+    const contentRef = ref(null);
     const collapse = inject("collapseParent");
     const parent = reactive(collapse);
     const classes = computed(() => {
@@ -55,123 +56,54 @@ const _sfc_main = create({
         [prefixCls + "__border"]: props.border
       };
     });
-    const relation = (child) => {
-      if (child.proxy) {
-        parent.children.push(child.proxy);
+    const expanded = computed(() => {
+      if (parent) {
+        return parent.isExpanded(props.name);
       }
-    };
-    relation(getCurrentInstance());
-    const proxyData = reactive({
-      openExpanded: false
+      return false;
     });
-    const wrapperRef = ref(null);
-    const contentRef = ref(null);
-    const onTransitionEnd = () => {
-      const wrapperRefEle = document.getElementsByClassName("nut-collapse__item-wrapper")[0];
-      if (wrapperRefEle) {
-        wrapperRefEle.style.willChange = "auto";
-      }
+    const wrapperHeight = ref(expanded.value ? "auto" : "0px");
+    const toggle = () => {
+      parent.updateVal(props.name);
     };
-    const animation = () => {
-      const wrapperRefEle = wrapperRef.value;
-      const contentRefEle = contentRef.value;
-      if (!wrapperRefEle || !contentRefEle) {
-        return;
-      }
-      const offsetHeight = contentRefEle.offsetHeight || "auto";
-      if (offsetHeight) {
-        const contentHeight = `${offsetHeight}px`;
-        wrapperRefEle.style.willChange = "height";
-        wrapperRefEle.style.height = !proxyData.openExpanded ? 0 : contentHeight;
-      }
-      if (!proxyData.openExpanded) {
-        onTransitionEnd();
+    const onTransitionEnd = () => {
+      if (expanded.value) {
+        wrapperHeight.value = "auto";
       }
     };
     const open = () => {
-      proxyData.openExpanded = !proxyData.openExpanded;
-      animation();
-    };
-    const defaultOpen = () => {
-      open();
-    };
-    const currentName = computed(() => props.name);
-    const toggleOpen = () => {
-      if (parent.props.accordion) {
-        nextTick(() => {
-          if (currentName.value == parent.props.modelValue) {
-            open();
-          } else {
-            parent.changeVal(currentName.value);
-          }
+      wrapperHeight.value = "0px";
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+          var _a;
+          const height = (_a = contentRef.value) == null ? void 0 : _a.offsetHeight;
+          wrapperHeight.value = height ? `${height}px` : "auto";
         });
-      } else {
-        parent.changeValAry(String(props.name));
-        open();
-      }
-    };
-    const changeOpen = (bol) => {
-      proxyData.openExpanded = bol;
-    };
-    const expanded = computed(() => {
-      if (parent) {
-        return parent.isExpanded(props.name);
-      }
-      return null;
-    });
-    watch(expanded, (value, oldValue) => {
-      if (value) {
-        proxyData.openExpanded = true;
-      }
-    });
-    const init = () => {
-      const { name } = props;
-      const active = parent && parent.props.modelValue;
-      nextTick(() => {
-        if (typeof active == "number" || typeof active == "string") {
-          if (name == active) {
-            defaultOpen();
-          }
-        } else if (Object.values(active) instanceof Array) {
-          const f = Object.values(active).filter((item) => item == name);
-          if (f.length > 0) {
-            defaultOpen();
-          }
-        }
       });
     };
-    onMounted(() => {
-      var observer = new MutationObserver(() => {
-        animation();
-      });
-      const ele = document.getElementsByClassName("nut-collapse__item-wrapper")[0];
-      if (ele) {
-        observer.observe(ele, {
-          childList: true,
-          subtree: true
+    const close = () => {
+      var _a;
+      const height = (_a = contentRef.value) == null ? void 0 : _a.offsetHeight;
+      wrapperHeight.value = height ? `${height}px` : "auto";
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+          wrapperHeight.value = "0px";
         });
-      }
-      init();
-    });
-    const emptyContent = computed(() => {
-      let ele = contentRef.value;
-      let _class = "";
-      if (!(ele == null ? void 0 : ele.innerText)) {
-        _class = "nut-collapse__item-wrapper__content--empty";
-      }
-      return _class;
+      });
+    };
+    watch(expanded, (value) => {
+      value ? open() : close();
     });
     return {
       classes,
-      emptyContent,
-      ...toRefs(proxyData),
       renderIcon,
       wrapperRef,
       contentRef,
       open,
-      toggleOpen,
-      changeOpen,
-      animation
+      toggle,
+      wrapperHeight,
+      expanded,
+      onTransitionEnd
     };
   }
 });
@@ -193,8 +125,8 @@ const _hoisted_7 = {
 };
 const _hoisted_8 = { class: "nut-collapse__item-extraWrapper__extraRender" };
 const _hoisted_9 = {
-  class: "nut-collapse__item-wrapper",
-  ref: "wrapperRef"
+  class: "nut-collapse__item-wrapper__content",
+  ref: "contentRef"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
@@ -202,7 +134,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, [
     createElementVNode("view", {
       class: normalizeClass(["nut-collapse-item__title", { "nut-collapse-item__title--disabled": _ctx.disabled }]),
-      onClick: _cache[0] || (_cache[0] = (...args) => _ctx.toggleOpen && _ctx.toggleOpen(...args))
+      onClick: _cache[0] || (_cache[0] = (...args) => _ctx.toggle && _ctx.toggle(...args))
     }, [
       createElementVNode("view", _hoisted_1, [
         createElementVNode("view", _hoisted_2, [
@@ -222,8 +154,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "nut-collapse-item__title-sub"
       }, null, 8, _hoisted_6)),
       createElementVNode("view", {
-        class: normalizeClass(["nut-collapse-item__title-icon", { "nut-collapse-item__title-icon--expanded": _ctx.openExpanded }]),
-        style: normalizeStyle({ transform: "rotate(" + (_ctx.openExpanded ? _ctx.rotate : 0) + "deg)" })
+        class: normalizeClass(["nut-collapse-item__title-icon", { "nut-collapse-item__title-icon--expanded": _ctx.expanded }]),
+        style: normalizeStyle({ transform: "rotate(" + (_ctx.expanded ? _ctx.rotate : 0) + "deg)" })
       }, [
         (openBlock(), createBlock(resolveDynamicComponent(_ctx.renderIcon(_ctx.icon))))
       ], 6)
@@ -233,14 +165,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         renderSlot(_ctx.$slots, "extra")
       ])
     ])) : createCommentVNode("", true),
-    createElementVNode("view", _hoisted_9, [
-      createElementVNode("view", {
-        class: normalizeClass(["nut-collapse__item-wrapper__content", _ctx.emptyContent]),
-        ref: "contentRef"
-      }, [
+    createElementVNode("view", {
+      class: "nut-collapse__item-wrapper",
+      ref: "wrapperRef",
+      style: normalizeStyle({
+        willChange: "height",
+        height: _ctx.wrapperHeight
+      }),
+      onTransitionend: _cache[1] || (_cache[1] = (...args) => _ctx.onTransitionEnd && _ctx.onTransitionEnd(...args))
+    }, [
+      createElementVNode("view", _hoisted_9, [
         renderSlot(_ctx.$slots, "default")
-      ], 2)
-    ], 512)
+      ], 512)
+    ], 36)
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "4.1.0-beta.1",
+  "version": "4.1.0-beta.2",
   "contributions": {
     "html": {
       "tags": [