@varlet/ui 2.19.2 → 2.19.3-alpha.1701190302604

package/highlight/web-types.en-US.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "2.19.2",
+  "version": "2.19.3-alpha.1701190302604",
   "name": "VARLET",
   "contributions": {
     "html": {

package/highlight/web-types.zh-CN.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "2.19.2",
+  "version": "2.19.3-alpha.1701190302604",
   "name": "VARLET",
   "contributions": {
     "html": {

package/lib/varlet.cjs.js

@@ -55,6 +55,7 @@ var removeItem = (arr, item) => {
     }
   }
 };
+var removeArrayBlank = (arr) => arr.filter((item) => item != null);
 var find = (arr, callback, from = "start") => {
   let i = from === "start" ? 0 : arr.length - 1;
   while (arr.length > 0 && i >= 0 && i <= arr.length - 1) {
@@ -5325,8 +5326,8 @@ function useCollapseItem() {
   );
   return {
     length,
-    collapseItem: childProviders,
-    bindCollapseItem: bindChildren
+    collapseItems: childProviders,
+    bindCollapseItems: bindChildren
   };
 }
 const props$U = {
@@ -5365,13 +5366,12 @@ const __sfc__$10 = vue.defineComponent({
   name: name$U,
   props: props$U,
   setup(props2) {
-    const active = vue.computed(() => props2.modelValue);
     const offset2 = vue.computed(() => props2.offset);
     const divider2 = vue.computed(() => props2.divider);
     const elevation2 = vue.computed(() => props2.elevation);
-    const { length, collapseItem: collapseItem2, bindCollapseItem } = useCollapseItem();
+    const normalizeValues = vue.computed(() => normalizeToArray(props2.modelValue));
+    const { length, collapseItems, bindCollapseItems } = useCollapseItem();
     const collapseProvider = {
-      active,
       offset: offset2,
       divider: divider2,
       elevation: elevation2,
@@ -5385,64 +5385,44 @@ const __sfc__$10 = vue.defineComponent({
       () => props2.modelValue,
       () => vue.nextTick().then(resize)
     );
-    bindCollapseItem(collapseProvider);
-    function checkValue() {
-      if (!props2.accordion && !isArray(props2.modelValue)) {
-        console.error('[Varlet] Collapse: type of prop "modelValue" should be an Array');
-        return false;
-      }
-      if (props2.accordion && isArray(props2.modelValue)) {
-        console.error('[Varlet] Collapse: type of prop "modelValue" should be a String or Number');
-        return false;
+    bindCollapseItems(collapseProvider);
+    function updateItem(itemValue, targetExpand) {
+      if (props2.accordion) {
+        const value2 = targetExpand ? itemValue : void 0;
+        updateModelValue(isArray(props2.modelValue) ? removeArrayBlank([value2]) : value2);
+        return;
       }
-      return true;
+      const value = targetExpand ? [...normalizeValues.value, itemValue] : normalizeValues.value.filter((value2) => value2 !== itemValue);
+      updateModelValue(value);
     }
-    function getValue(value, isExpand) {
-      if (!checkValue())
-        return null;
-      if (isExpand)
-        return props2.accordion ? value : [...props2.modelValue, value];
-      return props2.accordion ? null : props2.modelValue.filter((name2) => name2 !== value);
-    }
-    function updateItem(value, isExpand) {
-      const modelValue = getValue(value, isExpand);
+    function updateModelValue(modelValue) {
       call(props2["onUpdate:modelValue"], modelValue);
       call(props2.onChange, modelValue);
     }
-    function matchName() {
-      if (props2.accordion) {
-        return collapseItem2.find(({ name: name2 }) => props2.modelValue === name2.value);
-      }
-      const filterItem = collapseItem2.filter(({ name: name2 }) => {
-        if (name2.value === void 0)
-          return false;
-        return props2.modelValue.includes(name2.value);
-      });
-      return filterItem.length ? filterItem : void 0;
-    }
-    function matchIndex() {
+    function matchItems() {
       if (props2.accordion) {
-        return collapseItem2.find(
-          ({ index, name: name2 }) => name2.value === void 0 && props2.modelValue === index.value
-        );
+        const [value] = normalizeValues.value;
+        if (value == null) {
+          return;
+        }
+        const matchedNameItem = collapseItems.find(({ name: name2 }) => value === name2.value);
+        if (matchedNameItem == null) {
+          return collapseItems.find(({ index, name: name2 }) => name2.value == null && value === index.value);
+        }
+        return matchedNameItem;
       }
-      return collapseItem2.filter(
-        ({ index, name: name2 }) => name2.value === void 0 && props2.modelValue.includes(index.value)
+      const matchedNameItems = collapseItems.filter(
+        ({ name: name2 }) => name2.value != null && normalizeValues.value.includes(name2.value)
+      );
+      const matchedIndexItems = collapseItems.filter(
+        ({ index, name: name2 }) => name2.value == null && normalizeValues.value.includes(index.value)
       );
+      return [...matchedNameItems, ...matchedIndexItems];
     }
     function resize() {
-      if (!checkValue())
-        return;
-      const matchProviders = matchName() || matchIndex();
-      if (props2.accordion && !matchProviders || !props2.accordion && !matchProviders.length) {
-        collapseItem2.forEach((provider) => {
-          provider.init(props2.accordion, false);
-        });
-        return;
-      }
-      collapseItem2.forEach((provider) => {
-        const isShow = props2.accordion ? matchProviders === provider : matchProviders.includes(provider);
-        provider.init(props2.accordion, isShow);
+      const matchedItems = removeArrayBlank(normalizeToArray(matchItems()));
+      collapseItems.forEach((collapseItem2) => {
+        collapseItem2.init(matchedItems.includes(collapseItem2));
       });
     }
     return {
@@ -5522,7 +5502,7 @@ function __render__$_(_ctx, _cache) {
         "div",
         {
           class: vue.normalizeClass(_ctx.n("header")),
-          onClick: _cache[0] || (_cache[0] = ($event) => _ctx.toggle())
+          onClick: _cache[0] || (_cache[0] = (...args) => _ctx.toggle && _ctx.toggle(...args))
         },
         [
           vue.createElementVNode(
@@ -5612,7 +5592,7 @@ const __sfc__$$ = vue.defineComponent({
     const contentEl = vue.ref(null);
     const name2 = vue.computed(() => props2.name);
     const { index, collapse, bindCollapse } = useCollapse();
-    const { active, offset: offset2, divider: divider2, elevation: elevation2, updateItem } = collapse;
+    const { offset: offset2, divider: divider2, elevation: elevation2, updateItem } = collapse;
     const collapseItemProvider = {
       index,
       name: name2,
@@ -5661,18 +5641,15 @@ const __sfc__$$ = vue.defineComponent({
         contentEl.value.style.height = "0px";
       });
     }
-    function init(accordion, show) {
-      if (active.value === void 0 || accordion && isArray(active.value) || show === isShow.value)
-        return;
+    function init(show) {
       isShow.value = show;
-      toggle(true);
     }
-    function toggle(initOrAccordion) {
-      if (props2.disabled)
+    function toggle() {
+      var _a;
+      if (props2.disabled) {
         return;
-      if (!initOrAccordion) {
-        updateItem(props2.name || index.value, !isShow.value);
       }
+      updateItem((_a = props2.name) != null ? _a : index.value, !isShow.value);
     }
     function start2() {
       isInitToTrigger = false;
@@ -10087,9 +10064,10 @@ const __sfc__$U = vue.defineComponent({
     );
     const sortWeekList = vue.computed(() => {
       const index = WEEK_HEADER.findIndex((week) => week === props2.componentProps.firstDayOfWeek);
-      if (index === -1 || index === 0)
+      if (index === -1 || index === 0) {
         return WEEK_HEADER;
-      return WEEK_HEADER.slice(index).concat(WEEK_HEADER.slice(0, index));
+      }
+      return [...WEEK_HEADER.slice(index), ...WEEK_HEADER.slice(0, index)];
     });
     const getDayAbbr = (key) => {
       var _a, _b;
@@ -16155,7 +16133,11 @@ const __sfc__$E = vue.defineComponent({
       if (props2.type === "number") {
         value = formatNumber(value);
       }
-      return withMaxlength(withTrim(value));
+      const targetValue = withMaxlength(withTrim(value));
+      if (targetValue === props2.modelValue) {
+        target.value = targetValue;
+      }
+      return targetValue;
     }
     function handleCompositionStart() {
       isComposing.value = true;
@@ -25038,7 +25020,7 @@ const uploader = "";
 const UploaderSfc = "";
 const watermark = "";
 const WatermarkSfc = "";
-const version = "2.19.2";
+const version = "2.19.3-alpha.1701190302604";
 function install(app) {
   stdin_default$3k.install && app.use(stdin_default$3k);
   stdin_default$3i.install && app.use(stdin_default$3i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "2.19.2",
+  "version": "2.19.3-alpha.1701190302604",
   "description": "A material like components library",
   "main": "lib/varlet.cjs.js",
   "module": "es/index.mjs",
@@ -48,9 +48,9 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/shared": "2.19.2",
-    "@varlet/icons": "2.19.2",
-    "@varlet/use": "2.19.2"
+    "@varlet/icons": "2.19.3-alpha.1701190302604",
+    "@varlet/shared": "2.19.3-alpha.1701190302604",
+    "@varlet/use": "2.19.3-alpha.1701190302604"
   },
   "devDependencies": {
     "@vue/runtime-core": "3.3.4",
@@ -66,9 +66,9 @@
     "typescript": "^5.1.5",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/cli": "2.19.2",
-    "@varlet/touch-emulator": "2.19.2",
-    "@varlet/ui": "2.19.2"
+    "@varlet/cli": "2.19.3-alpha.1701190302604",
+    "@varlet/ui": "2.19.3-alpha.1701190302604",
+    "@varlet/touch-emulator": "2.19.3-alpha.1701190302604"
   },
   "scripts": {
     "dev": "varlet-cli dev",

package/types/collapse.d.ts

@@ -3,7 +3,7 @@ import { VNode } from 'vue'
 
 export declare const collapseProps: Record<keyof CollapseProps, any>
 
-export type CollapseModelValue = null | string | number | Array<string | number>
+export type CollapseModelValue = undefined | string | number | Array<string | number | undefined>
 
 export interface CollapseProps extends BasicAttributes {
   modelValue?: CollapseModelValue