Skip to content

Commit d8e349e

Browse files
author
Ives van Hoorne
committed
Fix correction switching between modules
1 parent 2462081 commit d8e349e

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

packages/app/src/app/components/CodeEditor/Monaco/index.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,11 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
236236
}
237237
};
238238

239-
changeModule = (newModule: Module, errors?: Array<ModuleError>) => {
239+
changeModule = (
240+
newModule: Module,
241+
errors?: Array<ModuleError>,
242+
corrections?: Array<ModuleCorrection>
243+
) => {
240244
const oldModule = this.currentModule;
241245

242246
this.currentModule = newModule;
@@ -249,7 +253,13 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
249253
this.changeCode(newModule.code || '');
250254
}
251255

252-
if (errors) this.setErrors(errors);
256+
if (errors) {
257+
this.setErrors(errors);
258+
}
259+
260+
if (corrections) {
261+
this.setCorrections(corrections);
262+
}
253263
});
254264
};
255265

packages/app/src/app/components/CodeEditor/types.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ export interface Editor {
3030
updateModules?: () => any;
3131
changeSettings?: (settings: Settings) => any;
3232
changeDependencies?: (deps: Object) => any;
33-
changeModule?: (module: Module, errors?: Array<ModuleError>) => any;
33+
changeModule?: (
34+
module: Module,
35+
errors?: Array<ModuleError>,
36+
corrections?: Array<ModuleCorrection>
37+
) => any;
3438
changeCode?: (code: string) => any;
3539

3640
currentModule?: Module;

packages/app/src/app/pages/Sandbox/Editor/Content/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,11 @@ class EditorPreview extends React.Component<Props, State> {
191191
}
192192
const editorModule = editor.currentModule;
193193

194-
if (newModule !== editorModule && editor.changeModule) {
194+
const changeModule = editor.changeModule;
195+
if (newModule !== editorModule && changeModule) {
195196
const errors = store.editor.errors.map(e => e);
196-
editor.changeModule(newModule, errors);
197+
const corrections = store.editor.corrections.map(e => e);
198+
changeModule(newModule, errors, corrections);
197199
} else if (editor.changeCode) {
198200
editor.changeCode(newModule.code || '');
199201
}

0 commit comments

Comments
 (0)