Skip to content

Fix for simulated button clicks for simulator button/pin inputs #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2022
Merged

Fix for simulated button clicks for simulator button/pin inputs #1017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/simulator/SensorInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
import { Box, Button, Switch, VStack } from "@chakra-ui/react";
import { ReactNode, useCallback, useState } from "react";
import { ReactNode, useCallback, useRef, useState } from "react";
import { useIntl } from "react-intl";
import {
RangeSensor as RangeSensorType,
Expand Down Expand Up @@ -35,15 +35,18 @@ const SensorInput = ({
minimised,
}: SensorInputProps) => {
const sensor = state[sensorId] as RangeSensorType;
const sensorValue = useRef<number>(sensor.value);
const intl = useIntl();
const [mouseDown, setMouseDown] = useState<boolean>(false);
const mouseDown = useRef<boolean>(false);
const handleSensorChange = useCallback(
(value: number) => {
// In this case isHeld is true, so the value should be reversed.
if (sensor.value === value) {
if (sensorValue.current === value) {
onValueChange(sensorId, value === sensor.min ? sensor.max : sensor.min);
sensorValue.current = value === sensor.min ? sensor.max : sensor.min;
} else {
onValueChange(sensorId, value);
sensorValue.current = value;
}
},
[onValueChange, sensor, sensorId]
Expand All @@ -61,12 +64,12 @@ const SensorInput = ({
}
};
const mouseDownTouchStartAction = () => {
setMouseDown(true);
mouseDown.current = true;
handleSensorChange(sensor.max);
};
const mouseUpTouchEndAction = () => {
if (mouseDown) {
setMouseDown(false);
if (mouseDown.current) {
mouseDown.current = false;
handleSensorChange(sensor.min);
}
};
Expand All @@ -87,8 +90,8 @@ const SensorInput = ({
mouseUpTouchEndAction();
};
const mouseLeaveListener = () => {
if (mouseDown) {
setMouseDown(false);
if (mouseDown.current) {
mouseDown.current = false;
handleSensorChange(sensor.min);
}
};
Expand All @@ -108,11 +111,11 @@ const SensorInput = ({
} else if (sensor.value === sensor.max) {
setIsHeld(true);
}
sensorValue.current = sensor.value;
setPrevSensorValue(sensor.value);
}

const disabled = running === RunningStatus.STOPPED;

return (
<VStack spacing={3}>
<Button
Expand All @@ -122,13 +125,13 @@ const SensorInput = ({
)}
transition="none"
_active={
sensor.value === sensor.min
sensorValue.current === sensor.min
? {}
: {
background: "brand.100",
}
}
isActive={!!sensor.value}
isActive={!!sensorValue.current}
disabled={disabled}
size="sm"
onKeyDown={keyListener}
Expand Down