react-simple-game-engine 0.3.27 → 0.3.29

package/lib/ui-components/movement-control.d.ts

@@ -1,12 +1,20 @@
-import { ReactElement, ReactNode } from "react";
+import { MutableRefObject, ReactElement, ReactNode } from "react";
 import { IJoystickProps } from "./react-joystick-component/Joystick";
+declare type TouchEvent = {
+    onPressed?: (container: HTMLDivElement, stick: HTMLButtonElement) => void;
+    onReleased?: (container: HTMLDivElement, stick: HTMLButtonElement) => void;
+};
 export declare type MovementControlProps = {
+    containerRef?: MutableRefObject<HTMLDivElement>;
     top?: number;
     left?: number;
     right?: number;
     bottom?: number;
     render?: (el: ReactElement) => ReactNode;
+    joystickTouchEvent?: TouchEvent;
+    containerTouchEvent?: TouchEvent;
     props?: Omit<IJoystickProps, "start" | "move" | "stop">;
 };
-export declare function MovementControl({ render, top, left, right, bottom, props, }: MovementControlProps): JSX.Element;
+export declare function MovementControl({ render, top, left, right, bottom, props, containerTouchEvent, joystickTouchEvent, containerRef, }: MovementControlProps): JSX.Element;
+export {};
 //# sourceMappingURL=movement-control.d.ts.map

