marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-06-06 07:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix triggering Number Stepper's input event twice

Browse Source
This commit is contained in:
redphx 2024-12-23 22:33:38 +07:00
parent fe9d9895e9
commit 8b5da5b928
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/ui/dialog/navigation-dialog.ts
View File

@ -5,6 +5,7 @@ import { BxEventBus } from "@/utils/bx-event-bus";
import { BxLogger } from "@/utils/bx-logger"; import { BxLogger } from "@/utils/bx-logger";
import { calculateSelectBoxes, CE, isElementVisible } from "@/utils/html"; import { calculateSelectBoxes, CE, isElementVisible } from "@/utils/html";
import { setNearby } from "@/utils/navigation-utils"; import { setNearby } from "@/utils/navigation-utils";
import { BxNumberStepper } from "@/web-components/bx-number-stepper";
export enum NavigationDirection { export enum NavigationDirection {
UP = 1, UP = 1,
@ -378,8 +379,13 @@ export class NavigationDialogManager {
if (document.activeElement instanceof HTMLInputElement && document.activeElement.type === 'range') { if (document.activeElement instanceof HTMLInputElement && document.activeElement.type === 'range') {
const $range = document.activeElement; const $range = document.activeElement;
if (direction === NavigationDirection.LEFT || direction === NavigationDirection.RIGHT) { if (direction === NavigationDirection.LEFT || direction === NavigationDirection.RIGHT) {
$range.value = (parseInt($range.value) + parseInt($range.step) * (direction === NavigationDirection.LEFT ? -1 : 1)).toString(); const $numberStepper = $range.closest('.bx-number-stepper') as BxNumberStepper;
$range.dispatchEvent(new InputEvent('input')); if ($numberStepper) {
BxNumberStepper.change.call($numberStepper, direction === NavigationDirection.LEFT ? 'dec' : 'inc');
} else {
$range.value = (parseInt($range.value) + parseInt($range.step) * (direction === NavigationDirection.LEFT ? -1 : 1)).toString();
$range.dispatchEvent(new InputEvent('input'));
}
handled = true; handled = true;
} }
} }

13
src/web-components/bx-number-stepper.ts
View File

@ -114,7 +114,6 @@ export class BxNumberStepper extends HTMLInputElement implements BxHtmlSettingEl
self.$range = $range; self.$range = $range;
options.hideSlider && $range.classList.add('bx-gone'); options.hideSlider && $range.classList.add('bx-gone');
$range.addEventListener('input', self.onRangeInput);
self.addEventListener('input', self.onRangeInput); self.addEventListener('input', self.onRangeInput);
self.appendChild($range); self.appendChild($range);
@ -165,7 +164,7 @@ export class BxNumberStepper extends HTMLInputElement implements BxHtmlSettingEl
this.$text.textContent = BxNumberStepper.updateTextValue.call(this); this.$text.textContent = BxNumberStepper.updateTextValue.call(this);
if (this.$range) { if (this.$range) {
this.$range.value = this.options.reverse ? -value : value; this.$range.value = (this.options.reverse ? -this.controlValue : this.controlValue).toString();
} }
BxNumberStepper.updateButtonsVisibility.call(this); BxNumberStepper.updateButtonsVisibility.call(this);
@ -258,11 +257,14 @@ export class BxNumberStepper extends HTMLInputElement implements BxHtmlSettingEl
} }
private static buttonPressed(this: BxNumberStepper, e: Event, $btn: HTMLElement) { private static buttonPressed(this: BxNumberStepper, e: Event, $btn: HTMLElement) {
BxNumberStepper.change.call(this, $btn.dataset.type as ButtonType);
}
static change(this: BxNumberStepper, direction:'inc' | 'dec') {
let value = this.controlValue; let value = this.controlValue;
value = this.options.reverse ? -value : value; value = this.options.reverse ? -value : value;
const btnType = $btn.dataset.type as ButtonType; if (direction === 'dec') {
if (btnType === 'dec') {
value = Math.max(this.uiMin, value - this.steps); value = Math.max(this.uiMin, value - this.steps);
} else { } else {
value = Math.min(this.uiMax, value + this.steps); value = Math.min(this.uiMax, value + this.steps);
@ -271,7 +273,8 @@ export class BxNumberStepper extends HTMLInputElement implements BxHtmlSettingEl
value = this.options.reverse ? -value : value; value = this.options.reverse ? -value : value;
BxNumberStepper.setValue.call(this, value); BxNumberStepper.setValue.call(this, value);
BxNumberStepper.updateButtonsVisibility.call(this); BxNumberStepper.updateButtonsVisibility.call(this);
this.onChange && this.onChange(e, value);
this.onChange && this.onChange(null, this.controlValue);
} }
private static clearIntervalId(this: BxNumberStepper) { private static clearIntervalId(this: BxNumberStepper) {