hidePanel API to fix f5j auto expand

Author: eagleoflqj

page/api.ts

@@ -23,6 +23,7 @@ import {
   hoverables,
   panel,
   preedit,
+  theme,
 } from './selector'
 import {
   setAccentColor,
@@ -117,6 +118,10 @@ const arrowBack = common.replace('{}', '0 0 24 24').replace('{}', 'M16.62 2.99a1
 const arrowForward = common.replace('{}', '0 0 24 24').replace('{}', 'M7.38 21.01c.49.49 1.28.49 1.77 0l8.31-8.31a.996.996 0 0 0 0-1.41L9.15 2.98c-.49-.49-1.28-.49-1.77 0s-.49 1.28 0 1.77L14.62 12l-7.25 7.25c-.48.48-.48 1.28.01 1.76z')
 
 function setCandidates(cands: Candidate[], highlighted: number, markText: string, pageable: boolean, hasPrev: boolean, hasNext: boolean, scrollState: SCROLL_STATE, scrollStart: boolean, scrollEnd: boolean) {
+  if (cands.length) {
+    // Auto layout requires display: not none so that getBoundingClientRect works.
+    theme.classList.remove('fcitx-hidden')
+  }
   const isVertical = hoverables.classList.contains('fcitx-vertical')
   resetMouseMoveState()
   hideContextmenu()
@@ -267,12 +272,21 @@ function updateElement(element: Element, innerHTML: string) {
 }
 
 function updateInputPanel(preeditHTML: string, auxUpHTML: string, auxDownHTML: string) {
+  if (preeditHTML || auxUpHTML || auxDownHTML) {
+    theme.classList.remove('fcitx-hidden')
+  }
   hideContextmenu()
   updateElement(preedit, preeditHTML)
   updateElement(auxUp, auxUpHTML)
   updateElement(auxDown, auxDownHTML)
 }
 
+function hidePanel() {
+  updateInputPanel('', '', '')
+  setCandidates([], -1, '', false, false, false, SCROLL_NONE, false, false)
+  theme.classList.add('fcitx-hidden')
+}
+
 function copyHTML() {
   const html = document.documentElement.outerHTML
   fcitx._copyHTML(html)
@@ -298,6 +312,7 @@ hoverables.addEventListener('wheel', (e) => {
 fcitx.setCandidates = setCandidates
 fcitx.setLayout = setLayout
 fcitx.updateInputPanel = updateInputPanel
+fcitx.hidePanel = hidePanel
 fcitx.resize = resize
 fcitx.setTheme = setTheme
 fcitx.setAccentColor = setAccentColor

page/global.d.ts

@@ -143,6 +143,7 @@ declare global {
     setCandidates: (cands: Candidate[], highlighted: number, markText: string, pageable: boolean, hasPrev: boolean, hasNext: boolean, scrollState: SCROLL_STATE, scrollStart: boolean, scrollEnd: boolean) => void
     setLayout: (layout: LAYOUT) => void
     updateInputPanel: (preeditHTML: string, auxUpHTML: string, auxDownHTML: string) => void
+    hidePanel: () => void
     resize: (new_epoch: number, dx: number, dy: number, dragging: boolean, hasContextmenu: boolean) => void
     setTheme: (theme: 0 | 1 | 2) => void
     setAccentColor: (color: number | null | string) => void

src/platform/macos.mm

@@ -313,9 +313,7 @@ static void setViewCornerRadius(NSView *view, CGFloat width, CGFloat height,
     [window setIsVisible:NO];
     hidden_ = true;
     epoch += 1;
-    invoke_js("updateInputPanel", "", "", "");
-    invoke_js("setCandidates", std::vector<Candidate>(), -1, "", false, false,
-              false, scroll_state_t::none, false, false);
+    invoke_js("hidePanel");
 }
 
 void WebviewCandidateWindow::write_clipboard(const std::string &html) {