fix: submenu editing now finally works kinda like I want it

src/renderer/components/MenuEditorView/MenuEditorView.css

@@ -120,11 +120,18 @@
 }
 
 .menu-editor-row-title {
+  flex: 1;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
+.menu-editor-row-title.is-editing {
+  white-space: normal;
+  overflow: visible;
+  text-overflow: clip;
+}
+
 .menu-editor-inline-input {
   width: 100%;
   border: 1px solid var(--vscode-focusBorder);
@@ -157,6 +164,12 @@
   gap: 0.75rem;
 }
 
+.menu-editor-inline-actions {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
 .menu-editor-inline-search-head strong {
   font-size: 0.8rem;
 }
@@ -166,6 +179,19 @@
   font-size: 0.75rem;
 }
 
+.menu-editor-inline-action {
+  border: 1px solid var(--vscode-button-border, transparent);
+  border-radius: 4px;
+  background: var(--vscode-button-secondaryBackground);
+  color: var(--vscode-button-secondaryForeground);
+  padding: 0.2rem 0.5rem;
+  cursor: pointer;
+}
+
+.menu-editor-inline-action:hover {
+  background: var(--vscode-button-secondaryHoverBackground);
+}
+
 .menu-editor-picker-backdrop {
   position: absolute;
   inset: 0;

src/renderer/components/MenuEditorView/MenuEditorView.tsx

@@ -3,9 +3,10 @@ import { Tree } from 'react-arborist';
 import { useI18n } from '../../i18n';
 import { showToast } from '../Toast';
 import type { MenuDocument, MenuItemData, PostData } from '../../../main/shared/electronApi';
+import { PageInput } from '../PageInput';
 import { createAutoExpandController } from './menuAutoExpand';
 import { resolveInsertTarget } from './menuInsertTarget';
-import { filterPagePosts, isPickerCloseKey, isPickerFocusShortcut } from './menuPagePicker';
+import { isPickerCloseKey } from './menuPagePicker';
 import { applyTreeMove } from './menuTreeMove';
 import './MenuEditorView.css';
 
@@ -171,11 +172,8 @@ export const MenuEditorView: React.FC = () => {
   const [isLoadingPages, setIsLoadingPages] = useState(false);
   const [pagePosts, setPagePosts] = useState<PostData[]>([]);
   const [editingEntryId, setEditingEntryId] = useState<string | null>(null);
-  const [editingText, setEditingText] = useState('');
-  const [selectedPageId, setSelectedPageId] = useState<string | null>(null);
   const [toolbarTooltip, setToolbarTooltip] = useState<string>('');
   const [recentParentInsertId, setRecentParentInsertId] = useState<string | null>(null);
-  const entryInputRef = useRef<HTMLInputElement | null>(null);
   const recentInsertTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const autoExpandController = useMemo(() => createAutoExpandController(450), []);
 
@@ -212,13 +210,6 @@ export const MenuEditorView: React.FC = () => {
     }
 
     const onWindowKeyDown = (event: KeyboardEvent): void => {
-      if (isPickerFocusShortcut({ key: event.key, metaKey: event.metaKey, ctrlKey: event.ctrlKey })) {
-        event.preventDefault();
-        entryInputRef.current?.focus();
-        entryInputRef.current?.select();
-        return;
-      }
-
       if (isPickerCloseKey(event.key)) {
         event.preventDefault();
         setItems((previous) => {
@@ -229,24 +220,37 @@ export const MenuEditorView: React.FC = () => {
           return removeItemByPath(previous, path).next;
         });
         setEditingEntryId(null);
-        setEditingText('');
-        setSelectedPageId(null);
       }
     };
 
-    window.addEventListener('keydown', onWindowKeyDown);
+    document.addEventListener('keydown', onWindowKeyDown);
     return () => {
-      window.removeEventListener('keydown', onWindowKeyDown);
+      document.removeEventListener('keydown', onWindowKeyDown);
     };
   }, [editingEntryId]);
 
   useEffect(() => {
-    if (!editingEntryId) {
+    if (!editingEntryId || isLoadingPages) {
       return;
     }
 
-    entryInputRef.current?.focus();
-  }, [editingEntryId]);
+    const focusInput = (): void => {
+      const input = document.querySelector('.menu-editor-row-title.is-editing .tag-input-field') as HTMLInputElement | null;
+      if (!input) {
+        return;
+      }
+      input.focus();
+      input.select();
+    };
+
+    const immediate = setTimeout(focusInput, 0);
+    const delayed = setTimeout(focusInput, 32);
+
+    return () => {
+      clearTimeout(immediate);
+      clearTimeout(delayed);
+    };
+  }, [editingEntryId, isLoadingPages]);
 
   const selectedPath = useMemo(() => {
     if (!selectedId) {
@@ -255,13 +259,6 @@ export const MenuEditorView: React.FC = () => {
     return findPathById(items, selectedId);
   }, [items, selectedId]);
 
-  const filteredPagePosts = useMemo(() => {
-    if (!editingEntryId) {
-      return [];
-    }
-    return filterPagePosts(pagePosts, editingText);
-  }, [editingEntryId, pagePosts, editingText]);
-
   const ensurePagePostsLoaded = async (): Promise<void> => {
     if (pagePosts.length > 0) {
       return;
@@ -280,59 +277,32 @@ export const MenuEditorView: React.FC = () => {
     }
   };
 
-  const finalizeEntry = (): void => {
+  const setDraftAsSubmenu = (label: string): void => {
     if (!editingEntryId) {
       return;
     }
 
-    const selectedPage = selectedPageId ? pagePosts.find((post) => post.id === selectedPageId) : null;
-    const trimmed = editingText.trim();
+    const trimmed = label.trim();
+    const nextTitle = trimmed || tr('menuEditor.newSubmenu');
 
-    if (selectedPage) {
-      setItems((previous) => mapItems(previous, (item) => {
-        if (item.id !== editingEntryId) {
-          return item;
-        }
+    setItems((previous) => mapItems(previous, (item) => {
+      if (item.id !== editingEntryId) {
+        return item;
+      }
 
-        return {
-          ...item,
-          title: selectedPage.title,
-          kind: 'page',
-          pageId: selectedPage.id,
-          pageSlug: selectedPage.slug,
-        };
-      }));
-    } else if (trimmed) {
-      setItems((previous) => mapItems(previous, (item) => {
-        if (item.id !== editingEntryId) {
-          return item;
-        }
-
-        return {
-          ...item,
-          title: trimmed,
-          kind: 'submenu',
-          pageId: undefined,
-          pageSlug: undefined,
-        };
-      }));
-    } else {
-      setItems((previous) => {
-        const path = findPathById(previous, editingEntryId);
-        if (!path) {
-          return previous;
-        }
-        return removeItemByPath(previous, path).next;
-      });
-      setSelectedId(null);
-    }
+      return {
+        ...item,
+        title: nextTitle,
+        kind: 'submenu',
+        pageId: undefined,
+        pageSlug: undefined,
+      };
+    }));
 
     setEditingEntryId(null);
-    setEditingText('');
-    setSelectedPageId(null);
   };
 
-  const finalizeEntryWithPage = (post: PostData): void => {
+  const setDraftAsPage = (post: PostData): void => {
     if (!editingEntryId) {
       return;
     }
@@ -352,8 +322,6 @@ export const MenuEditorView: React.FC = () => {
     }));
 
     setEditingEntryId(null);
-    setEditingText('');
-    setSelectedPageId(null);
   };
 
   const startCreateEntry = async (): Promise<void> => {
@@ -392,8 +360,6 @@ export const MenuEditorView: React.FC = () => {
 
     setSelectedId(newEntry.id);
     setEditingEntryId(newEntry.id);
-    setEditingText('');
-    setSelectedPageId(null);
   };
 
   const save = async (): Promise<void> => {
@@ -486,8 +452,6 @@ export const MenuEditorView: React.FC = () => {
 
     if (editingEntryId === selectedId) {
       setEditingEntryId(null);
-      setEditingText('');
-      setSelectedPageId(null);
     }
     setSelectedId(null);
   };
@@ -622,79 +586,24 @@ export const MenuEditorView: React.FC = () => {
                       <span className="menu-editor-row-kind">
                         {node.data.kind === 'page' ? tr('menuEditor.type.page') : tr('menuEditor.type.submenu')}
                       </span>
-                      <span className="menu-editor-row-title">{node.data.title}</span>
+                      <span className={`menu-editor-row-title ${editingEntryId === node.data.id ? 'is-editing' : ''}`}>
+                        {editingEntryId === node.data.id ? (
+                          <PageInput
+                            pages={pagePosts}
+                            onSelectPage={setDraftAsPage}
+                            onCreateSubmenu={setDraftAsSubmenu}
+                            createSubmenuLabel={tr('menuEditor.addSubmenu')}
+                            placeholder={tr('menuEditor.newEntryPlaceholder')}
+                            disabled={isLoadingPages}
+                            autoFocus
+                          />
+                        ) : node.data.title}
+                      </span>
                     </>
                   </div>
                 )}
               </Tree>
             )}
-
-            {editingEntryId && (
-              <div className="menu-editor-inline-search">
-                <div className="menu-editor-entry-editor">
-                  <input
-                    ref={entryInputRef}
-                    type="text"
-                    className="menu-editor-inline-input"
-                    value={editingText}
-                    onChange={(event) => {
-                      setEditingText(event.target.value);
-                      setSelectedPageId(null);
-                    }}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault();
-                        finalizeEntry();
-                      }
-
-                      if (event.key === 'Escape') {
-                        event.preventDefault();
-                        setItems((previous) => {
-                          const path = findPathById(previous, editingEntryId);
-                          if (!path) {
-                            return previous;
-                          }
-                          return removeItemByPath(previous, path).next;
-                        });
-                        setEditingEntryId(null);
-                        setEditingText('');
-                        setSelectedPageId(null);
-                      }
-                    }}
-                    placeholder={tr('menuEditor.newEntryPlaceholder')}
-                  />
-                </div>
-                <div className="menu-editor-inline-search-head">
-                  <strong>{tr('menuEditor.pagePicker.title')}</strong>
-                  <span>{tr('menuEditor.createHint')}</span>
-                </div>
-                {isLoadingPages ? (
-                  <div className="menu-editor-picker-state">{tr('menuEditor.pagePicker.loading')}</div>
-                ) : filteredPagePosts.length === 0 ? (
-                  <div className="menu-editor-picker-state">{tr('menuEditor.pagePicker.empty')}</div>
-                ) : (
-                  <div className="menu-editor-picker-list">
-                    {filteredPagePosts.map((post) => (
-                      <button
-                        key={post.id}
-                        type="button"
-                        className={`menu-editor-picker-item ${selectedPageId === post.id ? 'is-active' : ''}`}
-                        onClick={() => {
-                          setSelectedPageId(post.id);
-                          setEditingText(post.title);
-                        }}
-                        onDoubleClick={() => {
-                          finalizeEntryWithPage(post);
-                        }}
-                      >
-                        <span>{post.title}</span>
-                        <small>/{post.slug}</small>
-                      </button>
-                    ))}
-                  </div>
-                )}
-              </div>
-            )}
           </div>
         </div>
       )}

