@varlet/ui 1.25.0 → 1.25.1-alpha.1642669197501

package/es/collapse/Collapse.js

@@ -41,9 +41,9 @@ export default defineComponent({
     };
 
     var getValue = (value, isExpand) => {
-      if (!checkValue()) return;
+      if (!checkValue()) return null;
       if (isExpand) return props.accordion ? value : [...props.modelValue, value];
-      return props.accordion ? undefined : props.modelValue.filter(name => name !== value);
+      return props.accordion ? null : props.modelValue.filter(name => name !== value);
     };
 
     var updateItem = (value, isExpand) => {

package/es/index-bar/IndexBar.js

@@ -2,9 +2,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-import { computed, defineComponent, nextTick, ref, watch, onMounted, onBeforeUnmount } from 'vue';
+import { computed, defineComponent, ref, watch, onMounted, onBeforeUnmount } from 'vue';
 import { easeInOutCubic, isPlainObject, toNumber } from '../utils/shared';
-import { getParentScroller, getScrollLeft, nextTickFrame, requestAnimationFrame, scrollTo as varScrollTo } from '../utils/elements';
+import { doubleRaf, getParentScroller, getScrollLeft, nextTickFrame, requestAnimationFrame, scrollTo as varScrollTo } from '../utils/elements';
 import { useIndexAnchors } from './provide';
 import { props } from './props';
 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";
@@ -107,6 +107,9 @@ export default defineComponent({
 
     var anchorClick = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (anchorName, manualCall) {
+        var {
+          offsetTop
+        } = barEl.value;
         if (manualCall) props.onClick == null ? void 0 : props.onClick(anchorName);
         if (anchorName === active.value) return;
         var indexAnchor = indexAnchors.find(_ref2 => {
@@ -116,7 +119,7 @@ export default defineComponent({
           return anchorName === name.value;
         });
         if (!indexAnchor) return;
-        var top = indexAnchor.ownTop.value;
+        var top = indexAnchor.ownTop.value - stickyOffsetTop.value + offsetTop;
         var left = getScrollLeft(scrollEl.value);
         clickedName.value = anchorName;
         emitEvent(anchorName);
@@ -141,23 +144,25 @@ export default defineComponent({
       requestAnimationFrame(() => anchorClick(index, true));
     };
 
-    watch(() => length.value, () => nextTick(() => {
-      indexAnchors.forEach(_ref3 => {
+    watch(() => length.value, /*#__PURE__*/_asyncToGenerator(function* () {
+      yield doubleRaf();
+      indexAnchors.forEach(_ref4 => {
         var {
           name,
           setOwnTop
-        } = _ref3;
+        } = _ref4;
         if (name.value) anchorNameList.value.push(name.value);
         setOwnTop();
       });
     }));
-    onMounted(() => {
+    onMounted( /*#__PURE__*/_asyncToGenerator(function* () {
       var _scroller$value;
 
+      yield doubleRaf();
       scroller.value = getParentScroller(barEl.value);
       scrollEl.value = scroller.value === window ? scroller.value.document.documentElement : scroller.value;
       (_scroller$value = scroller.value) == null ? void 0 : _scroller$value.addEventListener('scroll', handleScroll);
-    });
+    }));
     onBeforeUnmount(() => {
       var _scroller$value2;
 

package/es/snackbar/style/index.js

@@ -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'

package/es/snackbar/style/less.js

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

package/es/sticky/Sticky.js

@@ -1,6 +1,10 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 import { defineComponent, ref, onMounted, onUnmounted, onActivated, onDeactivated, computed, watch } from 'vue';
 import { props } from './props';
-import { getParentScroller, toPxNum } from '../utils/elements';
+import { doubleRaf, getParentScroller, toPxNum } from '../utils/elements';
 import { toNumber } from '../utils/shared';
 import { renderSlot as _renderSlot, normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
 export function render(_ctx, _cache) {
@@ -96,12 +100,19 @@ export default defineComponent({
       }
     };
 
-    var addScrollListener = () => {
-      scroller = getParentScroller(stickyEl.value);
-      scroller !== window && scroller.addEventListener('scroll', handleScroll);
-      window.addEventListener('scroll', handleScroll);
-      handleScroll();
-    };
+    var addScrollListener = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* () {
+        yield doubleRaf();
+        scroller = getParentScroller(stickyEl.value);
+        scroller !== window && scroller.addEventListener('scroll', handleScroll);
+        window.addEventListener('scroll', handleScroll);
+        handleScroll();
+      });
+
+      return function addScrollListener() {
+        return _ref.apply(this, arguments);
+      };
+    }();
 
     var removeScrollListener = () => {
       scroller !== window && scroller.removeEventListener('scroll', handleScroll);

package/es/utils/shared.js

@@ -29,7 +29,6 @@ export var isBool = val => typeof val === 'boolean';
 export var isNumber = val => typeof val === 'number';
 export var isPlainObject = val => Object.prototype.toString.call(val) === '[object Object]';
 export var isArray = val => Array.isArray(val);
-export var isPromise = val => val instanceof Promise;
 export var isURL = val => {
   if (!val) {
     return false;

package/highlight/web-types.json

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

package/lib/collapse/Collapse.js

@@ -51,9 +51,9 @@ var _default = (0, _vue.defineComponent)({
     };
 
     var getValue = (value, isExpand) => {
-      if (!checkValue()) return;
+      if (!checkValue()) return null;
       if (isExpand) return props.accordion ? value : [...props.modelValue, value];
-      return props.accordion ? undefined : props.modelValue.filter(name => name !== value);
+      return props.accordion ? null : props.modelValue.filter(name => name !== value);
     };
 
     var updateItem = (value, isExpand) => {

package/lib/index-bar/IndexBar.js

@@ -118,6 +118,9 @@ var _default = (0, _vue.defineComponent)({
 
     var anchorClick = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (anchorName, manualCall) {
+        var {
+          offsetTop
+        } = barEl.value;
         if (manualCall) props.onClick == null ? void 0 : props.onClick(anchorName);
         if (anchorName === active.value) return;
         var indexAnchor = indexAnchors.find(_ref2 => {
@@ -127,7 +130,7 @@ var _default = (0, _vue.defineComponent)({
           return anchorName === name.value;
         });
         if (!indexAnchor) return;
-        var top = indexAnchor.ownTop.value;
+        var top = indexAnchor.ownTop.value - stickyOffsetTop.value + offsetTop;
         var left = (0, _elements.getScrollLeft)(scrollEl.value);
         clickedName.value = anchorName;
         emitEvent(anchorName);
@@ -152,23 +155,25 @@ var _default = (0, _vue.defineComponent)({
       (0, _elements.requestAnimationFrame)(() => anchorClick(index, true));
     };
 
-    (0, _vue.watch)(() => length.value, () => (0, _vue.nextTick)(() => {
-      indexAnchors.forEach(_ref3 => {
+    (0, _vue.watch)(() => length.value, /*#__PURE__*/_asyncToGenerator(function* () {
+      yield (0, _elements.doubleRaf)();
+      indexAnchors.forEach(_ref4 => {
         var {
           name,
           setOwnTop
-        } = _ref3;
+        } = _ref4;
         if (name.value) anchorNameList.value.push(name.value);
         setOwnTop();
       });
     }));
-    (0, _vue.onMounted)(() => {
+    (0, _vue.onMounted)( /*#__PURE__*/_asyncToGenerator(function* () {
       var _scroller$value;
 
+      yield (0, _elements.doubleRaf)();
       scroller.value = (0, _elements.getParentScroller)(barEl.value);
       scrollEl.value = scroller.value === window ? scroller.value.document.documentElement : scroller.value;
       (_scroller$value = scroller.value) == null ? void 0 : _scroller$value.addEventListener('scroll', handleScroll);
-    });
+    }));
     (0, _vue.onBeforeUnmount)(() => {
       var _scroller$value2;
 

package/lib/snackbar/style/index.js

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

package/lib/snackbar/style/less.js

@@ -1,8 +1,8 @@
 require('../../styles/common.less')
+require('../SnackbarSfc.less')
 require('../../styles/elevation.less')
 require('../../loading/loading.less')
 require('../../button/button.less')
 require('../../icon/icon.less')
 require('../snackbar.less')
 require('../coreSfc.less')
-require('../SnackbarSfc.less')

package/lib/sticky/Sticky.js

@@ -12,6 +12,10 @@ var _elements = require("../utils/elements");
 
 var _shared = require("../utils/shared");
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function render(_ctx, _cache) {
   return (0, _vue.openBlock)(), (0, _vue.createElementBlock)("div", {
     class: (0, _vue.normalizeClass)(["var-sticky", [_ctx.enableCSSMode ? 'var-sticky--css-mode' : null]]),
@@ -106,12 +110,19 @@ var _default = (0, _vue.defineComponent)({
       }
     };
 
-    var addScrollListener = () => {
-      scroller = (0, _elements.getParentScroller)(stickyEl.value);
-      scroller !== window && scroller.addEventListener('scroll', handleScroll);
-      window.addEventListener('scroll', handleScroll);
-      handleScroll();
-    };
+    var addScrollListener = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* () {
+        yield (0, _elements.doubleRaf)();
+        scroller = (0, _elements.getParentScroller)(stickyEl.value);
+        scroller !== window && scroller.addEventListener('scroll', handleScroll);
+        window.addEventListener('scroll', handleScroll);
+        handleScroll();
+      });
+
+      return function addScrollListener() {
+        return _ref.apply(this, arguments);
+      };
+    }();
 
     var removeScrollListener = () => {
       scroller !== window && scroller.removeEventListener('scroll', handleScroll);

package/lib/utils/shared.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.isURL = exports.isString = exports.isPromise = exports.isPlainObject = exports.isNumber = exports.isHTMLSupportVideo = exports.isHTMLSupportImage = exports.isEmpty = exports.isBool = exports.isArray = exports.inBrowser = exports.easeInOutCubic = exports.dt = exports.cubic = exports.createCache = void 0;
+exports.isURL = exports.isString = exports.isPlainObject = exports.isNumber = exports.isHTMLSupportVideo = exports.isHTMLSupportImage = exports.isEmpty = exports.isBool = exports.isArray = exports.inBrowser = exports.easeInOutCubic = exports.dt = exports.cubic = exports.createCache = void 0;
 exports.kebabCase = kebabCase;
 exports.linear = void 0;
 exports.parseFormat = parseFormat;
@@ -62,10 +62,6 @@ var isArray = val => Array.isArray(val);
 
 exports.isArray = isArray;
 
-var isPromise = val => val instanceof Promise;
-
-exports.isPromise = isPromise;
-
 var isURL = val => {
   if (!val) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "1.25.0",
+  "version": "1.25.1-alpha.1642669197501",
   "description": "A material like components library",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -39,13 +39,13 @@
   },
   "gitHead": "ee9c3866bedad96c86365b0f9888a3a6bb781b1f",
   "dependencies": {
-    "@varlet/icons": "1.25.0",
+    "@varlet/icons": "1.25.1-alpha.1642669197501",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1"
   },
   "devDependencies": {
-    "@varlet/cli": "1.25.0",
-    "@varlet/touch-emulator": "1.25.0",
+    "@varlet/cli": "1.25.1-alpha.1642669197501",
+    "@varlet/touch-emulator": "1.25.1-alpha.1642669197501",
     "@vue/test-utils": "2.0.0-rc.6",
     "@vue/runtime-core": "^3.2.16",
     "typescript": "^4.4.4",

package/types/collapse.d.ts

@@ -1,6 +1,6 @@
 import { VarComponent } from './varComponent'
 
-export type CollapseModelValue = undefined | string | number | Array<string | number | undefined>
+export type CollapseModelValue = null | string | number | Array<string | number>
 
 export interface CollapseProps {
   modelValue?: CollapseModelValue