@predy-js/render-interface 0.3.4-beta.14 → 0.3.4-beta.16

package/dist/index.js

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.3.4-beta.14
+ * Version: v0.3.4-beta.16
  */
 
 'use strict';
@@ -197,6 +197,12 @@ var EVENT_TYPE_TOUCH_START = 'touchstart';
 var EVENT_TYPE_TOUCH_MOVE = 'touchmove';
 var EVENT_TYPE_TOUCH_END = 'touchend';
 var EVENT_TYPE_TOUCH_CANCEL = 'touchcancel';
+exports.PredyNativeEventType = void 0;
+(function (PredyNativeEventType) {
+    PredyNativeEventType[PredyNativeEventType["touchstart"] = 1] = "touchstart";
+    PredyNativeEventType[PredyNativeEventType["touchmove"] = 2] = "touchmove";
+    PredyNativeEventType[PredyNativeEventType["touchend"] = 3] = "touchend";
+})(exports.PredyNativeEventType || (exports.PredyNativeEventType = {}));
 // // 扩展事件类型
 // export enum EVENT_TYPE {
 //   // 基础事件
@@ -6039,15 +6045,17 @@ var WebHandler = /** @class */ (function () {
     };
     WebHandler.prototype.handleEvent = function (type, e) {
         e.preventDefault();
-        var np = this.getNormalizedPos(e);
+        // const np = this.getNormalizedPos(e);
+        var rect = e.target.getBoundingClientRect();
         var pointer = {
             id: e.pointerId,
-            x: np[0],
-            y: np[1],
-            clientX: e.clientX,
-            clientY: e.clientY,
-            force: 1,
+            x: e.clientX - rect.left,
+            y: e.clientY - rect.top,
             ts: this.timeStamp,
+            layout: {
+                width: rect.width,
+                height: rect.height,
+            },
         };
         // 更新触点集合
         if (type === EVENT_TYPE_TOUCH_END) {
@@ -6074,7 +6082,12 @@ var WebHandler = /** @class */ (function () {
 
 var RNHandler = /** @class */ (function () {
     function RNHandler(system) {
+        var _this = this;
         this.system = system;
+        this.handleTouch = function (e) {
+            e.preventDefault();
+            _this.system.handleBaseEvent(e);
+        };
         this.timeOrigin = Date.now();
     }
     Object.defineProperty(RNHandler.prototype, "timeStamp", {
@@ -6085,10 +6098,16 @@ var RNHandler = /** @class */ (function () {
         configurable: true
     });
     RNHandler.prototype.setup = function () {
-        throw new Error('Method not implemented.');
+        var target = this.system.target;
+        target.addEventListener('touchstart', this.handleTouch);
+        target.addEventListener('touchmove', this.handleTouch);
+        target.addEventListener('touchend', this.handleTouch);
     };
     RNHandler.prototype.teardown = function () {
-        throw new Error('Method not implemented.');
+        var target = this.system.target;
+        target.removeEventListener('touchstart', this.handleTouch);
+        target.removeEventListener('touchmove', this.handleTouch);
+        target.removeEventListener('touchend', this.handleTouch);
     };
     return RNHandler;
 }());
@@ -6103,7 +6122,7 @@ var H5Handler = /** @class */ (function () {
             var event = {
                 type: type,
                 timestamp: _this.timeStamp,
-                target: e.target,
+                // target: e.target,
                 touches: _this.encapsulate(e.targetTouches),
                 changedTouches: _this.encapsulate(e.changedTouches),
                 preventDefault: function () { return e.preventDefault(); },
@@ -6149,15 +6168,17 @@ var H5Handler = /** @class */ (function () {
         var touches = [];
         for (var i = 0; i < list.length; i++) {
             var touch = list[i];
-            var _a = this.getNormalizedPos(touch), x = _a[0], y = _a[1];
+            // const [x, y] = this.getNormalizedPos(touch);
+            var rect = touch.target.getBoundingClientRect();
             touches.push({
                 id: touch.identifier,
-                x: x,
-                y: y,
-                clientX: touch.clientX,
-                clientY: touch.clientY,
-                force: 1,
+                x: touch.clientX - rect.left,
+                y: touch.clientY - rect.top,
                 ts: this.timeStamp,
+                layout: {
+                    width: rect.width,
+                    height: rect.height,
+                },
             });
         }
         return touches;
@@ -6215,7 +6236,7 @@ var UniversalRecognizer = /** @class */ (function () {
         this.gestureStartTime = event.timestamp;
         this.trackedTouches.clear();
         event.touches.forEach(function (t) { return _this.trackedTouches.set(t.id, t); });
-        this.startPositions = event.touches.map(function (t) { return [t.clientX, t.clientY]; });
+        this.startPositions = event.touches.map(function (t) { return [t.x, t.y]; });
         // 初始化多指手势数据
         if (this.options.touchCount > 1) {
             this.initialCenter = this.calculateCenter(event.touches);
@@ -6227,16 +6248,26 @@ var UniversalRecognizer = /** @class */ (function () {
         if (![exports.RecognizerState.BEGAN, exports.RecognizerState.ACTIVE].includes(this.state)) {
             return;
         }
-        // 验证触点数量一致性
-        if (event.touches.length !== this.options.touchCount) {
+        // 验证触点数量
+        if (!this.validateTouchCount(event)) {
             this.reset();
             return;
         }
-        // 核心验证逻辑
-        if (!this.validateGesture(event)) {
+        // 验证时间区间
+        if (!this.validateDuration(event)) {
             this.handleFailure();
             return;
         }
+        // 验证距离区间
+        if (!this.validateDistance(event)) {
+            return;
+        }
+        // 方向/路径验证
+        if (this.options.direction !== undefined) {
+            if (!this.validateDirection(event)) {
+                return;
+            }
+        }
         // 更新状态为持续活动
         if (this.state === exports.RecognizerState.BEGAN) {
             this.setState(exports.RecognizerState.ACTIVE);
@@ -6248,9 +6279,8 @@ var UniversalRecognizer = /** @class */ (function () {
         if (![exports.RecognizerState.BEGAN, exports.RecognizerState.ACTIVE].includes(this.state)) {
             return;
         }
-        // 最终验证（例如点击的持续时间）
-        var isValid = this.validateFinalConditions(event);
-        if (isValid) {
+        // 最终验证
+        if (this.validateDuration(event)) {
             this.setState(exports.RecognizerState.END);
             if (this.validateThreshold(event)) {
                 this.trigger(event);
@@ -6264,26 +6294,6 @@ var UniversalRecognizer = /** @class */ (function () {
     /**
      * 手势识别核心算法
      */
-    UniversalRecognizer.prototype.validateGesture = function (event) {
-        // 基础验证
-        if (!this.validateTouchCount(event)) {
-            return false;
-        }
-        if (!this.validateDuration(event)) {
-            return false;
-        }
-        if (!this.validateDistance(event)) {
-            return false;
-        }
-        // 方向/路径验证
-        if (this.options.direction !== undefined) {
-            if (!this.validateDirection(event)) {
-                return false;
-            }
-        }
-        // 高级手势验证
-        return true;
-    };
     UniversalRecognizer.prototype.validateTouchCount = function (event) {
         return event.touches.length === this.options.touchCount;
     };
@@ -6341,26 +6351,13 @@ var UniversalRecognizer = /** @class */ (function () {
                 return true;
         }
     };
-    UniversalRecognizer.prototype.validateFinalConditions = function (event) {
-        // 验证时间区间
-        var duration = event.timestamp - this.gestureStartTime;
-        if (this.options.minDuration && duration < this.options.minDuration) {
-            return false;
-        }
-        if (this.options.maxDuration && duration > this.options.maxDuration) {
-            return false;
-        }
-        // 验证点击次数（需要外部状态管理）
-        // 此处需要结合外部计数器实现双击等逻辑
-        return true;
-    };
     UniversalRecognizer.prototype.calculateOverallDelta = function (event) {
         var _this = this;
         // 计算多点触控的平均移动量
         var totalDelta = [0, 0];
         event.touches.forEach(function (t, idx) {
-            totalDelta[0] += t.clientX - _this.startPositions[idx][0];
-            totalDelta[1] += t.clientY - _this.startPositions[idx][1];
+            totalDelta[0] += t.x - _this.startPositions[idx][0];
+            totalDelta[1] += t.y - _this.startPositions[idx][1];
         });
         return [totalDelta[0] / event.touches.length, totalDelta[1] / event.touches.length];
     };
@@ -6372,7 +6369,7 @@ var UniversalRecognizer = /** @class */ (function () {
         var currentCentroid = this.calculateCenter(touches);
         // 计算所有触点到中心点的平均距离
         var currentDistances = touches.map(function (t) {
-            return Math.hypot(t.clientX - currentCentroid[0], t.clientY - currentCentroid[1]);
+            return Math.hypot(t.x - currentCentroid[0], t.y - currentCentroid[1]);
         });
         var currentAvgDistance = currentDistances.reduce(function (a, b) { return a + b; }) / touches.length;
         // 初始平均距离（从startPositions计算）
@@ -6391,7 +6388,7 @@ var UniversalRecognizer = /** @class */ (function () {
         var totalAngleChange = 0;
         touches.forEach(function (t, index) {
             // 当前触点角度
-            var currentAngle = Math.atan2(t.clientY - currentCentroid[1], t.clientX - currentCentroid[0]);
+            var currentAngle = Math.atan2(t.y - currentCentroid[1], t.x - currentCentroid[0]);
             // 初始触点角度
             var initialPos = _this.startPositions[index];
             var initialAngle = Math.atan2(initialPos[1] - _this.initialCenter[1], initialPos[0] - _this.initialCenter[0]);
@@ -6412,14 +6409,14 @@ var UniversalRecognizer = /** @class */ (function () {
     UniversalRecognizer.prototype.calculateCenter = function (touchList) {
         var pointersLength = touchList.length;
         if (pointersLength === 1) {
-            return [touchList[0].clientX, touchList[0].clientY];
+            return [touchList[0].x, touchList[0].y];
         }
         var x = 0;
         var y = 0;
         var i = 0;
         while (i < pointersLength) {
-            x += touchList[i].clientX;
-            y += touchList[i].clientY;
+            x += touchList[i].x;
+            y += touchList[i].y;
             i++;
         }
         return [x / pointersLength, y / pointersLength];
@@ -6603,7 +6600,7 @@ var BaseRecognizer = /** @class */ (function () {
     return BaseRecognizer;
 }());
 
-consoleLog('version: ' + "0.3.4-beta.14");
+consoleLog('version: ' + "0.3.4-beta.16");
 var ModuleMsg = 'RI Package: @predy-js/render-interface';
 
 var RI = /*#__PURE__*/Object.freeze({
@@ -6646,6 +6643,7 @@ var RI = /*#__PURE__*/Object.freeze({
     EVENT_TYPE_TOUCH_MOVE: EVENT_TYPE_TOUCH_MOVE,
     EVENT_TYPE_TOUCH_END: EVENT_TYPE_TOUCH_END,
     EVENT_TYPE_TOUCH_CANCEL: EVENT_TYPE_TOUCH_CANCEL,
+    get PredyNativeEventType () { return exports.PredyNativeEventType; },
     get GESTURE_DIRECTION () { return exports.GESTURE_DIRECTION; },
     get ShaderCompileResultStatus () { return exports.ShaderCompileResultStatus; },
     ShaderLibraryEmpty: ShaderLibraryEmpty