merge changeIME into selectIME

src/components/MyDeployer.vue

@@ -2,7 +2,7 @@
 import { useNotification } from 'naive-ui'
 import { worker } from '../workerAPI'
 import {
- changeIME,
+ selectIME,
  deployed,
  selectOptions,
  setLoading
@@ -48,10 +48,8 @@ worker.control('deployStatus', async (status: 'start' | 'failure' | 'success', s
  value: schema.id
  })
  }
- const currentSchema = schemasJson[0].id
- await changeIME(currentSchema)
+ selectIME(schemasJson[0].id)
  }
- setLoading(false)
  break
  }
 })

src/components/MyMenu.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed, watchEffect } from 'vue'
+import { computed, watchEffect } from 'vue'
 import { NButton, NButtonGroup, NIcon, NSpace, NSelect } from 'naive-ui'
 import { WeatherMoon16Regular, Circle16Regular } from '@vicons/fluent'
 import {
@@ -9,6 +9,7 @@ import {
  schemaId,
  ime,
  selectOptions,
+ showVariant,
  variants,
  variant,
  isEnglish,
@@ -17,23 +18,17 @@ import {
  isEnglishPunctuation,
  enableEmoji,
  schemaExtended,
- setLoading,
  changeLanguage,
  changeVariant,
  changeWidth,
  changeCharset,
  changePunctuation,
  changeEmoji,
- changeIME
+ selectIME
 } from '../control'
 import { getTextarea, getQueryString } from '../util'
 
-const showVariant = ref<boolean>(false)
-
-init(getQueryString('schemaId'), getQueryString('variantName')).then(() => {
- showVariant.value = true
- setLoading(false)
-})
+init(getQueryString('schemaId'), getQueryString('variantName'))
 
 const variantLabel = computed(() => showVariant.value && !deployed.value ? variant.value.name : '')
 const singleVariant = computed(() => !deployed.value && variants.value.length === 1)
@@ -43,15 +38,6 @@ watchEffect(() => {
  localStorage.setItem('variantName', variantLabel.value)
 })
 
-async function selectIME (targetIME: string) {
- resetFocus()
- showVariant.value = false
- setLoading(true)
- await changeIME(targetIME)
- showVariant.value = true
- setLoading(false)
-}
-
 async function switchVariant () {
  showVariant.value = false
  await changeVariant()
@@ -68,9 +54,10 @@ function resetFocus () {
  getTextarea(props.textareaSelector).focus()
 }
 
-defineExpose({
- selectIME
-})
+function onSelectIME (value: string) {
+ resetFocus()
+ selectIME(value)
+}
 </script>
 
 <template>
@@ -80,7 +67,7 @@ defineExpose({
  :value="ime"
  :options="selectOptions"
  :loading="loading"
- @update:value="selectIME"
+ @update:value="onSelectIME"
  />
  <n-button-group
  class="square-group"

src/components/MyPanel.vue

@@ -13,6 +13,7 @@ import {
  loading,
  hideComment,
  changeLanguage,
+ selectIME,
  syncOptions
 } from '../control'
 import { isMobile, getTextarea } from '../util'
@@ -22,14 +23,12 @@ const props = defineProps<{
  text: string
  debugMode?: boolean
  updateText:(newText: string) => void
- onUpdateSchema?: (targetIME: string) => Promise<void>
 }>()
 
 const { textareaSelector, updateText } = toRaw(props)
 const {
  text,
- debugMode,
- onUpdateSchema
+ debugMode
 } = toRefs(props)
 
 const mouseX = ref<number>(0)
@@ -174,7 +173,7 @@ async function analyze (result: RIME_RESULT, rimeKey: string) {
  editing.value = false
  showMenu.value = false
  if (result.state === 2 && result.updatedSchema) {
- await onUpdateSchema?.value!(result.updatedSchema.split('/')[0])
+ await selectIME(result.updatedSchema.split('/')[0])
  }
  if (result.state === 3 && isPrintable(rimeKey)) {
  insert(rimeKey)

src/control.ts

@@ -152,6 +152,8 @@ for (const schema of schemas as {
  }
 }
 
+const showVariant = ref<boolean>(false)
+
 const variants = computed(() => schemaVariants[schemaId.value])
 
 const variantIndex = computed({
@@ -176,7 +178,7 @@ async function init (_schemaId: string, variantName: string) {
  break
  }
  }
- return changeIME(schemaId.value)
+ return selectIME(schemaId.value)
 }
 
 const isEnglish = ref<boolean>(false)
@@ -220,7 +222,9 @@ function changeVariant () {
  return setVariant()
 }
 
-async function changeIME (targetIME: string) {
+async function selectIME (targetIME: string) {
+ showVariant.value = false
+ setLoading(true)
  try {
  await setIME(targetIME)
  schemaId.value = targetIME
@@ -240,6 +244,8 @@ async function changeIME (targetIME: string) {
  } catch (e) {
  console.error(e)
  }
+ showVariant.value = true
+ setLoading(false)
 }
 
 function syncOptions (updatedOptions: string[]) {
@@ -285,6 +291,7 @@ export {
  schemaId,
  ime,
  selectOptions,
+ showVariant,
  variants,
  variant,
  isEnglish,
@@ -301,6 +308,6 @@ export {
  changeCharset,
  changePunctuation,
  changeEmoji,
- changeIME,
+ selectIME,
  syncOptions
 }

src/views/MainView.vue

@@ -56,7 +56,6 @@ async function copyLink () {
  textarea.focus()
 }
 
-const menu = ref<InstanceType<typeof MyMenu>>()
 const panel = ref<InstanceType<typeof MyPanel>>()
 const simulator = ref<InstanceType<typeof MySimulator>>()
 const editor = ref<InstanceType<typeof MyEditor>>()
@@ -87,7 +86,6 @@ const AsyncEditor = defineAsyncComponent(() => import('../components/MyEditor.vu
  class="my-column"
  >
  <my-menu
- ref="menu"
  :textarea-selector="textareaSelector"
  />
  <n-input
@@ -126,7 +124,6 @@ const AsyncEditor = defineAsyncComponent(() => import('../components/MyEditor.vu
  :text="text"
  :update-text="updateText"
  :debug-mode="simulator?.debugMode"
- :on-update-schema="menu?.selectIME"
  />
  <my-font />
  <my-deployer />