lyb-pixi-js 1.11.3 → 1.11.4

package/Components/Custom/LibPixiSlide.d.ts

@@ -30,6 +30,8 @@ export interface LibPixiSlideParams {
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiSlide-滑动页
  */
 export declare class LibPixiSlide extends LibPixiContainer {
+    /** 舞台 */
+    private _stage;
     /** 滑动加速度触发翻页 */
     private _SPEED_THRESHOLD;
     /** 滑动比例翻页 */

package/Components/Custom/LibPixiSlide.js

@@ -1,7 +1,7 @@
 import { Graphics } from "pixi.js";
 import gsap from "gsap";
-import { LibPixiContainer } from "../Base/LibPixiContainer";
 import { libPixiEvent } from "../../Utils/LibPixiEvent";
+import { LibPixiContainer } from "../Base/LibPixiContainer";
 /** @description 滑动页
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiSlide-滑动页
  */
@@ -37,6 +37,7 @@ export class LibPixiSlide extends LibPixiContainer {
         this._startTime = new Date().getTime();
         /** 是否正在拖动 */
         this._isDragging = false;
+        this._stage = stage;
         const mask = new Graphics();
         mask.beginFill(0xffffff);
         mask.drawRect(0, 0, this.width, this.height);
@@ -67,7 +68,7 @@ export class LibPixiSlide extends LibPixiContainer {
         this._setDepth();
         libPixiEvent(this, "pointerdown", this._onDragStart.bind(this));
         libPixiEvent(stage, "pointermove", this._onDragMove.bind(this));
-        window.addEventListener("pointerup", this._onDragEnd.bind(this));
+        libPixiEvent(stage, "pointerup", this._onDragEnd.bind(this));
     }
     /** @description 更新坐标 */
     updatePosition(v, index) {
@@ -180,15 +181,16 @@ export class LibPixiSlide extends LibPixiContainer {
     }
     /** @description 开始拖动 */
     _onDragStart(event) {
+        const { x, y } = this._stage.toLocal(event.global);
         this._isDragging = true;
         gsap.killTweensOf(this._slideArea);
         this._startTime = new Date().getTime();
         if (this._direction === "x") {
-            this._startX = event.global.x;
+            this._startX = x;
             this._offsetX = this._slideArea.x;
         }
         else {
-            this._startY = event.global.y;
+            this._startY = y;
             this._offsetY = this._slideArea.y;
         }
     }
@@ -196,12 +198,13 @@ export class LibPixiSlide extends LibPixiContainer {
     _onDragMove(event) {
         if (!this._isDragging)
             return;
+        const { x, y } = this._stage.toLocal(event.global);
         if (this._direction === "x") {
-            const moveX = event.pageX - this._startX;
+            const moveX = x - this._startX;
             this._slideArea.x = this._offsetX + moveX;
         }
         else {
-            const moveY = event.pageY - this._startY;
+            const moveY = y - this._startY;
             this._slideArea.y = this._offsetY + moveY;
         }
         this._onScroll();
@@ -219,6 +222,7 @@ export class LibPixiSlide extends LibPixiContainer {
     }
     /** @description 结束拖动 */
     _onDragEnd(event) {
+        const { x, y } = this._stage.toLocal(event.global);
         if (this._direction === "x") {
             if (!this._isDragging)
                 return;
@@ -226,7 +230,7 @@ export class LibPixiSlide extends LibPixiContainer {
             //滑动耗时
             const slideTime = new Date().getTime() - this._startTime;
             //滑动距离
-            const slide = this._startX - event.pageX;
+            const slide = this._startX - x;
             //滑动速度
             const slideSpeed = Math.abs(slide) / slideTime;
             //要滑动的页数
@@ -255,7 +259,7 @@ export class LibPixiSlide extends LibPixiContainer {
             //滑动耗时
             const slideTime = new Date().getTime() - this._startTime;
             //滑动距离
-            const slide = this._startY - event.pageY;
+            const slide = this._startY - y;
             //滑动速度
             const slideSpeed = Math.abs(slide) / slideTime;
             //要滑动的页数

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) {
@@ -1340,25 +1340,25 @@
     return !toStringTag || !(typeof obj === "object" && (toStringTag in obj || typeof obj[toStringTag] !== "undefined"));
   }
   function isArray$3(obj) {
-    return toStr$1(obj) === "[object Array]" && canTrustToString(obj);
+    return toStr(obj) === "[object Array]" && canTrustToString(obj);
   }
   function isDate(obj) {
-    return toStr$1(obj) === "[object Date]" && canTrustToString(obj);
+    return toStr(obj) === "[object Date]" && canTrustToString(obj);
   }
   function isRegExp$1(obj) {
-    return toStr$1(obj) === "[object RegExp]" && canTrustToString(obj);
+    return toStr(obj) === "[object RegExp]" && canTrustToString(obj);
   }
   function isError(obj) {
-    return toStr$1(obj) === "[object Error]" && canTrustToString(obj);
+    return toStr(obj) === "[object Error]" && canTrustToString(obj);
   }
   function isString(obj) {
-    return toStr$1(obj) === "[object String]" && canTrustToString(obj);
+    return toStr(obj) === "[object String]" && canTrustToString(obj);
   }
   function isNumber(obj) {
-    return toStr$1(obj) === "[object Number]" && canTrustToString(obj);
+    return toStr(obj) === "[object Number]" && canTrustToString(obj);
   }
   function isBoolean(obj) {
-    return toStr$1(obj) === "[object Boolean]" && canTrustToString(obj);
+    return toStr(obj) === "[object Boolean]" && canTrustToString(obj);
   }
   function isSymbol(obj) {
     if (hasShammedSymbols) {
@@ -1394,7 +1394,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) {
@@ -1703,7 +1703,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;
@@ -1836,78 +1836,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() {
@@ -1918,14 +1942,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") {
@@ -1994,7 +2018,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;
   }
@@ -2009,7 +2033,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;
@@ -2043,7 +2067,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 = {
@@ -2214,7 +2238,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);
@@ -55196,6 +55220,7 @@ void main(void){
       this._pageNum = 0;
       this._startTime = (/* @__PURE__ */ new Date()).getTime();
       this._isDragging = false;
+      this._stage = stage;
       const mask = new Graphics();
       mask.beginFill(16777215);
       mask.drawRect(0, 0, this.width, this.height);
@@ -55225,7 +55250,7 @@ void main(void){
       this._setDepth();
       libPixiEvent(this, "pointerdown", this._onDragStart.bind(this));
       libPixiEvent(stage, "pointermove", this._onDragMove.bind(this));
-      window.addEventListener("pointerup", this._onDragEnd.bind(this));
+      libPixiEvent(stage, "pointerup", this._onDragEnd.bind(this));
     }
     /** @description 更新坐标 */
     updatePosition(v2, index) {
@@ -55319,14 +55344,15 @@ void main(void){
     }
     /** @description 开始拖动 */
     _onDragStart(event) {
+      const { x: x2, y: y2 } = this._stage.toLocal(event.global);
       this._isDragging = true;
       gsapWithCSS.killTweensOf(this._slideArea);
       this._startTime = (/* @__PURE__ */ new Date()).getTime();
       if (this._direction === "x") {
-        this._startX = event.global.x;
+        this._startX = x2;
         this._offsetX = this._slideArea.x;
       } else {
-        this._startY = event.global.y;
+        this._startY = y2;
         this._offsetY = this._slideArea.y;
       }
     }
@@ -55334,11 +55360,12 @@ void main(void){
     _onDragMove(event) {
       if (!this._isDragging)
         return;
+      const { x: x2, y: y2 } = this._stage.toLocal(event.global);
       if (this._direction === "x") {
-        const moveX = event.pageX - this._startX;
+        const moveX = x2 - this._startX;
         this._slideArea.x = this._offsetX + moveX;
       } else {
-        const moveY = event.pageY - this._startY;
+        const moveY = y2 - this._startY;
         this._slideArea.y = this._offsetY + moveY;
       }
       this._onScroll();
@@ -55355,12 +55382,13 @@ void main(void){
     }
     /** @description 结束拖动 */
     _onDragEnd(event) {
+      const { x: x2, y: y2 } = this._stage.toLocal(event.global);
       if (this._direction === "x") {
         if (!this._isDragging)
           return;
         this._isDragging = false;
         const slideTime = (/* @__PURE__ */ new Date()).getTime() - this._startTime;
-        const slide = this._startX - event.pageX;
+        const slide = this._startX - x2;
         const slideSpeed = Math.abs(slide) / slideTime;
         const pageChange = Math.round(slide / this._pageWidth);
         if (Math.abs(slide) > this._pageWidth * this._SCROLL_THRESHOLD) {
@@ -55380,7 +55408,7 @@ void main(void){
           return;
         this._isDragging = false;
         const slideTime = (/* @__PURE__ */ new Date()).getTime() - this._startTime;
-        const slide = this._startY - event.pageY;
+        const slide = this._startY - y2;
         const slideSpeed = Math.abs(slide) / slideTime;
         const pageChange = Math.round(slide / this._pageHeight);
         if (Math.abs(slide) > this._pageHeight * this._SCROLL_THRESHOLD) {

package/package.json

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