diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 86aa5b72..0f4c73f0 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -41,12 +41,14 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.1.1") implementation(npm("golden-layout", "^1.5.9")) + // Can't upgrade monaco-editor until https://github.com/microsoft/monaco-editor/issues/2466 is fixed. implementation(npm("monaco-editor", "0.20.0")) - implementation(npm("three", "^0.127.0")) + implementation(npm("three", "^0.128.0")) implementation(npm("javascript-lp-solver", "0.4.17")) - implementation(devNpm("file-loader", "^6.0.0")) - implementation(devNpm("monaco-editor-webpack-plugin", "1.9.0")) + implementation(devNpm("file-loader", "^6.2.0")) + // Can't upgrade monaco-editor-webpack-plugin until monaco-editor is upgraded. + implementation(devNpm("monaco-editor-webpack-plugin", "1.9.1")) testImplementation(kotlin("test-js")) testImplementation(project(":test-utils")) diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt index ab727020..0e1a063b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt @@ -70,6 +70,7 @@ class AsmEditorWidget(private val ctrl: AsmEditorController) : Widget() { } observe(ctrl.didRedo) { + editor.focus() editor.trigger( source = AsmEditorWidget::class.simpleName, handlerId = "redo",