lyb-pixi-js 1.12.26 → 1.12.28

package/Components/Custom/LibPixiArrangeLinearV2.js

@@ -15,7 +15,7 @@ export class LibPixiArrangeLinearV2 extends Container {
     }
     /** @description 布局 */
     layout() {
-        const { colNum = this._elementList.length, gap = 10, direction = "x", anchorX = 0, anchorY = 0, } = this._params;
+        const { colNum = this._elementList.length, gap = 0, direction = "x", anchorX = 0, anchorY = 0, } = this._params;
         let lastRowMax = 0; // 当前行（或列）的最大高度（或宽度），用于多行/多列换行时计算偏移
         let rowOffset = 0; // 累计偏移量，控制换行后的整体偏移位置
         this._elementList.forEach((item, index) => {

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -9,6 +9,12 @@ export interface LibPixiScrollContainerYParams {
     scrollContent: Container;
     /** 背景色，用于定位 */
     bgColor?: string;
+    /** 自定义遮罩贴图 */
+    maskTexture?: Texture;
+    /** 遮罩X坐标 */
+    maskX?: number;
+    /** 遮罩Y坐标 */
+    maskY?: number;
     /** 是否需要滚动条 */
     scrollbar?: boolean;
     /** 滚动靠右坐标 */
@@ -17,12 +23,6 @@ export interface LibPixiScrollContainerYParams {
     scrollbarWidth?: number;
     /** 滚动条颜色 */
     scrollbarColor?: string;
-    /** 自定义遮罩贴图 */
-    maskTexture?: Texture;
-    /** 遮罩X坐标 */
-    maskX?: number;
-    /** 遮罩Y坐标 */
-    maskY?: number;
     /** 滚动触发 */
     onScroll?: (y: number) => void;
 }
@@ -50,6 +50,10 @@ export declare class LibPixiScrollContainerY extends LibPixiContainer {
     private _scrollbarRgiht;
     /** 滚动条宽度 */
     private _scrollbarWidth;
+    /** 上边距 */
+    private _topMargin;
+    /** 右边距元素 */
+    private _bottomMarginBox;
     /** 滚动容器 */
     _scrollContent: Container;
     /** 遮罩 */
@@ -66,7 +70,7 @@ export declare class LibPixiScrollContainerY extends LibPixiContainer {
     private _onScroll?;
     constructor(params: LibPixiScrollContainerYParams);
     /** @description 添加边距 */
-    addMargin(topMargin: number, bottomMargin: number): void;
+    addMargin(topMargin: number, bottomMargin?: number): void;
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度
@@ -76,6 +80,8 @@ export declare class LibPixiScrollContainerY extends LibPixiContainer {
     scrollToTop(): void;
     /** @description 往滚动内容添加元素 */
     addContent(container: Container): void;
+    /** @description 更新右边距坐标 */
+    private _updateBottomMargin;
     /** @description 按下 */
     private _onDragStart;
     /** @description 拖动 */

package/Components/Custom/LibPixiScrollContainerY.js

@@ -26,6 +26,8 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._scrollbarDragging = false;
         /** 滚动条拖动偏移量 */
         this._scrollbarDragOffset = 0;
+        /** 上边距 */
+        this._topMargin = 0;
         this._scrollbarRgiht = scrollbarRgiht;
         this._scrollbarWidth = scrollbarWidth;
         this._scrollContent = scrollContent;
@@ -95,7 +97,8 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         });
     }
     /** @description 添加边距 */
-    addMargin(topMargin, bottomMargin) {
+    addMargin(topMargin, bottomMargin = topMargin) {
+        this._topMargin = topMargin;
         if (topMargin) {
             const topMarginBox = new Sprite();
             this._content.addChild(topMarginBox);
@@ -103,10 +106,10 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
             this._scrollContent.y += topMargin;
         }
         if (bottomMargin) {
-            const bottomMarginBox = new Sprite();
-            this._content.addChild(bottomMarginBox);
-            bottomMarginBox.height = bottomMargin;
-            bottomMarginBox.y = topMargin + this._scrollContent.height;
+            this._bottomMarginBox = new Sprite();
+            this._content.addChild(this._bottomMarginBox);
+            this._bottomMarginBox.height = bottomMargin;
+            this._bottomMarginBox.y = topMargin + this._scrollContent.height;
         }
     }
     /** @description 设置滚动容器可视区宽高
@@ -118,6 +121,7 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._maskGraphics.height = height;
         this.setSize(width, height);
         this._scrollbar.x = width - (this._scrollbarRgiht || this._scrollbarWidth);
+        this._updateBottomMargin();
     }
     /** @description 返回顶部 */
     scrollToTop() {
@@ -128,12 +132,16 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
     addContent(container) {
         this._scrollContent.addChild(container);
     }
+    /** @description 更新右边距坐标 */
+    _updateBottomMargin() {
+        this._bottomMarginBox.x = this._topMargin + this._scrollContent.width;
+    }
     /** @description 按下 */
     _onDragStart(event) {
         if (this._content.height <= this._maskGraphics.height)
             return;
-        const position = event.getLocalPosition(this);
-        this._startY = position.y - this._content.y;
+        const { y } = event.getLocalPosition(this);
+        this._startY = y - this._content.y;
         this._isDragging = true;
         this._velocity = 0;
         this._startTime = Date.now();
@@ -143,8 +151,8 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
     /** @description 拖动 */
     _onDragMove(event) {
         if (this._isDragging) {
-            const position = event.getLocalPosition(this);
-            const newPosition = position.y - this._startY;
+            const { y } = event.getLocalPosition(this);
+            const newPosition = y - this._startY;
             this._content.y = newPosition;
             this._updateScrollbar();
         }

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(obj), 8, -1) : protoTag ? "Object" : "";
+      var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr$1(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(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isDate(obj) {
-    return toStr(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isRegExp$1(obj) {
-    return toStr(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isError(obj) {
-    return toStr(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isString(obj) {
-    return toStr(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isNumber(obj) {
-    return toStr(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isBoolean(obj) {
-    return toStr(obj) === "[object Boolean]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(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(obj) {
+  function toStr$1(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$2 = Math.max;
+  var max$3 = Math.max;
   var min$2 = Math.min;
   var pow$2 = Math.pow;
   var round$3 = Math.round;
@@ -1833,102 +1833,78 @@
     Object_getPrototypeOf = $Object2.getPrototypeOf || null;
     return Object_getPrototypeOf;
   }
-  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];
-      }
-      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 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;
       }
-      return str;
-    };
-    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,
+    }
+    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)
         );
-      };
-      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;
+        if (Object(result) === result) {
+          return result;
+        }
+        return this;
       }
-      return bound;
+      return target.apply(
+        that,
+        concatty(args, arguments)
+      );
     };
-    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 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() {
+      };
+      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 functionApply;
   var hasRequiredFunctionApply;
   function requireFunctionApply() {
@@ -1939,14 +1915,14 @@
     return functionApply;
   }
   var reflectApply = typeof Reflect !== "undefined" && Reflect && Reflect.apply;
-  var bind$2 = requireFunctionBind();
+  var bind$2 = functionBind;
   var $apply$1 = requireFunctionApply();
-  var $call$2 = requireFunctionCall();
+  var $call$2 = functionCall;
   var $reflectApply = reflectApply;
   var actualApply = $reflectApply || bind$2.call($call$2, $apply$1);
-  var bind$1 = requireFunctionBind();
+  var bind$1 = functionBind;
   var $TypeError$4 = type;
-  var $call$1 = requireFunctionCall();
+  var $call$1 = functionCall;
   var $actualApply = actualApply;
   var callBindApplyHelpers = function callBindBasic2(args) {
     if (args.length < 1 || typeof args[0] !== "function") {
@@ -2015,7 +1991,7 @@
     hasRequiredHasown = 1;
     var call = Function.prototype.call;
     var $hasOwn = Object.prototype.hasOwnProperty;
-    var bind2 = requireFunctionBind();
+    var bind2 = functionBind;
     hasown = bind2.call(call, $hasOwn);
     return hasown;
   }
@@ -2030,7 +2006,7 @@
   var $URIError = uri;
   var abs$1 = abs$2;
   var floor$1 = floor$2;
-  var max$1 = max$2;
+  var max$1 = max$3;
   var min$1 = min$2;
   var pow$1 = pow$2;
   var round$2 = round$3;
@@ -2064,7 +2040,7 @@
   var $ObjectGPO = requireObject_getPrototypeOf();
   var $ReflectGPO = requireReflect_getPrototypeOf();
   var $apply = requireFunctionApply();
-  var $call = requireFunctionCall();
+  var $call = functionCall;
   var needsEval = {};
   var TypedArray = typeof Uint8Array === "undefined" || !getProto ? undefined$1 : getProto(Uint8Array);
   var INTRINSICS = {
@@ -2234,7 +2210,7 @@
     "%WeakMapPrototype%": ["WeakMap", "prototype"],
     "%WeakSetPrototype%": ["WeakSet", "prototype"]
   };
-  var bind = requireFunctionBind();
+  var bind = functionBind;
   var hasOwn = requireHasown();
   var $concat = bind.call($call, Array.prototype.concat);
   var $spliceApply = bind.call($apply, Array.prototype.splice);
@@ -49382,6 +49358,7 @@ void main(void)\r
       this._isDragging = false;
       this._scrollbarDragging = false;
       this._scrollbarDragOffset = 0;
+      this._topMargin = 0;
       this._scrollbarRgiht = scrollbarRgiht;
       this._scrollbarWidth = scrollbarWidth;
       this._scrollContent = scrollContent;
@@ -49453,7 +49430,8 @@ void main(void)\r
       });
     }
     /** @description 添加边距 */
-    addMargin(topMargin, bottomMargin) {
+    addMargin(topMargin, bottomMargin = topMargin) {
+      this._topMargin = topMargin;
       if (topMargin) {
         const topMarginBox = new Sprite();
         this._content.addChild(topMarginBox);
@@ -49461,10 +49439,10 @@ void main(void)\r
         this._scrollContent.y += topMargin;
       }
       if (bottomMargin) {
-        const bottomMarginBox = new Sprite();
-        this._content.addChild(bottomMarginBox);
-        bottomMarginBox.height = bottomMargin;
-        bottomMarginBox.y = topMargin + this._scrollContent.height;
+        this._bottomMarginBox = new Sprite();
+        this._content.addChild(this._bottomMarginBox);
+        this._bottomMarginBox.height = bottomMargin;
+        this._bottomMarginBox.y = topMargin + this._scrollContent.height;
       }
     }
     /** @description 设置滚动容器可视区宽高
@@ -49476,6 +49454,7 @@ void main(void)\r
       this._maskGraphics.height = height;
       this.setSize(width, height);
       this._scrollbar.x = width - (this._scrollbarRgiht || this._scrollbarWidth);
+      this._updateBottomMargin();
     }
     /** @description 返回顶部 */
     scrollToTop() {
@@ -49486,12 +49465,16 @@ void main(void)\r
     addContent(container) {
       this._scrollContent.addChild(container);
     }
+    /** @description 更新右边距坐标 */
+    _updateBottomMargin() {
+      this._bottomMarginBox.x = this._topMargin + this._scrollContent.width;
+    }
     /** @description 按下 */
     _onDragStart(event) {
       if (this._content.height <= this._maskGraphics.height)
         return;
-      const position = event.getLocalPosition(this);
-      this._startY = position.y - this._content.y;
+      const { y: y2 } = event.getLocalPosition(this);
+      this._startY = y2 - this._content.y;
       this._isDragging = true;
       this._velocity = 0;
       this._startTime = Date.now();
@@ -49501,8 +49484,8 @@ void main(void)\r
     /** @description 拖动 */
     _onDragMove(event) {
       if (this._isDragging) {
-        const position = event.getLocalPosition(this);
-        const newPosition = position.y - this._startY;
+        const { y: y2 } = event.getLocalPosition(this);
+        const newPosition = y2 - this._startY;
         this._content.y = newPosition;
         this._updateScrollbar();
       }
@@ -58457,7 +58440,7 @@ void main(void){
     layout() {
       const {
         colNum = this._elementList.length,
-        gap = 10,
+        gap = 0,
         direction = "x",
         anchorX = 0,
         anchorY = 0

package/package.json

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