@3dsource/angular-unreal-module 0.0.191 → 0.0.192

package/fesm2022/3dsource-angular-unreal-module.mjs

@@ -4635,6 +4635,16 @@ const TAB_KEY_CODE = 9;
 const ARROW_KEY_MIN = 37;
 const ARROW_KEY_MAX = 40;
 const TEXT_ENTRY_SELECTOR = "input, textarea, select, [contenteditable]:not([contenteditable=\"false\"])";
+const MOUSE_BUTTONS = [
+	[MouseButton.MainButton, MouseButtonsMask.PrimaryButton],
+	[MouseButton.AuxiliaryButton, MouseButtonsMask.AuxiliaryButton],
+	[MouseButton.SecondaryButton, MouseButtonsMask.SecondaryButton],
+	[MouseButton.FourthButton, MouseButtonsMask.FourthButton],
+	[MouseButton.FifthButton, MouseButtonsMask.FifthButton]
+];
+function buttonMask(button) {
+	return MOUSE_BUTTONS.find(([b]) => b === button)?.[1] ?? 0;
+}
 var InputService = class InputService extends SubService {
 	constructor() {
 		super();
@@ -4677,6 +4687,12 @@ var InputService = class InputService extends SubService {
 		this.maxByteValue = 255;
 		this.fingers = [...INITIAL_FINGER_IDS];
 		this.heldKeys = /* @__PURE__ */ new Set();
+		this.heldButtons = 0;
+		this.lastMousePosition = {
+			x: 0,
+			y: 0
+		};
+		this.leavePending = false;
 		this.mouseMoveView = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(9));
 		this.mouseButtonView = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(6));
 		this.mouseWheelView = /* @__PURE__ */ new DataView(/* @__PURE__ */ new ArrayBuffer(7));
@@ -4716,6 +4732,8 @@ var InputService = class InputService extends SubService {
 		this.fingerIds.clear();
 		this.fingers = [...INITIAL_FINGER_IDS];
 		this.heldKeys.clear();
+		this.heldButtons = 0;
+		this.leavePending = false;
 		merge(fromResizeObserver(video), this.actions$.pipe(ofType(videoAdaptedToContainer))).pipe(debounceTime$1(RESIZE_DEBOUNCE_MS), takeUntil(this.deactivatedVideoTrigger$)).subscribe(() => this.setupNormalizeAndQuantize(video));
 		this.setupNormalizeAndQuantize(video);
 		this.registerInputs(video);
@@ -4770,8 +4788,9 @@ var InputService = class InputService extends SubService {
 		this.commandsSender.sendInputData(data);
 	}
 	registerInputs(video) {
-		fromEvent(window, "blur").pipe(filter$1(() => !!video), takeUntil(this.deactivatedVideoTrigger$)).subscribe(() => this.releaseMouseButtons(255, 0, 0));
-		merge(fromEvent(window, "blur"), fromEvent(document, "visibilitychange").pipe(filter$1(() => document.visibilityState === "hidden"))).pipe(takeUntil(merge(this.reInit$, this.destroy$))).subscribe(() => this.releaseKeys());
+		const focusLost$ = merge(fromEvent(window, "blur"), fromEvent(document, "visibilitychange").pipe(filter$1(() => document.visibilityState === "hidden")));
+		focusLost$.pipe(takeUntil(merge(this.reInit$, this.destroy$))).subscribe(() => this.releaseKeys());
+		focusLost$.pipe(takeUntil(merge(this.disconnect$, this.reInit$, this.destroy$))).subscribe(() => this.releaseMouseButtons(this.heldButtons));
 		this.registerMouseEnterAndLeaveEvents(video);
 		this.registerHoveringMouseEvents(video);
 		this.registerKeyboardEvents();
@@ -4875,6 +4894,7 @@ var InputService = class InputService extends SubService {
 		data.setUint16(2, coord.x, true);
 		data.setUint16(4, coord.y, true);
 		this.sendInputData(data.buffer);
+		this.heldButtons |= buttonMask(button);
 	}
 	emitMouseUp(button, x, y) {
 		const coord = this.normalizeAndQuantizeUnsigned(x, y);
@@ -4884,6 +4904,7 @@ var InputService = class InputService extends SubService {
 		data.setUint16(2, coord.x, true);
 		data.setUint16(4, coord.y, true);
 		this.sendInputData(data.buffer);
+		this.heldButtons &= ~buttonMask(button);
 	}
 	emitMouseWheel(delta, x, y) {
 		const coord = this.normalizeAndQuantizeUnsigned(x, y);
@@ -4894,36 +4915,52 @@ var InputService = class InputService extends SubService {
 		data.setUint16(5, coord.y, true);
 		this.sendInputData(data.buffer);
 	}
-	releaseMouseButtons(buttons, x, y) {
-		if (buttons & MouseButtonsMask.PrimaryButton) this.emitMouseUp(MouseButton.MainButton, x, y);
-		if (buttons & MouseButtonsMask.SecondaryButton) this.emitMouseUp(MouseButton.SecondaryButton, x, y);
-		if (buttons & MouseButtonsMask.AuxiliaryButton) this.emitMouseUp(MouseButton.AuxiliaryButton, x, y);
-		if (buttons & MouseButtonsMask.FourthButton) this.emitMouseUp(MouseButton.FourthButton, x, y);
-		if (buttons & MouseButtonsMask.FifthButton) this.emitMouseUp(MouseButton.FifthButton, x, y);
+	releaseMouseButtons(buttons) {
+		const { x, y } = this.lastMousePosition;
+		for (const [button, mask] of MOUSE_BUTTONS) if (buttons & mask & this.heldButtons) this.emitMouseUp(button, x, y);
+		if (this.leavePending && !this.heldButtons) {
+			this.leavePending = false;
+			this.sendMouseLeave();
+		}
 	}
 	pressMouseButtons(buttons, x, y) {
-		if (buttons & MouseButtonsMask.PrimaryButton) this.emitMouseDown(MouseButton.MainButton, x, y);
-		if (buttons & MouseButtonsMask.SecondaryButton) this.emitMouseDown(MouseButton.SecondaryButton, x, y);
-		if (buttons & MouseButtonsMask.AuxiliaryButton) this.emitMouseDown(MouseButton.AuxiliaryButton, x, y);
-		if (buttons & MouseButtonsMask.FourthButton) this.emitMouseDown(MouseButton.FourthButton, x, y);
-		if (buttons & MouseButtonsMask.FifthButton) this.emitMouseDown(MouseButton.FifthButton, x, y);
+		for (const [button, mask] of MOUSE_BUTTONS) if (buttons & mask & ~this.heldButtons) this.emitMouseDown(button, x, y);
+	}
+	sendMouseEnter() {
+		const data = this.singleByteView;
+		data.setUint8(0, MessageType.MouseEnter);
+		this.sendInputData(data.buffer);
+	}
+	sendMouseLeave() {
+		const data = this.singleByteView;
+		data.setUint8(0, MessageType.MouseLeave);
+		this.sendInputData(data.buffer);
 	}
 	registerHoveringMouseEvents(htmlVideoElement) {
 		fromEvent(htmlVideoElement, "mousemove").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
-			const { x, y } = this.getMousePositionWithOffset(e);
+			this.leavePending = false;
+			this.releaseMouseButtons(this.heldButtons & ~e.buttons);
+			this.lastMousePosition = this.getMousePositionWithOffset(e);
+			const { x, y } = this.lastMousePosition;
 			this.emitMouseMove(x, y, e.movementX, e.movementY);
 			e.preventDefault();
 		});
 		fromEvent(htmlVideoElement, "mousedown").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
-			const { x, y } = this.getMousePositionWithOffset(e);
+			this.leavePending = false;
 			this.focusWindow();
-			this.emitMouseDown(e.button, x, y);
 			e.preventDefault();
+			if (!buttonMask(e.button)) return;
+			this.lastMousePosition = this.getMousePositionWithOffset(e);
+			const { x, y } = this.lastMousePosition;
+			this.emitMouseDown(e.button, x, y);
 		});
 		fromEvent(htmlVideoElement, "mouseup").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
-			const { x, y } = this.getMousePositionWithOffset(e);
-			this.emitMouseUp(e.button, x, y);
+			this.leavePending = false;
 			e.preventDefault();
+			if (this.heldButtons & buttonMask(e.button)) {
+				const { x, y } = this.getMousePositionWithOffset(e);
+				this.emitMouseUp(e.button, x, y);
+			}
 		});
 		fromEvent(htmlVideoElement, "wheel").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
 			this.emitMouseWheel(e.deltaY * WHEEL_DELTA_SCALE, e.offsetX, e.offsetY);
@@ -4933,17 +4970,22 @@ var InputService = class InputService extends SubService {
 	registerMouseEnterAndLeaveEvents(htmlVideoElement) {
 		fromEvent(htmlVideoElement, "mouseenter").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
 			this.focusWindow();
-			const data = this.singleByteView;
-			data.setUint8(0, MessageType.MouseEnter);
-			this.sendInputData(data.buffer);
-			this.pressMouseButtons(e.buttons, e.offsetX, e.offsetY);
-		});
-		fromEvent(htmlVideoElement, "mouseleave").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => {
-			const data = this.singleByteView;
-			data.setUint8(0, MessageType.MouseLeave);
-			this.sendInputData(data.buffer);
-			this.releaseMouseButtons(e.buttons, e.offsetX, e.offsetY);
+			const dragReturned = this.leavePending;
+			this.leavePending = false;
+			this.releaseMouseButtons(this.heldButtons & ~e.buttons);
+			if (!dragReturned) this.sendMouseEnter();
+			this.lastMousePosition = this.getMousePositionWithOffset(e);
+			const { x, y } = this.lastMousePosition;
+			this.pressMouseButtons(e.buttons, x, y);
+		});
+		fromEvent(htmlVideoElement, "mouseleave").pipe(takeUntil(this.deactivatedVideoTrigger$)).subscribe(() => {
+			if (this.heldButtons) this.leavePending = true;
+			else {
+				this.leavePending = false;
+				this.sendMouseLeave();
+			}
 		});
+		fromEvent(window, "mouseup", { capture: true }).pipe(filter$1((e) => e.composedPath()[0] !== htmlVideoElement), takeUntil(this.deactivatedVideoTrigger$)).subscribe((e) => this.releaseMouseButtons(buttonMask(e.button) | ~e.buttons));
 	}
 	isBrowserKey(keyCode) {
 		return keyCode >= FUNCTION_KEY_MIN && keyCode <= FUNCTION_KEY_MAX || keyCode >= ARROW_KEY_MIN && keyCode <= ARROW_KEY_MAX || keyCode === TAB_KEY_CODE;