lyb-pixi-js 1.12.28 → 1.12.29

package/Components/Custom/LibPixiScrollContainerX.d.ts

@@ -1,4 +1,4 @@
-import { Container } from "pixi.js";
+import { Container, Texture } from "pixi.js";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
 export interface LibPixiScrollContainerXParams {
     /** 宽度 */
@@ -9,13 +9,17 @@ export interface LibPixiScrollContainerXParams {
     scrollContent: Container;
     /** 背景色，用于定位 */
     bgColor?: string;
-    /** 右边距 */
-    rightMargin?: number;
+    /** 自定义遮罩贴图 */
+    maskTexture?: Texture;
+    /** 遮罩X坐标 */
+    maskX?: number;
+    /** 遮罩Y坐标 */
+    maskY?: number;
 }
-/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
- * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainerX-X轴滚动容器
- */
+/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export declare class LibPixiScrollContainerX extends LibPixiContainer {
+    /** 舞台 */
+    static stage: Container;
     /** 开始位置 */
     private _startX;
     /** 惯性速度 */
@@ -28,6 +32,10 @@ export declare class LibPixiScrollContainerX extends LibPixiContainer {
     private _scrollSpeed;
     /** 是否处于拖动状态 */
     private _isDragging;
+    /** 左边距 */
+    private _leftMargin;
+    /** 右边距元素 */
+    private _rightMarginBox;
     /** 滚动容器 */
     _scrollContent: Container;
     /** 遮罩 */
@@ -35,6 +43,8 @@ export declare class LibPixiScrollContainerX extends LibPixiContainer {
     /** 滚动的内容 */
     private _content;
     constructor(params: LibPixiScrollContainerXParams);
+    /** @description 添加边距 */
+    addMargin(leftMargin: number, rightMargin?: number): void;
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度
@@ -44,6 +54,8 @@ export declare class LibPixiScrollContainerX extends LibPixiContainer {
     scrollToTop(): void;
     /** @description 往滚动内容添加元素 */
     addContent(container: Container): void;
+    /** @description 更新右边距坐标 */
+    private _updateRightMargin;
     /** @description 按下 */
     private _onDragStart;
     /** @description 拖动 */

package/Components/Custom/LibPixiScrollContainerX.js

@@ -1,12 +1,12 @@
-import { Container, Graphics, Sprite, } from "pixi.js";
+import { Container, Sprite, } from "pixi.js";
 import { gsap } from "gsap";
+import { libPixiEvent } from "../../Utils/LibPixiEvent";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
-/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
- * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainerX-X轴滚动容器
- */
+import { LibPixiRectangle } from "../Base/LibPixiRectangle";
+/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export class LibPixiScrollContainerX extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollContent, bgColor, rightMargin = 0 } = params;
+        const { width, height, scrollContent, bgColor, maskTexture, maskX = 0, maskY = 0, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startX = 0;
@@ -20,42 +20,69 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
         this._scrollSpeed = 200;
         /** 是否处于拖动状态 */
         this._isDragging = false;
+        /** 左边距 */
+        this._leftMargin = 0;
         this._scrollContent = scrollContent;
         // 创建内容容器
         this._content = new Container();
         this.addChild(this._content);
         this._content.addChild(this._scrollContent);
-        //创建右边距
-        const rightMarginBox = new Sprite();
-        this._content.addChild(rightMarginBox);
-        rightMarginBox.width = this._content.width + rightMargin;
-        // 创建遮罩
-        this._maskGraphics = new Graphics();
-        this.addChild(this._maskGraphics);
-        this._maskGraphics.clear();
-        this._maskGraphics.beginFill(0x000000);
-        this._maskGraphics.drawRect(0, 0, width, height);
-        this._maskGraphics.endFill();
-        this.mask = this._maskGraphics;
+        //自定义遮罩
+        if (maskTexture) {
+            this._maskGraphics = new Sprite(maskTexture);
+            this.addChild(this._maskGraphics);
+            this._maskGraphics.width = width;
+            this._maskGraphics.height = height;
+            this._maskGraphics.position.set(maskX, maskY);
+            this.mask = this._maskGraphics;
+        }
+        else {
+            this._maskGraphics = new LibPixiRectangle(width, height, "#000");
+            this.addChild(this._maskGraphics);
+            this.mask = this._maskGraphics;
+        }
         // 添加事件监听
-        this.eventMode = "static";
-        this.on("pointerdown", this._onDragStart, this);
-        this.on("pointermove", this._onDragMove, this);
-        this.on("pointerup", this._onDragEnd, this);
-        this.on("pointerupoutside", this._onDragEnd, this);
-        this.on("wheel", this._onWheelScroll, this);
+        libPixiEvent(this, "pointerdown", (event) => {
+            this._onDragStart(event);
+        });
+        libPixiEvent(LibPixiScrollContainerX.stage, "pointermove", (event) => {
+            this._onDragMove(event);
+        });
+        libPixiEvent(this, "pointerup", () => {
+            this._onDragEnd();
+        });
+        libPixiEvent(this, "wheel", (event) => {
+            this._onWheelScroll(event);
+        });
+        libPixiEvent(this, "pointerupoutside", () => {
+            this._onDragEnd();
+        });
+    }
+    /** @description 添加边距 */
+    addMargin(leftMargin, rightMargin = leftMargin) {
+        this._leftMargin = leftMargin;
+        if (leftMargin) {
+            const leftMarginBox = new Sprite();
+            this._content.addChild(leftMarginBox);
+            leftMarginBox.width = leftMargin;
+            this._scrollContent.x += leftMargin;
+        }
+        if (rightMargin) {
+            this._rightMarginBox = new Sprite();
+            this._content.addChild(this._rightMarginBox);
+            this._rightMarginBox.height = rightMargin;
+            this._rightMarginBox.x = leftMargin + this._scrollContent.width;
+        }
     }
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度
      */
     setDimensions(width, height) {
-        // 更新遮罩尺寸
-        this._maskGraphics.clear();
-        this._maskGraphics.beginFill(0x000000);
-        this._maskGraphics.drawRect(0, 0, width, height);
-        this._maskGraphics.endFill();
+        this._maskGraphics.width = width;
+        this._maskGraphics.height = height;
         this.setSize(width, height);
+        this._updateRightMargin();
     }
     /** @description 返回顶部 */
     scrollToTop() {
@@ -66,12 +93,16 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
     addContent(container) {
         this._scrollContent.addChild(container);
     }
+    /** @description 更新右边距坐标 */
+    _updateRightMargin() {
+        this._rightMarginBox.x = this._leftMargin + this._scrollContent.width;
+    }
     /** @description 按下 */
     _onDragStart(event) {
         if (this._content.width <= this._maskGraphics.width)
             return;
-        const position = event.getLocalPosition(this);
-        this._startX = position.x - this._content.x;
+        const { x } = event.getLocalPosition(this);
+        this._startX = x - this._content.x;
         this._isDragging = true;
         this._velocity = 0;
         this._startTime = Date.now();
@@ -81,8 +112,8 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
     /** @description 拖动 */
     _onDragMove(event) {
         if (this._isDragging) {
-            const position = event.getLocalPosition(this);
-            const newPosition = position.x - this._startX;
+            const { x } = event.getLocalPosition(this);
+            const newPosition = x - this._startX;
             this._content.x = newPosition;
         }
     }
@@ -133,10 +164,11 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
     _limitScrollRange() {
         //如果内容顶部离开了滚动容器顶部，则归位
         if (this._content.x > 0) {
+            //回弹
             gsap.to(this._content, {
-                duration: 0.75,
+                duration: 0.2,
+                ease: "power1.out",
                 x: 0,
-                ease: "elastic.out",
             });
         }
         // 如果滚动距离大于内容高度减去遮罩高度
@@ -144,18 +176,12 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
             this._content.width - this._maskGraphics.width) {
             // 如果内容高度大于遮罩高度，则滚动到底部
             if (this._content.width > this._maskGraphics.width) {
+                //回弹
                 const x = -(this._content.width - this._maskGraphics.width);
                 gsap.to(this._content, {
-                    duration: 0.75,
+                    duration: 0.2,
+                    ease: "power1.out",
                     x,
-                    ease: "elastic.out",
-                });
-            }
-            // 否则静止不动
-            else {
-                gsap.to(this._content, {
-                    duration: 0.25,
-                    x: 0,
                 });
             }
         }

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -26,10 +26,10 @@ export interface LibPixiScrollContainerYParams {
     /** 滚动触发 */
     onScroll?: (y: number) => void;
 }
-/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
- * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainerY-Y轴滚动容器
- */
+/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export declare class LibPixiScrollContainerY extends LibPixiContainer {
+    /** 舞台 */
+    static stage: Container;
     /** 开始位置 */
     private _startY;
     /** 惯性速度 */

package/Components/Custom/LibPixiScrollContainerY.js

@@ -3,9 +3,7 @@ import { gsap } from "gsap";
 import { libPixiEvent } from "../../Utils/LibPixiEvent";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
 import { LibPixiRectangle } from "../Base/LibPixiRectangle";
-/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
- * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainerY-Y轴滚动容器
- */
+/** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export class LibPixiScrollContainerY extends LibPixiContainer {
     constructor(params) {
         const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, maskTexture, maskX = 0, maskY = 0, } = params;
@@ -74,13 +72,11 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
             });
         });
         // 添加事件监听
-        this.eventMode = "static";
-        this.on("pointerdown", this._onDragStart, this);
         libPixiEvent(this, "pointerdown", (event) => {
             this._onDragStart(event);
             this._updateScrollbarSize();
         });
-        libPixiEvent(this, "pointermove", (event) => {
+        libPixiEvent(LibPixiScrollContainerY.stage, "pointermove", (event) => {
             this._onScrollbarDragMove(event);
             this._onDragMove(event);
         });

package/lyb-pixi.js

@@ -1315,7 +1315,7 @@
       var ys = arrObjKeys(obj, inspect2);
       var isPlainObject = gPO ? gPO(obj) === Object.prototype : obj instanceof Object || obj.constructor === Object;
       var protoTag = obj instanceof Object ? "" : "null prototype";
-      var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr$1(obj), 8, -1) : protoTag ? "Object" : "";
+      var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr(obj), 8, -1) : protoTag ? "Object" : "";
       var constructorTag = isPlainObject || typeof obj.constructor !== "function" ? "" : obj.constructor.name ? obj.constructor.name + " " : "";
       var tag2 = constructorTag + (stringTag || protoTag ? "[" + $join.call($concat$1.call([], stringTag || [], protoTag || []), ": ") + "] " : "");
       if (ys.length === 0) {
@@ -1337,25 +1337,25 @@
     return $replace$1.call(String(s2), /"/g, """);
   }
   function isArray$3(obj) {
-    return toStr$1(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isDate(obj) {
-    return toStr$1(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isRegExp$1(obj) {
-    return toStr$1(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isError(obj) {
-    return toStr$1(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isString(obj) {
-    return toStr$1(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isNumber(obj) {
-    return toStr$1(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isBoolean(obj) {
-    return toStr$1(obj) === "[object Boolean]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr(obj) === "[object Boolean]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isSymbol(obj) {
     if (hasShammedSymbols) {
@@ -1391,7 +1391,7 @@
   function has$3(obj, key) {
     return hasOwn$1.call(obj, key);
   }
-  function toStr$1(obj) {
+  function toStr(obj) {
     return objectToString.call(obj);
   }
   function nameOf(f2) {
@@ -1700,7 +1700,7 @@
   var uri = URIError;
   var abs$2 = Math.abs;
   var floor$2 = Math.floor;
-  var max$3 = Math.max;
+  var max$2 = Math.max;
   var min$2 = Math.min;
   var pow$2 = Math.pow;
   var round$3 = Math.round;
@@ -1833,78 +1833,102 @@
     Object_getPrototypeOf = $Object2.getPrototypeOf || null;
     return Object_getPrototypeOf;
   }
-  var ERROR_MESSAGE = "Function.prototype.bind called on incompatible ";
-  var toStr = Object.prototype.toString;
-  var max$2 = Math.max;
-  var funcType = "[object Function]";
-  var concatty = function concatty2(a2, b2) {
-    var arr = [];
-    for (var i2 = 0; i2 < a2.length; i2 += 1) {
-      arr[i2] = a2[i2];
-    }
-    for (var j2 = 0; j2 < b2.length; j2 += 1) {
-      arr[j2 + a2.length] = b2[j2];
-    }
-    return arr;
-  };
-  var slicy = function slicy2(arrLike, offset) {
-    var arr = [];
-    for (var i2 = offset || 0, j2 = 0; i2 < arrLike.length; i2 += 1, j2 += 1) {
-      arr[j2] = arrLike[i2];
-    }
-    return arr;
-  };
-  var joiny = function(arr, joiner) {
-    var str = "";
-    for (var i2 = 0; i2 < arr.length; i2 += 1) {
-      str += arr[i2];
-      if (i2 + 1 < arr.length) {
-        str += joiner;
+  var implementation;
+  var hasRequiredImplementation;
+  function requireImplementation() {
+    if (hasRequiredImplementation)
+      return implementation;
+    hasRequiredImplementation = 1;
+    var ERROR_MESSAGE = "Function.prototype.bind called on incompatible ";
+    var toStr2 = Object.prototype.toString;
+    var max2 = Math.max;
+    var funcType = "[object Function]";
+    var concatty = function concatty2(a2, b2) {
+      var arr = [];
+      for (var i2 = 0; i2 < a2.length; i2 += 1) {
+        arr[i2] = a2[i2];
       }
-    }
-    return str;
-  };
-  var implementation$1 = function bind2(that) {
-    var target = this;
-    if (typeof target !== "function" || toStr.apply(target) !== funcType) {
-      throw new TypeError(ERROR_MESSAGE + target);
-    }
-    var args = slicy(arguments, 1);
-    var bound;
-    var binder = function() {
-      if (this instanceof bound) {
-        var result = target.apply(
-          this,
-          concatty(args, arguments)
-        );
-        if (Object(result) === result) {
-          return result;
+      for (var j2 = 0; j2 < b2.length; j2 += 1) {
+        arr[j2 + a2.length] = b2[j2];
+      }
+      return arr;
+    };
+    var slicy = function slicy2(arrLike, offset) {
+      var arr = [];
+      for (var i2 = offset || 0, j2 = 0; i2 < arrLike.length; i2 += 1, j2 += 1) {
+        arr[j2] = arrLike[i2];
+      }
+      return arr;
+    };
+    var joiny = function(arr, joiner) {
+      var str = "";
+      for (var i2 = 0; i2 < arr.length; i2 += 1) {
+        str += arr[i2];
+        if (i2 + 1 < arr.length) {
+          str += joiner;
         }
-        return this;
       }
-      return target.apply(
-        that,
-        concatty(args, arguments)
-      );
+      return str;
     };
-    var boundLength = max$2(0, target.length - args.length);
-    var boundArgs = [];
-    for (var i2 = 0; i2 < boundLength; i2++) {
-      boundArgs[i2] = "$" + i2;
-    }
-    bound = Function("binder", "return function (" + joiny(boundArgs, ",") + "){ return binder.apply(this,arguments); }")(binder);
-    if (target.prototype) {
-      var Empty = function Empty2() {
+    implementation = function bind2(that) {
+      var target = this;
+      if (typeof target !== "function" || toStr2.apply(target) !== funcType) {
+        throw new TypeError(ERROR_MESSAGE + target);
+      }
+      var args = slicy(arguments, 1);
+      var bound;
+      var binder = function() {
+        if (this instanceof bound) {
+          var result = target.apply(
+            this,
+            concatty(args, arguments)
+          );
+          if (Object(result) === result) {
+            return result;
+          }
+          return this;
+        }
+        return target.apply(
+          that,
+          concatty(args, arguments)
+        );
       };
-      Empty.prototype = target.prototype;
-      bound.prototype = new Empty();
-      Empty.prototype = null;
-    }
-    return bound;
-  };
-  var implementation = implementation$1;
-  var functionBind = Function.prototype.bind || implementation;
-  var functionCall = Function.prototype.call;
+      var boundLength = max2(0, target.length - args.length);
+      var boundArgs = [];
+      for (var i2 = 0; i2 < boundLength; i2++) {
+        boundArgs[i2] = "$" + i2;
+      }
+      bound = Function("binder", "return function (" + joiny(boundArgs, ",") + "){ return binder.apply(this,arguments); }")(binder);
+      if (target.prototype) {
+        var Empty = function Empty2() {
+        };
+        Empty.prototype = target.prototype;
+        bound.prototype = new Empty();
+        Empty.prototype = null;
+      }
+      return bound;
+    };
+    return implementation;
+  }
+  var functionBind;
+  var hasRequiredFunctionBind;
+  function requireFunctionBind() {
+    if (hasRequiredFunctionBind)
+      return functionBind;
+    hasRequiredFunctionBind = 1;
+    var implementation2 = requireImplementation();
+    functionBind = Function.prototype.bind || implementation2;
+    return functionBind;
+  }
+  var functionCall;
+  var hasRequiredFunctionCall;
+  function requireFunctionCall() {
+    if (hasRequiredFunctionCall)
+      return functionCall;
+    hasRequiredFunctionCall = 1;
+    functionCall = Function.prototype.call;
+    return functionCall;
+  }
   var functionApply;
   var hasRequiredFunctionApply;
   function requireFunctionApply() {
@@ -1915,14 +1939,14 @@
     return functionApply;
   }
   var reflectApply = typeof Reflect !== "undefined" && Reflect && Reflect.apply;
-  var bind$2 = functionBind;
+  var bind$2 = requireFunctionBind();
   var $apply$1 = requireFunctionApply();
-  var $call$2 = functionCall;
+  var $call$2 = requireFunctionCall();
   var $reflectApply = reflectApply;
   var actualApply = $reflectApply || bind$2.call($call$2, $apply$1);
-  var bind$1 = functionBind;
+  var bind$1 = requireFunctionBind();
   var $TypeError$4 = type;
-  var $call$1 = functionCall;
+  var $call$1 = requireFunctionCall();
   var $actualApply = actualApply;
   var callBindApplyHelpers = function callBindBasic2(args) {
     if (args.length < 1 || typeof args[0] !== "function") {
@@ -1991,7 +2015,7 @@
     hasRequiredHasown = 1;
     var call = Function.prototype.call;
     var $hasOwn = Object.prototype.hasOwnProperty;
-    var bind2 = functionBind;
+    var bind2 = requireFunctionBind();
     hasown = bind2.call(call, $hasOwn);
     return hasown;
   }
@@ -2006,7 +2030,7 @@
   var $URIError = uri;
   var abs$1 = abs$2;
   var floor$1 = floor$2;
-  var max$1 = max$3;
+  var max$1 = max$2;
   var min$1 = min$2;
   var pow$1 = pow$2;
   var round$2 = round$3;
@@ -2040,7 +2064,7 @@
   var $ObjectGPO = requireObject_getPrototypeOf();
   var $ReflectGPO = requireReflect_getPrototypeOf();
   var $apply = requireFunctionApply();
-  var $call = functionCall;
+  var $call = requireFunctionCall();
   var needsEval = {};
   var TypedArray = typeof Uint8Array === "undefined" || !getProto ? undefined$1 : getProto(Uint8Array);
   var INTRINSICS = {
@@ -2210,7 +2234,7 @@
     "%WeakMapPrototype%": ["WeakMap", "prototype"],
     "%WeakSetPrototype%": ["WeakSet", "prototype"]
   };
-  var bind = functionBind;
+  var bind = requireFunctionBind();
   var hasOwn = requireHasown();
   var $concat = bind.call($call, Array.prototype.concat);
   var $spliceApply = bind.call($apply, Array.prototype.splice);
@@ -49201,7 +49225,15 @@ void main(void)\r
   }
   class LibPixiScrollContainerX extends LibPixiContainer {
     constructor(params) {
-      const { width, height, scrollContent, bgColor, rightMargin = 0 } = params;
+      const {
+        width,
+        height,
+        scrollContent,
+        bgColor,
+        maskTexture,
+        maskX = 0,
+        maskY = 0
+      } = params;
       super(width, height, bgColor);
       this._startX = 0;
       this._velocity = 0;
@@ -49209,37 +49241,64 @@ void main(void)\r
       this._startPosition = 0;
       this._scrollSpeed = 200;
       this._isDragging = false;
+      this._leftMargin = 0;
       this._scrollContent = scrollContent;
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
-      const rightMarginBox = new Sprite();
-      this._content.addChild(rightMarginBox);
-      rightMarginBox.width = this._content.width + rightMargin;
-      this._maskGraphics = new Graphics();
-      this.addChild(this._maskGraphics);
-      this._maskGraphics.clear();
-      this._maskGraphics.beginFill(0);
-      this._maskGraphics.drawRect(0, 0, width, height);
-      this._maskGraphics.endFill();
-      this.mask = this._maskGraphics;
-      this.eventMode = "static";
-      this.on("pointerdown", this._onDragStart, this);
-      this.on("pointermove", this._onDragMove, this);
-      this.on("pointerup", this._onDragEnd, this);
-      this.on("pointerupoutside", this._onDragEnd, this);
-      this.on("wheel", this._onWheelScroll, this);
+      if (maskTexture) {
+        this._maskGraphics = new Sprite(maskTexture);
+        this.addChild(this._maskGraphics);
+        this._maskGraphics.width = width;
+        this._maskGraphics.height = height;
+        this._maskGraphics.position.set(maskX, maskY);
+        this.mask = this._maskGraphics;
+      } else {
+        this._maskGraphics = new LibPixiRectangle(width, height, "#000");
+        this.addChild(this._maskGraphics);
+        this.mask = this._maskGraphics;
+      }
+      libPixiEvent(this, "pointerdown", (event) => {
+        this._onDragStart(event);
+      });
+      libPixiEvent(LibPixiScrollContainerX.stage, "pointermove", (event) => {
+        this._onDragMove(event);
+      });
+      libPixiEvent(this, "pointerup", () => {
+        this._onDragEnd();
+      });
+      libPixiEvent(this, "wheel", (event) => {
+        this._onWheelScroll(event);
+      });
+      libPixiEvent(this, "pointerupoutside", () => {
+        this._onDragEnd();
+      });
+    }
+    /** @description 添加边距 */
+    addMargin(leftMargin, rightMargin = leftMargin) {
+      this._leftMargin = leftMargin;
+      if (leftMargin) {
+        const leftMarginBox = new Sprite();
+        this._content.addChild(leftMarginBox);
+        leftMarginBox.width = leftMargin;
+        this._scrollContent.x += leftMargin;
+      }
+      if (rightMargin) {
+        this._rightMarginBox = new Sprite();
+        this._content.addChild(this._rightMarginBox);
+        this._rightMarginBox.height = rightMargin;
+        this._rightMarginBox.x = leftMargin + this._scrollContent.width;
+      }
     }
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度
      */
     setDimensions(width, height) {
-      this._maskGraphics.clear();
-      this._maskGraphics.beginFill(0);
-      this._maskGraphics.drawRect(0, 0, width, height);
-      this._maskGraphics.endFill();
+      this._maskGraphics.width = width;
+      this._maskGraphics.height = height;
       this.setSize(width, height);
+      this._updateRightMargin();
     }
     /** @description 返回顶部 */
     scrollToTop() {
@@ -49250,12 +49309,16 @@ void main(void)\r
     addContent(container) {
       this._scrollContent.addChild(container);
     }
+    /** @description 更新右边距坐标 */
+    _updateRightMargin() {
+      this._rightMarginBox.x = this._leftMargin + this._scrollContent.width;
+    }
     /** @description 按下 */
     _onDragStart(event) {
       if (this._content.width <= this._maskGraphics.width)
         return;
-      const position = event.getLocalPosition(this);
-      this._startX = position.x - this._content.x;
+      const { x: x2 } = event.getLocalPosition(this);
+      this._startX = x2 - this._content.x;
       this._isDragging = true;
       this._velocity = 0;
       this._startTime = Date.now();
@@ -49265,8 +49328,8 @@ void main(void)\r
     /** @description 拖动 */
     _onDragMove(event) {
       if (this._isDragging) {
-        const position = event.getLocalPosition(this);
-        const newPosition = position.x - this._startX;
+        const { x: x2 } = event.getLocalPosition(this);
+        const newPosition = x2 - this._startX;
         this._content.x = newPosition;
       }
     }
@@ -49312,22 +49375,17 @@ void main(void)\r
     _limitScrollRange() {
       if (this._content.x > 0) {
         gsapWithCSS.to(this._content, {
-          duration: 0.75,
-          x: 0,
-          ease: "elastic.out"
+          duration: 0.2,
+          ease: "power1.out",
+          x: 0
         });
       } else if (Math.abs(this._content.x) >= this._content.width - this._maskGraphics.width) {
         if (this._content.width > this._maskGraphics.width) {
           const x2 = -(this._content.width - this._maskGraphics.width);
           gsapWithCSS.to(this._content, {
-            duration: 0.75,
-            x: x2,
-            ease: "elastic.out"
-          });
-        } else {
-          gsapWithCSS.to(this._content, {
-            duration: 0.25,
-            x: 0
+            duration: 0.2,
+            ease: "power1.out",
+            x: x2
           });
         }
       }
@@ -49407,13 +49465,11 @@ void main(void)\r
           delay: 1
         });
       });
-      this.eventMode = "static";
-      this.on("pointerdown", this._onDragStart, this);
       libPixiEvent(this, "pointerdown", (event) => {
         this._onDragStart(event);
         this._updateScrollbarSize();
       });
-      libPixiEvent(this, "pointermove", (event) => {
+      libPixiEvent(LibPixiScrollContainerY.stage, "pointermove", (event) => {
         this._onScrollbarDragMove(event);
         this._onDragMove(event);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.12.28",
+  "version": "1.12.29",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {