@varlet/ui 2.5.3 → 2.5.4

package/highlight/attributes.json

@@ -1283,6 +1283,10 @@
     "type": "boolean",
     "description": "是否禁用下拉刷新 默认值：false"
   },
+  "var-pull-refresh/target": {
+    "type": "string | HTMLElement",
+    "description": "触发滚动的对象，如果为 undefined 会监听距离最近的一个可滚动的祖先节点 默认值：-"
+  },
   "var-pull-refresh/animation-duration": {
     "type": "string | number",
     "description": "加载结束后回到初始位置的动画时长（ms） 默认值：300"

package/highlight/tags.json

@@ -490,6 +490,7 @@
     "attributes": [
       "v-model",
       "disabled",
+      "target",
       "animation-duration",
       "success-duration",
       "bg-color",

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": "2.5.2",
+  "version": "2.5.3",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -3836,6 +3836,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "target",
+              "description": "触发滚动的对象，如果为 undefined 会监听距离最近的一个可滚动的祖先节点",
+              "default": "-",
+              "value": {
+                "type": "string | HTMLElement",
+                "kind": "expression"
+              }
+            },
             {
               "name": "animation-duration",
               "description": "加载结束后回到初始位置的动画时长（ms）",

package/lib/back-top/BackTop.js

@@ -95,28 +95,8 @@ var _default = (0, _vue.defineComponent)({
     };
 
     var throttleScroll = (0, _shared.throttle)(scroll, 200);
-
-    var getTarget = () => {
-      var {
-        target
-      } = props;
-
-      if ((0, _shared.isString)(target)) {
-        var el = document.querySelector(props.target);
-
-        if (!el) {
-          throw Error('[Varlet] BackTop: target element cannot found');
-        }
-
-        return el;
-      }
-
-      if ((0, _shared.isObject)(target)) return target;
-      throw Error('[Varlet] BackTop: type of prop "target" should be a selector or an element object');
-    };
-
     (0, _vue.onMounted)(() => {
-      target = props.target ? getTarget() : (0, _elements.getParentScroller)(backTopEl.value);
+      target = props.target ? (0, _elements.getTarget)(props.target, 'BackTop') : (0, _elements.getParentScroller)(backTopEl.value);
       target.addEventListener('scroll', throttleScroll);
       disabled.value = false;
     });

package/lib/pull-refresh/PullRefresh.js

@@ -180,7 +180,7 @@ var _default = (0, _vue.defineComponent)({
       }
     });
     (0, _vue.onMounted)(() => {
-      scroller = (0, _elements.getParentScroller)(freshNode.value);
+      scroller = props.target ? (0, _elements.getTarget)(props.target, 'PullRefresh') : (0, _elements.getParentScroller)(freshNode.value);
       setPosition();
     });
     return {

package/lib/pull-refresh/props.js

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

package/lib/utils/elements.js

@@ -9,6 +9,7 @@ exports.getLeft = getLeft;
 exports.getParentScroller = getParentScroller;
 exports.getScrollLeft = getScrollLeft;
 exports.getScrollTop = getScrollTop;
+exports.getTarget = getTarget;
 exports.getTop = getTop;
 exports.getTranslate = getTranslate;
 exports.inViewport = inViewport;
@@ -122,6 +123,21 @@ function getAllParentScroller(el) {
   }
 
   return allParentScroller;
+}
+
+function getTarget(target, componentName) {
+  if ((0, _shared.isString)(target)) {
+    var el = document.querySelector(target);
+
+    if (!el) {
+      throw Error("[Varlet] " + componentName + ": target element cannot found");
+    }
+
+    return el;
+  }
+
+  if ((0, _shared.isObject)(target)) return target;
+  throw Error("[Varlet] " + componentName + ": type of prop \"target\" should be a selector or an element object");
 } // example 1rem
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "A material like components library",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -45,15 +45,17 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.6",
+    "@varlet/icons": "2.5.4",
+    "@varlet/shared": "2.5.4",
     "dayjs": "^1.10.4",
-    "decimal.js": "^10.2.1",
-    "@varlet/icons": "2.5.3",
-    "@varlet/shared": "2.5.3"
+    "decimal.js": "^10.2.1"
   },
   "devDependencies": {
     "@types/jest": "^26.0.15",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.7.18",
+    "@varlet/cli": "2.5.4",
+    "@varlet/touch-emulator": "2.5.4",
     "@vue/runtime-core": "3.2.25",
     "@vue/test-utils": "^2.0.2",
     "clipboard": "^2.0.6",
@@ -62,9 +64,7 @@
     "postcss-px-to-viewport": "^1.1.1",
     "typescript": "^4.4.4",
     "vue": "3.2.25",
-    "vue-router": "4.0.12",
-    "@varlet/touch-emulator": "2.5.3",
-    "@varlet/cli": "2.5.3"
+    "vue-router": "4.0.12"
   },
   "browserslist": [
     "Chrome >= 54",

package/types/pullRefresh.d.ts

@@ -10,6 +10,7 @@ export interface PullRefreshProps extends BasicAttributes {
   successBgColor?: string
   color?: string
   successColor?: string
+  target?: string | HTMLElement
   onRefresh?: ListenerProp<() => void>
   'onUpdate:modelValue'?: ListenerProp<(value: boolean) => void>
 }