nhanh-pure-function 1.2.6 → 1.2.8

package/lib/User.d.ts

@@ -1,9 +1,9 @@
 /**
- * 滚动触底事件
- * @param {触底事件} callback
+ * 滚动结束监听器
+ * @param {(trigger?: "vertical" | "horizontal") => void} callback
  */
-export function _ScrollBottomListener(
-  callback: Function
+export function _ScrollEndListener(
+  callback: (trigger?: "vertical" | "horizontal") => void
 ): (payload: Event) => void;
 
 /**
@@ -164,7 +164,7 @@ type DragOption = {
   dragDom?: HTMLElement;
 };
 /** 拖拽 */
-export class Drag {
+export class _Drag {
   /**
    * 初始化拖拽
    * @param  dom 被拖拽的元素
@@ -191,7 +191,7 @@ type LocalDragOptions = {
   update_up?: (value: UpdateValue) => void | undefined;
 };
 /** 局部拖拽 计算位置距离/百分比 */
-export class LocalDrag {
+export class _LocalDrag {
   /**
    * 初始化拖拽
    * @param  parentDom 被拖拽元素的祖先元素

package/lib/User.js

@@ -1,21 +1,46 @@
 import { _IsObject, _NotNull, _Debounce } from "./Utility";
 
 /**
- * 滚动触底事件
- * @param {触底事件} callback
+ * 滚动结束监听器
+ * @param {(trigger: "vertical" | "horizontal") => void} callback
  */
-export function _ScrollBottomListener(callback) {
+export function _ScrollEndListener(callback) {
   const debouncedCallback = _Debounce(callback, 100);
   let lastScrollTop = 0;
+  let lastScrollLeft = 0;
   return function (payload) {
     const target = payload.target;
-    const { scrollTop, scrollHeight, clientHeight } = target;
-    /** 向上滚动？ */
-    const isUp = lastScrollTop > scrollTop;
-    lastScrollTop = scrollTop;
-    if (isUp) return;
-    const bottom = scrollHeight - scrollTop - clientHeight;
-    if (bottom <= 1) debouncedCallback();
+    if (!target) return;
+
+    const {
+      scrollTop,
+      scrollHeight,
+      clientHeight,
+      scrollLeft,
+      scrollWidth,
+      clientWidth,
+    } = target;
+    function vertical() {
+      if (lastScrollTop == scrollTop) return;
+      /** 向上滚动？ */
+      const isUp = lastScrollTop > scrollTop;
+      lastScrollTop = scrollTop;
+      if (isUp) return;
+      const bottom = scrollHeight - scrollTop - clientHeight;
+      if (bottom <= 1) debouncedCallback("vertical");
+    }
+    function horizontal() {
+      if (lastScrollLeft == scrollLeft) return;
+      /** 向左滚动？ */
+      const isLeft = lastScrollLeft > scrollLeft;
+      lastScrollLeft = scrollLeft;
+      if (isLeft) return;
+      const right = scrollWidth - scrollLeft - clientWidth;
+      if (right <= 1) debouncedCallback("horizontal");
+    }
+
+    vertical();
+    horizontal();
   };
 }
 
@@ -353,7 +378,7 @@ export function _CloseOnOutsideClick(querySelector, callback, options) {
 }
 
 /** 拖拽dom */
-export class Drag {
+export class _Drag {
   #dom = null;
   #isAllowed = false;
   #eventFunction = {};
@@ -433,7 +458,7 @@ export class Drag {
 }
 
 /** 局部拖拽 计算位置距离/百分比 */
-export class LocalDrag {
+export class _LocalDrag {
   #parentDom = null;
   #isAllowed = false;
   #eventFunction = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nhanh-pure-function",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "纯函数工具",
   "main": "lib/Index.js",
   "scripts": {