src/renderer/components/PageInput/PageInput.tsx

@@ -0,0 +1,180 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import type { PostData } from '../../../main/shared/electronApi';
+import '../TagInput/TagInput.css';
+
+interface PageInputProps {
+  pages: PostData[];
+  onSelectPage: (page: PostData) => void;
+  onCreateSubmenu: (label: string) => void;
+  placeholder?: string;
+  createSubmenuLabel: string;
+  disabled?: boolean;
+  autoFocus?: boolean;
+}
+
+export const PageInput: React.FC<PageInputProps> = ({
+  pages,
+  onSelectPage,
+  onCreateSubmenu,
+  placeholder = '',
+  createSubmenuLabel,
+  disabled = false,
+  autoFocus = false,
+}) => {
+  const [inputValue, setInputValue] = useState('');
+  const [showSuggestions, setShowSuggestions] = useState(false);
+  const [selectedIndex, setSelectedIndex] = useState(-1);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const suggestions = useMemo(() => {
+    if (!inputValue.trim()) {
+      return [];
+    }
+
+    const query = inputValue.toLowerCase().trim();
+    return pages
+      .filter((page) => page.title.toLowerCase().includes(query) || page.slug.toLowerCase().includes(query))
+      .slice(0, 8);
+  }, [inputValue, pages]);
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent): void => {
+      if (containerRef.current && !containerRef.current.contains(event.target as Node)) {
+        setShowSuggestions(false);
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, []);
+
+  useEffect(() => {
+    if (!autoFocus || disabled) {
+      return;
+    }
+
+    const timer = setTimeout(() => {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    }, 0);
+
+    return () => clearTimeout(timer);
+  }, [autoFocus, disabled]);
+
+  const selectPage = (page: PostData): void => {
+    onSelectPage(page);
+    setInputValue('');
+    setShowSuggestions(false);
+    setSelectedIndex(-1);
+  };
+
+  const createSubmenu = (label: string): void => {
+    const trimmed = label.trim();
+    if (!trimmed) {
+      return;
+    }
+
+    onCreateSubmenu(trimmed);
+    setInputValue('');
+    setShowSuggestions(false);
+    setSelectedIndex(-1);
+    inputRef.current?.focus();
+  };
+
+  const exactMatchExists = inputValue.trim()
+    ? suggestions.some((item) => item.title.toLowerCase() === inputValue.trim().toLowerCase())
+    : false;
+
+  const showCreateOption = inputValue.trim() && !exactMatchExists;
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>): void => {
+    if (event.key === 'ArrowDown') {
+      event.preventDefault();
+      const maxIndex = suggestions.length + (showCreateOption ? 0 : -1);
+      setSelectedIndex((previous) => Math.min(previous + 1, maxIndex));
+      return;
+    }
+
+    if (event.key === 'ArrowUp') {
+      event.preventDefault();
+      setSelectedIndex((previous) => Math.max(previous - 1, -1));
+      return;
+    }
+
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      if (selectedIndex >= 0 && selectedIndex < suggestions.length) {
+        selectPage(suggestions[selectedIndex]);
+      } else if (selectedIndex === suggestions.length && showCreateOption) {
+        createSubmenu(inputValue);
+      } else {
+        const exactMatch = pages.find((page) => page.title.toLowerCase() === inputValue.trim().toLowerCase());
+        if (exactMatch) {
+          selectPage(exactMatch);
+        } else if (inputValue.trim()) {
+          createSubmenu(inputValue);
+        }
+      }
+      return;
+    }
+
+    if (event.key === 'Escape') {
+      setShowSuggestions(false);
+      setInputValue('');
+    }
+  };
+
+  return (
+    <div className="tag-input-container" ref={containerRef}>
+      <div className="tag-input-wrapper">
+        <input
+          ref={inputRef}
+          type="text"
+          className="tag-input-field"
+          value={inputValue}
+          autoFocus={autoFocus}
+          onChange={(event) => {
+            setInputValue(event.target.value);
+            setShowSuggestions(true);
+          }}
+          onInput={(event) => {
+            setInputValue((event.target as HTMLInputElement).value);
+            setShowSuggestions(true);
+          }}
+          onFocus={() => setShowSuggestions(true)}
+          onKeyDown={handleKeyDown}
+          placeholder={placeholder}
+          disabled={disabled}
+          autoComplete="off"
+        />
+      </div>
+
+      {showSuggestions && (suggestions.length > 0 || showCreateOption) && (
+        <div className="tag-suggestions">
+          {suggestions.map((page, index) => (
+            <button
+              key={page.id}
+              type="button"
+              className={`tag-suggestion ${selectedIndex === index ? 'selected' : ''}`}
+              onClick={() => selectPage(page)}
+            >
+              <span className="tag-suggestion-name">{page.title}</span>
+            </button>
+          ))}
+
+          {showCreateOption && (
+            <button
+              type="button"
+              className={`tag-suggestion create-new ${selectedIndex === suggestions.length ? 'selected' : ''}`}
+              onClick={() => createSubmenu(inputValue)}
+            >
+              <span className="tag-suggestion-icon">+</span>
+              <span>{createSubmenuLabel}</span>
+            </button>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};

src/renderer/components/PageInput/index.ts

@@ -0,0 +1 @@
+export { PageInput } from './PageInput';

src/renderer/components/TagInput/TagInput.tsx

@@ -261,6 +261,10 @@ export const TagInput: React.FC<TagInputProps> = ({
             setInputValue(e.target.value);
             setShowSuggestions(true);
           }}
+          onInput={(e) => {
+            setInputValue((e.target as HTMLInputElement).value);
+            setShowSuggestions(true);
+          }}
           onFocus={() => setShowSuggestions(true)}
           onKeyDown={handleKeyDown}
           placeholder={value.length === 0 ? placeholder : ''}