unika-components 1.1.112 → 1.1.113

package/dist/unika-components.esm.js

@@ -30808,7 +30808,6 @@ var script = defineComponent({
         const scrollStartTime = ref(0);
         const scrollStartPosition = ref(0);
         const isDragging = ref(false);
-        const isInteractingWithComponent = ref(false);
         const clickStartTime = ref(0);
         const clickStartY = ref(0);
         const isUserPaused = ref(false);
@@ -30970,6 +30969,7 @@ var script = defineComponent({
             // handleTouchMove = function() { ... }
             // ...
             handleTouchStart = (e) => {
+                console.log('handleTouchStart');
                 const pageId = currentPageId.value;
                 if (!container.value)
                     return;
@@ -31004,6 +31004,7 @@ var script = defineComponent({
                 dragStartScrolls.value[pageId] = 0;
             }
             handleTouchMove = (e) => {
+                console.log('handleTouchMove');
                 e.preventDefault();
                 const pageId = currentPageId.value;
                 if (!container.value)
@@ -31039,8 +31040,9 @@ var script = defineComponent({
                 }
             };
             handleTouchEnd = (e) => {
+                console.log('handleTouchEnd');
                 currentPageId.value;
-                if (!container.value || isInteractingWithComponent.value)
+                if (!container.value)
                     return;
                 isDragging.value = false;
                 if (inertiaAnimation.value) {
@@ -31052,7 +31054,25 @@ var script = defineComponent({
                     startInertia();
                 }
             };
+            handleMouseDown = (e) => {
+                console.log('handleMouseDown');
+                const pageId = currentPageId.value;
+                isMousePressing.value = true;
+                if (!container.value)
+                    return;
+                if (inertiaAnimation.value) {
+                    cancelAnimationFrame(inertiaAnimation.value);
+                    inertiaAnimation.value = undefined;
+                }
+                dragStartYs.value[pageId] = e.clientY;
+                dragStartScrolls.value[pageId] = scrollPositions.value[pageId] || 0;
+                isDragging.value = false;
+                clickStartTime.value = Date.now();
+                clickStartY.value = e.clientY;
+                scrollVelocity.value = 0;
+            };
             handleMouseMove = (e) => {
+                console.log('handleMouseMove');
                 e.preventDefault && e.preventDefault();
                 const pageId = currentPageId.value;
                 if (!isMousePressing.value)
@@ -31061,55 +31081,46 @@ var script = defineComponent({
                     return;
                 const mouseY = e.clientY;
                 const deltaY = (mouseY - dragStartYs.value[pageId]) * speedFactor;
-                // 添加拖动阈值判断
-                if (!isDragging.value && Math.abs(deltaY) < 5) {
-                    return;
-                }
                 const now = Date.now();
                 const timeDiff = now - lastScrollTime.value;
                 if (timeDiff > 0) {
                     scrollVelocity.value = -deltaY / timeDiff;
                 }
                 lastScrollTime.value = now;
-                if (!isDragging.value && Math.abs(deltaY) >= 5) {
+                if (Math.abs(deltaY) > 1) {
                     isDragging.value = true;
                 }
                 const maxScroll = maxScrollPositions.value[pageId] || 0;
                 let nextScroll = dragStartScrolls.value[pageId] - deltaY;
-                // 修改边界检测逻辑，增加阈值
-                const edgeThreshold = 60; // 边缘触发翻页的阈值
-                if (isDragging.value) {
-                    // 在内容区域内正常滚动
-                    if (nextScroll > -edgeThreshold && nextScroll < maxScroll + edgeThreshold) {
-                        stopAutoScroll(true);
-                        scrollPositions.value[pageId] = Math.max(0, Math.min(nextScroll, maxScroll));
-                    }
-                    // 超出底部，准备翻页但不要立即触发
-                    else if (nextScroll >= maxScroll + edgeThreshold) {
-                        scrollPositions.value[pageId] = maxScroll + edgeThreshold * 0.3; // 增加一些阻力
-                    }
-                    // 超出顶部，准备翻页但不要立即触发
-                    else if (nextScroll <= -edgeThreshold) {
-                        scrollPositions.value[pageId] = -edgeThreshold * 0.3; // 增加一些阻力
-                    }
-                }
-            };
-            handleMouseUp = (e) => {
-                const pageId = currentPageId.value;
-                const maxScroll = maxScrollPositions.value[pageId] || 0;
-                const currentScroll = scrollPositions.value[pageId] || 0;
-                // 检查是否需要翻页
-                if (currentScroll >= maxScroll + 40) { // 翻页阈值比拖动时小
+                // 超出底部，翻到下一页
+                if ((maxScroll === 0 && deltaY < -40) || nextScroll > maxScroll + 60) {
                     goToNextPage();
+                    resetDragState(pageId);
+                    return;
                 }
-                else if (currentScroll <= -40) {
+                // 超出顶部，翻到上一页
+                if ((maxScroll === 0 && deltaY > 40) || nextScroll < -60) {
                     goToPrevPage();
+                    resetDragState(pageId);
+                    return;
                 }
-                else if (Math.abs(scrollVelocity.value) > 0.1) {
-                    startInertiaIframe();
+                if (isDragging.value) {
+                    stopAutoScroll(true);
+                    scrollPositions.value[pageId] = Math.max(0, Math.min(nextScroll, maxScroll));
                 }
+            };
+            handleMouseUp = (e) => {
+                console.log('handleMouseUp');
                 isMousePressing.value = false;
                 isDragging.value = false;
+                if (inertiaAnimation.value) {
+                    cancelAnimationFrame(inertiaAnimation.value);
+                    inertiaAnimation.value = undefined;
+                }
+                // 惯性滚动
+                if (Math.abs(scrollVelocity.value) > 0.1) {
+                    startInertia();
+                }
             };
             handleMouseLeave = () => {
                 isMousePressing.value = false;
@@ -31321,39 +31332,6 @@ var script = defineComponent({
                 musicStatus.value = true;
             }
         };
-        const startInertiaIframe = () => {
-            const decay = 0.96;
-            const minVelocity = 0.1; // 提高最小速度阈值
-            const pageId = currentPageId.value;
-            const maxScroll = maxScrollPositions.value[pageId] || 0;
-            const animate = () => {
-                if (Math.abs(scrollVelocity.value) < minVelocity) {
-                    // 检查是否接近边界
-                    if (scrollPositions.value[pageId] < 10) {
-                        scrollPositions.value[pageId] = 0;
-                    }
-                    else if (scrollPositions.value[pageId] > maxScroll - 10) {
-                        scrollPositions.value[pageId] = maxScroll;
-                    }
-                    scrollVelocity.value = 0;
-                    return;
-                }
-                let newPosition = scrollPositions.value[pageId] + scrollVelocity.value * 16 * speedFactor;
-                // 增加边界弹性
-                if (newPosition < 0) {
-                    newPosition = 0;
-                    scrollVelocity.value = -scrollVelocity.value * 0.3;
-                }
-                else if (newPosition > maxScroll) {
-                    newPosition = maxScroll;
-                    scrollVelocity.value = -scrollVelocity.value * 0.3;
-                }
-                scrollPositions.value[pageId] = newPosition;
-                scrollVelocity.value *= decay;
-                inertiaAnimation.value = requestAnimationFrame(animate);
-            };
-            inertiaAnimation.value = requestAnimationFrame(animate);
-        };
         return {
             personalData,
             global,

package/dist/unika-components.umd.js

@@ -30815,7 +30815,6 @@
           const scrollStartTime = vue.ref(0);
           const scrollStartPosition = vue.ref(0);
           const isDragging = vue.ref(false);
-          const isInteractingWithComponent = vue.ref(false);
           const clickStartTime = vue.ref(0);
           const clickStartY = vue.ref(0);
           const isUserPaused = vue.ref(false);
@@ -30977,6 +30976,7 @@
               // handleTouchMove = function() { ... }
               // ...
               handleTouchStart = (e) => {
+                  console.log('handleTouchStart');
                   const pageId = currentPageId.value;
                   if (!container.value)
                       return;
@@ -31011,6 +31011,7 @@
                   dragStartScrolls.value[pageId] = 0;
               }
               handleTouchMove = (e) => {
+                  console.log('handleTouchMove');
                   e.preventDefault();
                   const pageId = currentPageId.value;
                   if (!container.value)
@@ -31046,8 +31047,9 @@
                   }
               };
               handleTouchEnd = (e) => {
+                  console.log('handleTouchEnd');
                   currentPageId.value;
-                  if (!container.value || isInteractingWithComponent.value)
+                  if (!container.value)
                       return;
                   isDragging.value = false;
                   if (inertiaAnimation.value) {
@@ -31059,7 +31061,25 @@
                       startInertia();
                   }
               };
+              handleMouseDown = (e) => {
+                  console.log('handleMouseDown');
+                  const pageId = currentPageId.value;
+                  isMousePressing.value = true;
+                  if (!container.value)
+                      return;
+                  if (inertiaAnimation.value) {
+                      cancelAnimationFrame(inertiaAnimation.value);
+                      inertiaAnimation.value = undefined;
+                  }
+                  dragStartYs.value[pageId] = e.clientY;
+                  dragStartScrolls.value[pageId] = scrollPositions.value[pageId] || 0;
+                  isDragging.value = false;
+                  clickStartTime.value = Date.now();
+                  clickStartY.value = e.clientY;
+                  scrollVelocity.value = 0;
+              };
               handleMouseMove = (e) => {
+                  console.log('handleMouseMove');
                   e.preventDefault && e.preventDefault();
                   const pageId = currentPageId.value;
                   if (!isMousePressing.value)
@@ -31068,55 +31088,46 @@
                       return;
                   const mouseY = e.clientY;
                   const deltaY = (mouseY - dragStartYs.value[pageId]) * speedFactor;
-                  // 添加拖动阈值判断
-                  if (!isDragging.value && Math.abs(deltaY) < 5) {
-                      return;
-                  }
                   const now = Date.now();
                   const timeDiff = now - lastScrollTime.value;
                   if (timeDiff > 0) {
                       scrollVelocity.value = -deltaY / timeDiff;
                   }
                   lastScrollTime.value = now;
-                  if (!isDragging.value && Math.abs(deltaY) >= 5) {
+                  if (Math.abs(deltaY) > 1) {
                       isDragging.value = true;
                   }
                   const maxScroll = maxScrollPositions.value[pageId] || 0;
                   let nextScroll = dragStartScrolls.value[pageId] - deltaY;
-                  // 修改边界检测逻辑，增加阈值
-                  const edgeThreshold = 60; // 边缘触发翻页的阈值
-                  if (isDragging.value) {
-                      // 在内容区域内正常滚动
-                      if (nextScroll > -edgeThreshold && nextScroll < maxScroll + edgeThreshold) {
-                          stopAutoScroll(true);
-                          scrollPositions.value[pageId] = Math.max(0, Math.min(nextScroll, maxScroll));
-                      }
-                      // 超出底部，准备翻页但不要立即触发
-                      else if (nextScroll >= maxScroll + edgeThreshold) {
-                          scrollPositions.value[pageId] = maxScroll + edgeThreshold * 0.3; // 增加一些阻力
-                      }
-                      // 超出顶部，准备翻页但不要立即触发
-                      else if (nextScroll <= -edgeThreshold) {
-                          scrollPositions.value[pageId] = -edgeThreshold * 0.3; // 增加一些阻力
-                      }
-                  }
-              };
-              handleMouseUp = (e) => {
-                  const pageId = currentPageId.value;
-                  const maxScroll = maxScrollPositions.value[pageId] || 0;
-                  const currentScroll = scrollPositions.value[pageId] || 0;
-                  // 检查是否需要翻页
-                  if (currentScroll >= maxScroll + 40) { // 翻页阈值比拖动时小
+                  // 超出底部，翻到下一页
+                  if ((maxScroll === 0 && deltaY < -40) || nextScroll > maxScroll + 60) {
                       goToNextPage();
+                      resetDragState(pageId);
+                      return;
                   }
-                  else if (currentScroll <= -40) {
+                  // 超出顶部，翻到上一页
+                  if ((maxScroll === 0 && deltaY > 40) || nextScroll < -60) {
                       goToPrevPage();
+                      resetDragState(pageId);
+                      return;
                   }
-                  else if (Math.abs(scrollVelocity.value) > 0.1) {
-                      startInertiaIframe();
+                  if (isDragging.value) {
+                      stopAutoScroll(true);
+                      scrollPositions.value[pageId] = Math.max(0, Math.min(nextScroll, maxScroll));
                   }
+              };
+              handleMouseUp = (e) => {
+                  console.log('handleMouseUp');
                   isMousePressing.value = false;
                   isDragging.value = false;
+                  if (inertiaAnimation.value) {
+                      cancelAnimationFrame(inertiaAnimation.value);
+                      inertiaAnimation.value = undefined;
+                  }
+                  // 惯性滚动
+                  if (Math.abs(scrollVelocity.value) > 0.1) {
+                      startInertia();
+                  }
               };
               handleMouseLeave = () => {
                   isMousePressing.value = false;
@@ -31328,39 +31339,6 @@
                   musicStatus.value = true;
               }
           };
-          const startInertiaIframe = () => {
-              const decay = 0.96;
-              const minVelocity = 0.1; // 提高最小速度阈值
-              const pageId = currentPageId.value;
-              const maxScroll = maxScrollPositions.value[pageId] || 0;
-              const animate = () => {
-                  if (Math.abs(scrollVelocity.value) < minVelocity) {
-                      // 检查是否接近边界
-                      if (scrollPositions.value[pageId] < 10) {
-                          scrollPositions.value[pageId] = 0;
-                      }
-                      else if (scrollPositions.value[pageId] > maxScroll - 10) {
-                          scrollPositions.value[pageId] = maxScroll;
-                      }
-                      scrollVelocity.value = 0;
-                      return;
-                  }
-                  let newPosition = scrollPositions.value[pageId] + scrollVelocity.value * 16 * speedFactor;
-                  // 增加边界弹性
-                  if (newPosition < 0) {
-                      newPosition = 0;
-                      scrollVelocity.value = -scrollVelocity.value * 0.3;
-                  }
-                  else if (newPosition > maxScroll) {
-                      newPosition = maxScroll;
-                      scrollVelocity.value = -scrollVelocity.value * 0.3;
-                  }
-                  scrollPositions.value[pageId] = newPosition;
-                  scrollVelocity.value *= decay;
-                  inertiaAnimation.value = requestAnimationFrame(animate);
-              };
-              inertiaAnimation.value = requestAnimationFrame(animate);
-          };
           return {
               personalData,
               global,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unika-components",
-  "version": "1.1.112",
+  "version": "1.1.113",
   "private": false,
   "main": "dist/unika-components.umd.js",
   "module": "dist/unika-components.esm.js",