diff --git a/Dockerfile b/Dockerfile index 45a23426..5cfc4ac4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ COPY apps/server/package.json ./apps/server/package.json COPY apps/web/package.json ./apps/web/package.json COPY packages/dialect/package.json ./packages/dialect/package.json COPY packages/editor/package.json ./packages/editor/package.json +COPY packages/icons/package.json ./packages/icons/package.json COPY packages/protocol/package.json ./packages/protocol/package.json COPY packages/question/package.json ./packages/question/package.json COPY packages/viewport/package.json ./packages/viewport/package.json diff --git a/apps/web/package.json b/apps/web/package.json index d9417423..805c32c0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -12,10 +12,10 @@ "dependencies": { "@chopin/dialect": "workspace:*", "@chopin/editor": "workspace:*", + "@chopin/icons": "workspace:*", "@chopin/protocol": "workspace:*", "@chopin/viewport": "workspace:*", "@fontsource-variable/inter": "^5.3.0", - "@phosphor-icons/react": "^2.1.10", "react": "catalog:react", "react-dom": "catalog:react", "react-markdown": "^10.1.0" diff --git a/apps/web/src/assets/figma/navigation/add-project.svg b/apps/web/src/assets/figma/navigation/add-project.svg index 695d5694..1bc9846d 100644 --- a/apps/web/src/assets/figma/navigation/add-project.svg +++ b/apps/web/src/assets/figma/navigation/add-project.svg @@ -12,7 +12,7 @@ - book-bookmark - - - - - - - - - diff --git a/apps/web/src/assets/figma/navigation/box-archive.svg b/apps/web/src/assets/figma/navigation/box-archive.svg deleted file mode 100644 index 2736ca23..00000000 --- a/apps/web/src/assets/figma/navigation/box-archive.svg +++ /dev/null @@ -1,8 +0,0 @@ - - box-archive - - - - - - diff --git a/apps/web/src/assets/figma/navigation/collapse.svg b/apps/web/src/assets/figma/navigation/collapse.svg deleted file mode 100644 index 998d1511..00000000 --- a/apps/web/src/assets/figma/navigation/collapse.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - diff --git a/apps/web/src/assets/figma/navigation/document-actions.svg b/apps/web/src/assets/figma/navigation/document-actions.svg index 67521f25..baa644f7 100644 --- a/apps/web/src/assets/figma/navigation/document-actions.svg +++ b/apps/web/src/assets/figma/navigation/document-actions.svg @@ -12,17 +12,17 @@ diff --git a/apps/web/src/assets/figma/navigation/new-document.svg b/apps/web/src/assets/figma/navigation/new-document.svg index 31942e55..8648fb3c 100644 --- a/apps/web/src/assets/figma/navigation/new-document.svg +++ b/apps/web/src/assets/figma/navigation/new-document.svg @@ -12,7 +12,7 @@ - - - - - diff --git a/apps/web/src/assets/figma/navigation/sidebar-right-3-hide.svg b/apps/web/src/assets/figma/navigation/sidebar-right-3-hide.svg deleted file mode 100644 index 821d0777..00000000 --- a/apps/web/src/assets/figma/navigation/sidebar-right-3-hide.svg +++ /dev/null @@ -1,19 +0,0 @@ - - sidebar-right-3-hide - diff --git a/apps/web/src/assets/icons/chat.svg b/apps/web/src/assets/icons/chat.svg index 703fb337..dfba35af 100644 --- a/apps/web/src/assets/icons/chat.svg +++ b/apps/web/src/assets/icons/chat.svg @@ -12,8 +12,7 @@ - chevron-right - - - - diff --git a/apps/web/src/assets/icons/navigation-xmark.svg b/apps/web/src/assets/icons/navigation-xmark.svg deleted file mode 100644 index 1feed2d9..00000000 --- a/apps/web/src/assets/icons/navigation-xmark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - xmark - - - - - diff --git a/apps/web/src/assets/icons/chat-close.svg b/apps/web/src/assets/icons/panel-close.svg similarity index 91% rename from apps/web/src/assets/icons/chat-close.svg rename to apps/web/src/assets/icons/panel-close.svg index 998d1511..e12fd20e 100644 --- a/apps/web/src/assets/icons/chat-close.svg +++ b/apps/web/src/assets/icons/panel-close.svg @@ -12,7 +12,7 @@ - circle-stopcircle-stop diff --git a/apps/web/src/assets/icons/send-arrow-up.svg b/apps/web/src/assets/icons/send-arrow-up.svg deleted file mode 100644 index f116a913..00000000 --- a/apps/web/src/assets/icons/send-arrow-up.svg +++ /dev/null @@ -1,7 +0,0 @@ - - arrow-up - diff --git a/apps/web/src/assets/icons/tool-chevron-down.svg b/apps/web/src/assets/icons/tool-chevron-down.svg deleted file mode 100644 index 8181ae1e..00000000 --- a/apps/web/src/assets/icons/tool-chevron-down.svg +++ /dev/null @@ -1,5 +0,0 @@ - - chevron-down - diff --git a/apps/web/src/assets/icons/tool-chevron-right.svg b/apps/web/src/assets/icons/tool-chevron-right.svg deleted file mode 100644 index dd3ee980..00000000 --- a/apps/web/src/assets/icons/tool-chevron-right.svg +++ /dev/null @@ -1,5 +0,0 @@ - - chevron-right - diff --git a/apps/web/src/assets/icons/tool-loader.svg b/apps/web/src/assets/icons/tool-loader.svg deleted file mode 100644 index 30925a97..00000000 --- a/apps/web/src/assets/icons/tool-loader.svg +++ /dev/null @@ -1,26 +0,0 @@ - - loader - diff --git a/apps/web/src/chat/chat.tsx b/apps/web/src/chat/chat.tsx index 1005e696..c02cbc5b 100644 --- a/apps/web/src/chat/chat.tsx +++ b/apps/web/src/chat/chat.tsx @@ -420,7 +420,7 @@ export function Chat( title="Stop Planner" type="button" > - + )} { expect(markup).toContain("Sam joined"); expect(markup).not.toContain("data-motion-feedback"); }); + +test("queued messages use the standard icon-button glyph", () => { + let markup = renderToStaticMarkup( + createElement(Transcript, { + active: true, + entries: [], + handle: "ana", + onWithdraw: () => {}, + queued: [{ handle: "ana", id: "queued", text: "One more thought" }], + }), + ); + + expect(markup).toMatch(/aria-label="Withdraw queued message"[^>]*>.*?height="14"/s); + expect(markup).toMatch(/aria-label="Withdraw queued message"[^>]*>.*?width="14"/s); + expect(markup).toContain("xmark"); + expect(markup).not.toContain(">×"); +}); diff --git a/apps/web/src/chat/transcript.tsx b/apps/web/src/chat/transcript.tsx index d065c5a8..a04e1b6c 100644 --- a/apps/web/src/chat/transcript.tsx +++ b/apps/web/src/chat/transcript.tsx @@ -1,7 +1,7 @@ /** The shared chat, grouped for reading rather than event delivery. */ import { useEffect, useId, useRef, useState } from "react"; -import { SignInIcon } from "@phosphor-icons/react"; +import { ChevronIcon, CloseIcon, LoaderIcon, SignInIcon } from "@chopin/icons"; import { AgentFace, Face, MotionDisclosure, MotionDisclosureIcon } from "@chopin/editor"; @@ -9,9 +9,6 @@ import { MessageMarkdown } from "./markdown"; import { capitalize, displayText, duration, group, summarize, toolCopy } from "./model"; import { motionContract } from "../motion-contract"; import { motionImmediately } from "../motion-input"; -import toolChevronDown from "../assets/icons/tool-chevron-down.svg"; -import toolChevronRight from "../assets/icons/tool-chevron-right.svg"; -import toolLoader from "../assets/icons/tool-loader.svg"; import type { Chat } from "@chopin/protocol"; import type { Group, Message } from "./model"; @@ -28,7 +25,7 @@ function ToolRun({ tools }: { tools: Chat.Activity[] }) { if (summary.state === "running") { return (
- +
@@ -46,9 +43,9 @@ function ToolRun({ tools }: { tools: Chat.Activity[] }) { > } + closed={