🐛 Fix zindex of picker

Author: lambdalisue

denops/fall/main/picker.ts

@@ -22,6 +22,7 @@ import {
 import { Picker } from "../picker.ts";
 
 let initialized: Promise<void>;
+let zindex = 50;
 
 export const main: Entrypoint = (denops) => {
   denops.dispatcher = {
@@ -75,21 +76,29 @@ async function startPicker(
   params: ItemPickerParams<unknown, string> & GlobalConfig,
   { signal }: { signal?: AbortSignal } = {},
 ): Promise<void | true> {
+  await using stack = new AsyncDisposableStack();
   const pickerParams = { screen, ...params };
-  await using itemPicker = new Picker(pickerParams);
-  await using actionPicker = new Picker({
-    name: "@action",
-    screen,
-    source: new ListSource(
-      Object.entries(params.actions).map(([name, action]) => ({
-        value: name,
-        detail: action,
-      })),
-    ),
-    ...getActionPickerParams(),
-  });
+  const itemPicker = stack.use(new Picker({ ...pickerParams, zindex }));
+  const actionPicker = stack.use(
+    new Picker({
+      name: "@action",
+      screen,
+      source: new ListSource(
+        Object.entries(params.actions).map(([name, action]) => ({
+          value: name,
+          detail: action,
+        })),
+      ),
+      ...getActionPickerParams(),
+      zindex: zindex + 1,
+    }),
+  );
 
-  await using _guardItemPicker = await itemPicker.open(denops, { signal });
+  zindex++;
+  stack.defer(() => {
+    zindex--;
+  });
+  stack.use(await itemPicker.open(denops, { signal }));
   while (true) {
     // Select items
     const resultItem = await itemPicker.start(

denops/fall/picker.ts

@@ -33,6 +33,7 @@ export type PickerParams<T> = {
   sorter?: Sorter<T>;
   renderer?: Renderer<T>;
   previewer?: Previewer<T>;
+  zindex?: number;
 };
 
 export type PickerResult<T> = {
@@ -80,19 +81,22 @@ export class Picker<T> implements AsyncDisposable {
         dimension: dimensions.input,
         border: borders.input,
         title: this.#name,
+        zindex: params.zindex,
       }),
     );
     this.#listComponent = this.#stack.use(
       new ListComponent({
         dimension: dimensions.list,
         border: borders.list,
+        zindex: params.zindex,
       }),
     );
     if ("preview" in dimensions && "preview" in borders) {
       this.#previewComponent = this.#stack.use(
         new PreviewComponent({
           dimension: dimensions.preview as Dimension,
           border: borders.preview as Border,
+          zindex: params.zindex,
         }),
       );
     }