package/lib/ui-components/movement-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"movement-control.d.ts","sourceRoot":"","sources":["../../src/ui-components/movement-control.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,SAAS,EAMV,MAAM,OAAO,CAAC;AAOf,OAAO,EACL,cAAc,EAEf,MAAM,qCAAqC,CAAC;AAE7C,oBAAY,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,SAAS,CAAC;IACzC,KAAK,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,GAAG,EACH,IAAS,EACT,KAAK,EACL,MAAW,EACX,KAAK,GACN,EAAE,oBAAoB,eAoFtB"}
+{"version":3,"file":"movement-control.d.ts","sourceRoot":"","sources":["../../src/ui-components/movement-control.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,YAAY,EACZ,SAAS,EAKV,MAAM,OAAO,CAAC;AAMf,OAAO,EACL,cAAc,EAEf,MAAM,qCAAqC,CAAC;AAE7C,aAAK,UAAU,GAAG;IAChB,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1E,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5E,CAAC;AACF,oBAAY,oBAAoB,GAAG;IACjC,YAAY,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,SAAS,CAAC;IACzC,kBAAkB,CAAC,EAAE,UAAU,CAAC;IAChC,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,KAAK,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,GAAG,EACH,IAAS,EACT,KAAK,EACL,MAAW,EACX,KAAK,EACL,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,GACb,EAAE,oBAAoB,eA4GtB"}

package/lib/ui-components/movement-control.js

@@ -10,33 +10,46 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useCallback, useContext, useEffect, useMemo, useRef, } from "react";
+import { useContext, useEffect, useMemo, useRef, } from "react";
 import { JoystickActionType } from "../export-enums";
 import { UISceneContext } from "../react-context";
 import { Watcher } from "../utilities";
 import { Joystick } from "./react-joystick-component";
 export function MovementControl(_a) {
-    var render = _a.render, top = _a.top, _b = _a.left, left = _b === void 0 ? 50 : _b, right = _a.right, _c = _a.bottom, bottom = _c === void 0 ? 50 : _c, props = _a.props;
+    var render = _a.render, top = _a.top, _b = _a.left, left = _b === void 0 ? 50 : _b, right = _a.right, _c = _a.bottom, bottom = _c === void 0 ? 50 : _c, props = _a.props, containerTouchEvent = _a.containerTouchEvent, joystickTouchEvent = _a.joystickTouchEvent, containerRef = _a.containerRef;
     var refJoyWrap = useRef(null);
     var refStick = useRef(null);
-    var refStickBasePosition = useRef(null);
     var scene = useContext(UISceneContext);
     var defaultShow = useMemo(function () {
         return scene.getInitialData();
     }, [scene]).joystick;
-    var debutStickPosition = useCallback(function (x, y) {
-        refJoyWrap.current.style.setProperty("--stick-center-x", x.toString());
-        refJoyWrap.current.style.setProperty("--stick-center-y", y.toString());
-    }, []);
+    useEffect(function () {
+        if (containerRef) {
+            containerRef.current = refJoyWrap.current;
+        }
+    }, [containerRef]);
     useEffect(function () {
         refStick.current = refJoyWrap.current.querySelectorAll("button")[0];
-        var _a = refStick.current.getBoundingClientRect(), left = _a.left, top = _a.top;
-        refStickBasePosition.current = {
-            x: left,
-            y: top,
+        if (!joystickTouchEvent) {
+            return;
+        }
+        var handlePointerdown = function (event) {
+            var _a;
+            event.target.setPointerCapture(event.pointerId);
+            (_a = joystickTouchEvent.onPressed) === null || _a === void 0 ? void 0 : _a.call(joystickTouchEvent, refJoyWrap.current, refStick.current);
+        };
+        var handlePointerup = function (event) {
+            var _a;
+            event.target.releasePointerCapture(event.pointerId);
+            (_a = joystickTouchEvent.onReleased) === null || _a === void 0 ? void 0 : _a.call(joystickTouchEvent, refJoyWrap.current, refStick.current);
+        };
+        refStick.current.addEventListener("pointerdown", handlePointerdown);
+        refStick.current.addEventListener("pointerup", handlePointerup);
+        return function () {
+            refStick.current.removeEventListener("pointerdown", handlePointerdown);
+            refStick.current.removeEventListener("pointerup", handlePointerup);
         };
-        debutStickPosition(left, top);
-    }, [debutStickPosition]);
+    }, [joystickTouchEvent]);
     var el = useMemo(function () {
         var onAction = function (e) {
             if (e.type === JoystickActionType.MOVE) {
@@ -53,20 +66,24 @@ export function MovementControl(_a) {
                     type: e.type,
                 });
             }
-            var _a = refStick.current.getBoundingClientRect(), left = _a.left, top = _a.top;
-            var stickCenterX = left - refStickBasePosition.current.x;
-            var stickCenterY = top - refStickBasePosition.current.y;
-            debutStickPosition(stickCenterX, stickCenterY);
         };
         var joystick = (_jsx(Joystick, __assign({ size: 60, baseColor: "#2D2D2D", stickColor: "rgb(120,121,122)", throttle: 100 }, props, { start: onAction, move: onAction, stop: onAction })));
-        return (_jsx("div", __assign({ ref: refJoyWrap, style: {
+        return (_jsx("div", __assign({ ref: refJoyWrap, onPointerDown: function (event) {
+                var _a;
+                event.target.setPointerCapture(event.pointerId);
+                (_a = containerTouchEvent === null || containerTouchEvent === void 0 ? void 0 : containerTouchEvent.onPressed) === null || _a === void 0 ? void 0 : _a.call(containerTouchEvent, refJoyWrap.current, refStick.current);
+            }, onPointerUp: function (event) {
+                var _a;
+                event.target.releasePointerCapture(event.pointerId);
+                (_a = containerTouchEvent === null || containerTouchEvent === void 0 ? void 0 : containerTouchEvent.onReleased) === null || _a === void 0 ? void 0 : _a.call(containerTouchEvent, refJoyWrap.current, refStick.current);
+            }, style: {
                 position: "absolute",
                 left: right != null ? undefined : left,
                 right: right,
                 bottom: top != null ? undefined : bottom,
                 top: top,
             } }, { children: render ? render(joystick) : joystick })));
-    }, [props, debutStickPosition]);
+    }, [props, containerTouchEvent]);
     return (_jsx(Watcher, __assign({ initialValues: {
             isShow: defaultShow,
         }, names: "control-visible" }, { children: function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-simple-game-engine",
-  "version": "0.3.27",
+  "version": "0.3.29",
   "description": "",
   "main": "lib/index.js",
   "types": "lib",