@varlet/ui 2.5.3 → 2.5.4

package/es/back-top/BackTop.js

@@ -2,9 +2,9 @@ import { defineComponent, ref, onMounted, onBeforeUnmount } from 'vue';
 import VarButton from '../button';
 import VarIcon from '../icon';
 import { props } from './props';
-import { isString, throttle, isObject } from '@varlet/shared';
+import { throttle } from '@varlet/shared';
 import { easeInOutCubic } from '../utils/shared';
-import { getScrollTop, getScrollLeft, scrollTo, getParentScroller, toPxNum, toSizeUnit } from '../utils/elements';
+import { getScrollTop, getScrollLeft, scrollTo, getParentScroller, toPxNum, toSizeUnit, getTarget } from '../utils/elements';
 import { call, createNamespace } from '../utils/components';
 var {
   n,
@@ -78,28 +78,8 @@ export default defineComponent({
     };
 
     var throttleScroll = throttle(scroll, 200);
-
-    var getTarget = () => {
-      var {
-        target
-      } = props;
-
-      if (isString(target)) {
-        var el = document.querySelector(props.target);
-
-        if (!el) {
-          throw Error('[Varlet] BackTop: target element cannot found');
-        }
-
-        return el;
-      }
-
-      if (isObject(target)) return target;
-      throw Error('[Varlet] BackTop: type of prop "target" should be a selector or an element object');
-    };
-
     onMounted(() => {
-      target = props.target ? getTarget() : getParentScroller(backTopEl.value);
+      target = props.target ? getTarget(props.target, 'BackTop') : getParentScroller(backTopEl.value);
       target.addEventListener('scroll', throttleScroll);
       disabled.value = false;
     });

package/es/pull-refresh/PullRefresh.js

@@ -4,7 +4,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 import VarIcon from '../icon';
 import { defineComponent, ref, computed, watch, onMounted } from 'vue';
-import { getParentScroller, getScrollTop } from '../utils/elements';
+import { getParentScroller, getScrollTop, getTarget } from '../utils/elements';
 import { props } from './props';
 import { toNumber } from '@varlet/shared';
 import { call, createNamespace } from '../utils/components';
@@ -165,7 +165,7 @@ export default defineComponent({
       }
     });
     onMounted(() => {
-      scroller = getParentScroller(freshNode.value);
+      scroller = props.target ? getTarget(props.target, 'PullRefresh') : getParentScroller(freshNode.value);
       setPosition();
     });
     return {

package/es/pull-refresh/props.js

@@ -34,6 +34,9 @@ export var props = {
   successColor: {
     type: String
   },
+  target: {
+    type: [String, Object]
+  },
   onRefresh: defineListenerProp(),
   'onUpdate:modelValue': defineListenerProp()
 };

package/es/utils/elements.js

@@ -2,7 +2,7 @@ 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 { isNumber, isString, kebabCase, toNumber } from '@varlet/shared';
+import { isNumber, isObject, isString, kebabCase, toNumber } from '@varlet/shared';
 import { getGlobalThis } from './shared';
 export function getLeft(element) {
   var {
@@ -92,6 +92,20 @@ export function getAllParentScroller(el) {
   }
 
   return allParentScroller;
+}
+export function getTarget(target, componentName) {
+  if (isString(target)) {
+    var el = document.querySelector(target);
+
+    if (!el) {
+      throw Error("[Varlet] " + componentName + ": target element cannot found");
+    }
+
+    return el;
+  }
+
+  if (isObject(target)) return target;
+  throw Error("[Varlet] " + componentName + ": type of prop \"target\" should be a selector or an element object");
 } // example 1rem
 
 export var isRem = value => isString(value) && value.endsWith('rem'); // e.g. 1 || 1px