Skip to content

fix: phase 7 verification, the defects it found #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmrMsCLL merged 5 commits into from
Nov 7, 2026
Merged

fix: phase 7 verification, the defects it found #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
735b8dc
fix(motion): state pulses stop under prefers-reduced-motion
AmrMsCLL Nov 7, 2026
f8c634c
fix(editor): the post editor works from the keyboard
AmrMsCLL Nov 7, 2026
429ecdb
fix(server): keep serving through a Redis outage and retry scheduled …
AmrMsCLL Nov 7, 2026
2744669
fix(server): a Redis command gives up after two seconds
AmrMsCLL Nov 7, 2026
b28d7a2
fix(blog): the post rail's 'more by' panel uses the first name
AmrMsCLL Nov 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
290 changes: 172 additions & 118 deletions site/app/editor/PostEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@ import Collaboration from '@tiptap/extension-collaboration';
import { CollaborationCaret } from '@tiptap/extension-collaboration-caret';
import { Placeholder } from '@tiptap/extensions';
import { EditorContent, useEditor, useEditorState } from '@tiptap/react';
import { useEffect, useState, type FormEvent } from 'react';
import {
createContext,
useContext,
useEffect,
useRef,
useState,
type FocusEvent,
type FormEvent,
type KeyboardEvent,
} from 'react';
import { readingMinutes } from '../posts';
import { CALLOUT_TINTS, columnsOf, postExtensions } from './extensions';
import { holdSession, openSession } from './session';
Expand Down Expand Up @@ -52,6 +61,8 @@ function selection(user: Record<string, string>) {

type Ask = { kind: 'link' | 'video'; value: string } | null;

const StopContext = createContext<(label: string) => 0 | -1>(() => 0);

function Mark({
on,
label,
Expand All @@ -65,13 +76,15 @@ function Mark({
act: () => void;
className?: string;
}) {
const stop = useContext(StopContext);
return (
<button
type="button"
className={className}
aria-label={label}
title={label}
aria-pressed={on}
tabIndex={stop(label)}
onMouseDown={(event) => event.preventDefault()}
onClick={act}
>
Expand All @@ -80,6 +93,35 @@ function Mark({
);
}

const STEP: Record<string, number> = { ArrowLeft: -1, ArrowRight: 1 };

function useRovingFocus(shape: string) {
const box = useRef<HTMLDivElement>(null);
const [current, setCurrent] = useState('Undo');
useEffect(() => {
if (!box.current?.querySelector('[tabindex="0"]')) {
setCurrent('Undo');
}
}, [shape]);
const stops = () => [...(box.current?.querySelectorAll<HTMLElement>('button, select') ?? [])];
return {
box,
stop: (label: string): 0 | -1 => (label === current ? 0 : -1),
onFocus: (event: FocusEvent<HTMLDivElement>) =>
setCurrent(event.target.getAttribute('aria-label') ?? current),
onKeyDown: (event: KeyboardEvent<HTMLDivElement>) => {
const all = stops();
const index = all.indexOf(event.target as HTMLElement);
const next = { Home: 0, End: all.length - 1 }[event.key] ?? index + STEP[event.key];
if (index < 0 || Number.isNaN(next)) {
return;
}
event.preventDefault();
all[(next + all.length) % all.length].focus();
},
};
}

function Toolbar({
editor,
pickImage,
Expand Down Expand Up @@ -120,6 +162,7 @@ function Toolbar({
canRedo: current.can().redo(),
}),
});
const { box, stop, onFocus, onKeyDown } = useRovingFocus(`${state.block}:${state.inTable}`);
const chain = () => editor.chain().focus();
const turn = (block: string) => {
const base = chain().clearNodes();
Expand All @@ -143,127 +186,138 @@ function Toolbar({
}
};
return (
<div className="toolbar" role="toolbar" aria-label="Formatting">
<div className="set">
<Mark label="Undo" glyph="↶" act={() => chain().undo().run()} />
<Mark label="Redo" glyph="↷" act={() => chain().redo().run()} />
</div>
<select
aria-label="Block style"
value={state.block}
onChange={(event) => turn(event.target.value)}
onMouseDown={(event) => event.stopPropagation()}
<StopContext value={stop}>
<div
ref={box}
className="toolbar"
role="toolbar"
aria-label="Formatting"
onFocus={onFocus}
onKeyDown={onKeyDown}
>
<option value="text">text</option>
<option value="heading2">heading</option>
<option value="heading3">subheading</option>
<option value="heading4">small heading</option>
<option value="quote">quote</option>
<option value="callout">callout</option>
<option value="code">code block</option>
</select>
<div className="set">
<Mark
on={state.bold}
label="Bold"
glyph="B"
className="b"
act={() => chain().toggleBold().run()}
/>
<Mark
on={state.italic}
label="Italic"
glyph="I"
className="i"
act={() => chain().toggleItalic().run()}
/>
<Mark
on={state.strike}
label="Strikethrough"
glyph="S"
className="s"
act={() => chain().toggleStrike().run()}
/>
<Mark
on={state.code}
label="Inline code"
glyph="</>"
className="mono"
act={() => chain().toggleCode().run()}
/>
<Mark
on={state.highlight}
label="Highlight"
glyph="◐"
act={() => chain().toggleHighlight().run()}
/>
<Mark
on={state.link}
label="Link"
glyph="⤷"
act={() => (state.link ? chain().unsetLink().run() : ask('link'))}
/>
</div>
<div className="set">
<Mark
on={state.bullets}
label="Bulleted list"
glyph="•≡"
act={() => chain().toggleBulletList().run()}
/>
<Mark
on={state.numbers}
label="Numbered list"
glyph="1≡"
act={() => chain().toggleOrderedList().run()}
/>
<Mark
on={state.checklist}
label="Checklist"
glyph="☑"
act={() => chain().toggleTaskList().run()}
/>
</div>
<div className="set">
<Mark label="Image" glyph="▣" act={pickImage} />
<Mark label="Video" glyph="▶" act={() => ask('video')} />
<Mark
label="Table"
glyph="▦"
act={() => chain().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run()}
/>
<Mark
label="Two columns"
glyph="▯▯"
act={() => chain().insertContent(columnsOf(2)).run()}
/>
<Mark label="Divider" glyph="—" act={() => chain().setHorizontalRule().run()} />
</div>
{state.block === 'callout' && (
<div className="set tints" role="group" aria-label="Callout tint">
{CALLOUT_TINTS.map((tint) => (
<button
key={tint}
type="button"
data-tint={tint}
aria-label={tint}
aria-pressed={state.tint === tint}
onMouseDown={(event) => event.preventDefault()}
onClick={() => chain().updateAttributes('callout', { tint }).run()}
/>
))}
<div className="set">
<Mark label="Undo" glyph="↶" act={() => chain().undo().run()} />
<Mark label="Redo" glyph="↷" act={() => chain().redo().run()} />
</div>
)}
{state.inTable && (
<select
aria-label="Block style"
tabIndex={stop('Block style')}
value={state.block}
onChange={(event) => turn(event.target.value)}
onMouseDown={(event) => event.stopPropagation()}
>
<option value="text">text</option>
<option value="heading2">heading</option>
<option value="heading3">subheading</option>
<option value="heading4">small heading</option>
<option value="quote">quote</option>
<option value="callout">callout</option>
<option value="code">code block</option>
</select>
<div className="set">
<Mark label="Add row" glyph="+row" act={() => chain().addRowAfter().run()} />
<Mark label="Add column" glyph="+col" act={() => chain().addColumnAfter().run()} />
<Mark label="Delete row" glyph="−row" act={() => chain().deleteRow().run()} />
<Mark label="Delete column" glyph="−col" act={() => chain().deleteColumn().run()} />
<Mark label="Delete table" glyph="×" act={() => chain().deleteTable().run()} />
<Mark
on={state.bold}
label="Bold"
glyph="B"
className="b"
act={() => chain().toggleBold().run()}
/>
<Mark
on={state.italic}
label="Italic"
glyph="I"
className="i"
act={() => chain().toggleItalic().run()}
/>
<Mark
on={state.strike}
label="Strikethrough"
glyph="S"
className="s"
act={() => chain().toggleStrike().run()}
/>
<Mark
on={state.code}
label="Inline code"
glyph="</>"
className="mono"
act={() => chain().toggleCode().run()}
/>
<Mark
on={state.highlight}
label="Highlight"
glyph="◐"
act={() => chain().toggleHighlight().run()}
/>
<Mark
on={state.link}
label="Link"
glyph="⤷"
act={() => (state.link ? chain().unsetLink().run() : ask('link'))}
/>
</div>
)}
</div>
<div className="set">
<Mark
on={state.bullets}
label="Bulleted list"
glyph="•≡"
act={() => chain().toggleBulletList().run()}
/>
<Mark
on={state.numbers}
label="Numbered list"
glyph="1≡"
act={() => chain().toggleOrderedList().run()}
/>
<Mark
on={state.checklist}
label="Checklist"
glyph="☑"
act={() => chain().toggleTaskList().run()}
/>
</div>
<div className="set">
<Mark label="Image" glyph="▣" act={pickImage} />
<Mark label="Video" glyph="▶" act={() => ask('video')} />
<Mark
label="Table"
glyph="▦"
act={() => chain().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run()}
/>
<Mark
label="Two columns"
glyph="▯▯"
act={() => chain().insertContent(columnsOf(2)).run()}
/>
<Mark label="Divider" glyph="—" act={() => chain().setHorizontalRule().run()} />
</div>
{state.block === 'callout' && (
<div className="set tints" role="group" aria-label="Callout tint">
{CALLOUT_TINTS.map((tint) => (
<button
key={tint}
type="button"
data-tint={tint}
aria-label={tint}
aria-pressed={state.tint === tint}
tabIndex={stop(tint)}
onMouseDown={(event) => event.preventDefault()}
onClick={() => chain().updateAttributes('callout', { tint }).run()}
/>
))}
</div>
)}
{state.inTable && (
<div className="set">
<Mark label="Add row" glyph="+row" act={() => chain().addRowAfter().run()} />
<Mark label="Add column" glyph="+col" act={() => chain().addColumnAfter().run()} />
<Mark label="Delete row" glyph="−row" act={() => chain().deleteRow().run()} />
<Mark label="Delete column" glyph="−col" act={() => chain().deleteColumn().run()} />
<Mark label="Delete table" glyph="×" act={() => chain().deleteTable().run()} />
</div>
)}
</div>
</StopContext>
);
}

Expand Down
Loading
Loading