synchronously reset and directly commit for symbol selector (#36)

Author: eagleoflqj

entry/src/main/cpp/harmonyfrontend/harmonyfrontend.cpp

@@ -33,7 +33,11 @@ void HarmonyFrontend::focusIn(bool clientPreedit) {
 
 void HarmonyFrontend::focusOut() { ic_->focusOut(); }
 
-void HarmonyFrontend::reset() { ic_->reset(); }
+InputContextState HarmonyFrontend::reset() {
+    ic_->isSyncEvent = true;
+    ic_->reset();
+    return ic_->popState(true);
+}
 
 HarmonyInputContext::HarmonyInputContext(HarmonyFrontend *frontend, InputContextManager &inputContextManager)
     : InputContext(inputContextManager, ""), frontend_(frontend) {

entry/src/main/cpp/harmonyfrontend/harmonyfrontend.h

@@ -25,7 +25,7 @@ class HarmonyFrontend : public AddonInstance {
     InputContextState keyEvent(const Key &key, bool isRelease);
     void focusIn(bool clientPreedit);
     void focusOut();
-    void reset();
+    InputContextState reset();
 
 private:
     Instance *instance_;

entry/src/main/cpp/napi_init.cpp

@@ -24,8 +24,13 @@ API(focusOut) {
 }
 
 API(reset) {
-    fcitx::reset();
-    return {};
+    auto state = fcitx::reset();
+    OBJECT(ret)
+    SET(ret, "commit", state.commit)
+    SET(ret, "preedit", state.preedit)
+    SET(ret, "cursorPos", state.cursorPos)
+    SET(ret, "accepted", state.accepted)
+    return ret;
 }
 
 API(processKey) {

entry/src/main/cpp/src/fcitx.cpp

@@ -88,8 +88,8 @@ void focusOut() {
     with_fcitx([] { frontend->focusOut(); });
 }
 
-void reset() {
-    with_fcitx([] { frontend->reset(); });
+InputContextState reset() {
+    return with_fcitx([] { return frontend->reset(); });
 }
 
 InputContextState processKey(uint32_t unicode, int32_t keyCode, bool isRelease) {

entry/src/main/cpp/src/fcitx.h

@@ -18,7 +18,7 @@ struct InputContextState {
 void init(const std::string &bundle, const std::string &resfile);
 void focusIn(bool clientPreedit);
 void focusOut();
-void reset();
+InputContextState reset();
 InputContextState processKey(uint32_t unicode, int32_t keyCode, bool isRelease);
 void selectCandidate(int index);
 void activateStatusAreaAction(int id);

entry/src/main/cpp/types/libentry/Index.d.ts

@@ -2,7 +2,6 @@ export const init: (bundle: string, resfile: string) => void
 export const setCallback: (callback: (data: string) => void) => void
 export const focusIn: (clientPreedit: boolean) => void
 export const focusOut: () => void
-export const reset: () => void
 
 export interface InputContextState {
   commit: string
@@ -11,5 +10,6 @@ export interface InputContextState {
   accepted: boolean
 }
 export const processKey: (unicode: number, keyCode: number, isRelease: boolean) => InputContextState
+export const reset: () => InputContextState
 export const selectCandidate: (index: number) => void
 export const activateStatusAreaAction: (index: number) => void

entry/src/main/ets/InputMethodExtensionAbility/model/KeyboardController.ets

@@ -249,6 +249,9 @@ export class KeyboardController {
     switch (event.type) {
       case 'COLLAPSE':
         return this.panel?.hide()
+      case 'COMMIT':
+        this.processResult(fcitx.reset())
+        return this.insertText(event.data)
       case 'COPY':
         return this.textInputClient?.sendExtendAction(inputMethodEngine.ExtendAction.COPY)
       case 'CUT':