Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Return keyboard focus after closing the Publish to GitHub dialog (#4877)

sarahd57b7f76d5ad
diff --git a/.changeset/publish-dialog-returns-focus.md b/.changeset/publish-dialog-returns-focus.md
new file mode 100644
index 000000000..b47c58d62
--- /dev/null
+++ b/.changeset/publish-dialog-returns-focus.md
@@ -0,0 +1,5 @@
+---
+'@inkeep/open-knowledge': patch
+---
+
+Closing the Publish to GitHub dialog now returns keyboard focus to the button that opened it.
diff --git a/knip.config.ts b/knip.config.ts
index 6a38348d8..8b615429f 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -143,11 +143,15 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
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/EditorHeader.dom.test.tsx b/packages/app/src/components/EditorHeader.dom.test.tsx
index 6fa67f70e..11b2e51f1 100644
--- a/packages/app/src/components/EditorHeader.dom.test.tsx
+++ b/packages/app/src/components/EditorHeader.dom.test.tsx
@@ -11,6 +11,11 @@ import {
expectVisualClassTokens,
expectVisualClassTokensAbsent,
} from '@/test-utils/visual-contract';
+import {
+ captureResizeObserver,
+ type HeaderMetrics,
+ mockHeaderMetrics,
+} from './EditorHeader.layout.test-helper';
vi.doMock('@lingui/react/macro', () => ({
...actualLinguiMacro,
@@ -137,73 +142,6 @@ function setNoteHost() {
});
}
-interface HeaderMetrics {
- header: number;
- leading: number;
- leadingOffset?: number;
- tabs?: number;
- trailing: number;
- collapsedTrailing?: number;
-}
-
-function mockHeaderMetrics({
- header,
- leading,
- leadingOffset = 0,
- tabs = 0,
- trailing,
- collapsedTrailing,
-}: HeaderMetrics) {
- const offsetWidth = vi
- .spyOn(HTMLElement.prototype, 'offsetWidth', 'get')
- .mockImplementation(function (this: HTMLElement) {
- if (this.tagName === 'HEADER') return header;
- if (this.hasAttribute('data-editor-header-leading-actions')) return leading;
- if (this.hasAttribute('data-editor-header-tabs')) return tabs;
- if (this.hasAttribute('data-editor-header-actions')) {
- const collapsed =
- this.querySelector('[data-testid="header-overflow-actions-trigger"]') !== null;
- return collapsed && collapsedTrailing !== undefined ? collapsedTrailing : trailing;
- }
- return 0;
- });
- const offsetLeft = vi
- .spyOn(HTMLElement.prototype, 'offsetLeft', 'get')
- .mockImplementation(function (this: HTMLElement) {
- return this.hasAttribute('data-editor-header-leading-actions') ? leadingOffset : 0;
- });
- return () => {
- offsetLeft.mockRestore();
- offsetWidth.mockRestore();
- };
-}
-
-function captureResizeObserver() {
- const callbacks: ResizeObserverCallback[] = [];
- const original = globalThis.ResizeObserver;
- class CapturingResizeObserver {
- constructor(callback: ResizeObserverCallback) {
- callbacks.push(callback);
- }
- observe() {}
- unobserve() {}
- disconnect() {}
- }
- globalThis.ResizeObserver = CapturingResizeObserver as unknown as typeof ResizeObserver;
- return {
- flush() {
- for (const callback of callbacks) {
- act(() => {
- callback([], {} as ResizeObserver);
- });
- }
- },
- restore() {
- globalThis.ResizeObserver = original;
- },
- };
-}
-
let rerenderHeader: ((tabs?: ReactNode) => void) | null = null;
async function renderHeader(tabs?: ReactNode) {
diff --git a/packages/app/src/components/EditorHeader.layout.test-helper.ts b/packages/app/src/components/EditorHeader.layout.test-helper.ts
new file mode 100644
index 000000000..a68872c3b
--- /dev/null
+++ b/packages/app/src/components/EditorHeader.layout.test-helper.ts
@@ -0,0 +1,66 @@
+import { act } from '@testing-library/react';
+import { vi } from 'vitest';
+
+export interface HeaderMetrics {
+ header: number;
+ leading: number;
+ leadingOffset?: number;
+ tabs?: number;
+ trailing: number;
+ collapsedTrailing?: number;
+}
+
+export function mockHeaderMetrics(source: HeaderMetrics | (() => HeaderMetrics)) {
+ const current = typeof source === 'function' ? source : () => source;
+ const offsetWidth = vi
+ .spyOn(HTMLElement.prototype, 'offsetWidth', 'get')
+ .mockImplementation(function (this: HTMLElement) {
+ const { header, leading, tabs = 0, trailing, collapsedTrailing } = current();
+ if (this.tagName === 'HEADER') return header;
+ if (this.hasAttribute('data-editor-header-leading-actions')) return leading;
+ if (this.hasAttribute('data-editor-header-tabs')) return tabs;
+ if (this.hasAttribute('data-editor-header-actions')) {
+ const collapsed =
+ this.querySelector('[data-testid="header-overflow-actions-trigger"]') !== null;
+ return collapsed && collapsedTrailing !== undefined ? collapsedTrailing : trailing;
+ }
+ return 0;
+ });
+ const offsetLeft = vi
+ .spyOn(HTMLElement.prototype, 'offsetLeft', 'get')
+ .mockImplementation(function (this: HTMLElement) {
+ return this.hasAttribute('data-editor-header-leading-actions')
+ ? (current().leadingOffset ?? 0)
+ : 0;
+ });
+ return () => {
+ offsetLeft.mockRestore();
+ offsetWidth.mockRestore();
+ };
+}
+
+export function captureResizeObserver() {
+ const callbacks: ResizeObserverCallback[] = [];
+ const original = globalThis.ResizeObserver;
+ class CapturingResizeObserver {
+ constructor(callback: ResizeObserverCallback) {
+ callbacks.push(callback);
+ }
+ observe() {}
+ unobserve() {}
+ disconnect() {}
+ }
+ globalThis.ResizeObserver = CapturingResizeObserver as unknown as typeof ResizeObserver;
+ return {
+ flush() {
+ for (const callback of callbacks) {
+ act(() => {
+ callback([], {} as ResizeObserver);
+ });
+ }
+ },
+ restore() {
+ globalThis.ResizeObserver = original;
+ },
+ };
+}
diff --git a/packages/app/src/components/EditorHeader.publish-focus.dom.test.tsx b/packages/app/src/components/EditorHeader.publish-focus.dom.test.tsx
new file mode 100644
index 000000000..b5b36c539
--- /dev/null
+++ b/packages/app/src/components/EditorHeader.publish-focus.dom.test.tsx
@@ -0,0 +1,170 @@
+import { cleanup, render, screen, waitFor, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { ComponentProps } from 'react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { EditorHeader } from '@/components/EditorHeader';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import { captureResizeObserver, mockHeaderMetrics } from './EditorHeader.layout.test-helper';
+
+vi.mock('@/editor/DocumentContext', () => ({
+ useDocumentContext: () => ({
+ activeDocName: 'docs/notes',
+ activeTarget: { kind: 'doc' },
+ activeProvider: null,
+ panes: [{ id: 'pane-0' }],
+ }),
+}));
+
+vi.mock('@/lib/single-file-mode', () => ({ useSingleFileMode: () => false }));
+
+vi.mock('@/components/ui/sidebar', () => ({
+ useSidebar: () => ({ state: 'expanded' }),
+ SidebarTrigger: (props: ComponentProps<'button'>) => (
+ <button type="button" data-testid="sidebar-trigger" {...props}>
+ sidebar
+ </button>
+ ),
+}));
+
+vi.mock('@/components/AppMenubar', () => ({ AppMenubar: () => null }));
+
+vi.mock('@/hooks/use-git-sync-status', () => ({
+ useGitSyncStatusDetailed: () => ({
+ status: { state: 'dormant', conflictCount: 0, hasRemote: false },
+ fetchError: null,
+ }),
+ useGitSyncStatus: () => ({ state: 'dormant', conflictCount: 0, hasRemote: false }),
+}));
+
+vi.mock('@/presence/use-sync-toasts', () => ({ useSyncToasts: () => {} }));
+
+vi.mock('@/presence/PresenceBar', () => ({
+ PresenceBar: () => <div data-testid="presence-bar" />,
+}));
+
+vi.mock('@/components/SyncStatusBadge', async () => ({
+ ...(await vi.importActual<typeof import('@/components/SyncStatusBadge')>(
+ '@/components/SyncStatusBadge',
+ )),
+ SyncStatusBadge: () => <div data-testid="sync-status-badge" />,
+}));
+
+vi.mock('@/components/BetaBadge', () => ({ BetaBadge: () => null }));
+vi.mock('@/components/InstanceBadge', () => ({ InstanceBadge: () => null }));
+vi.mock('@/components/SettingsButton', () => ({
+ SettingsButton: () => <div data-testid="settings-button" />,
+}));
+vi.mock('@/components/HelpPopover', () => ({
+ HelpPopover: () => <div data-testid="help-popover" />,
+}));
+
+vi.mock('@/lib/use-workspace', () => ({
+ useWorkspace: () => ({ contentDir: '/projects/field-notes' }),
+}));
+
+vi.mock('@/lib/share/publish-wizard', async () => ({
+ ...(await vi.importActual<typeof import('@/lib/share/publish-wizard')>(
+ '@/lib/share/publish-wizard',
+ )),
+ fetchPublishOwners: () => new Promise(() => {}),
+ fetchPublishNameCheck: () => new Promise(() => {}),
+}));
+
+const CRAMPED = { header: 107, leading: 57, trailing: 218, collapsedTrailing: 44 };
+const ROOMY = { header: 1_280, leading: 57, trailing: 218 };
+
+let metrics: typeof CRAMPED | typeof ROOMY = ROOMY;
+let resizeObserver: ReturnType<typeof captureResizeObserver> | null = null;
+
+function installLayout() {
+ mockHeaderMetrics(() => metrics);
+ resizeObserver = captureResizeObserver();
+}
+
+function relayout(next: typeof CRAMPED | typeof ROOMY) {
+ metrics = next;
+ resizeObserver?.flush();
+}
+
+function renderHeader() {
+ return render(
+ <EditorHeader onOpenSearch={() => {}}>
+ <div>tabs</div>
+ </EditorHeader>,
+ { wrapper: TooltipProvider },
+ );
+}
+
+function trailingGroup(): HTMLElement {
+ return document.querySelector('[data-editor-header-actions]') as HTMLElement;
+}
+
+async function closeDialogWithEscape() {
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+}
+
+afterEach(() => {
+ cleanup();
+ vi.restoreAllMocks();
+ vi.unstubAllGlobals();
+ metrics = ROOMY;
+ resizeObserver?.restore();
+ resizeObserver = null;
+});
+
+describe('EditorHeader Publish to GitHub dialog focus return', () => {
+ test('closing the dialog opened from the inline Share button focuses that Share button', async () => {
+ installLayout();
+ renderHeader();
+
+ const share = await within(trailingGroup()).findByRole('button', { name: 'Share doc' });
+ await userEvent.click(share);
+ await screen.findByRole('dialog');
+
+ await closeDialogWithEscape();
+
+ expect(document.activeElement).toBe(share);
+ });
+
+ test('when the actions fold away while the dialog is open, closing it focuses "More actions"', async () => {
+ installLayout();
+ renderHeader();
+
+ await userEvent.click(
+ await within(trailingGroup()).findByRole('button', { name: 'Share doc' }),
+ );
+ await screen.findByRole('dialog');
+
+ relayout(CRAMPED);
+ const trigger = await screen.findByTestId('header-overflow-actions-trigger');
+ expect(screen.queryByRole('button', { name: 'Share doc' })).toBeNull();
+
+ await closeDialogWithEscape();
+
+ expect(document.activeElement).toBe(trigger);
+ });
+
+ test('closing the dialog opened from Share inside a "More actions" panel that has since closed focuses "More actions"', async () => {
+ metrics = CRAMPED;
+ installLayout();
+ renderHeader();
+
+ const trigger = await screen.findByTestId('header-overflow-actions-trigger');
+ await userEvent.click(trigger);
+ const panel = await waitFor(() => {
+ const found = document.querySelector<HTMLElement>('[data-editor-header-overflow-actions]');
+ expect(found).not.toBeNull();
+ return found as HTMLElement;
+ });
+ await userEvent.click(within(panel).getByRole('button', { name: 'Share doc' }));
+ await screen.findByRole('dialog');
+ await waitFor(() =>
+ expect(document.querySelector('[data-editor-header-overflow-actions]')).toBeNull(),
+ );
+
+ await closeDialogWithEscape();
+
+ expect(document.activeElement).toBe(trigger);
+ });
+});
diff --git a/packages/app/src/components/EditorHeader.tsx b/packages/app/src/components/EditorHeader.tsx
index 5be162ac6..cc7fd44af 100644
--- a/packages/app/src/components/EditorHeader.tsx
+++ b/packages/app/src/components/EditorHeader.tsx
@@ -90,6 +90,8 @@ export function EditorHeader({
const leadingActionsRef = useRef<HTMLDivElement>(null);
const tabsHostRef = useRef<HTMLDivElement>(null);
const trailingActionsRef = useRef<HTMLDivElement>(null);
+ const shareButtonRef = useRef<HTMLButtonElement>(null);
+ const overflowTriggerRef = useRef<HTMLButtonElement>(null);
const shareInput: ShareTargetInput | null = (() => {
if (activeTarget?.kind === 'folder') {
return buildFolderShareInput(activeTarget.folderPath);
@@ -203,7 +205,11 @@ export function EditorHeader({
<>
{}
{!reducedChrome && (
- <ShareButton input={shareInput} onClickWhenNoRemote={() => setPublishOpen(true)} />
+ <ShareButton
+ input={shareInput}
+ onClickWhenNoRemote={() => setPublishOpen(true)}
+ triggerRef={shareButtonRef}
+ />
)}
{!noteWindow && <SyncStatusBadge onSignIn={onSignIn} onSetIdentity={onSetIdentity} />}
<PresenceBar />
@@ -343,6 +349,7 @@ export function EditorHeader({
<Popover>
<PopoverTrigger asChild>
<Button
+ ref={overflowTriggerRef}
variant="ghost"
size="icon-sm"
aria-label={overflowActionsLabel}
@@ -379,7 +386,11 @@ export function EditorHeader({
))}
{!noteWindow && <SyncToastHost />}
{!reducedChrome && (
- <PublishToGitHubDialog open={publishOpen} onOpenChange={setPublishOpen} />
+ <PublishToGitHubDialog
+ open={publishOpen}
+ onOpenChange={setPublishOpen}
+ returnFocus={() => (shareButtonRef.current ?? overflowTriggerRef.current)?.focus()}
+ />
)}
</div>
</header>
diff --git a/packages/app/src/components/PublishToGitHubDialog.dom.test.tsx b/packages/app/src/components/PublishToGitHubDialog.dom.test.tsx
index 2092691c7..aebc79599 100644
--- a/packages/app/src/components/PublishToGitHubDialog.dom.test.tsx
+++ b/packages/app/src/components/PublishToGitHubDialog.dom.test.tsx
@@ -160,7 +160,9 @@ async function renderDialog() {
const { PublishToGitHubDialog } = await import('./PublishToGitHubDialog');
const onOpenChange = vi.fn((_open: boolean) => {});
await act(async () => {
- render(<PublishToGitHubDialog open={true} onOpenChange={onOpenChange} />);
+ render(
+ <PublishToGitHubDialog open={true} onOpenChange={onOpenChange} returnFocus={() => {}} />,
+ );
await Promise.resolve();
});
return { onOpenChange };
diff --git a/packages/app/src/components/PublishToGitHubDialog.tsx b/packages/app/src/components/PublishToGitHubDialog.tsx
index 4e5d5ca20..ef2df85f6 100644
--- a/packages/app/src/components/PublishToGitHubDialog.tsx
+++ b/packages/app/src/components/PublishToGitHubDialog.tsx
@@ -51,9 +51,14 @@ const NAME_CHECK_DEBOUNCE_MS = 500;
export interface PublishToGitHubDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
+ returnFocus: () => void;
}
-export function PublishToGitHubDialog({ open, onOpenChange }: PublishToGitHubDialogProps) {
+export function PublishToGitHubDialog({
+ open,
+ onOpenChange,
+ returnFocus,
+}: PublishToGitHubDialogProps) {
const { t } = useLingui();
const workspace = useWorkspace();
const { activeDocName } = useDocumentContext();
@@ -279,7 +284,14 @@ export function PublishToGitHubDialog({ open, onOpenChange }: PublishToGitHubDia
return (
<>
<DialogRoot open={open} onOpenChange={onOpenChange}>
- <DialogContent className="sm:max-w-lg" showCloseButton={false}>
+ <DialogContent
+ className="sm:max-w-lg"
+ showCloseButton={false}
+ onCloseAutoFocus={(event) => {
+ event.preventDefault();
+ returnFocus();
+ }}
+ >
{publishResult ? (
<PublishSuccessView
ownerLogin={publishResult.ownerLogin}
diff --git a/packages/app/src/components/ShareButton.tsx b/packages/app/src/components/ShareButton.tsx
index b725c4dc0..8e39295a0 100644
--- a/packages/app/src/components/ShareButton.tsx
+++ b/packages/app/src/components/ShareButton.tsx
@@ -3,7 +3,7 @@
import type { ShareFreshness } from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import { CircleHelp, Share2 } from 'lucide-react';
-import { useEffect, useRef, useState } from 'react';
+import { type Ref, useEffect, useRef, useState } from 'react';
import { toast } from 'sonner';
import { CopyButton } from '@/components/CopyButton';
import { Button } from '@/components/ui/button';
@@ -24,9 +24,10 @@ const COPY_SHORTCUT = { mac: '⌘ C', windowsLinux: 'Ctrl C' };
export interface ShareButtonProps {
input: ShareTargetInput | null;
onClickWhenNoRemote: () => void;
+ triggerRef?: Ref<HTMLButtonElement>;
}
-export function ShareButton({ input, onClickWhenNoRemote }: ShareButtonProps) {
+export function ShareButton({ input, onClickWhenNoRemote, triggerRef }: ShareButtonProps) {
const { t } = useLingui();
const { status } = useGitSyncStatusDetailed();
const [busy, setBusy] = useState(false);
@@ -100,6 +101,7 @@ export function ShareButton({ input, onClickWhenNoRemote }: ShareButtonProps) {
{}
<PopoverAnchor asChild>
<Button
+ ref={triggerRef}
variant="ghost"
size="sm"
aria-label={input?.kind === 'folder' ? t`Share folder` : t`Share doc`}
diff --git a/packages/app/src/components/settings/SettingsDialogShell.tsx b/packages/app/src/components/settings/SettingsDialogShell.tsx
index 54d8f13c3..2133a5cad 100644
--- a/packages/app/src/components/settings/SettingsDialogShell.tsx
+++ b/packages/app/src/components/settings/SettingsDialogShell.tsx
@@ -144,7 +144,7 @@ export function SettingsDialogShell({
if (tryFlash()) {
observer.disconnect();
} else {
- giveUpTimer = setTimeout(() => observer?.disconnect(), 4000);
+ giveUpTimer = setTimeout(() => observer?.disconnect(), 15_000);
}
return () => {
diff --git a/packages/app/src/components/settings/SyncSection.publish-focus.dom.test.tsx b/packages/app/src/components/settings/SyncSection.publish-focus.dom.test.tsx
new file mode 100644
index 000000000..92bc6a9f8
--- /dev/null
+++ b/packages/app/src/components/settings/SyncSection.publish-focus.dom.test.tsx
@@ -0,0 +1,98 @@
+import { cleanup, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { afterEach, expect, test, vi } from 'vitest';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import { SyncSection } from './SyncSection';
+
+const syncStatus = vi.hoisted(() => ({ hasRemote: false }));
+
+vi.mock('@/hooks/use-git-sync-status', () => ({
+ useGitSyncStatus: () => ({ state: 'dormant', conflictCount: 0, hasRemote: syncStatus.hasRemote }),
+ useGitSyncStatusDetailed: () => ({
+ status: { state: 'dormant', conflictCount: 0, hasRemote: syncStatus.hasRemote },
+ fetchError: null,
+ }),
+}));
+
+vi.mock('@/lib/config-provider', () => ({
+ useConfigContext: () => ({
+ projectConfig: null,
+ projectLocalConfig: null,
+ projectLocalSynced: true,
+ projectSynced: true,
+ }),
+}));
+
+vi.mock('@/hooks/use-enable-sync-with-confirm', () => ({
+ useSyncModeWriter: () => null,
+ useSyncDefaultWriter: () => null,
+ useSyncIntervalWriter: () => null,
+ useSyncModeSelection: () => ({
+ confirmOpen: false,
+ setConfirmOpen: () => {},
+ pendingMode: null,
+ onModeSelect: () => {},
+ onConfirm: () => {},
+ }),
+}));
+
+vi.mock('@/lib/use-settings-route', () => ({ consumeSyncAdvancedIntent: () => false }));
+
+vi.mock('@/editor/DocumentContext', () => ({
+ useDocumentContext: () => ({ activeDocName: null }),
+}));
+
+vi.mock('@/lib/use-workspace', () => ({
+ useWorkspace: () => ({ contentDir: '/projects/field-notes' }),
+}));
+
+vi.mock('@/lib/share/publish-wizard', async () => ({
+ ...(await vi.importActual<typeof import('@/lib/share/publish-wizard')>(
+ '@/lib/share/publish-wizard',
+ )),
+ fetchPublishOwners: async () => ({ ok: true, owners: [{ kind: 'user', login: 'alice' }] }),
+ fetchPublishNameCheck: async () => ({ ok: true, available: true }),
+ submitPublishRequest: async () => ({ ok: true, ownerLogin: 'alice', repoName: 'field-notes' }),
+}));
+
+afterEach(() => {
+ syncStatus.hasRemote = false;
+ cleanup();
+});
+
+test('closing the Publish to GitHub dialog focuses the "Set up syncing" button that opened it', async () => {
+ render(<SyncSection />, { wrapper: TooltipProvider });
+
+ const setUp = screen.getByTestId('settings-sync-setup');
+ await userEvent.click(setUp);
+ await screen.findByRole('dialog');
+
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+
+ expect(document.activeElement).toBe(setUp);
+});
+
+test('successful publishing keeps the success dialog open and returns focus to Sync after its opener disappears', async () => {
+ const view = render(<SyncSection />, { wrapper: TooltipProvider });
+
+ await userEvent.click(screen.getByTestId('settings-sync-setup'));
+ await screen.findByRole('dialog');
+ await waitFor(
+ () =>
+ expect((screen.getByRole('button', { name: 'Publish' }) as HTMLButtonElement).disabled).toBe(
+ false,
+ ),
+ { timeout: 1500 },
+ );
+ await userEvent.click(screen.getByRole('button', { name: 'Publish' }));
+ await screen.findByRole('button', { name: 'Done' });
+
+ syncStatus.hasRemote = true;
+ view.rerender(<SyncSection />);
+ expect(screen.getByRole('button', { name: 'Done' })).toBeTruthy();
+
+ await userEvent.click(screen.getByRole('button', { name: 'Done' }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+ expect(document.activeElement).toBe(screen.getByTestId('settings-sync-section'));
+});
diff --git a/packages/app/src/components/settings/SyncSection.tsx b/packages/app/src/components/settings/SyncSection.tsx
index c1ad76163..a67e68a35 100644
--- a/packages/app/src/components/settings/SyncSection.tsx
+++ b/packages/app/src/components/settings/SyncSection.tsx
@@ -8,7 +8,7 @@ import {
} from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import { ArrowUpRight, ChevronRight } from 'lucide-react';
-import { useEffect, useState } from 'react';
+import { type Ref, useEffect, useRef, useState } from 'react';
import { toast } from 'sonner';
import { AuthModal } from '@/components/AuthModal';
import { EnableSyncConfirmDialog } from '@/components/EnableSyncConfirmDialog';
@@ -49,6 +49,37 @@ const SYNC_SELECTED_TOGGLE_CLASS =
'data-[state=on]:border-primary data-[state=on]:bg-primary data-[state=on]:text-primary-foreground data-[state=on]:hover:bg-primary/90';
export function SyncSection() {
+ const [publishOpen, setPublishOpen] = useState(false);
+ const setUpSyncingRef = useRef<HTMLButtonElement>(null);
+ const syncSectionRef = useRef<HTMLElement>(null);
+
+ return (
+ <section
+ ref={syncSectionRef}
+ aria-labelledby="settings-sync-title"
+ tabIndex={-1}
+ data-testid="settings-sync-section"
+ >
+ <SyncSectionContent
+ onPublish={() => setPublishOpen(true)}
+ setUpSyncingRef={setUpSyncingRef}
+ />
+ <PublishToGitHubDialog
+ open={publishOpen}
+ onOpenChange={setPublishOpen}
+ returnFocus={() => (setUpSyncingRef.current ?? syncSectionRef.current)?.focus()}
+ />
+ </section>
+ );
+}
+
+function SyncSectionContent({
+ onPublish,
+ setUpSyncingRef,
+}: {
+ onPublish: () => void;
+ setUpSyncingRef: Ref<HTMLButtonElement>;
+}) {
const { t } = useLingui();
const status = useGitSyncStatus();
const { projectConfig, projectLocalConfig, projectLocalSynced, projectSynced } =
@@ -65,16 +96,11 @@ export function SyncSection() {
const localMode = resolveLocalAutoSyncMode(projectLocalConfig?.autoSync) ?? 'off';
const { confirmOpen, setConfirmOpen, pendingMode, onModeSelect, onConfirm } =
useSyncModeSelection(modeWriter, localMode);
- const [publishOpen, setPublishOpen] = useState(false);
const [authModalOpen, setAuthModalOpen] = useState(false);
if (status && !status.hasRemote && status.state === 'dormant') {
return (
- <section
- aria-labelledby="settings-sync-title"
- className="space-y-4"
- data-testid="settings-sync-empty"
- >
+ <div className="space-y-4" data-testid="settings-sync-empty">
<SettingsSectionHeader
titleId="settings-sync-title"
title={<Trans>Sync</Trans>}
@@ -95,7 +121,7 @@ export function SyncSection() {
<Trans>We'll create a repository and start syncing — no terminal needed.</Trans>
</p>
</div>
- <Button onClick={() => setPublishOpen(true)} data-testid="settings-sync-setup">
+ <Button ref={setUpSyncingRef} onClick={onPublish} data-testid="settings-sync-setup">
<Trans>Set up syncing</Trans>
</Button>
</div>
@@ -120,9 +146,7 @@ export function SyncSection() {
</Trans>
</CollapsibleContent>
</Collapsible>
-
- <PublishToGitHubDialog open={publishOpen} onOpenChange={setPublishOpen} />
- </section>
+ </div>
);
}
@@ -226,7 +250,7 @@ export function SyncSection() {
}
return (
- <section aria-labelledby="settings-sync-title" className="space-y-3">
+ <div className="space-y-3">
<SettingsSectionHeader
titleId="settings-sync-title"
title={<Trans>Sync</Trans>}
@@ -600,6 +624,6 @@ export function SyncSection() {
onSuccess={() => setAuthModalOpen(false)}
reauth
/>
- </section>
+ </div>
);
}
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index 8a60e5826..a28cc2b18 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 6fcdc23f2..4fc2c11f9 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 40b5cdfd6..9f2f6feb6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 93666af70..2a085742b 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 867598d34..878d5196b 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 0970ac12f..4ada3cf26 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,3 +1,4 @@
+
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.ts
index b632185e1..cbe2b705f 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,3 +1,4 @@
+
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.ts
index c530ce4ba..89bc9b4d9 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,3 +1,4 @@
+
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.ts
index d3767adc9..a78aeb0e4 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index b076f955c..e7cc69c3f 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,3 +1,4 @@
+
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.ts
index 7935e35f8..9ddcd0730 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,3 +1,4 @@
+
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/app/tests/stress/settings-search.e2e.ts b/packages/app/tests/stress/settings-search.e2e.ts
index 115d4aab0..406bc4089 100644
--- a/packages/app/tests/stress/settings-search.e2e.ts
+++ b/packages/app/tests/stress/settings-search.e2e.ts
@@ -75,12 +75,23 @@ test.describe('Settings search — navigation + pinned layout', () => {
await page.getByTestId('settings-search-input').fill('Config sharing');
const result = page.getByTestId('settings-search-result-subsection:sync:sharing');
await expect(result).toBeVisible({ timeout: 5_000 });
+ await page.evaluate(() => {
+ const observer = new MutationObserver(() => {
+ if (document.querySelector('[data-field="section:sharing"].animate-settings-nav-flash')) {
+ document.documentElement.dataset.sharingNavigationFlashed = 'true';
+ observer.disconnect();
+ }
+ });
+ observer.observe(document.body, { childList: true, subtree: true, attributes: true });
+ });
await result.click();
const block = page.locator('[data-field="section:sharing"]');
await expect(block).toBeVisible({ timeout: SETTINGS_PANEL_TIMEOUT_MS });
await expect(block).toBeInViewport();
- await expect(block).toHaveClass(/animate-settings-nav-flash/, { timeout: 2_000 });
+ await expect
+ .poll(() => page.evaluate(() => document.documentElement.dataset.sharingNavigationFlashed))
+ .toBe('true');
});
test('Preview tabs is searchable from its catalog-backed label and description', async ({
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index f4cc8a286..2a597ec3d 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,3 +1,4 @@
+
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.ts
index 8fb428b90..01ef76a9f 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,3 +1,4 @@
+
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.ts
index fc267cbea..fb0ba5a7c 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,3 +1,4 @@
+
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.ts
index bfd7e3109..fa3cfcd86 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,3 +1,4 @@
+
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.ts
index 4d3250d3a..8be632ba4 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,3 +1,4 @@
+
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');