@varlet/ui 2.21.0 → 2.21.1-alpha.1705566892480

package/es/index-bar/IndexBar.mjs

@@ -36,7 +36,7 @@ import { props } from "./props.mjs";
 import { createNamespace } from "../utils/components.mjs";
 import { onSmartMounted } from "@varlet/use";
 const { name, n, classes } = createNamespace("index-bar");
-import { renderSlot as _renderSlot, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
+import { renderSlot as _renderSlot, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
 const _withScopeId = (n2) => (_pushScopeId(""), n2 = n2(), _popScopeId(), n2);
 const _hoisted_1 = ["onClick"];
 function __render__(_ctx, _cache) {
@@ -64,7 +64,15 @@ function __render__(_ctx, _cache) {
                 class: _normalizeClass(_ctx.classes(_ctx.n("anchor-item"), [_ctx.active === anchorName, _ctx.n("anchor-item--active")])),
                 style: _normalizeStyle({ color: _ctx.active === anchorName && _ctx.highlightColor ? _ctx.highlightColor : void 0 }),
                 onClick: ($event) => _ctx.anchorClick({ anchorName, manualCall: true })
-              }, _toDisplayString(anchorName), 15, _hoisted_1);
+              }, [
+                _renderSlot(_ctx.$slots, "anchor-name", { anchorName }, () => [
+                  _createTextVNode(
+                    _toDisplayString(anchorName),
+                    1
+                    /* TEXT */
+                  )
+                ])
+              ], 14, _hoisted_1);
             }),
             128
             /* KEYED_FRAGMENT */

package/es/index.bundle.mjs

@@ -262,7 +262,7 @@ import './tooltip/style/index.mjs'
 import './uploader/style/index.mjs'
 import './watermark/style/index.mjs'
 
-const version = '2.21.0'
+const version = '2.21.1-alpha.1705566892480'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/index.mjs

@@ -174,7 +174,7 @@ export * from './tooltip/index.mjs'
 export * from './uploader/index.mjs'
 export * from './watermark/index.mjs'
 
-const version = '2.21.0'
+const version = '2.21.1-alpha.1705566892480'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/picker/Picker.mjs

