lyb-pixi-js 1.9.9 → 1.9.11

package/Components/Base/LibPixiHtmlText.js

@@ -14,7 +14,7 @@ export class LibPixiHtmlText extends HTMLText {
             breakWords: wordWrap,
             fill: fontColor,
             align,
-            whiteSpace: "normal",
+            whiteSpace: "pre-line",
             fontFamily: fontFamily,
             stroke: stroke ? strokeColor : "transparent",
             strokeThickness: stroke ? strokeThickness : 0,

package/Components/Custom/LibPixiScrollContainerX.d.ts

@@ -7,6 +7,10 @@ export interface LibPixiScrollContainerXParams {
     height: number;
     /** 滚动内容 */
     scrollContent: Container;
+    /** 背景色，用于定位 */
+    bgColor?: string;
+    /** 右边距 */
+    rightMargin?: number;
 }
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainerX-X 轴滚动容器

package/Components/Custom/LibPixiScrollContainerX.js

@@ -1,4 +1,4 @@
-import { Container, Graphics } from "pixi.js";
+import { Container, Graphics, Sprite, } from "pixi.js";
 import { gsap } from "gsap";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
@@ -6,8 +6,8 @@ import { LibPixiContainer } from "../Base/LibPixiContainer";
  */
 export class LibPixiScrollContainerX extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollContent } = params;
-        super(width, height);
+        const { width, height, scrollContent, bgColor, rightMargin = 0 } = params;
+        super(width, height, bgColor);
         /** 开始位置 */
         this._startX = 0;
         /** 惯性速度 */
@@ -25,6 +25,10 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
         this._content = new Container();
         this.addChild(this._content);
         this._content.addChild(this._scrollContent);
+        //创建右边距
+        const rightMarginBox = new Sprite();
+        this._content.addChild(rightMarginBox);
+        rightMarginBox.height = this._content.width + rightMargin;
         // 创建遮罩
         this._maskGraphics = new Graphics();
         this.addChild(this._maskGraphics);

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -7,6 +7,10 @@ export interface LibPixiScrollContainerYParams {
     height: number;
     /** 滚动内容 */
     scrollContent: Container;
+    /** 底部边距 */
+    bottomMargin?: number;
+    /** 背景色，用于定位 */
+    bgColor?: string;
     /** 是否需要滚动条 */
     scrollbar?: boolean;
     /** 滚动靠右坐标 */

package/Components/Custom/LibPixiScrollContainerY.js

@@ -1,4 +1,4 @@
-import { Container } from "pixi.js";
+import { Container, Sprite } from "pixi.js";
 import { gsap } from "gsap";
 import { libPixiEvent } from "../../Utils/LibPixiEvent";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
@@ -8,8 +8,8 @@ import { LibPixiRectangle } from "../Base/LibPixiRectangle";
  */
 export class LibPixiScrollContainerY extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, } = params;
-        super(width, height);
+        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, bottomMargin = 0, } = params;
+        super(width, height, bgColor);
         /** 开始位置 */
         this._startY = 0;
         /** 惯性速度 */
@@ -33,6 +33,10 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._content = new Container();
         this.addChild(this._content);
         this._content.addChild(this._scrollContent);
+        //创建底部边距
+        const bottomMarginBox = new Sprite();
+        this._content.addChild(bottomMarginBox);
+        bottomMarginBox.height = this._content.height + bottomMargin;
         // 创建遮罩
         this._maskGraphics = new LibPixiRectangle(width, height, "#000");
         this.addChild(this._maskGraphics);

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 tag = 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$1 = Math.abs;
   var floor$1 = Math.floor;
-  var max$2 = Math.max;
+  var max$1 = Math.max;
   var min$1 = Math.min;
   var pow$1 = Math.pow;
   var round$2 = 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$1 = 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$1(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 = abs$1;
   var floor = floor$1;
-  var max = max$2;
+  var max = max$1;
   var min = min$1;
   var pow = pow$1;
   var round$1 = round$2;
@@ -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);
@@ -49093,8 +49117,8 @@ void main(void)\r
   }
   class LibPixiScrollContainerX extends LibPixiContainer {
     constructor(params) {
-      const { width, height, scrollContent } = params;
-      super(width, height);
+      const { width, height, scrollContent, bgColor, rightMargin = 0 } = params;
+      super(width, height, bgColor);
       this._startX = 0;
       this._velocity = 0;
       this._startTime = 0;
@@ -49105,6 +49129,9 @@ void main(void)\r
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
+      const rightMarginBox = new Sprite();
+      this._content.addChild(rightMarginBox);
+      rightMarginBox.height = this._content.width + rightMargin;
       this._maskGraphics = new Graphics();
       this.addChild(this._maskGraphics);
       this._maskGraphics.clear();
@@ -49243,9 +49270,11 @@ void main(void)\r
         scrollbarRgiht,
         scrollbarWidth = 10,
         scrollbarColor = "#ffffff",
-        onScroll
+        onScroll,
+        bgColor,
+        bottomMargin = 0
       } = params;
-      super(width, height);
+      super(width, height, bgColor);
       this._startY = 0;
       this._velocity = 0;
       this._startTime = 0;
@@ -49260,6 +49289,9 @@ void main(void)\r
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
+      const bottomMarginBox = new Sprite();
+      this._content.addChild(bottomMarginBox);
+      bottomMarginBox.height = this._content.height + bottomMargin;
       this._maskGraphics = new LibPixiRectangle(width, height, "#000");
       this.addChild(this._maskGraphics);
       this.mask = this._maskGraphics;
@@ -55004,7 +55036,7 @@ void main(void){
         breakWords: wordWrap,
         fill: fontColor,
         align,
-        whiteSpace: "normal",
+        whiteSpace: "pre-line",
         fontFamily,
         stroke: stroke ? strokeColor : "transparent",
         strokeThickness: stroke ? strokeThickness : 0

package/package.json

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