Skip to content

Commit 62d9664

Browse files
committed
Remove innecesary calls to getInstance
1 parent 48e0146 commit 62d9664

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

react_frontend/src/components/buttons/PlayPause.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ const PlayPauseButton = ({
3737
const entrypointRef = useRef<Entry | undefined>(undefined);
3838
const runningFilesRef = useRef<Entry[]>([]);
3939
const runningEntrypointRef = useRef<Entry | undefined>(undefined);
40-
const [state, setState] = useState<string>(
41-
CommsManager.getInstance().getState()
42-
);
40+
const [state, setState] = useState<string>(states.IDLE);
4341
const [loading, setLoading] = useState<boolean>(false);
4442
const isCodeUpdatedRef = useRef<boolean | undefined>(undefined);
4543
const [, _updateCode] = useState<boolean | undefined>(false);

react_frontend/src/components/layouts/ExerciseContainer.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
import Frequencies from "Components/statusBar/Frequencies";
2020
import { StyledExerciseContainer } from "Styles/layouts/ExerciseContainer.styles";
2121
import { getHalGuiMethods } from "Helpers/editor";
22-
import { subscribe, unsubscribe } from "Helpers/utils";
22+
import { clearTimeouts, subscribe, unsubscribe } from "Helpers/utils";
2323
import { fileExplorer } from "Helpers/explorer";
2424
import getTools from "Helpers/tools";
2525

@@ -66,9 +66,6 @@ const ExerciseContainer = ({
6666
setUniverses(list);
6767
};
6868

69-
// RB manager setup
70-
const connected = useRef<boolean>(false);
71-
7269
const resetUniverse = (e: unknown) => {
7370
const T = CustomEvent<{ detail: unknown }>;
7471
if (e instanceof T) {
@@ -93,13 +90,7 @@ const ExerciseContainer = ({
9390
}
9491
}
9592

96-
if (timeoutRef.current) {
97-
window.clearTimeout(timeoutRef.current);
98-
}
99-
100-
if (connectTimeoutRef.current) {
101-
window.clearTimeout(connectTimeoutRef.current);
102-
}
93+
clearTimeouts([timeoutRef, connectTimeoutRef]);
10394
};
10495
}, []);
10596

@@ -113,7 +104,6 @@ const ExerciseContainer = ({
113104
await currManager.connect();
114105
getUniverseList(project);
115106
console.log("Connected!", currManager.getState());
116-
connected.current = true;
117107
setManager(currManager);
118108
if (callback) {
119109
waitManagerState(desiredState ? desiredState : "connected", callback);

react_frontend/src/helpers/utils.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { getFile, getHelperFile } from "Api";
22
import { Entry } from "jderobot-ide-interface";
33
import JSZip from "jszip";
4+
import { MutableRefObject } from "react";
45

56
export const saveCode = (
67
fileName: string,
@@ -142,3 +143,13 @@ const zipCodeFolder = async (zip: JSZip, file: Entry, project: string) => {
142143
}
143144
}
144145
};
146+
147+
export const clearTimeouts = (
148+
timeoutsRef: MutableRefObject<number | null>[]
149+
) => {
150+
for (const element of timeoutsRef) {
151+
if (element.current) {
152+
window.clearTimeout(element.current);
153+
}
154+
}
155+
};

0 commit comments

Comments
 (0)