@@ -232,18 +232,9 @@ const __sfc__ = defineComponent({
     const columnHeight = computed(() => optionCount.value * optionHeight.value);
     const { prevY, moveY, dragging, startTouch, moveTouch, endTouch } = useTouch();
     let prevIndexes = [];
-    buildScrollColumns();
-    watch(() => props2.columns, buildScrollColumns, { deep: true });
-    watch(
-      () => modelValue.value,
-      () => {
-        if (props2.cascade && props2.modelValue.length) {
-          buildScrollColumns();
-        } else {
-          updateScrollColumnsIndex();
-        }
-      }
-    );
+    initScrollColumns();
+    watch(() => props2.columns, initScrollColumns, { deep: true });
+    watch(() => modelValue.value, initScrollColumns);
     function getOptionKey(key) {
       const keyMap = {
         text: props2.textKey,
@@ -260,7 +251,7 @@ const __sfc__ = defineComponent({
       prevIndexes = [...indexes];
     }
     function normalizeNormalMode(columns) {
-      return columns.map((column) => {
+      return columns.map((column, idx) => {
         const scrollColumn = {
           id: sid++,
           prevY: 0,
@@ -274,6 +265,9 @@ const __sfc__ = defineComponent({
           scrollEl: null,
           scrolling: false
         };
+        const value = modelValue.value[idx];
+        const index = scrollColumn.column.findIndex((option) => value === getValue(option));
+        scrollColumn.index = index === -1 ? 0 : index;
         scrollTo(scrollColumn);
         return scrollColumn;
       });
@@ -283,7 +277,7 @@ const __sfc__ = defineComponent({
       createChildren(scrollColumns2, column);
       return scrollColumns2;
     }
-    function createChildren(scrollColumns2, children) {
+    function createChildren(scrollColumns2, children, syncModelValue = true) {
       var _a;
       if (children.length) {
         const scrollColumn = {
@@ -300,31 +294,30 @@ const __sfc__ = defineComponent({
           scrolling: false
         };
         scrollColumns2.push(scrollColumn);
-        if (props2.modelValue.length) {
-          const index = children.findIndex((option) => modelValue.value[scrollColumns2.length - 1] === getValue(option));
+        if (syncModelValue) {
+          const value = modelValue.value[scrollColumns2.length - 1];
+          const index = children.findIndex((option) => value === getValue(option));
           scrollColumn.index = index === -1 ? 0 : index;
         }
         scrollTo(scrollColumn);
-        createChildren(scrollColumns2, (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : []);
+        createChildren(
+          scrollColumns2,
+          (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : [],
+          syncModelValue
+        );
       }
     }
     function rebuildChildren(scrollColumn) {
       var _a;
       scrollColumns.value.splice(scrollColumns.value.indexOf(scrollColumn) + 1);
-      createChildren(scrollColumns.value, (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : []);
+      createChildren(
+        scrollColumns.value,
+        (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : [],
+        false
+      );
     }
-    function buildScrollColumns() {
+    function initScrollColumns() {
       scrollColumns.value = props2.cascade ? normalizeCascadeMode(props2.columns) : normalizeNormalMode(props2.columns);
-      if (!props2.cascade) {
-        updateScrollColumnsIndex();
-      }
-    }
-    function updateScrollColumnsIndex() {
-      scrollColumns.value.forEach((scrollColumn, idx) => {
-        const index = scrollColumn.column.findIndex((option) => modelValue.value[idx] === getValue(option));
-        scrollColumn.index = index === -1 ? 0 : index;
-        scrollTo(scrollColumn);
-      });
       const { indexes } = getPicked();
       setPrevIndexes(indexes);
     }
@@ -413,23 +406,23 @@ const __sfc__ = defineComponent({
       scrollTo(scrollColumn, shouldMomentum ? MOMENTUM_TRANSITION_DURATION : TRANSITION_DURATION);
       scrollColumn.scrolling = scrollColumn.translate !== oldTranslate;
       if (!scrollColumn.scrolling) {
-        change(scrollColumn);
+        handleScrollColumnChange(scrollColumn);
       }
     }
     function handleTransitionend(scrollColumn) {
       scrollColumn.scrolling = false;
-      change(scrollColumn);
+      handleScrollColumnChange(scrollColumn);
     }
     function isSamePicked() {
       const { indexes } = getPicked();
       return indexes.every((index, idx) => index === prevIndexes[idx]);
     }
-    function change(scrollColumn) {
-      const { cascade, onChange } = props2;
+    function handleScrollColumnChange(scrollColumn) {
+      const { onChange, cascade } = props2;
       if (isSamePicked()) {
         return;
       }
-      if (cascade && !props2.modelValue.length) {
+      if (cascade) {
         rebuildChildren(scrollColumn);
       }
       const hasScrolling = scrollColumns.value.some((scrollColumn2) => scrollColumn2.scrolling);

package/es/snackbar/Snackbar.mjs

@@ -3,7 +3,7 @@ import { defineComponent } from "vue";
 import { createNamespace, useTeleport } from "../utils/components.mjs";
 import { props } from "./props.mjs";
 const { name, n } = createNamespace("snackbar");
-import { renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, resolveComponent as _resolveComponent, mergeProps as _mergeProps, withCtx as _withCtx, createVNode as _createVNode, Transition as _Transition, Teleport as _Teleport, openBlock as _openBlock, createBlock as _createBlock } from "vue";
+import { renderSlot as _renderSlot, resolveComponent as _resolveComponent, mergeProps as _mergeProps, withCtx as _withCtx, createSlots as _createSlots, createVNode as _createVNode, Transition as _Transition, Teleport as _Teleport, openBlock as _openBlock, createBlock as _createBlock } from "vue";
 function __render__(_ctx, _cache) {
   const _component_var_snackbar_core = _resolveComponent("var-snackbar-core");
   return _openBlock(), _createBlock(_Teleport, {
@@ -18,25 +18,28 @@ function __render__(_ctx, _cache) {
       default: _withCtx(() => [
         _createVNode(_component_var_snackbar_core, _mergeProps(_ctx.$props, {
           class: _ctx.n("transition")
-        }), {
-          icon: _withCtx(() => [
-            _renderSlot(_ctx.$slots, "icon")
-          ]),
-          action: _withCtx(() => [
-            _renderSlot(_ctx.$slots, "action")
-          ]),
+        }), _createSlots({
           default: _withCtx(() => [
-            _renderSlot(_ctx.$slots, "default", {}, () => [
-              _createTextVNode(
-                _toDisplayString(_ctx.content),
-                1
-                /* TEXT */
-              )
-            ])
+            _renderSlot(_ctx.$slots, "default")
           ]),
-          _: 3
-          /* FORWARDED */
-        }, 16, ["class"])
+          _: 2
+          /* DYNAMIC */
+        }, [
+          _ctx.$slots.icon ? {
+            name: "icon",
+            fn: _withCtx(() => [
+              _renderSlot(_ctx.$slots, "icon")
+            ]),
+            key: "0"
+          } : void 0,
+          _ctx.$slots.action ? {
+            name: "action",
+            fn: _withCtx(() => [
+              _renderSlot(_ctx.$slots, "action")
+            ]),
+            key: "1"
+          } : void 0
+        ]), 1040, ["class"])
       ]),
       _: 3
       /* FORWARDED */

package/es/snackbar/core.mjs

@@ -16,7 +16,9 @@ const ICON_TYPE_DICT = {
   error: "error",
   loading: ""
 };
-import { renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeClass as _normalizeClass, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createElementBlock as _createElementBlock, normalizeStyle as _normalizeStyle, vShow as _vShow, withDirectives as _withDirectives } from "vue";
+import { renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, normalizeClass as _normalizeClass, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createElementBlock as _createElementBlock, normalizeStyle as _normalizeStyle, vShow as _vShow, withDirectives as _withDirectives, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
+const _withScopeId = (n2) => (_pushScopeId(""), n2 = n2(), _popScopeId(), n2);
+const _hoisted_1 = { key: 0 };
 function __render__(_ctx, _cache) {
   const _component_var_icon = _resolveComponent("var-icon");
   const _component_var_loading = _resolveComponent("var-loading");
@@ -59,32 +61,24 @@ function __render__(_ctx, _cache) {
             2
             /* CLASS */
           ),
-          _createElementVNode(
-            "div",
-            {
-              class: _normalizeClass([_ctx.n("icon")])
-            },
-            [
-              _ctx.iconName ? (_openBlock(), _createBlock(_component_var_icon, {
-                key: 0,
-                name: _ctx.iconName
-              }, null, 8, ["name"])) : _createCommentVNode("v-if", true),
-              _ctx.type === "loading" ? (_openBlock(), _createBlock(_component_var_loading, {
-                key: 1,
-                type: _ctx.loadingType,
-                size: _ctx.loadingSize,
-                color: _ctx.loadingColor,
-                radius: _ctx.loadingRadius
-              }, null, 8, ["type", "size", "color", "radius"])) : _createCommentVNode("v-if", true),
-              _renderSlot(_ctx.$slots, "icon")
-            ],
-            2
-            /* CLASS */
-          ),
+          _ctx.iconName || _ctx.type === "loading" || _ctx.$slots.icon ? (_openBlock(), _createElementBlock("div", _hoisted_1, [
+            _ctx.iconName ? (_openBlock(), _createBlock(_component_var_icon, {
+              key: 0,
+              name: _ctx.iconName
+            }, null, 8, ["name"])) : _createCommentVNode("v-if", true),
+            _ctx.type === "loading" ? (_openBlock(), _createBlock(_component_var_loading, {
+              key: 1,
+              type: _ctx.loadingType,
+              size: _ctx.loadingSize,
+              color: _ctx.loadingColor,
+              radius: _ctx.loadingRadius
+            }, null, 8, ["type", "size", "color", "radius"])) : _createCommentVNode("v-if", true),
+            _renderSlot(_ctx.$slots, "icon")
+          ])) : _createCommentVNode("v-if", true),
           _ctx.$slots.action ? (_openBlock(), _createElementBlock(
             "div",
             {
-              key: 0,
+              key: 1,
               class: _normalizeClass(_ctx.n("action"))
             },
             [
@@ -118,24 +112,25 @@ const __sfc__ = defineComponent({
       () => props2.show,
       () => props2.lockScroll
     );
-    const isForbidClick = computed(() => props2.type === "loading" || props2.forbidClick);
-    const iconName = computed(() => {
-      if (!props2.type)
-        return "";
-      return ICON_TYPE_DICT[props2.type];
+    const isForbidClick = computed(() => {
+      const { type, forbidClick } = props2;
+      return type === "loading" || forbidClick;
     });
-    const updateAfterDuration = () => {
+    const iconName = computed(() => !props2.type ? "" : ICON_TYPE_DICT[props2.type]);
+    function updateAfterDuration() {
       timer.value = setTimeout(() => {
-        props2.type !== "loading" && call(props2["onUpdate:show"], false);
+        if (props2.type !== "loading") {
+          call(props2["onUpdate:show"], false);
+        }
       }, props2.duration);
-    };
+    }
     watch(
       () => props2.show,
       (show) => {
         if (show) {
           call(props2.onOpen);
           updateAfterDuration();
-        } else if (show === false) {
+        } else {
           clearTimeout(timer.value);
           call(props2.onClose);
         }
@@ -156,11 +151,11 @@ const __sfc__ = defineComponent({
     });
     return {
       SNACKBAR_TYPE,
-      n,
-      classes,
       zIndex,
       iconName,
-      isForbidClick
+      isForbidClick,
+      n,
+      classes
     };
   }
 });

package/es/snackbar/props.mjs

@@ -25,9 +25,7 @@ const props = {
     type: String,
     default: "top"
   },
-  content: {
-    type: [String, Function, Object]
-  },
+  content: [String, Function, Object],
   contentClass: String,
   duration: {
     type: Number,

package/es/snackbar/style/index.mjs

@@ -1,7 +1,6 @@
 import '../../styles/common.css'
 import '../../styles/elevation.css'
 import '../../loading/loading.css'
-import '../../button/button.css'
 import '../../icon/icon.css'
 import '../snackbar.css'
 import '../coreSfc.css'