Skip to content

Revert challenge completion events to non-batched #602

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

Open
twells46 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert challenge completion events to non-batched #602

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
27 changes: 21 additions & 6 deletions src/pages/ChallengeRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import Motor from '../programming/AbstractRobot/Motor';
import { Modal } from './sharedRoot/Modal';
import AiWindow from '../components/Ai/AiWindow';
import Robot from '../state/State/Robot';
import { flushSync } from 'react-dom';


export interface ChallengeRootRouteParams {
Expand Down Expand Up @@ -986,26 +987,40 @@ const ConnectedChallengeRoot = connect((state: ReduxState, { params: { challenge
robots: Dict.map(state.robots.robots, Async.latestValue),
};
}, (dispatch, { params: { challengeId } }: RootPublicProps) => ({
// Flush sync prevents bugs related to React 18 event batching
onChallengeCompletionCreate: (challengeCompletion: ChallengeCompletion) => {
dispatch(ChallengeCompletionsAction.createChallengeCompletion({ challengeId, challengeCompletion }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.createChallengeCompletion({ challengeId, challengeCompletion }));
});
},
// Flush sync on this one results in an error
onChallengeCompletionSceneDiffChange: (sceneDiff: OuterObjectPatch<Scene>) => {
dispatch(ChallengeCompletionsAction.setSceneDiff({ challengeId, sceneDiff }));
},
onChallengeCompletionEventStateRemove: (eventId: string) => {
dispatch(ChallengeCompletionsAction.removeEventState({ challengeId, eventId }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.removeEventState({ challengeId, eventId }));
});
},
onChallengeCompletionEventStateChange: (eventId: string, eventState: boolean) => {
dispatch(ChallengeCompletionsAction.setEventState({ challengeId, eventId, eventState }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.setEventState({ challengeId, eventId, eventState }));
});
},
onChallengeCompletionEventStatesAndPredicateCompletionsChange: (eventStates: Dict<boolean>, success: PredicateCompletion, failure: PredicateCompletion) => {
dispatch(ChallengeCompletionsAction.setEventStatesAndPredicateCompletions({ challengeId, eventStates, success, failure }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.setEventStatesAndPredicateCompletions({ challengeId, eventStates, success, failure }));
});
},
onChallengeCompletionSuccessPredicateCompletionChange: (success?: PredicateCompletion) => {
dispatch(ChallengeCompletionsAction.setSuccessPredicateCompletion({ challengeId, success }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.setSuccessPredicateCompletion({ challengeId, success }));
});
},
onChallengeCompletionFailurePredicateCompletionChange: (failure?: PredicateCompletion) => {
dispatch(ChallengeCompletionsAction.setFailurePredicateCompletion({ challengeId, failure }));
flushSync(() => {
dispatch(ChallengeCompletionsAction.setFailurePredicateCompletion({ challengeId, failure }));
});
},
onChallengeCompletionReset: () => {
dispatch(ChallengeCompletionsAction.resetChallengeCompletion({ challengeId }));
Expand Down