@varlet/ui 2.15.0-alpha.1693213353380 → 2.15.0

package/es/drag/Drag.mjs

@@ -58,9 +58,9 @@ var __sfc__ = defineComponent({
     });
     var dragged = ref(false);
     var enableTransition = ref(false);
-    var dragging = ref(false);
     var {
       touching,
+      dragging,
       moveX,
       moveY,
       startTouch,
@@ -71,28 +71,22 @@ var __sfc__ = defineComponent({
     var {
       disabled: teleportDisabled
     } = useTeleport();
-    var draggingRunner = null;
     var handleTouchstart = event => {
       if (props.disabled) {
         return;
       }
-      if (draggingRunner) {
-        window.clearTimeout(draggingRunner);
-      }
-      saveXY();
       startTouch(event);
-      dragging.value = false;
+      saveXY();
     };
     var handleTouchmove = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(function* (event) {
         if (!touching.value || props.disabled) {
           return;
         }
+        moveTouch(event);
         event.preventDefault();
         enableTransition.value = false;
         dragged.value = true;
-        dragging.value = true;
-        moveTouch(event);
         if (props.direction.includes('x')) {
           x.value += moveX.value;
         }
@@ -112,9 +106,6 @@ var __sfc__ = defineComponent({
       endTouch();
       enableTransition.value = true;
       attract();
-      draggingRunner = window.setTimeout(() => {
-        dragging.value = false;
-      });
     };
     var handleClick = event => {
       if (dragging.value) {
@@ -251,12 +242,11 @@ var __sfc__ = defineComponent({
 
     // expose
     var reset = () => {
+      resetTouch();
       enableTransition.value = false;
       dragged.value = false;
-      dragging.value = false;
       x.value = 0;
       y.value = 0;
-      resetTouch();
     };
     watch(() => props.boundary, toPxBoundary);
     onWindowResize(resize);

package/es/form/Form.mjs

@@ -3,7 +3,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { defineComponent, computed } from 'vue';
 import { props } from './props.mjs';
 import { useFormItems } from './provide.mjs';
-import { createNamespace } from '../utils/components.mjs';
+import { call, createNamespace } from '../utils/components.mjs';
 import { find } from '@varlet/shared';
 import { getParentScroller, getTop, scrollTo, toPxNum } from '../utils/elements.mjs';
 import { linear } from '../utils/shared.mjs';
@@ -12,9 +12,15 @@ var {
 } = createNamespace('form');
 import { renderSlot as _renderSlot, normalizeClass as _normalizeClass, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
 function __render__(_ctx, _cache) {
-  return _openBlock(), _createElementBlock("div", {
-    class: _normalizeClass(_ctx.n())
-  }, [_renderSlot(_ctx.$slots, "default")], 2 /* CLASS */);
+  return _openBlock(), _createElementBlock("form", {
+    class: _normalizeClass(_ctx.n()),
+    onSubmit: _cache[0] || (_cache[0] = function () {
+      return _ctx.handleSubmit && _ctx.handleSubmit(...arguments);
+    }),
+    onReset: _cache[1] || (_cache[1] = function () {
+      return _ctx.handleReset && _ctx.handleReset(...arguments);
+    })
+  }, [_renderSlot(_ctx.$slots, "default")], 34 /* CLASS, HYDRATE_EVENTS */);
 }
 
 var __sfc__ = defineComponent({
@@ -39,14 +45,29 @@ var __sfc__ = defineComponent({
         });
       }, 300);
     };
+    var handleSubmit = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (event) {
+        event.preventDefault();
+        var valid = yield validate();
+        call(props.onSubmit, valid);
+      });
+      return function handleSubmit(_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    var handleReset = event => {
+      event.preventDefault();
+      reset();
+      call(props.onReset);
+    };
 
     // expose
     var validate = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* () {
-        var res = yield Promise.all(formItems.map(_ref2 => {
+      var _ref2 = _asyncToGenerator(function* () {
+        var res = yield Promise.all(formItems.map(_ref3 => {
           var {
             validate
-          } = _ref2;
+          } = _ref3;
           return validate();
         }));
         if (props.scrollToError) {
@@ -62,23 +83,23 @@ var __sfc__ = defineComponent({
         return res.every(result => result === true);
       });
       return function validate() {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
 
     // expose
-    var reset = () => formItems.forEach(_ref3 => {
+    var reset = () => formItems.forEach(_ref4 => {
       var {
         reset
-      } = _ref3;
+      } = _ref4;
       return reset();
     });
 
     // expose
-    var resetValidation = () => formItems.forEach(_ref4 => {
+    var resetValidation = () => formItems.forEach(_ref5 => {
       var {
         resetValidation
-      } = _ref4;
+      } = _ref5;
       return resetValidation();
     });
     var formProvider = {
@@ -88,6 +109,8 @@ var __sfc__ = defineComponent({
     bindFormItems(formProvider);
     return {
       n,
+      handleSubmit,
+      handleReset,
       validate,
       reset,
       resetValidation

package/es/form/props.mjs

@@ -1,3 +1,4 @@
+import { defineListenerProp } from '../utils/components.mjs';
 export var props = {
   disabled: Boolean,
   readonly: Boolean,
@@ -5,5 +6,7 @@ export var props = {
   scrollToErrorOffsetY: {
     type: [String, Number],
     default: 0
-  }
+  },
+  onSubmit: defineListenerProp(),
+  onReset: defineListenerProp()
 };

package/es/index.bundle.mjs

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

package/es/index.mjs

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

package/es/input/Input.mjs

@@ -13,8 +13,8 @@ var {
 import { renderSlot as _renderSlot, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, normalizeProps as _normalizeProps, guardReactiveProps as _guardReactiveProps, withCtx as _withCtx, createSlots as _createSlots, createVNode as _createVNode, withModifiers as _withModifiers, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
 var _withScopeId = n => (_pushScopeId(""), n = n(), _popScopeId(), n);
 var _hoisted_1 = ["placeholder", "enterkeyhint"];
-var _hoisted_2 = ["id", "disabled", "type", "value", "placeholder", "maxlength", "rows", "enterkeyhint", "inputmode"];
-var _hoisted_3 = ["id", "disabled", "type", "value", "placeholder", "maxlength", "enterkeyhint", "inputmode"];
+var _hoisted_2 = ["id", "disabled", "readonly", "type", "value", "placeholder", "maxlength", "rows", "enterkeyhint", "inputmode"];
+var _hoisted_3 = ["id", "disabled", "readonly", "type", "value", "placeholder", "maxlength", "enterkeyhint", "inputmode"];
 function __render__(_ctx, _cache) {
   var _component_var_field_decorator = _resolveComponent("var-field-decorator");
   var _component_var_form_details = _resolveComponent("var-form-details");
@@ -60,7 +60,8 @@ function __render__(_ctx, _cache) {
       ref: "el",
       autocomplete: "new-password",
       id: _ctx.id,
-      disabled: _ctx.formDisabled || _ctx.disabled || _ctx.formReadonly || _ctx.readonly,
+      disabled: _ctx.formDisabled || _ctx.disabled,
+      readonly: _ctx.formReadonly || _ctx.readonly,
       type: _ctx.normalizedType,
       value: _ctx.modelValue,
       placeholder: !_ctx.hint ? _ctx.placeholder : undefined,
@@ -98,7 +99,8 @@ function __render__(_ctx, _cache) {
       ref: "el",
       autocomplete: "new-password",
       id: _ctx.id,
-      disabled: _ctx.formDisabled || _ctx.disabled || _ctx.formReadonly || _ctx.readonly,
+      disabled: _ctx.formDisabled || _ctx.disabled,
+      readonly: _ctx.formReadonly || _ctx.readonly,
       type: _ctx.normalizedType,
       value: _ctx.modelValue,
       placeholder: !_ctx.hint ? _ctx.placeholder : undefined,

package/es/picker/Picker.mjs

@@ -2,9 +2,10 @@ import VarButton from '../button/index.mjs';
 import VarPopup from '../popup/index.mjs';
 import { defineComponent, watch, ref, computed, Transition, toRaw } from 'vue';
 import { props } from './props.mjs';
+import { useTouch } from '@varlet/use';
 import { clamp, clampArrayRange, isArray } from '@varlet/shared';
 import { dt } from '../utils/shared.mjs';
-import { toPxNum, getTranslateY, requestAnimationFrame } from '../utils/elements.mjs';
+import { toPxNum, getTranslateY } from '../utils/elements.mjs';
 import { pack } from '../locale/index.mjs';
 import { createNamespace, call } from '../utils/components.mjs';
 var {
@@ -76,9 +77,9 @@ function __render__(_ctx, _cache) {
       return _openBlock(), _createElementBlock("div", {
         class: _normalizeClass(_ctx.n('column')),
         key: c.id,
-        onTouchstartPassive: $event => _ctx.handleTouchstart(c),
+        onTouchstartPassive: $event => _ctx.handleTouchstart($event, c),
         onTouchmove: _withModifiers($event => _ctx.handleTouchmove($event, c), ["prevent"]),
-        onTouchend: $event => _ctx.handleTouchend($event, c)
+        onTouchend: $event => _ctx.handleTouchend(c)
       }, [_createElementVNode("div", {
         class: _normalizeClass(_ctx.n('scroller')),
         ref_for: true,
@@ -133,7 +134,14 @@ var __sfc__ = defineComponent({
     var center = computed(() => optionCount.value * optionHeight.value / 2 - optionHeight.value / 2);
     var columnHeight = computed(() => optionCount.value * optionHeight.value);
     var prevIndexes = [];
-    var dragging = false;
+    var {
+      prevY,
+      moveY,
+      dragging,
+      startTouch,
+      moveTouch,
+      endTouch
+    } = useTouch();
     var setScrollEl = (el, scrollColumn) => {
       scrollColumn.scrollEl = el;
     };
@@ -172,30 +180,27 @@ var __sfc__ = defineComponent({
       scrollColumn.translate += Math.abs(distance / duration) / 0.003 * (distance < 0 ? -1 : 1);
     };
     var handleClick = (scrollColumn, index) => {
-      if (dragging) {
+      if (dragging.value) {
         return;
       }
       scrollColumn.index = index;
       scrollColumn.scrolling = true;
       scrollTo(scrollColumn, TRANSITION_DURATION);
     };
-    var handleTouchstart = scrollColumn => {
+    var handleTouchstart = (event, scrollColumn) => {
       scrollColumn.touching = true;
       scrollColumn.translate = getTranslateY(scrollColumn.scrollEl);
+      startTouch(event);
     };
     var handleTouchmove = (event, scrollColumn) => {
       if (!scrollColumn.touching) {
         return;
       }
-      dragging = true;
+      moveTouch(event);
       scrollColumn.scrolling = false;
       scrollColumn.duration = 0;
-      var {
-        clientY
-      } = event.touches[0];
-      var deltaY = scrollColumn.prevY !== undefined ? clientY - scrollColumn.prevY : 0;
-      scrollColumn.prevY = clientY;
-      scrollColumn.translate += deltaY;
+      scrollColumn.prevY = prevY.value;
+      scrollColumn.translate += moveY.value;
       clampTranslate(scrollColumn);
       var now = performance.now();
       if (now - scrollColumn.momentumTime > MOMENTUM_RECORD_TIME) {
@@ -203,9 +208,10 @@ var __sfc__ = defineComponent({
         scrollColumn.momentumPrevY = scrollColumn.translate;
       }
     };
-    var handleTouchend = (event, scrollColumn) => {
+    var handleTouchend = scrollColumn => {
+      endTouch();
       scrollColumn.touching = false;
-      scrollColumn.prevY = undefined;
+      scrollColumn.prevY = 0;
       var distance = scrollColumn.translate - scrollColumn.momentumPrevY;
       var duration = performance.now() - scrollColumn.momentumTime;
       var shouldMomentum = Math.abs(distance) >= MOMENTUM_ALLOW_DISTANCE && duration <= MOMENTUM_RECORD_TIME;
@@ -222,9 +228,6 @@ var __sfc__ = defineComponent({
       if (!scrollColumn.scrolling) {
         change(scrollColumn);
       }
-      requestAnimationFrame(() => {
-        dragging = false;
-      });
     };
     var handleTransitionend = scrollColumn => {
       scrollColumn.scrolling = false;
@@ -237,8 +240,8 @@ var __sfc__ = defineComponent({
       } : column;
       var scrollColumn = {
         id: sid++,
-        prevY: undefined,
-        momentumPrevY: undefined,
+        prevY: 0,
+        momentumPrevY: 0,
         touching: false,
         translate: center.value,
         index: (_normalColumn$initial = normalColumn.initialIndex) != null ? _normalColumn$initial : 0,
@@ -266,8 +269,8 @@ var __sfc__ = defineComponent({
         var index = initial ? (_props$cascadeInitial = props.cascadeInitialIndexes[scrollColumns.length]) != null ? _props$cascadeInitial : 0 : 0;
         var scrollColumn = {
           id: sid++,
-          prevY: undefined,
-          momentumPrevY: undefined,
+          prevY: 0,
+          momentumPrevY: 0,
           touching: false,
           translate: center.value,
           index,

package/es/snackbar/style/index.mjs

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