@kabmo-labs/kabmo 0.27.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +495 -467
- package/dist/client/static/js/index-81f7berm.css +1 -0
- package/dist/client/static/js/{index-e3qh2yps.js → index-xzvyrxya.js} +795 -795
- package/marketplace/plugins/command-runner/package.json +3 -17
- package/marketplace/plugins/command-runner/settings-schema.json +14 -0
- package/marketplace/plugins/git-forge/README.md +17 -7
- package/marketplace/plugins/git-forge/package.json +4 -30
- package/marketplace/plugins/git-forge/panel.css +16 -0
- package/marketplace/plugins/git-forge/settings-schema.json +27 -0
- package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
- package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
- package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
- package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
- package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
- package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
- package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
- package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
- package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
- package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
- package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
- package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
- package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
- package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
- package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
- package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
- package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
- package/marketplace/plugins/session-info/package.json +2 -10
- package/marketplace/plugins/session-info/settings-schema.json +8 -0
- package/marketplace/plugins/stats/README.md +17 -5
- package/marketplace/plugins/stats/package.json +3 -23
- package/marketplace/plugins/stats/settings-schema.json +20 -0
- package/marketplace/plugins/stats/src/app.tsx +1 -1
- package/marketplace/plugins/stats/src/groups.test.ts +46 -1
- package/marketplace/plugins/stats/src/groups.ts +22 -11
- package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
- package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
- package/marketplace/plugins/stats/src/labels.test.ts +54 -1
- package/marketplace/plugins/stats/src/labels.ts +33 -7
- package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
- package/marketplace/plugins/stats/src/sampler.ts +39 -5
- package/marketplace/plugins/stats/src/snapshot.ts +6 -0
- package/package.json +2 -2
- package/src/client/components/common/harness-glyph/index.tsx +18 -1
- package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
- package/src/client/components/common/session-actions-menu/index.tsx +43 -1
- package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
- package/src/client/components/common/session-row/index.tsx +4 -0
- package/src/client/components/common/session-row/session-row.test.tsx +6 -0
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
- package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
- package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
- package/src/client/components/settings/Modal.tsx +6 -2
- package/src/client/components/settings/Sidebar.tsx +30 -3
- package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
- package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
- package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
- package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
- package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
- package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
- package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
- package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
- package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
- package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +3 -2
- package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
- package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
- package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
- package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
- package/src/client/components/workspace/chat-timeline/index.tsx +11 -5
- package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +1 -9
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
- package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
- package/src/client/components/workspace/editor/FilePane.tsx +9 -4
- package/src/client/components/workspace/editor/Notices.tsx +2 -2
- package/src/client/components/workspace/editor/Pane.tsx +2 -2
- package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
- package/src/client/components/workspace/editor/index.tsx +6 -10
- package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
- package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +9 -1
- package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
- package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
- package/src/client/components/workspace/terminal-panel/index.tsx +14 -1
- package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
- package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
- package/src/client/hooks/chat/composer/use-draft.ts +45 -1
- package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
- package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
- package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
- package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
- package/src/client/hooks/chat/timeline/actions.ts +4 -4
- package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
- package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
- package/src/client/hooks/chat/timeline/index.ts +5 -2
- package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
- package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
- package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
- package/src/client/hooks/chat/timeline/modes.ts +32 -52
- package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
- package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
- package/src/client/hooks/chat/timeline/pending-dispatch.ts +4 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
- package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
- package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
- package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
- package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
- package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
- package/src/client/hooks/chat/timeline/send-props.ts +2 -0
- package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
- package/src/client/hooks/chat/timeline/send.test.ts +1 -0
- package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
- package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
- package/src/client/hooks/chat/waiting/cancel.ts +13 -6
- package/src/client/hooks/chat/waiting/choice.ts +13 -16
- package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
- package/src/client/hooks/chat/waiting/dispatch.ts +48 -28
- package/src/client/hooks/chat/waiting/held.ts +37 -13
- package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
- package/src/client/hooks/chat/waiting/hold.ts +20 -11
- package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
- package/src/client/hooks/chat/waiting/restore.ts +34 -0
- package/src/client/hooks/chat/waiting/store.ts +9 -3
- package/src/client/hooks/editor/file-editor-types.ts +21 -12
- package/src/client/hooks/editor/save-file.test.ts +1 -1
- package/src/client/hooks/editor/save-file.ts +35 -8
- package/src/client/hooks/editor/target-key.ts +17 -0
- package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
- package/src/client/hooks/editor/use-disk-digest.ts +164 -0
- package/src/client/hooks/editor/use-disk-sync.ts +212 -0
- package/src/client/hooks/editor/use-file-cache.ts +113 -0
- package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
- package/src/client/hooks/editor/use-file-editor.ts +90 -52
- package/src/client/hooks/editor/use-file-read.ts +24 -10
- package/src/client/hooks/editor/use-file-writes.ts +4 -4
- package/src/client/hooks/models/harness-catalog.ts +15 -0
- package/src/client/hooks/ui/notifications.ts +17 -8
- package/src/client/hooks/workspace/panel-registry.ts +1 -1
- package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
- package/src/client/lib/notifications/os.test.ts +1 -30
- package/src/client/lib/notifications/os.ts +0 -15
- package/src/client/lib/notifications/platform.test.ts +68 -0
- package/src/client/lib/notifications/platform.ts +36 -0
- package/src/server/index.ts +7 -0
- package/src/server/lib/harness/acp/client.ts +81 -87
- package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
- package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
- package/src/server/lib/harness/acp/prompt.test.ts +70 -1
- package/src/server/lib/harness/acp/prompt.ts +32 -1
- package/src/server/lib/harness/acp/protocol.ts +23 -0
- package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
- package/src/server/lib/harness/acp/session-handshake.ts +22 -20
- package/src/server/lib/harness/acp/session-options.ts +16 -0
- package/src/server/lib/harness/acp/session-process.ts +43 -0
- package/src/server/lib/harness/acp/session.ts +11 -12
- package/src/server/lib/harness/acp/stdio.ts +129 -0
- package/src/server/lib/harness/acp/verbs.test.ts +97 -0
- package/src/server/lib/harness/acp/verbs.ts +16 -6
- package/src/server/lib/harness/auto-probe.server.ts +4 -3
- package/src/server/lib/harness/capabilities.ts +8 -0
- package/src/server/lib/harness/config.server.ts +3 -2
- package/src/server/lib/harness/custom.server.ts +209 -0
- package/src/server/lib/harness/launch.ts +6 -1
- package/src/server/lib/harness/register.server.ts +8 -1
- package/src/server/lib/harness/schema.server.ts +21 -0
- package/src/server/lib/harness/session-lease.server.test.ts +99 -0
- package/src/server/lib/harness/session-lease.server.ts +193 -0
- package/src/server/lib/harness/session-store.server.test.ts +8 -8
- package/src/server/lib/harness/session-store.server.ts +25 -4
- package/src/server/lib/harness/session-title.server.ts +12 -2
- package/src/server/lib/harness/spawn.server.ts +123 -20
- package/src/server/lib/harness/update-queue.server.ts +3 -3
- package/src/server/lib/lifecycle/after-listen.ts +12 -1
- package/src/server/lib/lifecycle/paths.ts +19 -1
- package/src/server/lib/mcp/registry.server.ts +155 -0
- package/src/server/lib/mcp/registry.test.ts +169 -0
- package/src/server/lib/mcp/store.server.ts +38 -0
- package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
- package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
- package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
- package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
- package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
- package/src/server/lib/omp/rpc/run-model.ts +4 -2
- package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
- package/src/server/lib/omp/session/standby.server.ts +13 -2
- package/src/server/lib/panels/manifest.test.ts +47 -1
- package/src/server/lib/panels/manifest.ts +19 -0
- package/src/server/lib/panels/registry.server.ts +19 -2
- package/src/server/lib/panels/scan.server.ts +26 -2
- package/src/server/lib/panels/settings-schema.server.ts +72 -0
- package/src/server/lib/plugins/background.server.ts +21 -3
- package/src/server/lib/plugins/background.test.ts +13 -0
- package/src/server/lib/plugins/loader.server.ts +35 -51
- package/src/server/lib/plugins/mcp.server.ts +100 -0
- package/src/server/lib/plugins/mcp.test.ts +75 -0
- package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
- package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
- package/src/server/lib/plugins/schedule-store.server.ts +107 -0
- package/src/server/lib/plugins/schema.server.ts +8 -0
- package/src/server/lib/plugins/settings.server.ts +56 -19
- package/src/server/lib/plugins/shutdown.server.ts +58 -0
- package/src/server/lib/plugins/shutdown.test.ts +28 -3
- package/src/server/lib/realtime/topics/global.server.ts +5 -1
- package/src/server/lib/schedule/rows.server.ts +9 -0
- package/src/server/lib/schedule/runtime.server.test.ts +91 -0
- package/src/server/lib/schedule/runtime.server.ts +101 -23
- package/src/server/lib/schedule/schema.server.ts +15 -0
- package/src/server/lib/schedule/store.server.test.ts +34 -0
- package/src/server/lib/schedule/store.server.ts +33 -9
- package/src/server/lib/sessions/fork.server.test.ts +47 -0
- package/src/server/lib/sessions/fork.server.ts +17 -1
- package/src/server/lib/sessions/spawn.server.ts +2 -2
- package/src/server/lib/waiting/runtime.server.test.ts +48 -0
- package/src/server/lib/waiting/runtime.server.ts +22 -0
- package/src/server/lib/waiting/schema.server.ts +8 -0
- package/src/server/lib/waiting/store.server.test.ts +14 -0
- package/src/server/lib/waiting/store.server.ts +6 -2
- package/src/server/routes/agent/command-resume.test.ts +9 -4
- package/src/server/routes/agent/new-mode.test.ts +40 -0
- package/src/server/routes/agent/new.ts +31 -10
- package/src/server/routes/agent/prewarm.ts +48 -7
- package/src/server/routes/fs/action.ts +9 -1
- package/src/server/routes/fs/digest.test.ts +100 -0
- package/src/server/routes/fs/digest.ts +106 -0
- package/src/server/routes/fs/index.ts +2 -0
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/harness/custom.test.ts +131 -0
- package/src/server/routes/harness/import-action.ts +2 -2
- package/src/server/routes/harness/root.ts +41 -8
- package/src/server/routes/harness/update.ts +2 -2
- package/src/server/routes/panels/bindings.ts +2 -0
- package/src/server/routes/panels/settings.test.ts +165 -0
- package/src/server/routes/panels/settings.ts +106 -0
- package/src/server/routes/schedule/body.ts +14 -0
- package/src/server/routes/schedule/index.ts +28 -4
- package/src/server/routes/settings/mcp.ts +9 -26
- package/src/server/routes/waiting/index.ts +21 -2
- package/src/server/routes/waiting/routes.test.ts +21 -0
- package/src/shared/lib/chat/composer/delegation.ts +3 -3
- package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
- package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
- package/src/shared/lib/fs/content-hash.ts +29 -0
- package/src/shared/lib/harness/catalog.ts +48 -6
- package/src/shared/lib/harness/fork.ts +60 -0
- package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
- package/src/shared/lib/harness/mcp-facts.ts +65 -0
- package/src/shared/lib/harness/menu.test.ts +16 -1
- package/src/shared/lib/harness/menu.ts +2 -2
- package/src/shared/lib/harness/rewind.ts +6 -6
- package/src/shared/lib/harness/session-modes.ts +31 -0
- package/src/shared/lib/harness/transcript.test.ts +29 -0
- package/src/shared/lib/harness/transcript.ts +19 -0
- package/src/shared/lib/notifications/settings.test.ts +21 -0
- package/src/shared/lib/notifications/settings.ts +24 -0
- package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
- package/src/shared/lib/omp/session/prewarm.ts +25 -6
- package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
- package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
- package/src/shared/lib/panels/capabilities.test.ts +1 -1
- package/src/shared/lib/panels/capabilities.ts +3 -0
- package/src/shared/lib/plugins/settings.ts +22 -0
- package/src/shared/lib/schedule/parse.test.ts +48 -0
- package/src/shared/lib/schedule/parse.ts +69 -45
- package/src/shared/lib/schedule/timezone.ts +128 -0
- package/src/shared/lib/settings/defaults.ts +2 -0
- package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
- package/src/shared/lib/workspace/relative-time.ts +16 -0
- package/src/shared/types/harness.ts +7 -0
- package/src/shared/types/omp/agent.ts +6 -0
- package/src/shared/types/panels-registry.ts +3 -3
- package/src/shared/types/panels.ts +4 -2
- package/src/shared/types/schedule.ts +13 -0
- package/src/shared/types/settings/state.ts +12 -1
- package/src/shared/types/waiting.ts +9 -0
- package/src/test-support/file-editor.test-util.ts +70 -5
- package/dist/client/static/js/index-32rpkj6b.css +0 -1
- package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
- package/src/client/hooks/editor/use-external-change.test.ts +0 -88
- package/src/client/hooks/editor/use-external-change.ts +0 -146
|
@@ -6,22 +6,28 @@
|
|
|
6
6
|
/**
|
|
7
7
|
* The list for the chosen section.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
9
|
+
* Four states that are NOT "empty", and each says its own thing:
|
|
10
10
|
*
|
|
11
11
|
* - **No workspace / no remote** is a refusal from the server, and the sentence
|
|
12
12
|
* names what to do (`git remote add origin …`);
|
|
13
13
|
* - **A section with nothing in it** is a normal answer — a project with no
|
|
14
14
|
* releases has none — and must not read as a failure;
|
|
15
15
|
* - **A truncated page** says so, because a silently short list reads as "this
|
|
16
|
-
* project has three issues", which is a wrong answer rather than a partial one
|
|
16
|
+
* project has three issues", which is a wrong answer rather than a partial one;
|
|
17
|
+
* - **A read in flight** draws skeleton rows, so the list does not jump when the
|
|
18
|
+
* answer lands and the panel does not look frozen.
|
|
17
19
|
*
|
|
18
20
|
* The notes the server returns (anonymous read, a section that failed) are shown
|
|
19
21
|
* ABOVE the list rather than in a corner: a list that is missing because a token
|
|
20
22
|
* is wrong looks exactly like a list that is genuinely empty.
|
|
23
|
+
*
|
|
24
|
+
* **Arrow keys move between rows.** A forge list is a column of buttons, and a
|
|
25
|
+
* reader who has opened one wants the next without reaching for the mouse. The
|
|
26
|
+
* rows stay real buttons, so Enter and Space keep working natively.
|
|
21
27
|
*/
|
|
22
28
|
|
|
23
29
|
import type { ForgeItem, ForgeList, ForgeProvider, ForgeSection } from '../protocol';
|
|
24
|
-
import {
|
|
30
|
+
import { Note } from '@kabmo-labs/kabmo-ui/components';
|
|
25
31
|
|
|
26
32
|
import { Glyph, ICON } from './Glyph';
|
|
27
33
|
import { ItemRow } from './Row';
|
|
@@ -35,20 +41,114 @@ interface ListProps {
|
|
|
35
41
|
loading: boolean;
|
|
36
42
|
error: string | null;
|
|
37
43
|
onOpen: (item: ForgeItem) => void;
|
|
44
|
+
onRetry: () => void;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** The rows a keyboard reader can move between, in DOM order. */
|
|
48
|
+
function rowButtons(container: HTMLElement): HTMLButtonElement[] {
|
|
49
|
+
return [...container.querySelectorAll<HTMLButtonElement>('button[data-forge-row]')];
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Move focus to the row `delta` away from the focused one, clamped. */
|
|
53
|
+
function moveFocus(container: HTMLElement, delta: number): void {
|
|
54
|
+
const rows = rowButtons(container);
|
|
55
|
+
if (rows.length === 0) return;
|
|
56
|
+
const current = rows.indexOf(document.activeElement as HTMLButtonElement);
|
|
57
|
+
const next = current === -1 ? (delta > 0 ? 0 : rows.length - 1) : Math.min(rows.length - 1, Math.max(0, current + delta));
|
|
58
|
+
rows[next]?.focus();
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function onListKeyDown(event: KeyboardEvent): void {
|
|
62
|
+
const container = event.currentTarget as HTMLElement;
|
|
63
|
+
if (event.key === 'ArrowDown') {
|
|
64
|
+
event.preventDefault();
|
|
65
|
+
moveFocus(container, 1);
|
|
66
|
+
} else if (event.key === 'ArrowUp') {
|
|
67
|
+
event.preventDefault();
|
|
68
|
+
moveFocus(container, -1);
|
|
69
|
+
} else if (event.key === 'Home') {
|
|
70
|
+
event.preventDefault();
|
|
71
|
+
rowButtons(container)[0]?.focus();
|
|
72
|
+
} else if (event.key === 'End') {
|
|
73
|
+
event.preventDefault();
|
|
74
|
+
const rows = rowButtons(container);
|
|
75
|
+
rows[rows.length - 1]?.focus();
|
|
76
|
+
}
|
|
38
77
|
}
|
|
39
78
|
|
|
40
|
-
|
|
79
|
+
/** A loading list: the shape of a row, without the content. */
|
|
80
|
+
function SkeletonRows() {
|
|
81
|
+
return (
|
|
82
|
+
<div aria-hidden="true" className="flex flex-col">
|
|
83
|
+
{[0, 1, 2, 3].map((index) => (
|
|
84
|
+
<div key={index} className="flex flex-col gap-1.5 border-b border-ink/8 px-2.5 py-2">
|
|
85
|
+
<div className="flex items-center gap-2">
|
|
86
|
+
<span className="h-2.5 w-10 flex-shrink-0 animate-pulse rounded bg-ink/10" />
|
|
87
|
+
<span className="h-2.5 flex-1 animate-pulse rounded bg-ink/10" />
|
|
88
|
+
<span className="h-2.5 w-6 flex-shrink-0 animate-pulse rounded bg-ink/10" />
|
|
89
|
+
</div>
|
|
90
|
+
<div className="flex items-center gap-2">
|
|
91
|
+
<span className="h-2 w-8 animate-pulse rounded bg-ink/5" />
|
|
92
|
+
<span className="h-2 w-16 animate-pulse rounded bg-ink/5" />
|
|
93
|
+
</div>
|
|
94
|
+
</div>
|
|
95
|
+
))}
|
|
96
|
+
</div>
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/** A centred state: a mark, a sentence, and the one action that helps. */
|
|
101
|
+
function StateBlock({
|
|
102
|
+
icon,
|
|
103
|
+
title,
|
|
104
|
+
hint,
|
|
105
|
+
action,
|
|
106
|
+
}: {
|
|
107
|
+
icon: string;
|
|
108
|
+
title: string;
|
|
109
|
+
hint?: string;
|
|
110
|
+
action?: preact.ComponentChildren;
|
|
111
|
+
}) {
|
|
112
|
+
return (
|
|
113
|
+
<div className="flex h-full flex-col items-center justify-center gap-2 px-6 text-center">
|
|
114
|
+
<span className="text-ink/40">
|
|
115
|
+
<Glyph path={icon} size={20} />
|
|
116
|
+
</span>
|
|
117
|
+
<p className="text-[11px] leading-relaxed text-ink/70">{title}</p>
|
|
118
|
+
{hint && <p className="max-w-xs text-[10px] leading-relaxed text-ink/55">{hint}</p>}
|
|
119
|
+
{action}
|
|
120
|
+
</div>
|
|
121
|
+
);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export function ItemList({ list, provider, section, selectedId, loading, error, onOpen, onRetry }: ListProps) {
|
|
41
125
|
if (error && !list) {
|
|
42
126
|
return (
|
|
43
|
-
<
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
127
|
+
<StateBlock
|
|
128
|
+
icon={ICON.warning}
|
|
129
|
+
title={error}
|
|
130
|
+
action={
|
|
131
|
+
<button
|
|
132
|
+
type="button"
|
|
133
|
+
onClick={onRetry}
|
|
134
|
+
className="mt-1 tap-target cursor-pointer rounded border border-ink/20 px-2.5 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ink/20"
|
|
135
|
+
>
|
|
136
|
+
Try again
|
|
137
|
+
</button>
|
|
138
|
+
}
|
|
139
|
+
/>
|
|
47
140
|
);
|
|
48
141
|
}
|
|
49
142
|
|
|
50
143
|
if (!list) {
|
|
51
|
-
|
|
144
|
+
if (loading) {
|
|
145
|
+
return (
|
|
146
|
+
<div className="flex h-full min-h-0 flex-col" aria-busy="true" aria-label="Reading from the host">
|
|
147
|
+
<SkeletonRows />
|
|
148
|
+
</div>
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
return <StateBlock icon={ICON.forge} title="No repository selected." hint="Pick a repository above to read its forge." />;
|
|
52
152
|
}
|
|
53
153
|
|
|
54
154
|
const data = list.sections[section];
|
|
@@ -56,8 +156,20 @@ export function ItemList({ list, provider, section, selectedId, loading, error,
|
|
|
56
156
|
|
|
57
157
|
return (
|
|
58
158
|
<div className="flex h-full min-h-0 flex-col">
|
|
159
|
+
{error && (
|
|
160
|
+
// A refresh that failed over a list that is still on screen is REPORTED
|
|
161
|
+
// rather than silently left as the old rows: the reader would otherwise
|
|
162
|
+
// be reading a snapshot of unknown age.
|
|
163
|
+
<div className="flex flex-shrink-0 items-start gap-1.5 border-b border-ink/10 px-2.5 py-1.5" role="status">
|
|
164
|
+
<span className="mt-0.5 flex-shrink-0 text-error-text">
|
|
165
|
+
<Glyph path={ICON.warning} size={11} />
|
|
166
|
+
</span>
|
|
167
|
+
<p className="min-w-0 flex-1 text-[10px] leading-relaxed text-error-text">{error}</p>
|
|
168
|
+
</div>
|
|
169
|
+
)}
|
|
170
|
+
|
|
59
171
|
{list.notes.length > 0 && (
|
|
60
|
-
<div className="flex-shrink-0 border-b border-ink/10 px-2.5 py-1.5">
|
|
172
|
+
<div className="flex flex-shrink-0 flex-col gap-0.5 border-b border-ink/10 px-2.5 py-1.5">
|
|
61
173
|
{list.notes.map((note) => (
|
|
62
174
|
<Note key={note}>{note}</Note>
|
|
63
175
|
))}
|
|
@@ -68,23 +180,39 @@ export function ItemList({ list, provider, section, selectedId, loading, error,
|
|
|
68
180
|
// The server already pushed the sentence into `notes` (shown above), so
|
|
69
181
|
// this is the same fact in the place the list would have been: a failed
|
|
70
182
|
// read is not an empty section, and only one of them is actionable.
|
|
71
|
-
<
|
|
183
|
+
<StateBlock
|
|
184
|
+
icon={ICON.warning}
|
|
185
|
+
title={`The ${name} could not be read.`}
|
|
186
|
+
hint="The note above names the reason."
|
|
187
|
+
action={
|
|
188
|
+
<button
|
|
189
|
+
type="button"
|
|
190
|
+
onClick={onRetry}
|
|
191
|
+
className="mt-1 tap-target cursor-pointer rounded border border-ink/20 px-2.5 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ink/20"
|
|
192
|
+
>
|
|
193
|
+
Try again
|
|
194
|
+
</button>
|
|
195
|
+
}
|
|
196
|
+
/>
|
|
72
197
|
) : data.items.length === 0 ? (
|
|
73
|
-
<
|
|
198
|
+
<StateBlock
|
|
199
|
+
icon={ICON.inbox}
|
|
200
|
+
title={`No ${name} for this repository.`}
|
|
201
|
+
hint={list.filter.state === 'open' ? 'Try the Closed or All filter.' : undefined}
|
|
202
|
+
/>
|
|
74
203
|
) : (
|
|
75
|
-
<div
|
|
204
|
+
<div
|
|
205
|
+
className="min-h-0 flex-1 overflow-y-auto scrollbar-overlay-container"
|
|
206
|
+
onKeyDown={onListKeyDown}
|
|
207
|
+
aria-busy={loading}
|
|
208
|
+
>
|
|
76
209
|
{data.items.map((item) => (
|
|
77
|
-
<ItemRow
|
|
78
|
-
key={`${section}:${item.id}`}
|
|
79
|
-
item={item}
|
|
80
|
-
selected={item.id === selectedId}
|
|
81
|
-
onOpen={() => onOpen(item)}
|
|
82
|
-
/>
|
|
210
|
+
<ItemRow key={`${section}:${item.id}`} item={item} selected={item.id === selectedId} onOpen={() => onOpen(item)} />
|
|
83
211
|
))}
|
|
84
212
|
{data.truncated && (
|
|
85
|
-
<p className="px-2.5 py-2 text-[10px] text-ink/
|
|
86
|
-
Showing the first {data.items.length}
|
|
87
|
-
|
|
213
|
+
<p className="px-2.5 py-2 text-[10px] leading-relaxed text-ink/55">
|
|
214
|
+
Showing the first {data.items.length}. The host returned a full page; raise "Items per section" in the
|
|
215
|
+
plugin settings to read more.
|
|
88
216
|
</p>
|
|
89
217
|
)}
|
|
90
218
|
</div>
|
|
@@ -14,12 +14,15 @@
|
|
|
14
14
|
*
|
|
15
15
|
* The title truncates rather than wraps: a long title that wraps makes the rows
|
|
16
16
|
* uneven, and the full title is the first thing the item's own page shows.
|
|
17
|
+
*
|
|
18
|
+
* The age is `tabular-nums` so a column of them lines up, and its tooltip is the
|
|
19
|
+
* full timestamp: a compact `3d` is a scan aid, not the only copy of the date.
|
|
17
20
|
*/
|
|
18
21
|
|
|
19
22
|
import type { ForgeItem } from '../protocol';
|
|
20
23
|
import { LabelChips, StateBadge } from './Badge';
|
|
21
24
|
import { Glyph, ICON } from './Glyph';
|
|
22
|
-
import { STATE_LABEL, itemIdLabel, relativeTime } from './format';
|
|
25
|
+
import { STATE_LABEL, fullTime, itemIdLabel, relativeTime } from './format';
|
|
23
26
|
|
|
24
27
|
interface RowProps {
|
|
25
28
|
item: ForgeItem;
|
|
@@ -37,25 +40,28 @@ export function ItemRow({ item, selected, onOpen }: RowProps) {
|
|
|
37
40
|
return (
|
|
38
41
|
<button
|
|
39
42
|
type="button"
|
|
43
|
+
data-forge-row
|
|
40
44
|
onClick={onOpen}
|
|
41
45
|
title={`${itemIdLabel(item)} ${item.title}`}
|
|
42
46
|
aria-label={accessibleName}
|
|
43
47
|
aria-current={selected ? 'true' : undefined}
|
|
44
|
-
className={`flex w-full flex-col gap-
|
|
48
|
+
className={`flex w-full cursor-pointer flex-col gap-1 border-b border-ink/8 px-2.5 py-2 text-left transition-colors focus-visible:outline-none ring-inset focus-visible:ring-2 focus-visible:ring-ink/20 ${
|
|
45
49
|
selected ? 'bg-ink/8' : 'hover:bg-ink/5'
|
|
46
50
|
}`}
|
|
47
51
|
>
|
|
48
52
|
<span aria-hidden="true" className="flex items-center gap-1.5">
|
|
49
53
|
<StateBadge state={item.state} />
|
|
50
54
|
<span className="min-w-0 flex-1 truncate text-xs text-ink">{item.title}</span>
|
|
51
|
-
<span className="flex-shrink-0 font-mono text-[10px] text-ink/
|
|
55
|
+
<span className="flex-shrink-0 font-mono text-[10px] tabular-nums text-ink/60" title={fullTime(item.updatedAt)}>
|
|
56
|
+
{age}
|
|
57
|
+
</span>
|
|
52
58
|
</span>
|
|
53
|
-
<span aria-hidden="true" className="flex items-center gap-1.5 text-[10px] text-ink/
|
|
59
|
+
<span aria-hidden="true" className="flex items-center gap-1.5 text-[10px] text-ink/60">
|
|
54
60
|
<span className="flex-shrink-0 font-mono">{itemIdLabel(item)}</span>
|
|
55
61
|
<span className="min-w-0 truncate">{item.author}</span>
|
|
56
62
|
{item.comments > 0 && (
|
|
57
63
|
<span className="flex flex-shrink-0 items-center gap-0.5" title={`${item.comments} comments`}>
|
|
58
|
-
<Glyph path={ICON.comment} size={
|
|
64
|
+
<Glyph path={ICON.comment} size={10} />
|
|
59
65
|
{item.comments}
|
|
60
66
|
</span>
|
|
61
67
|
)}
|
|
@@ -17,21 +17,22 @@
|
|
|
17
17
|
*
|
|
18
18
|
* A count of zero is shown rather than hidden — "0 releases" is information, and
|
|
19
19
|
* a missing row would make the reader wonder whether the section exists at all.
|
|
20
|
-
* A `+` says the host returned a full page, and a
|
|
21
|
-
* be read at all (a 403 is not an empty project).
|
|
20
|
+
* A `+` says the host returned a full page, and a `!` says the section could not
|
|
21
|
+
* be read at all (a 403 is not an empty project). Both carry a tooltip, because
|
|
22
|
+
* a one-character answer is only useful when it can be explained.
|
|
22
23
|
*
|
|
23
|
-
* There is no provider header here: the header's own
|
|
24
|
+
* There is no provider header here: the header's own chip already names the
|
|
24
25
|
* host, and a second `GITHUB` label six lines below it was the panel saying the
|
|
25
26
|
* same thing twice in a 40px column.
|
|
26
27
|
*
|
|
27
28
|
* The state filter (open / closed / all) is deliberately NOT here. It belongs to
|
|
28
|
-
* the list it filters, so it sits in the header beside the
|
|
29
|
+
* the list it filters, so it sits in the header beside the search — a control
|
|
29
30
|
* that changes the list must not look like a fourth section.
|
|
30
31
|
*/
|
|
31
32
|
|
|
32
33
|
import type { ForgeList, ForgeProvider, ForgeSection } from '../protocol';
|
|
33
34
|
import { Glyph, ICON } from './Glyph';
|
|
34
|
-
import { sectionLabel, sectionShort } from './format';
|
|
35
|
+
import { countLabel, countTitle, sectionLabel, sectionShort } from './format';
|
|
35
36
|
|
|
36
37
|
interface SidebarProps {
|
|
37
38
|
sections: readonly ForgeSection[];
|
|
@@ -55,9 +56,7 @@ export function Sidebar({ sections, active, list, provider, onSelect }: SidebarP
|
|
|
55
56
|
{sections.map((section) => {
|
|
56
57
|
const isActive = section === active;
|
|
57
58
|
const data = list?.sections[section];
|
|
58
|
-
|
|
59
|
-
// confident wrong number, and it is the number a reader acts on.
|
|
60
|
-
const count = data && !data.failed ? data.items.length : null;
|
|
59
|
+
const count = countLabel(data);
|
|
61
60
|
const name = sectionLabel(section, provider);
|
|
62
61
|
// The name is stated ONCE, explicitly. Both the long and the short
|
|
63
62
|
// label are in the DOM (the breakpoint decides which is drawn), so
|
|
@@ -65,10 +64,7 @@ export function Sidebar({ sections, active, list, provider, onSelect }: SidebarP
|
|
|
65
64
|
// `IssuesIssues2+`, which a screen reader reads as two words and a
|
|
66
65
|
// count with no separation. The count is part of the name because it
|
|
67
66
|
// is the reason the row exists.
|
|
68
|
-
const accessibleName =
|
|
69
|
-
count === null
|
|
70
|
-
? name
|
|
71
|
-
: `${name} — ${count}${data?.truncated ? '+' : ''}`;
|
|
67
|
+
const accessibleName = count ? `${name}, ${count} items` : name;
|
|
72
68
|
return (
|
|
73
69
|
<button
|
|
74
70
|
key={section}
|
|
@@ -77,7 +73,7 @@ export function Sidebar({ sections, active, list, provider, onSelect }: SidebarP
|
|
|
77
73
|
title={name}
|
|
78
74
|
aria-label={accessibleName}
|
|
79
75
|
aria-current={isActive ? 'true' : undefined}
|
|
80
|
-
className={`flex flex-shrink-0 items-center gap-1.5 whitespace-nowrap px-2.5 py-1 text-left text-xs transition-colors @[520px]:w-full @[520px]:whitespace-normal ${
|
|
76
|
+
className={`flex flex-shrink-0 tap-target cursor-pointer items-center gap-1.5 whitespace-nowrap px-2.5 py-1.5 text-left text-xs transition-colors focus-visible:outline-none ring-inset focus-visible:ring-2 focus-visible:ring-ink/20 @[520px]:w-full @[520px]:whitespace-normal ${
|
|
81
77
|
isActive ? 'bg-ink/8 font-medium text-ink' : 'text-ink/70 hover:bg-ink/5 hover:text-ink'
|
|
82
78
|
}`}
|
|
83
79
|
>
|
|
@@ -88,8 +84,14 @@ export function Sidebar({ sections, active, list, provider, onSelect }: SidebarP
|
|
|
88
84
|
<span aria-hidden="true" className="@[520px]:hidden">
|
|
89
85
|
{sectionShort(section, provider)}
|
|
90
86
|
</span>
|
|
91
|
-
<span
|
|
92
|
-
|
|
87
|
+
<span
|
|
88
|
+
aria-hidden="true"
|
|
89
|
+
title={countTitle(data)}
|
|
90
|
+
className={`ml-auto flex-shrink-0 pl-1 font-mono text-[10px] tabular-nums ${
|
|
91
|
+
data?.failed ? 'text-error-text' : 'text-ink/60'
|
|
92
|
+
}`}
|
|
93
|
+
>
|
|
94
|
+
{count}
|
|
93
95
|
</span>
|
|
94
96
|
</button>
|
|
95
97
|
);
|
|
@@ -22,6 +22,10 @@
|
|
|
22
22
|
* fail is worse than no button, and a second copy of the rules here would drift
|
|
23
23
|
* from the one the server enforces.
|
|
24
24
|
*
|
|
25
|
+
* **No verbs means no bar.** A read-only credential used to leave an empty
|
|
26
|
+
* bordered strip at the bottom of the item, which reads as a control that failed
|
|
27
|
+
* to load. The bar is absent instead, and the detail's own note says why.
|
|
28
|
+
*
|
|
25
29
|
* ## A refusal is reported where the action was
|
|
26
30
|
*
|
|
27
31
|
* The server's sentence ("GitLab has no request-changes event…") lands in the
|
|
@@ -31,20 +35,12 @@
|
|
|
31
35
|
|
|
32
36
|
import { useState } from 'preact/hooks';
|
|
33
37
|
|
|
34
|
-
import type {
|
|
35
|
-
ForgeCapabilities,
|
|
36
|
-
ForgeCredential,
|
|
37
|
-
ForgeDetail,
|
|
38
|
-
ForgeItem,
|
|
39
|
-
ForgeMergeMethod,
|
|
40
|
-
ForgeWrite,
|
|
41
|
-
} from '../protocol';
|
|
38
|
+
import type { ForgeCapabilities, ForgeCredential, ForgeItem, ForgeMergeMethod, ForgeWrite } from '../protocol';
|
|
42
39
|
import type { ForgeWriteState } from './use-forge';
|
|
43
40
|
import { Glyph, ICON } from './Glyph';
|
|
44
41
|
|
|
45
42
|
interface WriteProps {
|
|
46
43
|
item: ForgeItem;
|
|
47
|
-
detail: ForgeDetail | null;
|
|
48
44
|
capabilities: ForgeCapabilities | null;
|
|
49
45
|
write: ForgeWriteState;
|
|
50
46
|
/** Which credential the server resolved. Absent when it could not be read. */
|
|
@@ -68,11 +64,16 @@ const MERGE_METHODS: Array<{ value: ForgeMergeMethod; label: string; hint: strin
|
|
|
68
64
|
{ value: 'rebase', label: 'Rebase', hint: 'Replays the commits onto the target, with no merge commit.' },
|
|
69
65
|
];
|
|
70
66
|
|
|
67
|
+
const FOCUS = 'tap-target focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ink/20';
|
|
68
|
+
|
|
71
69
|
/** The sentence a confirmation shows before an irreversible verb runs. */
|
|
72
70
|
export function consequence(item: ForgeItem, pending: Pending, method: ForgeMergeMethod): string {
|
|
73
71
|
if (pending === 'merge') {
|
|
74
72
|
const chosen = MERGE_METHODS.find((entry) => entry.value === method);
|
|
75
|
-
|
|
73
|
+
// The sentence names WHAT happens; the radio list below names what each
|
|
74
|
+
// style means. Repeating the chosen style's hint here made the default
|
|
75
|
+
// choice read twice in a row.
|
|
76
|
+
return `Merge ${item.number !== null ? `#${item.number}` : item.title} into its target branch with "${chosen?.label ?? method}".`;
|
|
76
77
|
}
|
|
77
78
|
if (pending === 'close') return `Close ${item.number !== null ? `#${item.number}` : item.title}. It stays readable and can be reopened.`;
|
|
78
79
|
if (pending === 'reopen') return `Reopen ${item.number !== null ? `#${item.number}` : item.title}.`;
|
|
@@ -81,7 +82,16 @@ export function consequence(item: ForgeItem, pending: Pending, method: ForgeMerg
|
|
|
81
82
|
return '';
|
|
82
83
|
}
|
|
83
84
|
|
|
84
|
-
|
|
85
|
+
/** The word on the confirm button, per verb. */
|
|
86
|
+
const CONFIRM_LABEL: Record<Exclude<Pending, null>, string> = {
|
|
87
|
+
merge: 'Merge',
|
|
88
|
+
close: 'Close',
|
|
89
|
+
reopen: 'Reopen',
|
|
90
|
+
approve: 'Approve',
|
|
91
|
+
request_changes: 'Request changes',
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
export function WriteBar({ item, capabilities, write }: WriteProps) {
|
|
85
95
|
const [body, setBody] = useState('');
|
|
86
96
|
const [pending, setPending] = useState<Pending>(null);
|
|
87
97
|
const [method, setMethod] = useState<ForgeMergeMethod>('merge');
|
|
@@ -125,23 +135,32 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
125
135
|
if (ok && (pending === 'approve' || pending === 'request_changes')) setBody('');
|
|
126
136
|
};
|
|
127
137
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
138
|
+
// No verb this read can perform: the bar is absent rather than empty. The
|
|
139
|
+
// detail's own note already says why (no credential, a release, a read-only
|
|
140
|
+
// token), so a second sentence here would repeat it.
|
|
141
|
+
if (!anyVerb) return null;
|
|
142
|
+
|
|
143
|
+
// Escape cancels the confirmation instead of leaving the item. The event is
|
|
144
|
+
// stopped here so the panel's own Escape handler (which returns to the list)
|
|
145
|
+
// does not also run: cancelling a dialog must not discard the item the reader
|
|
146
|
+
// is still working on.
|
|
147
|
+
const onKeyDown = (event: KeyboardEvent) => {
|
|
148
|
+
if (event.key !== 'Escape' || !pending) return;
|
|
149
|
+
event.stopPropagation();
|
|
150
|
+
setPending(null);
|
|
151
|
+
};
|
|
133
152
|
|
|
134
153
|
return (
|
|
135
|
-
<div className="flex flex-shrink-0 flex-col gap-1.5 border-t border-ink/10 px-2.5 py-
|
|
154
|
+
<div className="flex flex-shrink-0 flex-col gap-1.5 border-t border-ink/10 bg-paper px-2.5 py-2" onKeyDown={onKeyDown}>
|
|
136
155
|
{caps?.comment && (
|
|
137
|
-
<div className="flex flex-col gap-1">
|
|
156
|
+
<div className="flex flex-col gap-1.5">
|
|
138
157
|
<textarea
|
|
139
158
|
value={body}
|
|
140
159
|
onInput={(event) => setBody(event.currentTarget.value)}
|
|
141
160
|
placeholder="Add a comment…"
|
|
142
161
|
aria-label="Comment"
|
|
143
162
|
rows={2}
|
|
144
|
-
className="w-full resize-y rounded border border-ink/15 bg-canvas px-2 py-1.5 text-[11px] text-ink outline-none placeholder-ink/
|
|
163
|
+
className="w-full resize-y rounded border border-ink/15 bg-canvas px-2 py-1.5 text-[11px] leading-relaxed text-ink outline-none placeholder-ink/40 focus:border-ink/40"
|
|
145
164
|
/>
|
|
146
165
|
<div className="flex flex-wrap items-center gap-1">
|
|
147
166
|
<button
|
|
@@ -149,7 +168,7 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
149
168
|
onClick={() => void submitComment()}
|
|
150
169
|
disabled={write.pending || body.trim().length === 0}
|
|
151
170
|
aria-label={`Post a comment on ${label}`}
|
|
152
|
-
className=
|
|
171
|
+
className={`cursor-pointer rounded border border-ink/15 px-2 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
153
172
|
>
|
|
154
173
|
Comment
|
|
155
174
|
</button>
|
|
@@ -162,7 +181,7 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
162
181
|
onClick={() => setPending('approve')}
|
|
163
182
|
disabled={write.pending}
|
|
164
183
|
aria-label={`Approve ${label}`}
|
|
165
|
-
className=
|
|
184
|
+
className={`cursor-pointer rounded border border-ink/15 px-2 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
166
185
|
>
|
|
167
186
|
Approve
|
|
168
187
|
</button>
|
|
@@ -173,7 +192,7 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
173
192
|
onClick={() => setPending('request_changes')}
|
|
174
193
|
disabled={write.pending}
|
|
175
194
|
aria-label={`Request changes on ${label}`}
|
|
176
|
-
className=
|
|
195
|
+
className={`cursor-pointer rounded border border-ink/15 px-2 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
177
196
|
>
|
|
178
197
|
Request changes
|
|
179
198
|
</button>
|
|
@@ -181,50 +200,54 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
181
200
|
</>
|
|
182
201
|
)}
|
|
183
202
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
203
|
+
<div className="ml-auto flex items-center gap-1">
|
|
204
|
+
{canMerge && !closed && (
|
|
205
|
+
<button
|
|
206
|
+
type="button"
|
|
207
|
+
onClick={() => setPending('merge')}
|
|
208
|
+
disabled={write.pending}
|
|
209
|
+
aria-label={`Merge ${label}`}
|
|
210
|
+
className={`flex cursor-pointer items-center gap-1 rounded border border-ink/20 bg-ink px-2 py-1 text-[10px] text-canvas transition-opacity hover:opacity-90 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
211
|
+
>
|
|
212
|
+
<Glyph path={ICON.merge} size={10} />
|
|
213
|
+
Merge
|
|
214
|
+
</button>
|
|
215
|
+
)}
|
|
196
216
|
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
217
|
+
{/*
|
|
218
|
+
The accessible name carries the ITEM (`Close #12`), because the
|
|
219
|
+
bare word collides with the header's `Closed` filter: two controls
|
|
220
|
+
whose names differ by a letter are ambiguous to a screen reader and
|
|
221
|
+
to anything else that addresses a control by name.
|
|
222
|
+
*/}
|
|
223
|
+
{caps.state && (
|
|
224
|
+
<button
|
|
225
|
+
type="button"
|
|
226
|
+
onClick={() => setPending(closed ? 'reopen' : 'close')}
|
|
227
|
+
disabled={write.pending}
|
|
228
|
+
aria-label={`${closed ? 'Reopen' : 'Close'} ${label}`}
|
|
229
|
+
className={`cursor-pointer rounded border border-ink/15 px-2 py-1 text-[10px] text-ink transition-colors hover:bg-ink/5 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
230
|
+
>
|
|
231
|
+
{closed ? 'Reopen' : 'Close'}
|
|
232
|
+
</button>
|
|
233
|
+
)}
|
|
234
|
+
</div>
|
|
214
235
|
</div>
|
|
215
236
|
</div>
|
|
216
237
|
)}
|
|
217
238
|
|
|
218
|
-
|
|
219
|
-
|
|
239
|
+
<div aria-live="polite" className="flex flex-col gap-0.5">
|
|
240
|
+
{write.error && <p className="text-[10px] leading-relaxed text-error-text">{write.error}</p>}
|
|
241
|
+
{write.notice && <p className="text-[10px] leading-relaxed text-success-text">{write.notice}</p>}
|
|
242
|
+
</div>
|
|
220
243
|
|
|
221
244
|
{pending && (
|
|
222
|
-
<div className="rounded border border-ink/20 bg-canvas p-2">
|
|
245
|
+
<div className="flex flex-col gap-1.5 rounded border border-ink/20 bg-canvas p-2" role="group" aria-label="Confirm the action">
|
|
223
246
|
<p className="text-[11px] leading-snug text-ink">{consequence(item, pending, chosen)}</p>
|
|
224
247
|
{pending === 'merge' && (
|
|
225
|
-
<div className="
|
|
248
|
+
<div className="flex flex-col gap-1">
|
|
226
249
|
{MERGE_METHODS.filter((entry) => methods.includes(entry.value)).map((entry) => (
|
|
227
|
-
<label key={entry.value} className="flex items-start gap-1.5 text-[
|
|
250
|
+
<label key={entry.value} className="flex cursor-pointer items-start gap-1.5 text-[10px] text-ink/80">
|
|
228
251
|
<input
|
|
229
252
|
type="radio"
|
|
230
253
|
name="forge-merge-method"
|
|
@@ -234,25 +257,25 @@ export function WriteBar({ item, detail, capabilities, write }: WriteProps) {
|
|
|
234
257
|
/>
|
|
235
258
|
<span>
|
|
236
259
|
<span className="font-medium text-ink">{entry.label}</span>
|
|
237
|
-
<span className="text-ink/
|
|
260
|
+
<span className="text-ink/60">: {entry.hint}</span>
|
|
238
261
|
</span>
|
|
239
262
|
</label>
|
|
240
263
|
))}
|
|
241
264
|
</div>
|
|
242
265
|
)}
|
|
243
|
-
<div className="
|
|
266
|
+
<div className="flex items-center gap-1">
|
|
244
267
|
<button
|
|
245
268
|
type="button"
|
|
246
269
|
onClick={() => void confirm()}
|
|
247
270
|
disabled={write.pending}
|
|
248
|
-
className=
|
|
271
|
+
className={`cursor-pointer rounded bg-ink px-2 py-1 text-[10px] text-canvas transition-opacity hover:opacity-90 disabled:cursor-default disabled:opacity-40 ${FOCUS}`}
|
|
249
272
|
>
|
|
250
|
-
{pending
|
|
273
|
+
{CONFIRM_LABEL[pending]}
|
|
251
274
|
</button>
|
|
252
275
|
<button
|
|
253
276
|
type="button"
|
|
254
277
|
onClick={() => setPending(null)}
|
|
255
|
-
className=
|
|
278
|
+
className={`cursor-pointer rounded px-2 py-1 text-[10px] text-ink/60 transition-colors hover:text-ink ${FOCUS}`}
|
|
256
279
|
>
|
|
257
280
|
Cancel
|
|
258
281
|
</button>
|