Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Close header actions when opening Publish (#7599)
Nick Gomez963d5b2e8dd7
diff --git a/.changeset/share-publish-overflow.md b/.changeset/share-publish-overflow.mdnew file mode 100644index 000000000..72e85a54e--- /dev/null+++ b/.changeset/share-publish-overflow.md@@ -0,0 +1,5 @@+---+"@inkeep/open-knowledge": patch+---++Close the More actions menu when its Share button opens Publish, and return focus to More actions when Publish closes.diff --git a/knip.config.ts b/knip.config.tsindex fac2580fe..e04bf5228 100644--- a/knip.config.ts+++ b/knip.config.ts@@ -157,15 +157,11 @@ export default {'src/shadow-fixture-launch.test-helper.mjs',],project: 'src/**',- ignoreDependencies: [- '@types/shell-quote',- ],+ ignoreDependencies: ['@types/shell-quote'],},'packages/cli': {entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],- ignoreDependencies: [- 'yjs',- ],+ ignoreDependencies: ['yjs'],},'packages/desktop': {entry: [diff --git a/packages/app/src/components/AppHeader.publish-focus.dom.test.tsx b/packages/app/src/components/AppHeader.publish-focus.dom.test.tsxindex b4f214723..343f1460b 100644--- a/packages/app/src/components/AppHeader.publish-focus.dom.test.tsx+++ b/packages/app/src/components/AppHeader.publish-focus.dom.test.tsx@@ -1,10 +1,12 @@+import { I18nProvider } from '@lingui/react';import { act, cleanup, render, screen, waitFor, within } from '@testing-library/react';import userEvent from '@testing-library/user-event';import type { ReactNode } from 'react';-import { afterEach, describe, expect, test, vi } from 'vitest';+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';import { AppHeader } from '@/components/AppHeader';import { TooltipProvider } from '@/components/ui/tooltip';import { ConfigContext } from '@/lib/config-context';+import { i18n } from '@/lib/i18n';import { configContextWithTerminal, TERMINAL_SETTING_UNSET } from '@/test-utils/config-context';vi.mock('@/editor/DocumentContext', () => ({@@ -15,12 +17,22 @@ vi.mock('@/editor/DocumentContext', () => ({}),}));+const shareStatus = vi.hoisted(() => ({ hasRemote: false }));+vi.mock('@/hooks/use-git-sync-status', () => ({useGitSyncStatusDetailed: () => ({- status: { state: 'dormant', conflictCount: 0, hasRemote: false },+ status: {+ state: shareStatus.hasRemote ? 'disabled' : 'dormant',+ conflictCount: 0,+ hasRemote: shareStatus.hasRemote,+ },fetchError: null,}),- useGitSyncStatus: () => ({ state: 'dormant', conflictCount: 0, hasRemote: false }),+ useGitSyncStatus: () => ({+ state: shareStatus.hasRemote ? 'disabled' : 'dormant',+ conflictCount: 0,+ hasRemote: shareStatus.hasRemote,+ }),}));vi.mock('@/presence/use-sync-toasts', () => ({ useSyncToasts: () => {} }));@@ -84,6 +96,24 @@ function installLayout() {vi.stubGlobal('ResizeObserver', CapturingResizeObserver);}+let blurredByDisable: Element[] = [];++function installSynchronousBlurOnDisable() {+ blurredByDisable = [];+ const setAttribute = Element.prototype.setAttribute;+ vi.spyOn(Element.prototype, 'setAttribute').mockImplementation(function blurBeforeDisabling(+ this: Element,+ name: string,+ value: string,+ ) {+ if (name === 'disabled' && this === document.activeElement && this instanceof HTMLElement) {+ this.blur();+ blurredByDisable.push(this);+ }+ setAttribute.call(this, name, value);+ });+}+function relayout(next: typeof CRAMPED | typeof ROOMY) {metrics = next;for (const callback of resizeCallbacks) {@@ -94,7 +124,9 @@ function relayout(next: typeof CRAMPED | typeof ROOMY) {function HeaderProviders({ children }: { children: ReactNode }) {return (<ConfigContext value={configContextWithTerminal(TERMINAL_SETTING_UNSET)}>- <TooltipProvider>{children}</TooltipProvider>+ <I18nProvider i18n={i18n}>+ <TooltipProvider>{children}</TooltipProvider>+ </I18nProvider></ConfigContext>);}@@ -112,12 +144,15 @@ async function closeDialogWithEscape() {await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());}+beforeEach(installSynchronousBlurOnDisable);+afterEach(() => {cleanup();vi.restoreAllMocks();vi.unstubAllGlobals();metrics = ROOMY;resizeCallbacks = [];+ shareStatus.hasRemote = false;});describe('AppHeader Publish to GitHub dialog focus return', () => {@@ -128,6 +163,7 @@ describe('AppHeader Publish to GitHub dialog focus return', () => {const share = within(trailingGroup()).getByRole('button', { name: 'Share doc' });await userEvent.click(share);await screen.findByRole('dialog');+ expect(blurredByDisable).toContain(share);await closeDialogWithEscape();@@ -138,8 +174,10 @@ describe('AppHeader Publish to GitHub dialog focus return', () => {installLayout();renderHeader();- await userEvent.click(within(trailingGroup()).getByRole('button', { name: 'Share doc' }));+ const share = within(trailingGroup()).getByRole('button', { name: 'Share doc' });+ await userEvent.click(share);await screen.findByRole('dialog');+ expect(blurredByDisable).toContain(share);relayout(CRAMPED);const trigger = screen.getByTestId('header-overflow-actions-trigger');@@ -162,8 +200,44 @@ describe('AppHeader Publish to GitHub dialog focus return', () => {expect(found).not.toBeNull();return found as HTMLElement;});- await userEvent.click(within(panel).getByRole('button', { name: 'Share doc' }));+ const share = within(panel).getByRole('button', { name: 'Share doc' });+ await userEvent.click(share);await screen.findByRole('dialog');+ expect(blurredByDisable).toContain(share);+ await waitFor(() =>+ expect(document.querySelector('[data-header-overflow-actions]')).toBeNull(),+ );++ await closeDialogWithEscape();++ expect(document.activeElement).toBe(trigger);+ });++ test('a server no-remote response closes More actions for Publish and restores its trigger on close', async () => {+ shareStatus.hasRemote = true;+ metrics = CRAMPED;+ installLayout();+ const constructUrl = vi+ .fn<typeof fetch>()+ .mockResolvedValue(Response.json({ ok: false, error: 'no-remote' }));+ vi.stubGlobal('fetch', constructUrl);+ renderHeader();++ const trigger = screen.getByTestId('header-overflow-actions-trigger');+ await userEvent.click(trigger);+ const panel = await waitFor(() => {+ const found = document.querySelector<HTMLElement>('[data-header-overflow-actions]');+ expect(found).not.toBeNull();+ return found as HTMLElement;+ });+ const share = within(panel).getByRole('button', { name: 'Share doc' });+ await userEvent.click(share);+ await screen.findByRole('dialog', { name: 'Publish to GitHub' });+ expect(blurredByDisable).toContain(share);+ expect(constructUrl).toHaveBeenCalledWith(+ '/api/share/construct-url',+ expect.objectContaining({ method: 'POST' }),+ );await waitFor(() =>expect(document.querySelector('[data-header-overflow-actions]')).toBeNull(),);diff --git a/packages/app/src/components/AppHeader.tsx b/packages/app/src/components/AppHeader.tsxindex b49e22086..e081d7efb 100644--- a/packages/app/src/components/AppHeader.tsx+++ b/packages/app/src/components/AppHeader.tsx@@ -17,7 +17,7 @@ import { NavigationHistoryControls } from '@/components/NavigationHistoryControlimport { ProjectSwitcher } from '@/components/ProjectSwitcher';import { PublishToGitHubDialog } from '@/components/PublishToGitHubDialog';import { SettingsButton } from '@/components/SettingsButton';-import { ShareButton } from '@/components/ShareButton';+import { ShareButton, type ShareButtonProps } from '@/components/ShareButton';import { displayState, SyncStatusBadge } from '@/components/SyncStatusBadge';import { WebProjectName } from '@/components/WebProjectName';import { useDocumentContext } from '@/editor/DocumentContext';@@ -183,13 +183,13 @@ export function AppHeader({ onOpenSearch }: AppHeaderProps) {});const badgesFolded = (foldsBadges || singleFile) && actionsOverflowed;- const trailingActions = (+ const renderTrailingActions = (onClickWhenNoRemote: ShareButtonProps['onClickWhenNoRemote']) => (<><PresenceBar />{!singleFile && (<ShareButtoninput={shareInput}- onClickWhenNoRemote={() => setPublishOpen(true)}+ onClickWhenNoRemote={onClickWhenNoRemote}triggerRef={shareButtonRef}/>)}@@ -264,11 +264,20 @@ export function AppHeader({ onOpenSearch }: AppHeaderProps) {>{actionsOverflowed ? (<HeaderOverflowActions syncStatus={gitSyncStatus} triggerRef={overflowTriggerRef}>- {badgesFolded && <AppHeaderBadges compact={false} isElectronHost={isElectronHost} />}- {trailingActions}+ {(close) => (+ <>+ {badgesFolded && (+ <AppHeaderBadges compact={false} isElectronHost={isElectronHost} />+ )}+ {renderTrailingActions(() => {+ close();+ setPublishOpen(true);+ })}+ </>+ )}</HeaderOverflowActions>) : (- trailingActions+ renderTrailingActions(() => setPublishOpen(true)))}<HeaderPaneButtons /><SyncToastHost />diff --git a/packages/app/src/components/HeaderOverflowActions.tsx b/packages/app/src/components/HeaderOverflowActions.tsxindex 142a964c8..13b427bf9 100644--- a/packages/app/src/components/HeaderOverflowActions.tsx+++ b/packages/app/src/components/HeaderOverflowActions.tsx@@ -1,6 +1,6 @@import { useLingui } from '@lingui/react/macro';import { MoreHorizontalIcon } from 'lucide-react';-import type { ReactNode, Ref } from 'react';+import { type ReactNode, type Ref, useState } from 'react';import { Button } from '@/components/ui/button';import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';import type { GitSyncStatus } from '@/hooks/use-git-sync-status';@@ -21,7 +21,7 @@ function syncAttentionOf(status: GitSyncStatus | null): SyncAttention | null {interface HeaderOverflowActionsProps {syncStatus: GitSyncStatus | null;- children: ReactNode;+ children: (close: () => void) => ReactNode;triggerRef?: Ref<HTMLButtonElement>;}@@ -31,6 +31,7 @@ export function HeaderOverflowActions({triggerRef,}: HeaderOverflowActionsProps) {const { t } = useLingui();+ const [open, setOpen] = useState(false);const syncAttention = syncAttentionOf(syncStatus);const syncAttentionLabel =syncAttention === 'conflict'@@ -47,7 +48,7 @@ export function HeaderOverflowActions({: t`More actions`;return (- <Popover>+ <Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild><Buttonref={triggerRef}@@ -79,7 +80,7 @@ export function HeaderOverflowActions({data-header-overflow-actions=""className="flex w-auto max-w-[calc(100vw-1rem)] flex-wrap items-center justify-end gap-2 p-2">- {children}+ {children(() => setOpen(false))}</PopoverContent></Popover>);diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.tsindex 4549c74b3..a50b00123 100644--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts@@ -1,4 +1,3 @@-import { readFileSync } from 'node:fs';import { join } from 'node:path';import { setTimeout as wait } from 'node:timers/promises';diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.tsindex 4fc2c11f9..6fcdc23f2 100644--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts@@ -1,4 +1,3 @@-import { setTimeout as wait } from 'node:timers/promises';import { normalizeBridge } from '@inkeep/open-knowledge-core';import { updateYFragment } from '@tiptap/y-tiptap';diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.tsindex 9f2f6feb6..40b5cdfd6 100644--- a/packages/app/tests/integration/interior-edit-freshness.test.ts+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts@@ -1,4 +1,3 @@-import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.tsindex 2a085742b..93666af70 100644--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts@@ -1,4 +1,3 @@-import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.tsindex 878d5196b..867598d34 100644--- a/packages/app/tests/integration/producer-guard-wiring.test.ts+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts@@ -1,4 +1,3 @@-import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.tsindex 4ada3cf26..0970ac12f 100644--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts@@ -1,4 +1,3 @@-import { randomUUID } from 'node:crypto';import { afterEach, describe, expect, test } from 'vitest';import { agentWriteMd, createTestServer, type TestServer } from './test-harness';diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.tsindex cbe2b705f..b632185e1 100644--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts@@ -1,4 +1,3 @@-import { execFileSync } from 'node:child_process';import { randomUUID } from 'node:crypto';import { join } from 'node:path';diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.tsindex 89bc9b4d9..c530ce4ba 100644--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts@@ -1,4 +1,3 @@-import { randomUUID } from 'node:crypto';import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';import type * as Y from 'yjs';diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.tsindex a78aeb0e4..d3767adc9 100644--- a/packages/app/tests/integration/undo-after-rollback.test.ts+++ b/packages/app/tests/integration/undo-after-rollback.test.ts@@ -1,4 +1,3 @@-import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';import { afterAll, beforeAll, describe, expect, test } from 'vitest';import * as Y from 'yjs';diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.tsindex e7cc69c3f..b076f955c 100644--- a/packages/app/tests/integration/undo-recycle-reset.test.ts+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts@@ -1,4 +1,3 @@-import { writeFileSync } from 'node:fs';import { join } from 'node:path';import { setTimeout as wait } from 'node:timers/promises';diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.tsindex 9ddcd0730..7935e35f8 100644--- a/packages/app/tests/integration/undo-rederive-survival.test.ts+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts@@ -1,4 +1,3 @@-import { prependFrontmatter } from '@inkeep/open-knowledge-core';import { Plugin, PluginKey } from '@tiptap/pm/state';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.tsindex 2a597ec3d..f4cc8a286 100644--- a/packages/core/src/bridge/compose.ts+++ b/packages/core/src/bridge/compose.ts@@ -1,4 +1,3 @@-import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.tsindex ffd8fce06..e7e63f43d 100644--- a/packages/core/src/bridge/doc-boundary-space.ts+++ b/packages/core/src/bridge/doc-boundary-space.ts@@ -1,4 +1,3 @@-import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.tsindex fb0ba5a7c..fc267cbea 100644--- a/packages/core/src/markdown/comment-promoter.ts+++ b/packages/core/src/markdown/comment-promoter.ts@@ -1,4 +1,3 @@-import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';import { SKIP, visit } from 'unist-util-visit';import type { VFile } from 'vfile';diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.tsindex ae8cb390b..861003fb4 100644--- a/packages/core/src/markdown/merged-walker.ts+++ b/packages/core/src/markdown/merged-walker.ts@@ -1,4 +1,3 @@-import type { Nodes, Parent, Root } from 'mdast';import { SKIP, visit } from 'unist-util-visit';import type { VFile } from 'vfile';diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.tsindex 8be632ba4..4d3250d3a 100644--- a/packages/core/src/markdown/safe-url.ts+++ b/packages/core/src/markdown/safe-url.ts@@ -1,4 +1,3 @@-export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');