zartui 2.1.6 → 2.1.7

package/lib/sticky/index.js

@@ -1,39 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.default = void 0;
-
 var _style = require("../utils/dom/style");
-
 var _unit = require("../utils/format/unit");
-
 var _utils = require("../utils");
-
 var _scroll = require("../utils/dom/scroll");
-
 var _bindEvent = require("../mixins/bind-event");
-
 var _touch = require("../mixins/touch");
-
 var _loading = _interopRequireDefault(require("../loading"));
-
 var _createNamespace = (0, _utils.createNamespace)('sticky'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1];
-
-var _default = createComponent({
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1];
+var _default = exports.default = createComponent({
   mixins: [(0, _bindEvent.BindEventMixin)(function (bind, isBind) {
     if (!this.scroller) {
       this.scroller = (0, _scroll.getScroller)(this.$el);
     }
-
     if (this.observer) {
       var method = isBind ? 'observe' : 'unobserve';
       this.observer[method](this.$el);
     }
-
     bind(this.scroller, 'scroll', this.onScroll, true);
     this.onScroll();
   }), _touch.TouchMixin],
@@ -105,21 +93,16 @@ var _default = createComponent({
       if (!this.fixed) {
         return;
       }
-
       var style = {};
-
       if ((0, _utils.isDef)(this.zIndex)) {
         style.zIndex = this.zIndex;
       }
-
       if (this.offsetTopPx && this.fixed) {
         style.top = this.offsetTopPx + "px";
       }
-
       if (this.transform) {
         style.transform = "translate3d(0, " + this.transform + "px, 0)";
       }
-
       return style;
     }
   },
@@ -130,7 +113,6 @@ var _default = createComponent({
   },
   created: function created() {
     var _this2 = this;
-
     // compatibility: https://caniuse.com/#feat=intersectionobserver
     if (!_utils.isServer && window.IntersectionObserver) {
       this.observer = new IntersectionObserver(function (entries) {
@@ -149,31 +131,25 @@ var _default = createComponent({
   methods: {
     onScroll: function onScroll() {
       var _this3 = this;
-
       // if(!this.overScroll&&this.refresh){
       //   return
       // }
       var container = this.container,
-          offsetTopPx = this.offsetTopPx;
-
+        offsetTopPx = this.offsetTopPx;
       if ((0, _style.isHidden)(this.$el)) {
         return;
       }
-
       setTimeout(function () {
         if (_this3.refresh && _this3.refreshtopToPageTop === null) {
           _this3.refreshtopToPageTop = (0, _scroll.getElementTop)(_this3.$el);
         }
       }, 500);
-
       if (this.refresh && this.refreshOffsetTop === null) {
         this.refreshOffsetTop = this.offsetTopPx;
       }
-
       this.height = this.$el.offsetHeight;
       var scrollTop = (0, _scroll.getScrollTop)(window);
       var topToPageTop = (0, _scroll.getElementTop)(this.$el);
-
       var emitScrollEvent = function emitScrollEvent() {
         _this3.$emit('scroll', {
           scrollTop: scrollTop,
@@ -181,18 +157,14 @@ var _default = createComponent({
           distance: overpx + scrollTop + offsetTopPx - topToPageTop
         });
       };
-
-      var overpx = this.refresh && this.lockfixed ? this.refreshDistance : 0; // The sticky component should be kept inside the container element
-
+      var overpx = this.refresh && this.lockfixed ? this.refreshDistance : 0;
+      // The sticky component should be kept inside the container element
       var currentY = document.documentElement.scrollTop || document.body.scrollTop;
       this.pull = currentY < this.refreshtopToPageTop - this.offsetTopPx;
-
       if (container) {
         var bottomToPageTop = topToPageTop - overpx + container.offsetHeight;
-
         if (scrollTop + offsetTopPx + this.height > bottomToPageTop) {
           var distanceToBottom = this.height + scrollTop - bottomToPageTop;
-
           if (distanceToBottom < this.height) {
             this.fixed = true;
             this.transform = -(distanceToBottom + offsetTopPx);
@@ -201,12 +173,10 @@ var _default = createComponent({
             this.fixed = false;
             this.lockfixed = false;
           }
-
           emitScrollEvent();
           return;
         }
       }
-
       if (scrollTop + offsetTopPx > topToPageTop - overpx) {
         this.fixed = true;
         this.lockfixed = true;
@@ -215,45 +185,33 @@ var _default = createComponent({
         this.lockfixed = false;
         this.fixed = false;
       }
-
       if (this.refresh && this.pc && !this.touchOn) {
         this.t1 = (0, _scroll.getScrollTop)(window);
         clearTimeout(this.timer);
-
         var _this = this;
-
         this.timer = setTimeout(function () {
           _this.t2 = (0, _scroll.getScrollTop)(window);
-
           if (!_this.autoScroll) {
             return;
           }
-
           var currentY = document.documentElement.scrollTop || document.body.scrollTop;
-
           if (_this.refresh && !_this.fixed && (0, _scroll.getScrollTop)(window) > _this.refreshtopToPageTop * _this.updownPercent / 100) {
             _this.scrollAnimation(currentY, _this.refreshtopToPageTop - _this.refreshOffsetTop, true);
-
             _this.touchOn = false;
             return;
           } else if (_this.refresh && !_this.fixed && (0, _scroll.getScrollTop)(window) <= _this.refreshtopToPageTop * _this.updownPercent / 100) {
             _this.scrollAnimation(currentY, 0, false);
-
             _this.touchOn = false;
             return;
           } else if (_this.refresh && _this.fixed && currentY < _this.refreshtopToPageTop - _this.offsetTopPx) {
             _this.$emit('refreshcallback');
-
             _this.scrollAnimation(currentY, _this.refreshtopToPageTop - _this.refreshOffsetTop, true);
-
             _this.touchOn = false;
             return;
           }
-
           _this.touchOn = false;
         }, _this.delayTime);
       }
-
       emitScrollEvent();
     },
     onTouchStart: function onTouchStart(event) {
@@ -262,7 +220,6 @@ var _default = createComponent({
     },
     onTouchMove: function onTouchMove(event) {
       this.touchMove(event);
-
       if (this.deltaY > 10) {
         this.overScroll = true;
       }
@@ -271,10 +228,8 @@ var _default = createComponent({
       if (!this.autoScroll) {
         return;
       }
-
       var that = this;
       var currentY = document.documentElement.scrollTop || document.body.scrollTop;
-
       if (this.refresh && !this.fixed && (0, _scroll.getScrollTop)(window) > this.refreshtopToPageTop * this.updownPercent / 100) {
         this.scrollAnimation(currentY, this.refreshtopToPageTop - this.refreshOffsetTop, true);
         this.touchOn = false;
@@ -289,23 +244,19 @@ var _default = createComponent({
         this.touchOn = false;
         return;
       }
-
       this.touchOn = false;
     },
     renderLoading: function renderLoading() {
       var h = this.$createElement;
-
       if (this.lockfixed && this.refresh && this.touchOn && this.pull && this.pulling) {
         if (this.$slots.pull) {
           return this.slots('pull');
         }
-
         return h(_loading.default);
       }
     },
     scrollAnimation: function scrollAnimation(currentY, targetY, lockfixed) {
       var _this4 = this;
-
       // 获取当前位置方法
       // 计算需要移动的距离 
       var needScrollTop = targetY - currentY;
@@ -314,8 +265,9 @@ var _default = createComponent({
         // 一次调用滑动帧数，每次调用会不一样
         var dist = Math.ceil(needScrollTop / _this4.scrollSpeed);
         _currentY += dist;
-        window.scrollTo(_currentY, currentY); // 如果移动幅度小于十个像素，直接移动，否则递归调用，实现动画效果
+        window.scrollTo(_currentY, currentY);
 
+        // 如果移动幅度小于十个像素，直接移动，否则递归调用，实现动画效果
         if (needScrollTop > _this4.scrollSpeed || needScrollTop < -_this4.scrollSpeed) {
           _this4.scrollAnimation(_currentY, targetY, lockfixed);
         } else {
@@ -328,15 +280,13 @@ var _default = createComponent({
   render: function render() {
     var h = arguments[0];
     var fixed = this.fixed,
-        cover = this.cover;
+      cover = this.cover;
     var style = {
       height: fixed ? this.height + "px" : null
     };
-
     if (cover && this.fixed) {
       style.width = "100%";
     }
-
     return h("div", {
       "style": style
     }, [h("div", {
@@ -349,6 +299,4 @@ var _default = createComponent({
       "style": this.headStyle
     }, [this.renderLoading()])])]);
   }
-});
-
-exports.default = _default;
+});

package/lib/swipe/index.js

@@ -2,35 +2,26 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var _utils = require("../utils");
-
 var _style = require("../utils/dom/style");
-
 var _event = require("../utils/dom/event");
-
 var _raf = require("../utils/dom/raf");
-
 var _number = require("../utils/format/number");
-
 var _touch = require("../mixins/touch");
-
 var _relation = require("../mixins/relation");
-
 var _bindEvent = require("../mixins/bind-event");
-
 // Utils
+
 // Mixins
-var _createNamespace = (0, _utils.createNamespace)('swipe'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1];
 
-var _default = createComponent({
+var _createNamespace = (0, _utils.createNamespace)('swipe'),
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1];
+var _default = exports.default = createComponent({
   mixins: [_touch.TouchMixin, (0, _relation.ParentMixin)('vanSwipe'), (0, _bindEvent.BindEventMixin)(function (bind, isBind) {
     bind(window, 'resize', this.resize, true);
     bind(window, 'orientationchange', this.resize, true);
     bind(window, 'visibilitychange', this.onVisibilityChange);
-
     if (isBind) {
       this.initialize();
     } else {
@@ -125,14 +116,12 @@ var _default = createComponent({
         transitionDuration: (this.swiping ? 0 : this.duration) + "ms",
         transform: "translate" + (this.vertical ? 'Y' : 'X') + "(" + this.offset + "px)"
       };
-
       if (this.size) {
         var mainAxis = this.vertical ? 'height' : 'width';
         var crossAxis = this.vertical ? 'width' : 'height';
         style[mainAxis] = this.trackSize + "px";
         style[crossAxis] = this[crossAxis] ? this[crossAxis] + "px" : '';
       }
-
       return style;
     },
     indicatorStyle: function indicatorStyle() {
@@ -153,11 +142,9 @@ var _default = createComponent({
       if (active === void 0) {
         active = +this.initialSwipe;
       }
-
       if (!this.$el || (0, _style.isHidden)(this.$el)) {
         return;
       }
-
       clearTimeout(this.timer);
       var rect = {
         width: this.$el.offsetWidth,
@@ -195,7 +182,6 @@ var _default = createComponent({
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
       this.touchMove(event);
-
       if (this.isCorrectDirection) {
         (0, _event.preventDefault)(event, this.stopPropagation);
         this.move({
@@ -206,21 +192,18 @@ var _default = createComponent({
     onTouchEnd: function onTouchEnd() {
       if (!this.touchable || !this.swiping) return;
       var size = this.size,
-          delta = this.delta;
+        delta = this.delta;
       var duration = Date.now() - this.touchStartTime;
       var speed = delta / duration;
       var shouldSwipe = Math.abs(speed) > 0.25 || Math.abs(delta) > size / 2;
-
       if (shouldSwipe && this.isCorrectDirection) {
         var offset = this.vertical ? this.offsetY : this.offsetX;
         var pace = 0;
-
         if (this.loop) {
           pace = offset > 0 ? delta > 0 ? -1 : 1 : 0;
         } else {
           pace = -Math[delta > 0 ? 'ceil' : 'floor'](delta / size);
         }
-
         this.move({
           pace: pace,
           emitChange: true
@@ -230,79 +213,66 @@ var _default = createComponent({
           pace: 0
         });
       }
-
       this.swiping = false;
       this.autoPlay();
     },
     getTargetActive: function getTargetActive(pace) {
       var active = this.active,
-          count = this.count,
-          maxCount = this.maxCount;
-
+        count = this.count,
+        maxCount = this.maxCount;
       if (pace) {
         if (this.loop) {
           return (0, _number.range)(active + pace, -1, count);
         }
-
         return (0, _number.range)(active + pace, 0, maxCount);
       }
-
       return active;
     },
     getTargetOffset: function getTargetOffset(targetActive, offset) {
       if (offset === void 0) {
         offset = 0;
       }
-
       var currentPosition = targetActive * this.size;
-
       if (!this.loop) {
         currentPosition = Math.min(currentPosition, -this.minOffset);
       }
-
       var targetOffset = offset - currentPosition;
-
       if (!this.loop) {
         targetOffset = (0, _number.range)(targetOffset, this.minOffset, 0);
       }
-
       return targetOffset;
     },
     move: function move(_ref) {
       var _ref$pace = _ref.pace,
-          pace = _ref$pace === void 0 ? 0 : _ref$pace,
-          _ref$offset = _ref.offset,
-          offset = _ref$offset === void 0 ? 0 : _ref$offset,
-          emitChange = _ref.emitChange;
+        pace = _ref$pace === void 0 ? 0 : _ref$pace,
+        _ref$offset = _ref.offset,
+        offset = _ref$offset === void 0 ? 0 : _ref$offset,
+        emitChange = _ref.emitChange;
       var loop = this.loop,
-          count = this.count,
-          active = this.active,
-          children = this.children,
-          trackSize = this.trackSize,
-          minOffset = this.minOffset;
-
+        count = this.count,
+        active = this.active,
+        children = this.children,
+        trackSize = this.trackSize,
+        minOffset = this.minOffset;
       if (count <= 1) {
         return;
       }
-
       var targetActive = this.getTargetActive(pace);
-      var targetOffset = this.getTargetOffset(targetActive, offset); // auto move first and last swipe in loop mode
+      var targetOffset = this.getTargetOffset(targetActive, offset);
 
+      // auto move first and last swipe in loop mode
       if (loop) {
         if (children[0] && targetOffset !== minOffset) {
           var outRightBound = targetOffset < minOffset;
           children[0].offset = outRightBound ? trackSize : 0;
         }
-
         if (children[count - 1] && targetOffset !== 0) {
           var outLeftBound = targetOffset > 0;
           children[count - 1].offset = outLeftBound ? -trackSize : 0;
         }
       }
-
       this.active = targetActive;
       this.offset = targetOffset;
-
       if (emitChange && targetActive !== active) {
         this.$emit('change', this.activeIndicator);
       }
@@ -310,12 +280,10 @@ var _default = createComponent({
     // @exposed-api
     prev: function prev() {
       var _this = this;
-
       this.correctPosition();
       this.resetTouchStatus();
       (0, _raf.doubleRaf)(function () {
         _this.swiping = false;
-
         _this.move({
           pace: -1,
           emitChange: true
@@ -325,12 +293,10 @@ var _default = createComponent({
     // @exposed-api
     next: function next() {
       var _this2 = this;
-
       this.correctPosition();
       this.resetTouchStatus();
       (0, _raf.doubleRaf)(function () {
         _this2.swiping = false;
-
         _this2.move({
           pace: 1,
           emitChange: true
@@ -340,22 +306,18 @@ var _default = createComponent({
     // @exposed-api
     swipeTo: function swipeTo(index, options) {
       var _this3 = this;
-
       if (options === void 0) {
         options = {};
       }
-
       this.correctPosition();
       this.resetTouchStatus();
       (0, _raf.doubleRaf)(function () {
         var targetIndex;
-
         if (_this3.loop && index === _this3.count) {
           targetIndex = _this3.active === 0 ? 0 : index;
         } else {
           targetIndex = index % _this3.count;
         }
-
         if (options.immediate) {
           (0, _raf.doubleRaf)(function () {
             _this3.swiping = false;
@@ -363,7 +325,6 @@ var _default = createComponent({
         } else {
           _this3.swiping = false;
         }
-
         _this3.move({
           pace: targetIndex - _this3.active,
           emitChange: true
@@ -372,13 +333,11 @@ var _default = createComponent({
     },
     correctPosition: function correctPosition() {
       this.swiping = true;
-
       if (this.active <= -1) {
         this.move({
           pace: this.count
         });
       }
-
       if (this.active >= this.count) {
         this.move({
           pace: -this.count
@@ -390,21 +349,17 @@ var _default = createComponent({
     },
     autoPlay: function autoPlay() {
       var _this4 = this;
-
       var autoplay = this.autoplay;
-
       if (autoplay > 0 && this.count > 1) {
         this.clear();
         this.timer = setTimeout(function () {
           _this4.next();
-
           _this4.autoPlay();
         }, autoplay);
       }
     },
     titleDiv: function titleDiv() {
       var h = this.$createElement;
-
       if (this.$slots.title) {
         return this.$slots.title;
       } else if (this.title) {
@@ -413,7 +368,6 @@ var _default = createComponent({
             "class": bem('title')
           }, [this.title[this.active == this.count ? 0 : this.active]]);
         }
-
         return h("div", {
           "class": bem('title')
         }, [this.title]);
@@ -423,7 +377,6 @@ var _default = createComponent({
     },
     foot: function foot() {
       var h = this.$createElement;
-
       if (this.title) {
         return h("div", {
           "class": bem('foot')
@@ -434,16 +387,13 @@ var _default = createComponent({
     },
     genIndicator: function genIndicator() {
       var _this5 = this;
-
       var h = this.$createElement;
       var count = this.count,
-          activeIndicator = this.activeIndicator;
+        activeIndicator = this.activeIndicator;
       var slot = this.slots('indicator');
-
       if (slot) {
         return slot;
       }
-
       if (this.showIndicators && count > 1) {
         return h("div", {
           "class": bem('indicators', {
@@ -472,6 +422,4 @@ var _default = createComponent({
       })
     }, [this.slots()]), this.foot()]);
   }
-});
-
-exports.default = _default;
+});