@varlet/ui 2.9.4-alpha.1680062897965 → 2.9.4-alpha.1680163809083

package/es/index.bundle.mjs

@@ -241,7 +241,7 @@ import './time-picker/style/index.mjs'
 import './tooltip/style/index.mjs'
 import './uploader/style/index.mjs'
 
-const version = '2.9.4-alpha.1680062897965'
+const version = '2.9.4-alpha.1680163809083'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/index.mjs

@@ -160,7 +160,7 @@ export * from './time-picker/index.mjs'
 export * from './tooltip/index.mjs'
 export * from './uploader/index.mjs'
 
-const version = '2.9.4-alpha.1680062897965'
+const version = '2.9.4-alpha.1680163809083'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/pull-refresh/PullRefresh.mjs

@@ -57,8 +57,6 @@ var __sfc__ = defineComponent({
   props,
 
   setup(props) {
-    var scroller;
-    var changing;
     var controlPosition = ref(0);
     var freshNode = ref(null);
     var controlNode = ref(null);
@@ -67,6 +65,9 @@ var __sfc__ = defineComponent({
     var iconName = ref('arrow-down');
     var refreshStatus = ref('default');
     var isEnd = ref(false);
+    var scroller;
+    var eventTargetScroller;
+    var changing;
     var startY = 0;
     var deltaY = 0; // https://github.com/varletjs/varlet/issues/509
 
@@ -105,12 +106,24 @@ var __sfc__ = defineComponent({
 
       startY = event.touches[0].clientY;
       deltaY = 0;
+      eventTargetScroller = getParentScroller(event.target);
     };
 
     var touchMove = event => {
-      if (!isTouchable.value) return;
+      if (!isTouchable.value) {
+        return;
+      }
+
+      if (eventTargetScroller !== scroller && getScrollTop(eventTargetScroller) > 0) {
+        return;
+      }
+
       var scrollTop = getScrollTop(scroller);
-      if (scrollTop > 0) return;
+
+      if (scrollTop > 0) {
+        return;
+      }
+
       var isReachTop = scrollTop === 0;
       var touch = event.touches[0];
       deltaY = touch.clientY - startY;
@@ -163,6 +176,8 @@ var __sfc__ = defineComponent({
             lockEvent('remove');
           }, toNumber(props.animationDuration));
         }
+
+        eventTargetScroller = null;
       });
 
       return function touchEnd() {

package/es/sticky/Sticky.mjs

@@ -160,6 +160,7 @@ var __sfc__ = defineComponent({
     onUnmounted(removeScrollListener);
     onDeactivated(removeScrollListener);
     useEventListener(window, 'scroll', handleScroll);
+    useEventListener(window, 'resize', resize);
     return {
       n,
       classes,