Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chg(ui): phosphorize icon set across app (#6486)

Seamus9b77ef7fa0ab
diff --git a/apps/web/src/components/app/GlobalHotkeys.tsx b/apps/web/src/components/app/GlobalHotkeys.tsx
index 4857afa99a..af50788f4f 100644
--- a/apps/web/src/components/app/GlobalHotkeys.tsx
+++ b/apps/web/src/components/app/GlobalHotkeys.tsx
@@ -36,7 +36,7 @@ import {
openFilePicker,
openFolderPicker,
} from '@core/util/upload';
-import IconGear from '@icon/macro-gear.svg';
+import IconGear from '@phosphor/gear.svg';
import Plus from '@phosphor/plus.svg';
import LogoutIcon from '@phosphor/sign-out.svg';
import Upload from '@phosphor/upload.svg';
diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsx
index 76db627a76..429fe4142d 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx
@@ -46,6 +46,7 @@ import type {
import { useHasPaidAccess } from '@core/auth';
import { useLogout } from '@core/auth/logout';
import { ContextMenuContent, MenuItem } from '@core/component/ContextMenu';
+import { getIconConfig } from '@core/component/EntityIcon';
import { inboxIconProps } from '@core/component/inboxIcon';
import { toast } from '@core/component/Toast/Toast';
import { UserIcon } from '@core/component/UserIcon';
@@ -72,24 +73,16 @@ import type { ValidHotkey } from '@core/hotkey/types';
import { activateClosestDOMScope } from '@core/hotkey/utils';
import { getDisplayName, tryMacroId } from '@core/user';
import LogoIcon from '@icon/macro-logo.svg';
-import { AnimatedActivityIcon } from '@icon/wide-activity';
-import WideCalendarIcon from '@icon/wide-calendar.svg';
-import { AnimatedCallIcon } from '@icon/wide-call';
-import PhoneIcon from '@icon/wide-call.svg';
-import { AnimatedChannelIcon } from '@icon/wide-channel';
-import { AnimatedCompanyIcon } from '@icon/wide-company';
-import { AnimatedEmailIcon } from '@icon/wide-email';
-import { AnimatedFileMdIcon } from '@icon/wide-fileMd';
-import { AnimatedHomeIcon } from '@icon/wide-home';
-import { AnimatedSearchIcon } from '@icon/wide-search';
-import { AnimatedStarIcon } from '@icon/wide-star';
-import { AnimatedTaskIcon } from '@icon/wide-task';
import { ContextMenu } from '@kobalte/core/context-menu';
import CaretRightIcon from '@phosphor/caret-right.svg';
import CaretUpIcon from '@phosphor/caret-up.svg';
import CompassIcon from '@phosphor/compass.svg';
import DotsThreeIcon from '@phosphor/dots-three.svg';
import GearIcon from '@phosphor/gear.svg';
+import HomeIcon from '@phosphor/house.svg';
+import SearchIcon from '@phosphor/magnifying-glass.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
+import ActivityIcon from '@phosphor/pulse.svg';
import SignOutIcon from '@phosphor/sign-out.svg';
import UsersThreeIcon from '@phosphor/users-three.svg';
import XIcon from '@phosphor/x.svg';
@@ -130,9 +123,7 @@ export interface SidebarItem {
label: string;
href: string;
params?: Record<string, unknown>;
- icon?: Component<
- JSX.SvgSVGAttributes<SVGSVGElement> & { triggerAnimation?: boolean }
- >;
+ icon?: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
hotkey?: ValidHotkey | ValidHotkey[];
hotkeyToken: HotkeyToken;
standaloneHotkey?: boolean;
@@ -190,7 +181,7 @@ const SIDEBAR_LINKS = [
id: 'inbox',
label: 'Home',
href: LIST_VIEW_PATHS.inbox,
- icon: AnimatedHomeIcon,
+ icon: HomeIcon,
hotkey: ['h', 'i'],
hotkeyToken: TOKENS.sidebar.goTo.inbox,
},
@@ -198,7 +189,7 @@ const SIDEBAR_LINKS = [
id: 'search',
label: 'Search',
href: LIST_VIEW_PATHS.search,
- icon: AnimatedSearchIcon,
+ icon: SearchIcon,
hotkey: '/',
hotkeyToken: TOKENS.sidebar.goTo.search,
standaloneHotkey: true,
@@ -208,7 +199,7 @@ const SIDEBAR_LINKS = [
id: 'agents',
label: 'Agents',
href: LIST_VIEW_PATHS.agents,
- icon: AnimatedStarIcon,
+ icon: getIconConfig('agent').icon,
hotkey: 'a',
hotkeyToken: TOKENS.sidebar.goTo.agents,
},
@@ -216,7 +207,7 @@ const SIDEBAR_LINKS = [
id: 'mail',
label: 'Email',
href: LIST_VIEW_PATHS.mail,
- icon: AnimatedEmailIcon,
+ icon: getIconConfig('email').icon,
hotkey: 'e',
hotkeyToken: TOKENS.sidebar.goTo.mail,
},
@@ -224,7 +215,7 @@ const SIDEBAR_LINKS = [
id: 'documents',
label: 'Files',
href: LIST_VIEW_PATHS.documents,
- icon: AnimatedFileMdIcon,
+ icon: getIconConfig('files').icon,
hotkey: 'f',
hotkeyToken: TOKENS.sidebar.goTo.documents,
},
@@ -239,7 +230,7 @@ const SIDEBAR_LINKS = [
or: ['doc-markdown'],
},
},
- icon: AnimatedFileMdIcon,
+ icon: getIconConfig('md').icon,
hotkey: 'd',
hotkeyToken: TOKENS.sidebar.goTo.markdownDocuments,
hiddenFromSidebar: true,
@@ -248,7 +239,7 @@ const SIDEBAR_LINKS = [
id: 'tasks',
label: 'Tasks',
href: LIST_VIEW_PATHS.tasks,
- icon: AnimatedTaskIcon,
+ icon: getIconConfig('task').icon,
hotkey: 't',
hotkeyToken: TOKENS.sidebar.goTo.tasks,
},
@@ -256,7 +247,7 @@ const SIDEBAR_LINKS = [
id: 'calendar',
label: 'Calendar',
href: '/calendar',
- icon: WideCalendarIcon,
+ icon: getIconConfig('calendar').icon,
hotkey: 'r',
hotkeyToken: TOKENS.sidebar.goTo.calendar,
},
@@ -264,7 +255,7 @@ const SIDEBAR_LINKS = [
id: 'channels',
label: 'Channels',
href: LIST_VIEW_PATHS.channels,
- icon: AnimatedChannelIcon,
+ icon: getIconConfig('channel').icon,
hotkey: 'c',
hotkeyToken: TOKENS.sidebar.goTo.channels,
},
@@ -599,20 +590,16 @@ const SidebarSectionMenu = (props: {
type TryCardItem = {
id: TryItemId;
label: string;
- icon: Component<{ triggerAnimation?: boolean; class?: string }>;
+ icon: Component<{ class?: string }>;
onClick: () => void;
};
const TryCardRow = (props: { item: TryCardItem }) => {
- const [isHovering, setIsHovering] = createSignal(false);
-
return (
<button
type="button"
aria-label={props.item.label}
class="flex h-7 w-full items-center justify-start gap-2 rounded-md px-1.5 py-0 text-sm font-medium text-ink-muted outline-none hover:bg-ink/5 hover:text-ink focus-visible:bg-ink/5 focus-visible:text-ink [&_svg]:size-3.5"
- onMouseEnter={() => setIsHovering(true)}
- onMouseLeave={() => setIsHovering(false)}
onMouseDown={(e) => {
if (e.button !== 0) return;
e.preventDefault();
@@ -620,7 +607,7 @@ const TryCardRow = (props: { item: TryCardItem }) => {
onClick={props.item.onClick}
>
<span class="size-5 shrink-0 flex items-center justify-center">
- <Dynamic component={props.item.icon} triggerAnimation={isHovering()} />
+ <Dynamic component={props.item.icon} />
</span>
<span class="min-w-0 flex-1 truncate text-left">{props.item.label}</span>
</button>
@@ -666,7 +653,6 @@ const SidebarDropdownLink = (
const analytics = useAnalytics();
const layout = useSplitLayout();
const location = useLocation();
- const [isHovering, setIsHovering] = createSignal(false);
let contextMenuOpen = false;
const isActive = () => {
@@ -752,13 +738,11 @@ const SidebarDropdownLink = (
'bg-ink/6 text-ink hover:bg-ink/6 data-highlighted:bg-ink/6'
)}
data-active={isActive() ? '' : undefined}
- onMouseEnter={() => setIsHovering(true)}
- onMouseLeave={() => setIsHovering(false)}
onSelect={openInCurrentSplit}
>
<Show when={props.icon}>
<div class="shrink-0 [&_svg]:size-3.5">
- <Dynamic component={props.icon} triggerAnimation={isHovering()} />
+ <Dynamic component={props.icon} />
</div>
</Show>
<span class="min-w-0 flex-1 truncate text-ink">{props.label}</span>
@@ -1009,7 +993,7 @@ const CALLS_LINK: SidebarItem = {
id: 'calls',
label: 'Calls',
href: LIST_VIEW_PATHS.calls,
- icon: AnimatedCallIcon,
+ icon: getIconConfig('call').icon,
hotkey: 'l',
hotkeyToken: TOKENS.sidebar.goTo.calls,
};
@@ -1018,7 +1002,7 @@ const COMPANIES_LINK: SidebarItem = {
id: 'companies',
label: 'Customers',
href: LIST_VIEW_PATHS.companies,
- icon: AnimatedCompanyIcon,
+ icon: getIconConfig('company').icon,
hotkey: 'o',
hotkeyToken: TOKENS.sidebar.goTo.companies,
};
@@ -1027,7 +1011,7 @@ const DASHBOARD_LINK: SidebarItem = {
id: 'home',
label: 'Assistant',
href: '/home',
- icon: AnimatedHomeIcon,
+ icon: HomeIcon,
hotkeyToken: TOKENS.sidebar.goTo.home,
};
@@ -1044,7 +1028,7 @@ const ACTIVITY_LINK: SidebarItem = {
id: 'activity',
label: 'Activity',
href: '/activity',
- icon: AnimatedActivityIcon,
+ icon: ActivityIcon,
hotkey: 'y',
hotkeyToken: TOKENS.sidebar.goTo.activity,
};
@@ -1053,7 +1037,7 @@ const RECENT_LINK: SidebarItem = {
id: 'recent',
label: 'Recent',
href: LIST_VIEW_PATHS.recent,
- icon: AnimatedActivityIcon,
+ icon: ActivityIcon,
// `r` is Calendar and `e`/`c`/`t` are taken; `n` is the only letter of
// "recent" that is not already a sidebar destination.
hotkey: 'n',
@@ -1421,7 +1405,7 @@ export const AppSidebar = (props: AppSidebarProps) => {
const addTryItem = (
id: TryItemId,
label: string,
- icon: Component<{ triggerAnimation?: boolean; class?: string }>,
+ icon: Component<{ class?: string }>,
onClick: () => void
) => {
if (!tryVisibility()[id]) return;
@@ -1920,9 +1904,7 @@ const SidebarLinkRow = (props: SidebarLinkProps) => {
? props.removeAction
: undefined
}
- fallback={
- <Dynamic component={props.icon} triggerAnimation={isHovering()} />
- }
+ fallback={<Dynamic component={props.icon} />}
>
{(removeAction) => (
<Tooltip label={removeAction().tooltip} as="span" placement="top">
diff --git a/apps/web/src/components/app/mobile/mobile-dock-views.ts b/apps/web/src/components/app/mobile/mobile-dock-views.ts
index bc5cf73837..f95c3a372e 100644
--- a/apps/web/src/components/app/mobile/mobile-dock-views.ts
+++ b/apps/web/src/components/app/mobile/mobile-dock-views.ts
@@ -1,19 +1,12 @@
import { useCalendarUiFlag } from '@app/features/calendar/hooks/use-calendar-ui-flag';
import { useFeatureFlag } from '@app/lib/analytics/posthog';
+import { getIconConfig } from '@core/component/EntityIcon';
import { enableCrm } from '@core/constant/featureFlags';
-import CompanyIcon from '@icon/wide-company.svg';
-import CalendarIcon from '@phosphor/calendar-blank.svg';
-import ChatsIcon from '@phosphor/chats-circle.svg';
-import EmailIcon from '@phosphor/envelope.svg';
-import FilesIcon from '@phosphor/folder-simple.svg';
import HouseIcon from '@phosphor/house.svg';
-import TasksIcon from '@phosphor/list-checks.svg';
-import CallsIcon from '@phosphor/phone.svg';
-import AgentsIcon from '@phosphor/sparkle.svg';
-import CalendarFillIcon from '@phosphor-fill/calendar-blank-fill.svg';
-import ChatsFillIcon from '@phosphor-fill/chats-circle-fill.svg';
+import CalendarFillIcon from '@phosphor-fill/calendar-fill.svg';
import EmailFillIcon from '@phosphor-fill/envelope-fill.svg';
-import FilesFillIcon from '@phosphor-fill/folder-simple-fill.svg';
+import FilesFillIcon from '@phosphor-fill/files-fill.svg';
+import ChannelFillIcon from '@phosphor-fill/hash-straight-fill.svg';
import HouseFillIcon from '@phosphor-fill/house-fill.svg';
import { createMemo } from 'solid-js';
import type { MobileDockIcon } from './MobileDockButton';
@@ -22,7 +15,7 @@ import type { MobileNavViewId } from './mobile-nav-views';
export type MobileDockView = {
id: Exclude<MobileNavViewId, 'search' | 'settings'>;
label: string;
- /** Same Phosphor glyph as the desktop sidebar. */
+ /** Phosphor glyph for this view. */
icon: MobileDockIcon;
iconActive?: MobileDockIcon;
/** When set, the scope pill renders icon-only with this icon. */
@@ -45,32 +38,32 @@ const MOBILE_DOCK_VIEWS: readonly MobileDockView[] = [
{
id: 'calendar',
label: 'Calendar',
- icon: CalendarIcon,
+ icon: getIconConfig('calendar').icon,
iconActive: CalendarFillIcon,
- pillIcon: CalendarIcon,
+ pillIcon: getIconConfig('calendar').icon,
},
{
id: 'mail',
label: 'Email',
- icon: EmailIcon,
+ icon: getIconConfig('email').icon,
iconActive: EmailFillIcon,
},
{
id: 'channels',
label: 'Channels',
- icon: ChatsIcon,
- iconActive: ChatsFillIcon,
+ icon: getIconConfig('channel').icon,
+ iconActive: ChannelFillIcon,
},
{
id: 'documents',
label: 'Files',
- icon: FilesIcon,
+ icon: getIconConfig('files').icon,
iconActive: FilesFillIcon,
},
- { id: 'agents', label: 'Agents', icon: AgentsIcon },
- { id: 'tasks', label: 'Tasks', icon: TasksIcon },
- { id: 'calls', label: 'Calls', icon: CallsIcon },
- { id: 'companies', label: 'CRM', icon: CompanyIcon },
+ { id: 'agents', label: 'Agents', icon: getIconConfig('agent').icon },
+ { id: 'tasks', label: 'Tasks', icon: getIconConfig('task').icon },
+ { id: 'calls', label: 'Calls', icon: getIconConfig('call').icon },
+ { id: 'companies', label: 'CRM', icon: getIconConfig('company').icon },
];
export function useMobileDockViews() {
diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsx
index f6f64081a4..5b106568fd 100644
--- a/apps/web/src/components/app/side-panel/SidePanel.tsx
+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx
@@ -4,12 +4,12 @@ import { registerHotkey } from '@core/hotkey/hotkeys';
import { TOKENS } from '@core/hotkey/tokens';
import { isMobile } from '@core/mobile/isMobile';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import SidePanelIcon from '@icon/square-half-filled.svg';
import { Accordion } from '@kobalte/core/accordion';
import ArrowLeft from '@phosphor/arrow-left.svg';
import CaretRight from '@phosphor/caret-right.svg';
import CircleDashedEmpty from '@phosphor/circle-dashed.svg';
import InfoIcon from '@phosphor/info.svg';
+import SidePanelIcon from '@phosphor/sidebar-simple.svg';
import { Button, Panel, Scroll } from '@ui';
import { cn } from '@ui/utils/classname';
import {
diff --git a/apps/web/src/components/app/sidebar-next/nav-items.ts b/apps/web/src/components/app/sidebar-next/nav-items.ts
index 380047f44b..0cd03c1bf2 100644
--- a/apps/web/src/components/app/sidebar-next/nav-items.ts
+++ b/apps/web/src/components/app/sidebar-next/nav-items.ts
@@ -8,7 +8,7 @@ import EnvelopeIcon from '@phosphor/envelope.svg';
import FolderSimpleIcon from '@phosphor/folder-simple.svg';
import HouseIcon from '@phosphor/house.svg';
import ListChecksIcon from '@phosphor/list-checks.svg';
-import SparkleIcon from '@phosphor/sparkle.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import BuildingsFillIcon from '@phosphor-fill/buildings-fill.svg';
import CalendarBlankFillIcon from '@phosphor-fill/calendar-blank-fill.svg';
import ChatsCircleFillIcon from '@phosphor-fill/chats-circle-fill.svg';
@@ -16,7 +16,7 @@ import EnvelopeFillIcon from '@phosphor-fill/envelope-fill.svg';
import FolderSimpleFillIcon from '@phosphor-fill/folder-simple-fill.svg';
import HouseFillIcon from '@phosphor-fill/house-fill.svg';
import ListChecksFillIcon from '@phosphor-fill/list-checks-fill.svg';
-import SparkleFillIcon from '@phosphor-fill/sparkle-fill.svg';
+import AgentFillIcon from '@phosphor-fill/sparkle-fill.svg';
import type { NavIcon } from './nav-glyph';
/**
@@ -102,8 +102,8 @@ const SIDEBAR_NEXT_NAV_ITEMS = [
id: 'agents',
label: 'Agents',
href: LIST_VIEW_PATHS.agents,
- icon: SparkleIcon,
- iconActive: SparkleFillIcon,
+ icon: AgentIcon,
+ iconActive: AgentFillIcon,
hotkey: 'a',
hotkeyToken: TOKENS.sidebar.goTo.agents,
},
diff --git a/apps/web/src/components/app/sidebar-next/use-sidebar-next-flag.ts b/apps/web/src/components/app/sidebar-next/use-sidebar-next-flag.ts
index be42819388..6ded5ae785 100644
--- a/apps/web/src/components/app/sidebar-next/use-sidebar-next-flag.ts
+++ b/apps/web/src/components/app/sidebar-next/use-sidebar-next-flag.ts
@@ -1,13 +1,12 @@
import { useFeatureFlag } from '@app/lib/analytics/posthog';
-import { enableSidebarNext } from '@core/constant/featureFlags';
+import { enableNewAppViews } from '@core/constant/featureFlags';
import type { Accessor } from 'solid-js';
/**
- * Whether `SidebarRail` renders in place of `AppSidebar`. Needs the
- * `enable-new-app-views` PostHog flag, in dev as much as anywhere else. Set
- * VITE_ENABLE_SIDEBAR_NEXT=true to force it on locally without PostHog.
+ * Whether `SidebarRail` renders in place of `AppSidebar`. Shares the
+ * `enable-new-app-views` gate with the rebuilt app surfaces.
*/
export function useSidebarNextFlag(): Accessor<boolean> {
- const flag = useFeatureFlag(enableSidebarNext);
+ const flag = useFeatureFlag(enableNewAppViews);
return () => flag().enabled;
}
diff --git a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
index d036a3eae3..86e796752d 100644
--- a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
@@ -31,7 +31,6 @@ import { getActiveCommandByToken } from '@core/hotkey/utils';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { useGetPermissions } from '@core/signal/permissions';
import { buildEntityData, type EntityData } from '@entity';
-import DotsThree from '@icon/dots-three-large.svg';
import ArrowRight from '@phosphor/arrow-right.svg';
import BellSimple from '@phosphor/bell-simple.svg';
import BellSlash from '@phosphor/bell-slash.svg';
@@ -39,6 +38,7 @@ import CaretDown from '@phosphor/caret-down.svg';
import CaretRight from '@phosphor/caret-right.svg';
import Check from '@phosphor/check.svg';
import Copy from '@phosphor/copy.svg';
+import DotsThree from '@phosphor/dots-three.svg';
import Link from '@phosphor/link.svg';
import Rename from '@phosphor/pencil-line.svg';
import Star from '@phosphor/star.svg';
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
index 2001881de1..71abb15352 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -20,8 +20,6 @@ import { isMobile } from '@core/mobile/isMobile';
import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { type EntityDragEvent, isEntityDragEvent } from '@entity';
-import { AnimatedSquareSidebarIcon } from '@icon/square-sidebar';
-import SplitIcon from '@icon/wide-newSplit.svg';
import { ContextMenu } from '@kobalte/core/context-menu';
import ArrowClockwise from '@phosphor/arrow-clockwise.svg';
import ArrowLeft from '@phosphor/arrow-left.svg';
@@ -31,14 +29,15 @@ import ExpandIcon from '@phosphor/arrows-out.svg';
import CaretDown from '@phosphor/caret-down.svg';
import CaretLeft from '@phosphor/caret-left.svg';
import CaretUp from '@phosphor/caret-up.svg';
+import SplitIcon from '@phosphor/columns.svg';
import CopyIcon from '@phosphor/copy.svg';
+import SidebarIcon from '@phosphor/sidebar-simple.svg';
import CloseIcon from '@phosphor/x.svg';
import { mergeRefs } from '@solid-primitives/refs';
import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';
import { Button, cn } from '@ui';
import {
createMemo,
- createSignal,
type ParentProps,
type Setter,
Show,
@@ -140,7 +139,6 @@ function SidebarExpandButton() {
const panel = useContext(SplitPanelContext);
const layout = useContext(SplitLayoutContext);
const sidebar = useSidebarCollapse();
- const [hovering, setHovering] = createSignal(false);
const isLeftmostSplit = () =>
layout?.manager.splits()[0]?.id === panel?.handle.id;
@@ -165,13 +163,8 @@ function SidebarExpandButton() {
disabled={!visible()}
tabindex={visible() ? undefined : -1}
onClick={() => sidebar.expand()}
- onMouseEnter={() => setHovering(true)}
- onMouseLeave={() => setHovering(false)}
>
- <AnimatedSquareSidebarIcon
- class="size-4"
- triggerAnimation={hovering()}
- />
+ <SidebarIcon class="size-4" />
</Button>
</div>
);
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
index 435c20b532..ccee77d452 100644
--- a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
@@ -26,7 +26,7 @@ import ClockIcon from '@phosphor/clock-clockwise.svg';
import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';
import PlugsIcon from '@phosphor/plugs.svg';
import PlusIcon from '@phosphor/plus.svg';
-import RobotIcon from '@phosphor/robot.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import SkillIcon from '@phosphor/sparkle.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
import {
@@ -54,7 +54,7 @@ import type {
const PAGES = [
{ id: 'new', label: 'New Chat', icon: PlusIcon },
{ id: 'routines', label: 'Routines', icon: ClockIcon },
- { id: 'agents', label: 'Agents', icon: RobotIcon },
+ { id: 'agents', label: 'Agents', icon: AgentIcon },
{ id: 'connections', label: 'Connections', icon: PlugsIcon },
{ id: 'skills', label: 'Skills', icon: SkillIcon },
] satisfies {
diff --git a/apps/web/src/features/block-agent/component/AgentPicker.tsx b/apps/web/src/features/block-agent/component/AgentPicker.tsx
index 296f7159c8..591118d3c4 100644
--- a/apps/web/src/features/block-agent/component/AgentPicker.tsx
+++ b/apps/web/src/features/block-agent/component/AgentPicker.tsx
@@ -1,5 +1,5 @@
import CheckIcon from '@phosphor/check.svg';
-import RobotIcon from '@phosphor/robot.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import { Avatar, cn } from '@ui';
import { createMemo, For, Show } from 'solid-js';
import type { PersonaOption } from './compose-agent-session-options';
@@ -124,7 +124,7 @@ export function AgentPicker(props: {
when={persona.avatarUrl}
fallback={
<Avatar.Fallback>
- <RobotIcon class="size-4" />
+ <AgentIcon class="size-4" />
</Avatar.Fallback>
}
>
diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
index 79d0e3d71a..e2a6df223d 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
@@ -24,8 +24,8 @@ import {
} from '@core/component/TopBar/ShareButton';
import { isMobile } from '@core/mobile/isMobile';
import { buildEntityData } from '@entity';
-import PhoneCallIcon from '@icon/wide-call.svg';
-import IconShared from '@icon/wide-share.svg';
+import PhoneCallIcon from '@phosphor/phone-call.svg';
+import IconShared from '@phosphor/share.svg';
import type { CallRecord } from '@service-storage/generated/schemas/callRecord';
import { Button } from '@ui';
import { type Accessor, Show } from 'solid-js';
diff --git a/apps/web/src/features/block-call/sidebar/active-call-widget.tsx b/apps/web/src/features/block-call/sidebar/active-call-widget.tsx
index c50638efbe..2c8886aa54 100644
--- a/apps/web/src/features/block-call/sidebar/active-call-widget.tsx
+++ b/apps/web/src/features/block-call/sidebar/active-call-widget.tsx
@@ -4,8 +4,8 @@ import type { SidebarState } from '@components/app/app-sidebar/sidebar';
import { ContextMenuContent, MenuItem } from '@core/component/ContextMenu';
import { useChannelsContext } from '@core/context/channels';
import { useUserId } from '@core/context/user';
-import PhoneIcon from '@icon/wide-call.svg';
import { ContextMenu } from '@kobalte/core/context-menu';
+import PhoneIcon from '@phosphor/phone-call.svg';
import XIcon from '@phosphor/x.svg';
import type { ApiChannelWithLatest } from '@service-storage/channel-list-types';
import { ChannelTypeEnum } from '@service-storage/client';
diff --git a/apps/web/src/features/block-canvas/component/TopBar.tsx b/apps/web/src/features/block-canvas/component/TopBar.tsx
index 2e7107fc33..564ed5bce9 100644
--- a/apps/web/src/features/block-canvas/component/TopBar.tsx
+++ b/apps/web/src/features/block-canvas/component/TopBar.tsx
@@ -37,10 +37,10 @@ import {
} from '@core/util/currentBlockDocumentName';
import { buildSimpleEntityUrl } from '@core/util/url';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
import Info from '@phosphor/info.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { onMount } from 'solid-js';
import { URL_PARAMS } from '../constants';
diff --git a/apps/web/src/features/block-channel/component/Top.tsx b/apps/web/src/features/block-channel/component/Top.tsx
index 8cd45e4368..ae163a3e87 100644
--- a/apps/web/src/features/block-channel/component/Top.tsx
+++ b/apps/web/src/features/block-channel/component/Top.tsx
@@ -11,10 +11,10 @@ import { UserIcon } from '@core/component/UserIcon';
import { useChannelName } from '@core/context/channels';
import { useUserId } from '@core/context/user';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import PhoneIcon from '@icon/wide-call.svg';
-import ChannelIcon from '@icon/wide-channel.svg';
import ChatTextIcon from '@phosphor/chat-text.svg';
+import ChannelIcon from '@phosphor/hash-straight.svg';
import PaperclipIcon from '@phosphor/paperclip.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import UsersIcon from '@phosphor/users.svg';
import type { ChannelParticipant } from '@queries/channel/types';
import { ChannelTypeEnum } from '@service-storage/client';
diff --git a/apps/web/src/features/block-chat/component/TopBar.tsx b/apps/web/src/features/block-chat/component/TopBar.tsx
index 7fbfbf4094..4fc38fff0a 100644
--- a/apps/web/src/features/block-chat/component/TopBar.tsx
+++ b/apps/web/src/features/block-chat/component/TopBar.tsx
@@ -20,10 +20,10 @@ import {
} from '@core/component/TopBar/ShareButton';
import { DEV_MODE_ENV } from '@core/constant/featureFlags';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
-import IconShared from '@icon/wide-share.svg';
import ChatDebugIcon from '@phosphor/chat-text.svg';
import Info from '@phosphor/info.svg';
import Notepad from '@phosphor/notepad.svg';
+import IconShared from '@phosphor/share.svg';
import type { Accessor } from 'solid-js';
export function TopBar(props: {
diff --git a/apps/web/src/features/block-code/component/TopBar.tsx b/apps/web/src/features/block-code/component/TopBar.tsx
index e072ea77d1..0f77b8b65d 100644
--- a/apps/web/src/features/block-code/component/TopBar.tsx
+++ b/apps/web/src/features/block-code/component/TopBar.tsx
@@ -29,10 +29,10 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import Download from '@phosphor/download-simple.svg';
import Info from '@phosphor/info.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import type { Component } from 'solid-js';
import { Show } from 'solid-js';
diff --git a/apps/web/src/features/block-email/component/EmailTaskButton.tsx b/apps/web/src/features/block-email/component/EmailTaskButton.tsx
index 6c2fbe4cf1..e460df9b0d 100644
--- a/apps/web/src/features/block-email/component/EmailTaskButton.tsx
+++ b/apps/web/src/features/block-email/component/EmailTaskButton.tsx
@@ -1,21 +1,16 @@
-import { AnimatedTaskIcon } from '@icon/wide-task';
+import TaskIcon from '@phosphor/list-checks.svg';
import { Button } from '@ui';
-import { createSignal } from 'solid-js';
export function EmailTaskButton(props: { onClick: () => void }) {
- const [hovering, setHovering] = createSignal(false);
-
return (
<Button
tooltip="Create Task"
variant="ghost"
size="sm"
- onMouseEnter={() => setHovering(true)}
- onMouseLeave={() => setHovering(false)}
onClick={props.onClick}
depth={2}
class="gap-1.5 rounded-full border border-edge-muted px-2 text-ink-extra-muted"
>
- <AnimatedTaskIcon triggerAnimation={hovering()} />
+ <TaskIcon />
<span class="text-xs font-semibold">Task</span>
</Button>
);
diff --git a/apps/web/src/features/block-email/component/TopBar.tsx b/apps/web/src/features/block-email/component/TopBar.tsx
index 7f85157c98..962964312f 100644
--- a/apps/web/src/features/block-email/component/TopBar.tsx
+++ b/apps/web/src/features/block-email/component/TopBar.tsx
@@ -31,15 +31,15 @@ import { TOKENS } from '@core/hotkey/tokens';
import { getActiveCommandByToken, runCommand } from '@core/hotkey/utils';
import { isMobile } from '@core/mobile/isMobile';
import { buildEntityData } from '@entity';
-import { AnimatedNoiseIcon } from '@icon/wide-noise';
-import IconShared from '@icon/wide-share.svg';
-import { AnimatedTaskIcon } from '@icon/wide-task';
import ArrowRightIcon from '@phosphor/arrow-right.svg';
import CheckIcon from '@phosphor/check.svg';
import EnvelopeSimpleIcon from '@phosphor/envelope-simple.svg';
import EnvelopeSimpleOpenIcon from '@phosphor/envelope-simple-open.svg';
+import TaskIcon from '@phosphor/list-checks.svg';
import ProhibitIcon from '@phosphor/prohibit.svg';
+import IconShared from '@phosphor/share.svg';
import TrashIcon from '@phosphor/trash.svg';
+import NoiseIcon from '@phosphor/waveform.svg';
import CheckBoldIcon from '@phosphor-icons/core/bold/check-bold.svg?component-solid';
import ArrowCounterClockwise from '@phosphor-icons/core/regular/arrow-counter-clockwise.svg?component-solid';
import { useEmailLinksQuery } from '@queries/email/link';
@@ -215,7 +215,7 @@ export function TopBar(props: {
},
{
label: 'Create task',
- icon: AnimatedTaskIcon,
+ icon: TaskIcon,
action: () => props.onCreateTask?.(),
condition: () => !!props.onCreateTask && !!emailCtx.thread()?.db_id,
},
@@ -240,7 +240,7 @@ export function TopBar(props: {
{
group: 'sender',
label: 'Sender → Noise',
- icon: AnimatedNoiseIcon,
+ icon: NoiseIcon,
action: () => emailCtx.markSenderNoise(),
condition: isOwnThread,
},
diff --git a/apps/web/src/features/block-image/component/TopBar.tsx b/apps/web/src/features/block-image/component/TopBar.tsx
index fcc08310d9..eb5bccea68 100644
--- a/apps/web/src/features/block-image/component/TopBar.tsx
+++ b/apps/web/src/features/block-image/component/TopBar.tsx
@@ -28,10 +28,10 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import Download from '@phosphor/download.svg';
import Info from '@phosphor/info.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
export function TopBar() {
diff --git a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
index 39ab6dfedf..a38573db97 100644
--- a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
+++ b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
@@ -2,7 +2,7 @@ import { buildChatEditor } from '@core/component/AI/component/input/buildChatEdi
import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';
import clickOutside from '@core/directive/clickOutside';
import { TOKENS } from '@core/hotkey/tokens';
-import { AnimatedStarIcon } from '@icon/wide-star';
+import SparkleIcon from '@phosphor/sparkle.svg';
import {
cancelAiEdit,
requestAiEdit,
@@ -24,7 +24,6 @@ export function DocumentAiEditBar(props: { documentId: string }) {
const [expanded, setExpanded] = createSignal(false);
const [editing, setEditing] = createSignal(false);
const [hovering, setHovering] = createSignal(false);
- const [focused, setFocused] = createSignal(false);
const [prompt, setPrompt] = createSignal('');
let editor = buildChatEditor();
@@ -108,7 +107,7 @@ export function DocumentAiEditBar(props: { documentId: string }) {
'ai-edit-star-breathing text-accent': editing(),
}}
>
- <AnimatedStarIcon triggerAnimation={hovering() && !editing()} />
+ <SparkleIcon />
</span>
<span
class="text-xs font-medium"
@@ -119,19 +118,11 @@ export function DocumentAiEditBar(props: { documentId: string }) {
</Button>
}
>
- <ComposerSurface
- onFocusIn={() => setFocused(true)}
- onFocusOut={(event) => {
- const next = event.relatedTarget as Node | null;
- if (next && event.currentTarget.contains(next)) return;
- setFocused(false);
- }}
- class="h-auto w-96 max-w-full"
- >
+ <ComposerSurface class="h-auto w-96 max-w-full">
<div class="flex flex-col gap-2 p-2" use:clickOutside={collapse}>
<div class="flex items-start gap-2">
<span class="flex h-8 w-4 shrink-0 items-center justify-center text-accent">
- <AnimatedStarIcon triggerAnimation={focused()} />
+ <SparkleIcon />
</span>
<div class="min-w-0 grow text-base text-ink">
<MarkdownShell
diff --git a/apps/web/src/features/block-md/component/FormatTools.tsx b/apps/web/src/features/block-md/component/FormatTools.tsx
index 5de211e4fa..4ed0aac0a9 100644
--- a/apps/web/src/features/block-md/component/FormatTools.tsx
+++ b/apps/web/src/features/block-md/component/FormatTools.tsx
@@ -12,7 +12,6 @@ import { editorFocusSignal } from '@core/component/LexicalMarkdown/utils';
import { toast } from '@core/component/Toast/Toast';
import { ENABLE_MARKDOWN_COMMENTS } from '@core/constant/featureFlags';
import type { ValidHotkey } from '@core/hotkey/types';
-import DotsThreeLarge from '@icon/dots-three-large.svg';
import {
$isTableCellNode,
$isTableSelection,
@@ -28,6 +27,7 @@ import TextCode from '@phosphor/code.svg';
import CodeBlock from '@phosphor/code-block.svg';
import CornersIn from '@phosphor/corners-in.svg';
import CornersOut from '@phosphor/corners-out.svg';
+import DotsThreeLarge from '@phosphor/dots-three.svg';
import ThreeDots from '@phosphor/dots-three.svg';
import MathIcon from '@phosphor/function.svg';
import Grid from '@phosphor/grid-four.svg';
diff --git a/apps/web/src/features/block-pdf/component/TopBar.tsx b/apps/web/src/features/block-pdf/component/TopBar.tsx
index 8a84bc785a..e46b87e60f 100644
--- a/apps/web/src/features/block-pdf/component/TopBar.tsx
+++ b/apps/web/src/features/block-pdf/component/TopBar.tsx
@@ -38,10 +38,10 @@ import { blockMetadataSignal } from '@core/signal/load';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { platformFetch } from '@core/util/platformFetch';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import DownloadIcon from '@phosphor/download-simple.svg';
import Printer from '@phosphor/printer.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import {
blockNameToItemType,
storageServiceClient,
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index 23369ce497..268070005d 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -40,8 +40,8 @@ import { ENABLE_PROJECT_SHARING } from '@core/constant/featureFlags';
import { isMobile } from '@core/mobile/isMobile';
import { useCanEdit, useIsDocumentOwner } from '@core/signal/permissions';
import { buildSimpleEntityUrl } from '@core/util/url';
-import IconShared from '@icon/wide-share.svg';
import Info from '@phosphor/info.svg';
+import IconShared from '@phosphor/share.svg';
import { createMemo, For, Show } from 'solid-js';
import { ProjectCreateMenu, useProjectCreateTools } from './ProjectCreateMenu';
diff --git a/apps/web/src/features/block-unknown/component/TopBar.tsx b/apps/web/src/features/block-unknown/component/TopBar.tsx
index f969d8ef81..db83975496 100644
--- a/apps/web/src/features/block-unknown/component/TopBar.tsx
+++ b/apps/web/src/features/block-unknown/component/TopBar.tsx
@@ -28,10 +28,10 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
import Info from '@phosphor/info.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { useGetFileBlob } from '../signal/blockData';
diff --git a/apps/web/src/features/block-unknown/component/UnknownContent.tsx b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
index d63e563a2b..77d82672f2 100644
--- a/apps/web/src/features/block-unknown/component/UnknownContent.tsx
+++ b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
@@ -1,5 +1,5 @@
-import ShareFat from '@icon/wide-share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
+import ShareFat from '@phosphor/share.svg';
import { Button } from '@ui';
export function UnknownContent(props: {
diff --git a/apps/web/src/features/block-video/component/TopBar.tsx b/apps/web/src/features/block-video/component/TopBar.tsx
index 9f2fc1b985..3c5ec3c23f 100644
--- a/apps/web/src/features/block-video/component/TopBar.tsx
+++ b/apps/web/src/features/block-video/component/TopBar.tsx
@@ -27,10 +27,10 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@icon/wide-share.svg';
import Download from '@phosphor/download.svg';
import Info from '@phosphor/info.svg';
import Quotes from '@phosphor/quotes.svg';
+import IconShared from '@phosphor/share.svg';
import Spinner from '@phosphor/spinner.svg';
import { createCallback } from '@solid-primitives/rootless';
import { createSignal } from 'solid-js';
diff --git a/apps/web/src/features/channel/Call/CallControls/CallControlsDefaultAndPanelRow.tsx b/apps/web/src/features/channel/Call/CallControls/CallControlsDefaultAndPanelRow.tsx
index e1accc0de5..8c1eb2c51c 100644
--- a/apps/web/src/features/channel/Call/CallControls/CallControlsDefaultAndPanelRow.tsx
+++ b/apps/web/src/features/channel/Call/CallControls/CallControlsDefaultAndPanelRow.tsx
@@ -1,8 +1,8 @@
-import PhoneDisconnect from '@icon/wide-call-disconnect.svg';
import { DropdownMenu } from '@kobalte/core/dropdown-menu';
import Gear from '@phosphor/gear.svg';
import Microphone from '@phosphor/microphone.svg';
import MicrophoneSlash from '@phosphor/microphone-slash.svg';
+import PhoneDisconnect from '@phosphor/phone-disconnect.svg';
import Screencast from '@phosphor/screencast.svg';
import VideoCamera from '@phosphor/video-camera.svg';
import VideoCameraSlash from '@phosphor/video-camera-slash.svg';
diff --git a/apps/web/src/features/channel/Call/ChannelCallButton.tsx b/apps/web/src/features/channel/Call/ChannelCallButton.tsx
index 928c498265..1bd7e7c19d 100644
--- a/apps/web/src/features/channel/Call/ChannelCallButton.tsx
+++ b/apps/web/src/features/channel/Call/ChannelCallButton.tsx
@@ -3,7 +3,7 @@ import { useChannelTab } from '@channel/Channel/ChannelTabContext';
import { useChannelName, useChannelType } from '@core/context/channels';
import { isMobile } from '@core/mobile/isMobile';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import PhoneIcon from '@icon/wide-call.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import { useActiveCallQuery } from '@queries/call/call';
import { ChannelTypeEnum } from '@service-storage/client';
import { Button, cn, confirmDialog } from '@ui';
diff --git a/apps/web/src/features/channel/Call/ChannelCallTab.tsx b/apps/web/src/features/channel/Call/ChannelCallTab.tsx
index c034e9fb0b..88e464ae04 100644
--- a/apps/web/src/features/channel/Call/ChannelCallTab.tsx
+++ b/apps/web/src/features/channel/Call/ChannelCallTab.tsx
@@ -1,7 +1,7 @@
import { useChannelTab } from '@channel/Channel/ChannelTabContext';
import { UserGroup } from '@core/component/UserGroup';
import { getDisplayName, tryMacroId } from '@core/user';
-import PhoneIcon from '@icon/wide-call.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import { useActiveCallQuery, useCallRecordQuery } from '@queries/call/call';
import { Button } from '@ui';
import { type Accessor, createMemo, Match, Show, Switch } from 'solid-js';
diff --git a/apps/web/src/features/channel/Call/InCallPanel/InCallPanelView.tsx b/apps/web/src/features/channel/Call/InCallPanel/InCallPanelView.tsx
index e6755a79f9..fbd81678d8 100644
--- a/apps/web/src/features/channel/Call/InCallPanel/InCallPanelView.tsx
+++ b/apps/web/src/features/channel/Call/InCallPanel/InCallPanelView.tsx
@@ -1,7 +1,7 @@
import { StackedAvatarsRow } from '@core/component/StackedAvatarsRow';
import { useChannelsContext } from '@core/context/channels';
-import PhoneDisconnect from '@icon/wide-call-disconnect.svg';
import ArrowsOut from '@phosphor/arrows-out.svg';
+import PhoneDisconnect from '@phosphor/phone-disconnect.svg';
import { useActiveCallQuery } from '@queries/call/call';
import { Avatar, cn, Surface, Tooltip } from '@ui';
import {
diff --git a/apps/web/src/features/channel/Channel/ActiveCallMessage.tsx b/apps/web/src/features/channel/Channel/ActiveCallMessage.tsx
index 2d992e2c98..e7aa23b2e4 100644
--- a/apps/web/src/features/channel/Channel/ActiveCallMessage.tsx
+++ b/apps/web/src/features/channel/Channel/ActiveCallMessage.tsx
@@ -1,6 +1,6 @@
import { useCallContextOptional } from '@channel/Call/CallContext';
import { joinChannelCall } from '@channel/Call/join-channel-call';
-import PhoneIcon from '@icon/wide-call.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import { useActiveCallQuery } from '@queries/call/call';
import { Button } from '@ui';
import { createMemo, createSignal, onCleanup, Show } from 'solid-js';
diff --git a/apps/web/src/features/channel/Message/ActionMenu.tsx b/apps/web/src/features/channel/Message/ActionMenu.tsx
index 7b49666dd3..ca69a6a26b 100644
--- a/apps/web/src/features/channel/Message/ActionMenu.tsx
+++ b/apps/web/src/features/channel/Message/ActionMenu.tsx
@@ -1,12 +1,12 @@
import { recordEmojiUsage } from '@core/component/Emoji/emojiUsage';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import StarIcon from '@icon/wide-star.svg';
-import TaskIcon from '@icon/wide-task.svg';
import ReplyIcon from '@phosphor/arrow-bend-up-left.svg';
import CopyIcon from '@phosphor/copy.svg';
import LinkIcon from '@phosphor/link.svg';
+import TaskIcon from '@phosphor/list-checks.svg';
import EditIcon from '@phosphor/pencil-simple.svg';
import AddEmojiIcon from '@phosphor/smiley.svg';
+import StarIcon from '@phosphor/sparkle.svg';
import TrashIcon from '@phosphor/trash.svg';
import { cn, Toolbar } from '@ui';
import {
diff --git a/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx b/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
index 2ea7740f19..882d0d508a 100644
--- a/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
+++ b/apps/web/src/features/channel/Message/ChannelCreatedIndicator.tsx
@@ -1,6 +1,6 @@
import { useChannel } from '@core/context/channels';
import { formatDate } from '@core/util/date';
-import ChannelIcon from '@icon/wide-channel.svg';
+import ChannelIcon from '@phosphor/hash-straight.svg';
import { ChannelTypeEnum } from '@service-storage/client';
import { Avatar } from '@ui';
import { Show } from 'solid-js';
diff --git a/apps/web/src/features/channel/Message/ChannelMessage.tsx b/apps/web/src/features/channel/Message/ChannelMessage.tsx
index 983a6010c0..2715d8174a 100644
--- a/apps/web/src/features/channel/Message/ChannelMessage.tsx
+++ b/apps/web/src/features/channel/Message/ChannelMessage.tsx
@@ -2,7 +2,7 @@ import { useMessageActionDrawer } from '@channel/Mobile/message-action-drawer-co
import { touchHandler } from '@core/directive/touchHandler';
import type { IUser } from '@core/user/types';
import { messageSendMotion } from '@core/util/message-send-motion';
-import TrashIcon from '@icon/square-trash.svg';
+import TrashIcon from '@phosphor/trash.svg';
import { type Accessor, type JSX, Match, Show, Switch } from 'solid-js';
import type { MessageEditor } from '../Channel/create-message-editor';
import { MessageEditorContent } from '../Channel/InlineMessageEditor';
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx b/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
index 72422dda96..dd07d7f164 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
@@ -1,7 +1,7 @@
-import { AnimatedSquareSidebarIcon } from '@icon/square-sidebar';
import CaretDownIcon from '@phosphor/caret-down.svg';
import CaretUpIcon from '@phosphor/caret-up.svg';
import PlusIcon from '@phosphor/plus.svg';
+import SidebarIcon from '@phosphor/sidebar-simple.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
import { Button, cn, Scroll, Tooltip } from '@ui';
import { createSignal, For, type JSX, Match, Show, Switch } from 'solid-js';
@@ -241,8 +241,6 @@ export function RailModeButton(props: {
expanded: boolean;
onToggle: () => void;
}) {
- const [hovering, setHovering] = createSignal(false);
-
return (
<Button
variant="ghost"
@@ -250,10 +248,8 @@ export function RailModeButton(props: {
label={props.expanded ? 'Collapse chat rail' : 'Expand chat rail'}
tooltipPlacement={props.expanded ? 'bottom' : 'right'}
onClick={props.onToggle}
- onMouseEnter={() => setHovering(true)}
- onMouseLeave={() => setHovering(false)}
>
- <AnimatedSquareSidebarIcon class="size-4" triggerAnimation={hovering()} />
+ <SidebarIcon class="size-4" />
</Button>
);
}
diff --git a/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx b/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
index 467ff62258..f232c6efbf 100644
--- a/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
+++ b/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
@@ -10,7 +10,6 @@ import { SplitPanel } from '@components/app/split-panel';
import { UserIcon } from '@core/component/UserIcon';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { type ChannelEntity, Entity } from '@entity';
-import ChannelIcon from '@icon/wide-channel.svg';
import { Popover } from '@kobalte/core/popover';
import ArrowClockwiseIcon from '@phosphor/arrow-clockwise.svg';
import CaretDownIcon from '@phosphor/caret-down.svg';
@@ -19,6 +18,7 @@ import ChatTextIcon from '@phosphor/chat-text.svg';
import ChatsIcon from '@phosphor/chats-circle.svg';
import CheckIcon from '@phosphor/check.svg';
import GearIcon from '@phosphor/gear.svg';
+import ChannelIcon from '@phosphor/hash-straight.svg';
import PlusIcon from '@phosphor/plus.svg';
import StarIcon from '@phosphor/star.svg';
import type { Favorite } from '@service-storage/generated/schemas/favorite';
diff --git a/apps/web/src/features/chat/ChatWithAgentButton.test.ts b/apps/web/src/features/chat/ChatWithAgentButton.test.ts
index 11efd8e91c..fdbff5af63 100644
--- a/apps/web/src/features/chat/ChatWithAgentButton.test.ts
+++ b/apps/web/src/features/chat/ChatWithAgentButton.test.ts
@@ -28,9 +28,6 @@ vi.mock('@core/constant/allBlocks', () => ({
vi.mock('@core/util/create', () => ({
createChat: mocks.createChat,
}));
-vi.mock('@icon/wide-star', () => ({
- AnimatedStarIcon: () => null,
-}));
vi.mock('@ui', () => ({
Button: () => null,
}));
diff --git a/apps/web/src/features/chat/ChatWithAgentButton.tsx b/apps/web/src/features/chat/ChatWithAgentButton.tsx
index 678ce6e44f..a31a1776a1 100644
--- a/apps/web/src/features/chat/ChatWithAgentButton.tsx
+++ b/apps/web/src/features/chat/ChatWithAgentButton.tsx
@@ -11,12 +11,11 @@ import { storeChatStateImmediate } from '@core/component/AI/util/storage';
import { toast } from '@core/component/Toast/Toast';
import { fileTypeToBlockName } from '@core/constant/allBlocks';
import { createChat } from '@core/util/create';
-import { AnimatedStarIcon } from '@icon/wide-star';
+import AgentIcon from '@phosphor/sparkle.svg';
import type { ChannelType } from '@service-cognition/generated/schemas/channelType';
import { Button } from '@ui';
-import { createSignal } from 'solid-js';
-export { AnimatedStarIcon as ChatWithAgentIcon };
+export { AgentIcon as ChatWithAgentIcon };
type ChatWithAgentEntity =
| { type: 'email'; id: string; name: string }
@@ -133,39 +132,31 @@ export function ChatWithAgentButton(props: {
/** Button text; defaults to "Chat". */
label?: string;
}) {
- const [hovering, setHovering] = createSignal(false);
-
return (
<Button
tooltip="Chat with Agent"
variant="outline"
size="sm"
- onMouseEnter={() => setHovering(true)}
- onMouseLeave={() => setHovering(false)}
onClick={() => openChatWithAgent(props.entity)}
depth={2}
class="bg-surface"
>
- <AnimatedStarIcon triggerAnimation={hovering()} />
+ <AgentIcon />
<span class="text-xs">{props.label ?? 'Chat'}</span>
</Button>
);
}
export function AskMacroButton(props: { entity: ChatWithAgentEntity }) {
- const [hovering, setHovering] = createSignal(false);
-
return (
<Button
onClick={() => openChatWithAgent(props.entity)}
- onMouseEnter={() => setHovering(true)}
- onMouseLeave={() => setHovering(false)}
variant="ghost"
size="sm"
depth={2}
class="gap-1.5 rounded-full border border-edge-muted px-2"
>
- <AnimatedStarIcon triggerAnimation={hovering()} />
+ <AgentIcon />
<span class="text-xs font-medium">Ask Macro</span>
</Button>
);
diff --git a/apps/web/src/features/command/CommandItem.tsx b/apps/web/src/features/command/CommandItem.tsx
index 7067926296..be6d3fecc1 100644
--- a/apps/web/src/features/command/CommandItem.tsx
+++ b/apps/web/src/features/command/CommandItem.tsx
@@ -2,8 +2,8 @@ import { useFeatureFlag } from '@app/lib/analytics/posthog';
import { UserIcon } from '@core/component/UserIcon';
import { hasValidHotkey } from '@core/hotkey/utils';
import { Entity, type EntityData } from '@entity';
-import SearchIcon from '@icon/macro-magnifying-glass.svg';
-import WideStar from '@icon/wide-star.svg';
+import SearchIcon from '@phosphor/magnifying-glass.svg';
+import WideStar from '@phosphor/sparkle.svg';
import Terminal from '@phosphor-icons/core/regular/terminal.svg?component-solid';
import {
BULK_DOCUMENT_WAKEUP_FEATURE_FLAG,
diff --git a/apps/web/src/features/command/Launcher.tsx b/apps/web/src/features/command/Launcher.tsx
index 96cffea769..56a2bca7b8 100644
--- a/apps/web/src/features/command/Launcher.tsx
+++ b/apps/web/src/features/command/Launcher.tsx
@@ -15,7 +15,6 @@ import type { BlockAlias, BlockName } from '@core/block';
import { CHAT_INPUT_TEXT_AREA_ID } from '@core/component/AI/component/input/ChatInput';
import { getIconConfig } from '@core/component/EntityIcon';
import {
- ENABLE_ANIMATED_ICONS,
enableChatV3Agents,
enableReminders,
enableSnippets,
@@ -39,35 +38,12 @@ import {
createSnippet,
} from '@core/util/create';
import { createControlledOpenSignal } from '@core/util/createControlledOpenSignal';
-import SkillIcon from '@icon/skill.svg';
-import WideAutomation from '@icon/wide-automation.svg';
-import { AnimatedChannelIcon } from '@icon/wide-channel';
-import WideChannel from '@icon/wide-channel.svg';
-import { AnimatedChatIcon } from '@icon/wide-chat';
-import WideChat from '@icon/wide-chat.svg';
-import { AnimatedDiagramIcon } from '@icon/wide-diagram';
-import WideDiagram from '@icon/wide-diagram.svg';
-import { AnimatedEmailIcon } from '@icon/wide-email';
-import WideEmail from '@icon/wide-email.svg';
-import WideFileCode from '@icon/wide-file-code.svg';
-import WideFileMd from '@icon/wide-file-md.svg';
-import { AnimatedFileCodeIcon } from '@icon/wide-fileCode';
-import { AnimatedFileMdIcon } from '@icon/wide-fileMd';
-import { AnimatedFolderIcon } from '@icon/wide-folder';
-import WideFolder from '@icon/wide-folder.svg';
-import { AnimatedSnippetIcon } from '@icon/wide-snippet';
-import WideSnippet from '@icon/wide-snippet.svg';
-import { AnimatedStarIcon } from '@icon/wide-star';
-import WideStar from '@icon/wide-star.svg';
-import { AnimatedTaskIcon } from '@icon/wide-task';
-import WideTask from '@icon/wide-task.svg';
import { Dialog } from '@kobalte/core/dialog';
import { getMarkdownGoldenBytes } from '@macro-inc/lexical-core/markdown-golden';
import type { Span } from '@macro-inc/observability';
-import BellSimpleIcon from '@phosphor/bell-simple.svg';
+import ChatIcon from '@phosphor/chat.svg';
import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';
import PlusIcon from '@phosphor/plus.svg';
-import Robot from '@phosphor/robot.svg';
import { createProject } from '@queries/storage/projects';
import { makePersisted } from '@solid-primitives/storage';
import {
@@ -484,8 +460,7 @@ export type { CreatableBlock, CreatableName } from './types';
export const CREATABLE_BLOCKS: CreatableBlock[] = [
{
label: 'Email',
- icon: WideEmail,
- animatedIcon: AnimatedEmailIcon,
+ icon: getIconConfig('email').icon,
description: 'Create email',
keywords: ['new', 'make', 'add', 'compose'],
blockName: 'email',
@@ -502,8 +477,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
// has not reached. Mutually exclusive with the Agent entry below:
// both bind `a`, and exactly one is ever enabled.
label: 'Agent',
- icon: WideStar,
- animatedIcon: AnimatedStarIcon,
+ icon: getIconConfig('chat').icon,
description: 'Create agent chat',
launcherHint: 'New agent session',
keywords: ['new', 'make', 'add', 'agent'],
@@ -523,7 +497,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Automation',
- icon: WideAutomation,
+ icon: getIconConfig('automation').icon,
description: 'Create automation',
launcherHint: 'Scheduled agent runs',
keywords: ['new', 'make', 'add', 'schedule', 'agent'],
@@ -537,7 +511,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Agent',
- icon: Robot,
+ icon: getIconConfig('agent').icon,
description: 'Create agent session',
launcherHint: 'Dedicated Agent Session',
keywords: ['new', 'make', 'add', 'agent', 'code', 'coder', 'session'],
@@ -554,7 +528,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Skill',
- icon: SkillIcon,
+ icon: getIconConfig('skill').icon,
description: 'Create skill',
launcherHint: 'Custom agent skill',
keywords: ['new', 'make', 'add', 'instruction', 'prompt'],
@@ -568,8 +542,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Document',
- icon: WideFileMd,
- animatedIcon: AnimatedFileMdIcon,
+ icon: getIconConfig('md').icon,
description: 'Create doc',
keywords: ['new', 'make', 'add', 'document', 'note'],
blockName: 'md',
@@ -583,8 +556,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Task',
- icon: WideTask,
- animatedIcon: AnimatedTaskIcon,
+ icon: getIconConfig('task').icon,
description: 'Create task',
keywords: ['new', 'make', 'add', 'todo'],
blockName: 'task',
@@ -598,7 +570,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Reminder',
- icon: BellSimpleIcon,
+ icon: getIconConfig('reminder').icon,
description: 'Create reminder',
launcherHint: 'Nudge yourself later',
keywords: ['new', 'make', 'add', 'remind', 'later', 'todo'],
@@ -615,8 +587,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Snippet',
- icon: WideSnippet,
- animatedIcon: AnimatedSnippetIcon,
+ icon: getIconConfig('snippet').icon,
description: 'Create snippet',
launcherHint: 'Reusable document template',
keywords: ['new', 'make', 'add'],
@@ -631,8 +602,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Message',
- icon: WideChat,
- animatedIcon: AnimatedChatIcon,
+ icon: ChatIcon,
description: 'Create message',
launcherHint: 'Quick send message',
keywords: ['new', 'make', 'add', 'channel'],
@@ -647,8 +617,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Channel',
- icon: WideChannel,
- animatedIcon: AnimatedChannelIcon,
+ icon: getIconConfig('channel').icon,
description: 'Create channel',
launcherHint: 'Team-wide or group chat',
keywords: ['new', 'make', 'add', 'channel', 'group', 'conversation'],
@@ -663,8 +632,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Canvas',
- icon: WideDiagram,
- animatedIcon: AnimatedDiagramIcon,
+ icon: getIconConfig('canvas').icon,
description: 'Create canvas',
keywords: ['new', 'make', 'add', 'diagram'],
blockName: 'canvas',
@@ -680,8 +648,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Folder',
- icon: WideFolder,
- animatedIcon: AnimatedFolderIcon,
+ icon: getIconConfig('project').icon,
description: 'Create folder',
keywords: ['new', 'make', 'add', 'project'],
blockName: 'project',
@@ -695,8 +662,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Code',
- icon: WideFileCode,
- animatedIcon: AnimatedFileCodeIcon,
+ icon: getIconConfig('code').icon,
description: 'Create code file',
keywords: ['new', 'make', 'add'],
blockName: 'code',
@@ -767,8 +733,6 @@ type LauncherMenuItemProps = {
};
const LauncherMenuItem = (props: LauncherMenuItemProps) => {
- const StaticIcon = props.creatableBlock.icon;
- const AnimatedIcon = props.creatableBlock.animatedIcon;
const selectedIconColor = () =>
getIconConfig(props.creatableBlock.blockName).foreground;
const launcherHint = () => props.creatableBlock.launcherHint;
@@ -781,14 +745,7 @@ const LauncherMenuItem = (props: LauncherMenuItemProps) => {
props.selected && selectedIconColor()
)}
>
- <Show
- when={ENABLE_ANIMATED_ICONS && AnimatedIcon}
- fallback={<Dynamic component={StaticIcon} />}
- >
- {(icon) => (
- <Dynamic component={icon()} triggerAnimation={props.selected} />
- )}
- </Show>
+ <Dynamic component={props.creatableBlock.icon} />
</div>
<div class="min-w-0 flex-1 flex items-baseline gap-2">
diff --git a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
index 60728fd63c..20cc506722 100644
--- a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
+++ b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
@@ -5,7 +5,7 @@ import { useHotkeyInterceptor } from '@app/signal/hotkeyRoot';
import { setActiveScope } from '@core/hotkey/state';
import { TOKENS } from '@core/hotkey/tokens';
import { activateClosestDOMScope } from '@core/hotkey/utils';
-import CreateIcon from '@icon/square-pen-create.svg';
+import CreateIcon from '@phosphor/note-pencil.svg';
import PlusIcon from '@phosphor/plus.svg';
import { Button, Dropdown, Hotkey, NavRow } from '@ui';
import {
@@ -36,7 +36,6 @@ export type SidebarCreateMenuProps = {
export const SidebarCreateMenu = (props: SidebarCreateMenuProps) => {
const analytics = useAnalytics();
const [open, setOpen] = createSignal(false);
- const [focusedIndex, setFocusedIndex] = createSignal(-1);
const blocks = useCreateMenuBlocks();
const isSlim = () => props.isSlim?.() ?? false;
@@ -161,21 +160,16 @@ export const SidebarCreateMenu = (props: SidebarCreateMenuProps) => {
<Dropdown.Content class="min-w-52">
<Dropdown.Group>
<For each={blocks()}>
- {(block, index) => (
+ {(block) => (
<Dropdown.Item
class="min-h-9 gap-2 px-2.5"
- onFocus={() => setFocusedIndex(index())}
- onMouseEnter={() => setFocusedIndex(index())}
onSelect={() => {
setOpen(false);
block.keyDownHandler();
}}
>
<div class="size-4 shrink-0 flex items-center rounded-sm text-ink-muted [&_svg]:size-4">
- <Dynamic
- component={block.animatedIcon ?? block.icon}
- triggerAnimation={focusedIndex() === index()}
- />
+ <Dynamic component={block.icon} />
</div>
<span class="flex-1 text-ink">{block.label}</span>
<Hotkey token={block.hotkeyToken} theme="subtle" class="ml-6" />
diff --git a/apps/web/src/features/command/types.ts b/apps/web/src/features/command/types.ts
index 1c4928ce10..8402b91c0e 100644
--- a/apps/web/src/features/command/types.ts
+++ b/apps/web/src/features/command/types.ts
@@ -1,7 +1,6 @@
import type { BlockAlias, BlockName } from '@core/block';
import type { HotkeyToken } from '@core/hotkey/tokens';
import type { HotkeyRegistrationOptions } from '@core/hotkey/types';
-import type { Component } from 'solid-js';
/**
* What a create-menu entry makes.
@@ -19,7 +18,6 @@ export type CreatableBlock = Omit<HotkeyRegistrationOptions, 'scopeId'> & {
launcherHint?: string;
blockName: CreatableName;
altHotkeyToken?: HotkeyToken;
- animatedIcon?: Component<{ triggerAnimation?: boolean }>;
/**
* Whether the entry is available at all, for one behind a feature flag.
*
diff --git a/apps/web/src/features/contacts/Contact/ContactHeader.tsx b/apps/web/src/features/contacts/Contact/ContactHeader.tsx
index 50cfff14f3..56add29fe4 100644
--- a/apps/web/src/features/contacts/Contact/ContactHeader.tsx
+++ b/apps/web/src/features/contacts/Contact/ContactHeader.tsx
@@ -1,6 +1,6 @@
import { InlineTitleEditor } from '@core/component/InlineTitleEditor';
import { getInitialsFromName } from '@core/user';
-import { AnimatedContactIcon } from '@icon/wide-contact';
+import ContactIcon from '@phosphor/address-book.svg';
import { useSetContactNameMutation } from '@queries/crm/contacts';
import type { CrmContactResponse } from '@service-storage/generated/schemas/crmContactResponse';
import { Avatar } from '@ui';
@@ -47,7 +47,7 @@ export function ContactHeader(props: { contact?: CrmContactResponse }) {
when={initials()}
fallback={
<Avatar.Fallback>
- <AnimatedContactIcon class="size-5 text-ink-muted" />
+ <ContactIcon class="size-5 text-ink-muted" />
</Avatar.Fallback>
}
keyed
diff --git a/apps/web/src/features/email-thread/components/copy-subject-button.tsx b/apps/web/src/features/email-thread/components/copy-subject-button.tsx
index 78209860f6..2441cd7526 100644
--- a/apps/web/src/features/email-thread/components/copy-subject-button.tsx
+++ b/apps/web/src/features/email-thread/components/copy-subject-button.tsx
@@ -1,6 +1,6 @@
import { isPlaceholderSubject } from '@app/features/email-compose/core/subject-text';
-import WideCopy from '@icon/wide-copy.svg';
import IconCheck from '@phosphor/check.svg';
+import CopyIcon from '@phosphor/copy.svg';
import { debounce } from '@solid-primitives/scheduled';
import { cn } from '@ui/utils/classname';
import { createSignal, Show } from 'solid-js';
@@ -39,7 +39,7 @@ export function CopySubjectButton(props: {
)}
onClick={handleCopy}
>
- <Show when={copied()} fallback={<WideCopy class="size-3.5" />}>
+ <Show when={copied()} fallback={<CopyIcon class="size-3.5" />}>
<IconCheck class="size-3.5" />
</Show>
</button>
diff --git a/apps/web/src/features/email-view/components/EmailSidebar.tsx b/apps/web/src/features/email-view/components/EmailSidebar.tsx
index 7ec1e3cce2..6744a6201e 100644
--- a/apps/web/src/features/email-view/components/EmailSidebar.tsx
+++ b/apps/web/src/features/email-view/components/EmailSidebar.tsx
@@ -1,13 +1,13 @@
import { useViewTabHotkeys, ViewSidebar } from '@app/components/view-shell';
import { SidebarCreateHeader } from '@app/components/view-shell/SidebarCreateButton';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import { AnimatedNoiseIcon } from '@icon/wide-noise';
-import { AnimatedSignalIcon } from '@icon/wide-signal';
import CalendarBlankIcon from '@phosphor/calendar-blank.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
import FileIcon from '@phosphor/file.svg';
import PaperPlaneTiltIcon from '@phosphor/paper-plane-tilt.svg';
import UsersThreeIcon from '@phosphor/users-three.svg';
+import SignalIcon from '@phosphor/wave-sine.svg';
+import NoiseIcon from '@phosphor/waveform.svg';
import { SidebarTagsSection } from '@property/tags/SidebarTagsSection';
import { pressHandlers } from '@ui';
import { type Component, For } from 'solid-js';
@@ -19,8 +19,8 @@ import type { EmailTab } from '../types';
import { EmailInboxList } from './EmailInboxSelector';
const TAB_ICONS: Record<EmailTab, Component<{ class?: string }>> = {
- important: AnimatedSignalIcon,
- noise: AnimatedNoiseIcon,
+ important: SignalIcon,
+ noise: NoiseIcon,
sent: PaperPlaneTiltIcon,
calendar: CalendarBlankIcon,
drafts: FileIcon,
diff --git a/apps/web/src/features/entity/components/ChatProviderIcon.tsx b/apps/web/src/features/entity/components/ChatProviderIcon.tsx
index 9cd31453af..a6576523ac 100644
--- a/apps/web/src/features/entity/components/ChatProviderIcon.tsx
+++ b/apps/web/src/features/entity/components/ChatProviderIcon.tsx
@@ -3,7 +3,7 @@ import {
ProviderIcon,
} from '@core/component/AI/component/ProviderIcon';
import { getChatStoredModel } from '@core/component/AI/util/storage';
-import { EntityIcon } from '@core/component/EntityIcon';
+import { EntityIcon, type EntityIconProps } from '@core/component/EntityIcon';
import { Show } from 'solid-js';
/** Soup supplies the saved model; a local draft selection takes precedence. */
@@ -12,6 +12,7 @@ export function ChatProviderIcon(props: {
model?: string | null;
class?: string;
animate?: boolean;
+ weight?: EntityIconProps['weight'];
}) {
const model = () => {
const stored = getChatStoredModel(props.id);
@@ -23,7 +24,12 @@ export function ChatProviderIcon(props: {
<Show
when={modelProvider(model())}
fallback={
- <EntityIcon targetType="chat" size="fill" class={props.class} />
+ <EntityIcon
+ targetType="chat"
+ size="fill"
+ class={props.class}
+ weight={props.weight}
+ />
}
>
<ProviderIcon
diff --git a/apps/web/src/features/entity/components/PulsingStar.tsx b/apps/web/src/features/entity/components/PulsingStar.tsx
index 2ac407ff5b..2dc52177e4 100644
--- a/apps/web/src/features/entity/components/PulsingStar.tsx
+++ b/apps/web/src/features/entity/components/PulsingStar.tsx
@@ -1,5 +1,5 @@
-import { AnimatedStarIcon } from '@icon/wide-star';
-import { createSignal, onCleanup } from 'solid-js';
+import SparkleIcon from '@phosphor/sparkle.svg';
+import { cn } from '@ui';
const kind = {
listIcon: 'size-4 text-chat',
@@ -13,21 +13,11 @@ export function PulsingStar(props: {
animate?: boolean;
class?: string;
}) {
- const [pulse, setPulse] = createSignal(false);
-
- const interval = setInterval(() => {
- if (props.animate) {
- setPulse((p) => !p);
- } else {
- setPulse(false);
- }
- }, 900);
-
- onCleanup(() => clearInterval(interval));
-
return (
<div class={kind[props.kind]}>
- <AnimatedStarIcon class={props.class} triggerAnimation={pulse()} />
+ <SparkleIcon
+ class={cn('size-full', props.class, props.animate && 'animate-pulse')}
+ />
</div>
);
}
diff --git a/apps/web/src/features/entity/composed/list-entity/channel.tsx b/apps/web/src/features/entity/composed/list-entity/channel.tsx
index eab1d7bc63..c0b69c2bc7 100644
--- a/apps/web/src/features/entity/composed/list-entity/channel.tsx
+++ b/apps/web/src/features/entity/composed/list-entity/channel.tsx
@@ -5,7 +5,7 @@ import {
} from '@core/component/LexicalMarkdown/theme';
import { UserIcon } from '@core/component/UserIcon';
import { DisplayName } from '@entity/components/DisplayName';
-import PhoneIcon from '@icon/wide-call.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import { useActiveCallsQuery } from '@queries/call/call';
import { useJoinChannelMutation } from '@queries/channel/join-links';
import { Button } from '@ui';
diff --git a/apps/web/src/features/entity/extractors-notification/notification-icon.tsx b/apps/web/src/features/entity/extractors-notification/notification-icon.tsx
index a133946cd6..6b12644275 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-icon.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-icon.tsx
@@ -1,6 +1,5 @@
import type { NotificationType } from '@core/types';
import GithubIcon from '@icon/mcp-github.svg';
-import PhoneIcon from '@icon/wide-call.svg';
import type { NotificationStack } from '@notifications';
import ArrowBendUpLeftIcon from '@phosphor/arrow-bend-up-left.svg';
import AtIcon from '@phosphor/at.svg';
@@ -10,8 +9,9 @@ import ChatIcon from '@phosphor/chat.svg';
import CheckIcon from '@phosphor/check.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
import FilesIcon from '@phosphor/files.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import QuestionIcon from '@phosphor/question.svg';
-import RobotIcon from '@phosphor/robot.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import UserPlusIcon from '@phosphor/user-plus.svg';
import { cn } from '@ui';
import type { JSX } from 'solid-js';
@@ -59,7 +59,7 @@ function getNotificationIcon(
.with('reminder', () => BellIcon)
.with('calendar_event_reminder', () => CalendarBlankIcon)
.with('inbox_reauth_required', () => EnvelopeIcon)
- .with('agent_session_settled', () => RobotIcon)
+ .with('agent_session_settled', () => AgentIcon)
.with('agent_session_waiting_for_input', () => QuestionIcon)
.with('agent_session_mentioned', () => AtIcon)
.exhaustive();
diff --git a/apps/web/src/features/entity/extractors-search/search-helpers.ts b/apps/web/src/features/entity/extractors-search/search-helpers.ts
index a365be7fad..8180894347 100644
--- a/apps/web/src/features/entity/extractors-search/search-helpers.ts
+++ b/apps/web/src/features/entity/extractors-search/search-helpers.ts
@@ -1,8 +1,8 @@
-import PhoneCallIcon from '@icon/wide-call.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
+import FileIcon from '@phosphor/file.svg';
import FilePdfIcon from '@phosphor/file-pdf.svg';
-import FileTextIcon from '@phosphor/file-text.svg';
-import HashIcon from '@phosphor/hash.svg';
+import HashIcon from '@phosphor/hash-straight.svg';
+import PhoneCallIcon from '@phosphor/phone-call.svg';
import { match } from 'ts-pattern';
import { type ContentHitData, hitHasSender } from '../types/search';
@@ -20,10 +20,10 @@ export function getSenderId(hit: ContentHitData): string | undefined {
*/
export function getSearchIcon(hit: ContentHitData) {
return match(hit)
- .with({ type: 'md' }, () => FileTextIcon)
+ .with({ type: 'md' }, () => FileIcon)
.with({ type: 'pdf' }, () => FilePdfIcon)
.with({ type: 'channel' }, () => HashIcon)
.with({ type: 'email' }, () => EnvelopeIcon)
.with({ type: 'call_record' }, () => PhoneCallIcon)
- .otherwise(() => FileTextIcon);
+ .otherwise(() => FileIcon);
}
diff --git a/apps/web/src/features/entity/extractors/entity-email-participants.tsx b/apps/web/src/features/entity/extractors/entity-email-participants.tsx
index 8295770180..1f5182e094 100644
--- a/apps/web/src/features/entity/extractors/entity-email-participants.tsx
+++ b/apps/web/src/features/entity/extractors/entity-email-participants.tsx
@@ -9,7 +9,7 @@ import {
highlightTermsInText,
mergeAdjacentMacroEmTags,
} from '@core/util/searchHighlight';
-import WideCopy from '@icon/wide-copy.svg';
+import CopyIcon from '@phosphor/copy.svg';
import { Surface } from '@ui';
import { createSignal, For, Show } from 'solid-js';
import type { EmailEntity, EmailThreadParticipants } from '../types/entity';
@@ -162,7 +162,7 @@ function HiddenParticipantsTooltip(props: { hidden: ResolvedParticipant[] }) {
onClick={[copyEmail, r.participant.email]}
>
<span class="truncate">{r.participant.email}</span>
- <WideCopy class="size-3 shrink-0 opacity-60" />
+ <CopyIcon class="size-3 shrink-0 opacity-60" />
</div>
)}
</For>
diff --git a/apps/web/src/features/entity/extractors/entity-icon.tsx b/apps/web/src/features/entity/extractors/entity-icon.tsx
index e197a66e25..170b44495d 100644
--- a/apps/web/src/features/entity/extractors/entity-icon.tsx
+++ b/apps/web/src/features/entity/extractors/entity-icon.tsx
@@ -1,5 +1,6 @@
import {
EntityIcon as CoreEntityIcon,
+ type EntityIconProps as CoreEntityIconProps,
getEntityIconType,
} from '@core/component/EntityIcon';
import { UserIcon } from '@core/component/UserIcon';
@@ -15,6 +16,7 @@ interface EntityIconProps {
class?: string;
suppressClick?: boolean;
showTooltip?: boolean;
+ weight?: CoreEntityIconProps['weight'];
}
function DirectMessageIcon(props: {
@@ -22,6 +24,7 @@ function DirectMessageIcon(props: {
class?: string;
suppressClick?: boolean;
showTooltip?: boolean;
+ weight?: CoreEntityIconProps['weight'];
}) {
const userId = useUserId();
const participantId = () => {
@@ -38,6 +41,7 @@ function DirectMessageIcon(props: {
targetType="direct_message"
size="fill"
class={props.class}
+ weight={props.weight}
/>
}
>
@@ -71,6 +75,7 @@ export function EntityIcon(props: EntityIconProps) {
targetType={iconType()}
size="fill"
class={props.class}
+ weight={props.weight}
/>
}
>
@@ -80,6 +85,7 @@ export function EntityIcon(props: EntityIconProps) {
class={props.class}
suppressClick={props.suppressClick}
showTooltip={props.showTooltip}
+ weight={props.weight}
/>
</Match>
<Match when={isChatEntity()}>
@@ -88,6 +94,7 @@ export function EntityIcon(props: EntityIconProps) {
model={(props.entity as ChatEntity).model}
animate={props.streamState?.type === 'created'}
class={`size-full ${props.class ?? ''}`}
+ weight={props.weight}
/>
</Match>
</Switch>
diff --git a/apps/web/src/features/entity/tests/entity-icon.test.tsx b/apps/web/src/features/entity/tests/entity-icon.test.tsx
index 1134f7dd59..bbbdedffe0 100644
--- a/apps/web/src/features/entity/tests/entity-icon.test.tsx
+++ b/apps/web/src/features/entity/tests/entity-icon.test.tsx
@@ -1,13 +1,13 @@
-import WideUnknown from '@icon/wide-unknown.svg';
-import CalendarIcon from '@phosphor/calendar-blank.svg';
+import CalendarIcon from '@phosphor/calendar.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
import EnvelopeOpenIcon from '@phosphor/envelope-open.svg';
-import FileIcon from '@phosphor/file.svg';
+import FileIcon from '@phosphor/file-dashed.svg';
import GitMergeIcon from '@phosphor/git-merge.svg';
import GitPullRequestIcon from '@phosphor/git-pull-request.svg';
+import GitMergeBold from '@phosphor-icons/core/bold/git-merge-bold.svg';
import { cleanup, render } from '@solidjs/testing-library';
import { createSignal } from 'solid-js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { HomeEntityIcon } from '../../inbox-view/components/HomeEntityIcon';
import { EntityIcon } from '../extractors/entity-icon';
import type {
@@ -16,12 +16,6 @@ import type {
UnknownForeignEntity,
} from '../types/entity';
-const flags = vi.hoisted(() => ({ wideIcons: false }));
-vi.mock('@core/constant/featureFlags', () => ({
- get USE_WIDE_ICONS() {
- return flags.wideIcons;
- },
-}));
vi.mock('@core/constant/allBlocks', () => ({
blockAcceptedFileExtensionSet: new Set(),
fileTypeToBlockName: vi.fn(),
@@ -79,11 +73,7 @@ function expectGlyph(container: HTMLElement, Glyph: typeof FileIcon) {
afterEach(cleanup);
-describe.each([false, true])('Entity.Icon with wide icons %s', (wideIcons) => {
- beforeEach(() => {
- flags.wideIcons = wideIcons;
- });
-
+describe('Entity.Icon', () => {
it.each([
[false, false, EnvelopeIcon, 'text-email'],
[true, false, EnvelopeOpenIcon, 'text-default'],
@@ -129,7 +119,7 @@ describe.each([false, true])('Entity.Icon with wide icons %s', (wideIcons) => {
metadata: { status: 'merged' },
};
const { container } = render(() => <EntityIcon entity={entity} />);
- expectGlyph(container, wideIcons ? WideUnknown : FileIcon);
+ expectGlyph(container, FileIcon);
expect(
container.firstElementChild?.classList.contains('text-default')
).toBe(true);
@@ -150,6 +140,16 @@ describe.each([false, true])('Entity.Icon with wide icons %s', (wideIcons) => {
).toBe(false);
});
+ it('forwards the requested weight for pull request states', () => {
+ const { container } = render(() => (
+ <EntityIcon entity={pullRequest('merged')} weight="bold" />
+ ));
+ expectGlyph(container, GitMergeBold);
+ expect(container.firstElementChild?.classList.contains('text-note')).toBe(
+ true
+ );
+ });
+
it('preserves pull request status colors in compact Home rows', () => {
const { container } = render(() => (
<HomeEntityIcon entity={pullRequest('merged')} />
diff --git a/apps/web/src/features/entity/tests/search-helpers.test.ts b/apps/web/src/features/entity/tests/search-helpers.test.ts
index fbc08afc9d..73265e0dbd 100644
--- a/apps/web/src/features/entity/tests/search-helpers.test.ts
+++ b/apps/web/src/features/entity/tests/search-helpers.test.ts
@@ -1,7 +1,7 @@
import EnvelopeIcon from '@phosphor/envelope.svg';
+import FileIcon from '@phosphor/file.svg';
import FilePdfIcon from '@phosphor/file-pdf.svg';
-import FileTextIcon from '@phosphor/file-text.svg';
-import HashIcon from '@phosphor/hash.svg';
+import HashIcon from '@phosphor/hash-straight.svg';
import { describe, expect, it } from 'vitest';
import {
getSearchIcon,
@@ -63,12 +63,12 @@ describe('search-helpers', () => {
});
describe('getSearchIcon', () => {
- it('returns FileTextIcon for md type', () => {
+ it('returns FileIcon for md type', () => {
const hit: ContentHitData = {
type: 'md',
} as ContentHitData;
- expect(getSearchIcon(hit)).toBe(FileTextIcon);
+ expect(getSearchIcon(hit)).toBe(FileIcon);
});
it('returns FilePdfIcon for pdf type', () => {
@@ -95,12 +95,12 @@ describe('search-helpers', () => {
expect(getSearchIcon(hit)).toBe(EnvelopeIcon);
});
- it('returns FileTextIcon for unknown types', () => {
+ it('returns FileIcon for unknown types', () => {
const hit: ContentHitData = {
type: 'unknown' as any,
} as ContentHitData;
- expect(getSearchIcon(hit)).toBe(FileTextIcon);
+ expect(getSearchIcon(hit)).toBe(FileIcon);
});
it('handles hits with additional properties', () => {
diff --git a/apps/web/src/features/getting-started/agent-examples.ts b/apps/web/src/features/getting-started/agent-examples.ts
index d96d9a5538..49d81fb207 100644
--- a/apps/web/src/features/getting-started/agent-examples.ts
+++ b/apps/web/src/features/getting-started/agent-examples.ts
@@ -1,5 +1,5 @@
-import { AnimatedFileMdIcon } from '@icon/wide-fileMd';
-import { AnimatedTaskIcon } from '@icon/wide-task';
+import FileIcon from '@phosphor/file.svg';
+import TaskIcon from '@phosphor/list-checks.svg';
import TagIcon from '@phosphor/tag.svg';
import type { Component } from 'solid-js';
@@ -31,14 +31,14 @@ export const AGENT_EXAMPLES: AgentExample[] = [
},
{
id: 'example-pull-tasks',
- icon: AnimatedTaskIcon,
+ icon: TaskIcon,
title: 'Pull tasks from inbox',
description: 'Turn important emails into tasks',
prompt: `Find my most important recent emails and create tasks from them. Link me to ${TASKS_LIST_LINK} where I can see all of my tasks.`,
},
{
id: 'example-weekly-brief',
- icon: AnimatedFileMdIcon,
+ icon: FileIcon,
title: 'Build weekly brief',
description: 'Summarize your week with links to sources',
prompt:
diff --git a/apps/web/src/features/getting-started/getting-started.tsx b/apps/web/src/features/getting-started/getting-started.tsx
index f06fd55f98..3f8b993cc2 100644
--- a/apps/web/src/features/getting-started/getting-started.tsx
+++ b/apps/web/src/features/getting-started/getting-started.tsx
@@ -17,11 +17,11 @@ import { useUserId, useUserInfo } from '@core/context/user';
import { isMobile } from '@core/mobile/isMobile';
import { setActiveTabId } from '@core/signal/settingsTab';
import { createChat } from '@core/util/create';
-import { AnimatedProfileIcon } from '@icon/wide-profile';
import BookOpenIcon from '@phosphor/book-open.svg';
import PaletteIcon from '@phosphor/palette.svg';
import PlayCircleIcon from '@phosphor/play-circle.svg';
import PlugsIcon from '@phosphor/plugs.svg';
+import ProfileIcon from '@phosphor/user-circle.svg';
import { useGithubLinkStatusQuery } from '@queries/auth/github-link';
import { isRealNamePart, useOwnUserName } from '@queries/auth/user-name-self';
import { useEmailLinksQuery } from '@queries/email/link';
@@ -202,7 +202,7 @@ function GettingStartedContent() {
},
{
id: 'set-name',
- icon: AnimatedProfileIcon,
+ icon: ProfileIcon,
title: 'Set your name & profile picture',
description: 'Introduce yourself in Account settings',
onActivate: () => openSettingsTab('Account'),
diff --git a/apps/web/src/features/home/home-examples.tsx b/apps/web/src/features/home/home-examples.tsx
index f024dbf7e6..5365b5d2fe 100644
--- a/apps/web/src/features/home/home-examples.tsx
+++ b/apps/web/src/features/home/home-examples.tsx
@@ -1,16 +1,16 @@
import { useChatInputContext } from '@core/component/AI/context';
import { isMobile } from '@core/mobile/isMobile';
-import { AnimatedEmailIcon } from '@icon/wide-email';
-import { AnimatedFileMdIcon } from '@icon/wide-fileMd';
-import { AnimatedSearchIcon } from '@icon/wide-search';
+import EmailIcon from '@phosphor/envelope.svg';
+import FileIcon from '@phosphor/file.svg';
+import SearchIcon from '@phosphor/magnifying-glass.svg';
import XIcon from '@phosphor/x.svg';
-import { createSignal, For, type JSX, Show } from 'solid-js';
+import { For, type JSX, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { replaceHomeComposerSelection } from './home-composer-selection';
import type { HomePreferences } from './home-prefs';
type HomeExample = {
- icon: (props: { class?: string; triggerAnimation?: boolean }) => JSX.Element;
+ icon: (props: { class?: string }) => JSX.Element;
title: string;
description: string;
prompt: string;
@@ -18,19 +18,19 @@ type HomeExample = {
const HOME_EXAMPLES: HomeExample[] = [
{
- icon: AnimatedFileMdIcon,
+ icon: FileIcon,
title: 'Draft a document',
description: 'Start from an idea',
prompt: 'Help me draft a document about ',
},
{
- icon: AnimatedEmailIcon,
+ icon: EmailIcon,
title: 'Draft an email',
description: 'Reply or compose',
prompt: 'Help me draft an email to ',
},
{
- icon: AnimatedSearchIcon,
+ icon: SearchIcon,
title: 'Search & research',
description: 'Across your workspace',
prompt: 'Research and summarize everything we have about ',
@@ -43,8 +43,6 @@ const HOME_EXAMPLES: HomeExample[] = [
*/
export function HomeExamples(props: { preferences: HomePreferences }) {
const input = useChatInputContext();
- const [hovered, setHovered] = createSignal<number | null>(null);
-
return (
<Show when={!isMobile() && !props.preferences.isDismissed('examples')}>
<section>
@@ -61,22 +59,17 @@ export function HomeExamples(props: { preferences: HomePreferences }) {
</div>
<div class="grid grid-cols-1 gap-2.5 sm:grid-cols-3">
<For each={HOME_EXAMPLES}>
- {(example, i) => (
+ {(example) => (
<button
type="button"
class="group flex flex-col gap-1 rounded-xl border border-edge-muted bg-active p-3 text-left transition-colors hover:bg-hover"
onClick={() =>
replaceHomeComposerSelection(input, example.prompt)
}
- onMouseEnter={() => setHovered(i())}
- onMouseLeave={() =>
- setHovered((prev) => (prev === i() ? null : prev))
- }
>
<div class="flex items-center gap-2">
<Dynamic
component={example.icon}
- triggerAnimation={hovered() === i()}
class="size-4 shrink-0 text-ink-muted transition-colors group-hover:text-accent"
/>
<span class="text-sm font-medium text-ink">
diff --git a/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx b/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx
index fc862ecac6..50d3ee8e55 100644
--- a/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx
+++ b/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx
@@ -4,7 +4,7 @@ import { toast } from '@core/component/Toast/Toast';
import { useCombinedRecipients } from '@core/signal/useCombinedRecipient';
import type { WithCustomUserInput } from '@core/user';
import { getDestinationFromOptions } from '@core/util/destination';
-import PhoneCallIcon from '@icon/wide-call.svg';
+import PhoneCallIcon from '@phosphor/phone-call.svg';
import PlusCircleIcon from '@phosphor/plus-circle.svg';
import XIcon from '@phosphor/x.svg';
import {
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-search-bar.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-search-bar.tsx
index 5d0f377c14..70b607c10f 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-search-bar.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-search-bar.tsx
@@ -5,8 +5,8 @@ import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { buildConfig } from '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder';
import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';
import { registerHotkey } from '@core/hotkey/hotkeys';
-import SearchIcon from '@icon/macro-magnifying-glass.svg';
import { markdownToPlainText } from '@macro-inc/lexical-core/utils/parsers';
+import SearchIcon from '@phosphor/magnifying-glass.svg';
import XIcon from '@phosphor/x.svg?component-solid';
import { cn, Hotkey } from '@ui';
import {
diff --git a/apps/web/src/features/next-soup/soup-view/sort-options.tsx b/apps/web/src/features/next-soup/soup-view/sort-options.tsx
index 0d592b8c21..dbf96f46aa 100644
--- a/apps/web/src/features/next-soup/soup-view/sort-options.tsx
+++ b/apps/web/src/features/next-soup/soup-view/sort-options.tsx
@@ -8,11 +8,11 @@ import {
getTaskPriorityOptionId,
getTaskStatusOptionId,
} from '@entity/utils/task-properties';
-import CalendarIcon from '@icon/wide-calendar.svg';
-import EditIcon from '@icon/wide-edit.svg';
-import EyeIcon from '@icon/wide-eye.svg';
+import CalendarIcon from '@phosphor/calendar.svg';
+import EyeIcon from '@phosphor/eye.svg';
import FlagIcon from '@phosphor/flag.svg';
import ListChecksIcon from '@phosphor/list-checks.svg';
+import EditIcon from '@phosphor/pencil-simple.svg';
import { PROPERTY_OPTION_IDS } from '@property/constants';
import type { JSX } from 'solid-js';
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view.tsx b/apps/web/src/features/next-soup/soup-view/soup-view.tsx
index c104dc622f..180a46bb35 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view.tsx
@@ -103,11 +103,11 @@ import {
type SearchLocation,
} from '@entity';
import type { SoupRowFamily } from '@entity/composed/list-entity/row-geometry';
-import SearchIcon from '@icon/macro-magnifying-glass.svg';
import CaretDownIcon from '@phosphor/caret-down.svg';
import ChevronRightIcon from '@phosphor/caret-right.svg';
import CheckIcon from '@phosphor/check.svg';
import InfoIcon from '@phosphor/info.svg';
+import SearchIcon from '@phosphor/magnifying-glass.svg';
import Spinner from '@phosphor/spinner.svg';
import { createElementSize } from '@solid-primitives/resize-observer';
import { debounce } from '@solid-primitives/scheduled';
diff --git a/apps/web/src/features/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx b/apps/web/src/features/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx
index cef6da3d72..9d024d1251 100644
--- a/apps/web/src/features/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx
@@ -41,7 +41,7 @@ import ChatTextIcon from '@phosphor-icons/core/regular/chat-text.svg?component-s
import PaperclipIcon from '@phosphor-icons/core/regular/paperclip.svg?component-solid';
import PhoneIcon from '@phosphor-icons/core/regular/phone.svg?component-solid';
import QuestionIcon from '@phosphor-icons/core/regular/question.svg?component-solid';
-import RobotIcon from '@phosphor-icons/core/regular/robot.svg?component-solid';
+import AgentIcon from '@phosphor-icons/core/regular/sparkle.svg?component-solid';
import UserPlusIcon from '@phosphor-icons/core/regular/user-plus.svg?component-solid';
import {
PropertiesProvider,
@@ -286,7 +286,7 @@ const tagBubbleIcon = (tag: NotificationTag) =>
))
.with('call_started', () => () => <PhoneIcon class={AVATAR_GLYPH_CLASS} />)
.with('agent_session_settled', () => () => (
- <RobotIcon class={AVATAR_GLYPH_CLASS} />
+ <AgentIcon class={AVATAR_GLYPH_CLASS} />
))
.with('agent_session_waiting_for_input', () => () => (
<QuestionIcon class={AVATAR_GLYPH_CLASS} />
diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
index e968eee507..ffde7e96fc 100644
--- a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
@@ -1,9 +1,9 @@
import type { SystemSortOption } from '@app/features/next-soup/soup-view/sort-options';
import { useSoupView } from '@app/features/next-soup/soup-view/soup-view-context';
import { useListLayout } from '@entity/composed/list-entity/shared';
-import StatusInProgress from '@icon/square-task-in-progress-circle.svg';
-import PriorityHigh from '@icon/wide-priority-high.svg';
import ArrowDownIcon from '@phosphor/arrow-down.svg';
+import PriorityHigh from '@phosphor/cell-signal-high.svg';
+import StatusInProgress from '@phosphor/circle-half.svg';
import UsersIcon from '@phosphor/users.svg';
import { Tooltip } from '@ui';
import { cn } from '@ui/utils/classname';
diff --git a/apps/web/src/features/onboarding/components/MockAppChrome.tsx b/apps/web/src/features/onboarding/components/MockAppChrome.tsx
index 66c1417471..7e873d7efa 100644
--- a/apps/web/src/features/onboarding/components/MockAppChrome.tsx
+++ b/apps/web/src/features/onboarding/components/MockAppChrome.tsx
@@ -1,15 +1,10 @@
import { GO_TO_COMMAND_SCOPE, GO_TO_LEADER_KEY } from '@app/constants/hotkeys';
+import { getIconConfig } from '@core/component/EntityIcon';
import { createHotkeyGroup, registerHotkey } from '@core/hotkey/hotkeys';
import type { ValidHotkey } from '@core/hotkey/types';
import MacroIcon from '@icon/macro-logo.svg';
-import { AnimatedChannelIcon } from '@icon/wide-channel';
-import { AnimatedEmailIcon } from '@icon/wide-email';
-import { AnimatedFileMdIcon } from '@icon/wide-fileMd';
-import { AnimatedFolderIcon } from '@icon/wide-folder';
-import { AnimatedGearIcon } from '@icon/wide-gear';
-import { AnimatedPlusIcon } from '@icon/wide-plus';
-import { AnimatedStarIcon } from '@icon/wide-star';
-import { AnimatedTaskIcon } from '@icon/wide-task';
+import GearIcon from '@phosphor/gear.svg';
+import PlusIcon from '@phosphor/plus.svg';
import { cn, HoverCard } from '@ui';
import {
createSignal,
@@ -30,37 +25,37 @@ const MOCK_SIDEBAR_LINKS = [
{
id: 'agents',
label: 'Agents',
- icon: AnimatedStarIcon,
+ icon: getIconConfig('agent').icon,
hotkey: 'a',
},
{
id: 'mail',
label: 'Emails',
- icon: AnimatedEmailIcon,
+ icon: getIconConfig('email').icon,
hotkey: 'e',
},
{
id: 'documents',
label: 'Documents',
- icon: AnimatedFileMdIcon,
+ icon: getIconConfig('md').icon,
hotkey: 'd',
},
{
id: 'tasks',
label: 'Tasks',
- icon: AnimatedTaskIcon,
+ icon: getIconConfig('task').icon,
hotkey: 't',
},
{
id: 'channels',
label: 'Channels',
- icon: AnimatedChannelIcon,
+ icon: getIconConfig('channel').icon,
hotkey: 'c',
},
{
id: 'folders',
label: 'Folders',
- icon: AnimatedFolderIcon,
+ icon: getIconConfig('project').icon,
hotkey: 'f',
},
] satisfies {
@@ -180,7 +175,7 @@ export function MockAppChrome(props: MockAppChromeProps) {
}}
title="Create"
>
- <AnimatedPlusIcon />
+ <PlusIcon />
</button>
<hr class="border-ink/5 w-full my-1" />
<button
@@ -271,7 +266,7 @@ export function MockAppChrome(props: MockAppChromeProps) {
onClick={(e) => e.preventDefault()}
title="Settings"
>
- <AnimatedGearIcon />
+ <GearIcon />
</button>
</div>
</div>
diff --git a/apps/web/src/features/onboarding/lessons/create-entity.tsx b/apps/web/src/features/onboarding/lessons/create-entity.tsx
index 9eeb01bfc7..73ea907351 100644
--- a/apps/web/src/features/onboarding/lessons/create-entity.tsx
+++ b/apps/web/src/features/onboarding/lessons/create-entity.tsx
@@ -8,8 +8,8 @@ import {
type SoupState,
} from '@app/features/next-soup/create-soup-state';
import { createHotkeyGroup, registerHotkey } from '@core/hotkey/hotkeys';
-import { AnimatedPlusIcon } from '@icon/wide-plus';
import { Dialog } from '@kobalte/core/dialog';
+import PlusIcon from '@phosphor/plus.svg';
import {
createEffect,
createSignal,
@@ -121,7 +121,7 @@ function CreateEntityContent(props: LessonContentProps) {
<div class="h-px flex-1 bg-edge-muted" />
</div>
<ClickCallout
- icon={AnimatedPlusIcon}
+ icon={PlusIcon}
label="in the sidebar"
completed={completed()}
/>
diff --git a/apps/web/src/features/onboarding/lessons/sidebar-nav.tsx b/apps/web/src/features/onboarding/lessons/sidebar-nav.tsx
index 458142dcce..51c871ab14 100644
--- a/apps/web/src/features/onboarding/lessons/sidebar-nav.tsx
+++ b/apps/web/src/features/onboarding/lessons/sidebar-nav.tsx
@@ -1,5 +1,5 @@
import { createSoupState } from '@app/features/next-soup/create-soup-state';
-import { AnimatedEmailIcon } from '@icon/wide-email';
+import EmailIcon from '@phosphor/envelope.svg';
import { createEffect, createSignal } from 'solid-js';
import { MockAppChrome } from '../components/MockAppChrome';
import { ClickCallout, HotkeyCallout } from '../components-lib';
@@ -40,7 +40,7 @@ function SidebarNavContent(props: LessonContentProps) {
<div class="h-px flex-1 bg-edge-muted" />
</div>
<ClickCallout
- icon={AnimatedEmailIcon}
+ icon={EmailIcon}
label="in the sidebar"
completed={done()}
/>
diff --git a/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx b/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
index 10fb3d061d..7c498fc2a4 100644
--- a/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
+++ b/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
@@ -1,12 +1,12 @@
-import StatusCanceled from '@icon/square-task-cancelled-circle.svg';
-import StatusCreated from '@icon/square-task-created-circle.svg';
-import StatusDone from '@icon/square-task-done-circle.svg';
-import StatusInProgress from '@icon/square-task-in-progress-circle.svg';
-import StatusInReview from '@icon/square-task-in-review-circle.svg';
-import PriorityHigh from '@icon/wide-priority-high.svg';
-import PriorityLow from '@icon/wide-priority-low.svg';
-import PriorityMedium from '@icon/wide-priority-medium.svg';
-import PriorityUrgent from '@icon/wide-priority-urgent.svg';
+import PriorityHigh from '@phosphor/cell-signal-high.svg';
+import PriorityLow from '@phosphor/cell-signal-low.svg';
+import PriorityMedium from '@phosphor/cell-signal-medium.svg';
+import StatusDone from '@phosphor/check-circle.svg';
+import StatusCreated from '@phosphor/circle-dashed.svg';
+import StatusInProgress from '@phosphor/circle-half.svg';
+import StatusInReview from '@phosphor/eye.svg';
+import PriorityUrgent from '@phosphor/warning-circle.svg';
+import StatusCanceled from '@phosphor/x-circle.svg';
import { type Component, Match, Switch } from 'solid-js';
import { twMerge } from 'tailwind-merge';
import { PROPERTY_OPTION_IDS } from '../../constants';
diff --git a/apps/web/src/features/settings/Agents.tsx b/apps/web/src/features/settings/Agents.tsx
index 03b03c849b..5e532bb9c8 100644
--- a/apps/web/src/features/settings/Agents.tsx
+++ b/apps/web/src/features/settings/Agents.tsx
@@ -9,7 +9,7 @@ import { usePipedreamMcpFlag } from '@core/pipedream/flag';
import MacroLogo from '@icon/macro-logo.svg';
import PencilIcon from '@phosphor/pencil-simple.svg';
import PlusIcon from '@phosphor/plus.svg';
-import RobotIcon from '@phosphor/robot.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import TrashIcon from '@phosphor/trash.svg';
import UploadIcon from '@phosphor/upload-simple.svg';
import XIcon from '@phosphor/x.svg';
@@ -451,7 +451,7 @@ function AgentAvatar(props: { agent: AgentSummary }) {
<Avatar.Fallback>
<Show
when={props.agent.id === MACRO_AGENT_BOT_ID}
- fallback={<RobotIcon class="size-5" />}
+ fallback={<AgentIcon class="size-5" />}
>
<MacroLogo class="size-5" />
</Show>
diff --git a/apps/web/src/features/settings/BotSettingsList.tsx b/apps/web/src/features/settings/BotSettingsList.tsx
index 6f9dc651b9..a1313d0312 100644
--- a/apps/web/src/features/settings/BotSettingsList.tsx
+++ b/apps/web/src/features/settings/BotSettingsList.tsx
@@ -1,8 +1,8 @@
import { BotAvatar } from '@channel/Bots/BotAvatar';
import { LoadingSpinner } from '@core/component/LoadingSpinner';
-import BotIcon from '@icon/wide-bot.svg';
import CaretRightIcon from '@phosphor/caret-right.svg';
import PlusIcon from '@phosphor/plus.svg';
+import BotIcon from '@phosphor/robot.svg';
import { useBotChannelsQuery } from '@queries/bots/bots';
import type { Bot } from '@service-storage/generated/schemas/bot';
import { Button } from '@ui';
diff --git a/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx b/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
index 348e2af49f..f0f81527b5 100644
--- a/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
+++ b/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
@@ -4,7 +4,7 @@ import { replaceCitations } from '@core/component/LexicalMarkdown/citationsUtils
import { ENABLE_TTFT } from '@core/constant/featureFlags';
import { createMarkdownFile } from '@core/util/create';
import { PulsingStar } from '@entity/components/PulsingStar';
-import WideFileMd from '@icon/wide-file-md.svg';
+import WideFileMd from '@phosphor/file.svg';
import CheckIcon from '@phosphor-icons/core/bold/check-bold.svg?component-solid';
import ClipboardIcon from '@phosphor-icons/core/bold/clipboard-bold.svg?component-solid';
import LoadingIcon from '@phosphor-icons/core/bold/spinner-gap-bold.svg?component-solid';
diff --git a/apps/web/src/lib/core/component/AI/component/tool/ListEntities.tsx b/apps/web/src/lib/core/component/AI/component/tool/ListEntities.tsx
index c6464ffe0f..207967c096 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/ListEntities.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/ListEntities.tsx
@@ -1,7 +1,7 @@
import { useSplitLayout } from '@components/app/split-layout/layout';
import { EntityIcon } from '@core/component/EntityIcon';
import { fileTypeToBlockName } from '@core/constant/allBlocks';
-import WideChannel from '@icon/wide-channel.svg';
+import WideChannel from '@phosphor/hash-straight.svg';
import List from '@phosphor-icons/core/regular/list.svg';
import type { NamedTool } from '@service-cognition/generated/tools/tool';
import { createMemo, createSignal } from 'solid-js';
diff --git a/apps/web/src/lib/core/component/AI/component/tool/Subagent.tsx b/apps/web/src/lib/core/component/AI/component/tool/Subagent.tsx
index e243b33064..8a72000e5e 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/Subagent.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/Subagent.tsx
@@ -1,6 +1,6 @@
import { ChatMessageMarkdown } from '@core/component/AI/component/message/ChatMessageMarkdown';
import { PulsingStar } from '@entity/components/PulsingStar';
-import StarIcon from '@icon/wide-star.svg';
+import StarIcon from '@phosphor/sparkle.svg';
import type { JSX } from 'solid-js';
import { createSignal, Show } from 'solid-js';
import { BaseTool } from './BaseTool';
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index ce51075d99..2a18a27d28 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -26,7 +26,6 @@ import { itemToBlockName, resolveBlockAlias } from '@core/constant/allBlocks';
import { getDisplayName, tryMacroId } from '@core/user';
import { copyBranchNameToClipboard } from '@core/util/branchName';
import { matches } from '@core/util/match';
-import DotsThree from '@icon/dots-three-large.svg';
import MacroEmbed from '@icon/macro-embed.svg';
import CollapseInlinePreview from '@phosphor/arrows-in-line-horizontal.svg';
import ExpandInlinePreview from '@phosphor/arrows-out-line-horizontal.svg';
@@ -34,6 +33,7 @@ import MessageIcon from '@phosphor/chat-circle.svg';
import ThreadIcon from '@phosphor/chats-circle.svg';
import ClockIcon from '@phosphor/clock.svg';
import ColumnsPlusRight from '@phosphor/columns-plus-right.svg';
+import DotsThree from '@phosphor/dots-three.svg';
import GitBranchIcon from '@phosphor/git-branch.svg';
import HighlightIcon from '@phosphor/highlighter-circle.svg';
import Link from '@phosphor/link.svg';
diff --git a/apps/web/src/lib/core/component/EntityIcon.test.tsx b/apps/web/src/lib/core/component/EntityIcon.test.tsx
index e025744e80..f18a1283b9 100644
--- a/apps/web/src/lib/core/component/EntityIcon.test.tsx
+++ b/apps/web/src/lib/core/component/EntityIcon.test.tsx
@@ -1,35 +1,28 @@
import { itemToBlockName } from '@core/constant/allBlocks';
-import SkillIcon from '@icon/skill.svg';
-import WideBook from '@icon/wide-book.svg';
-import WideSnippet from '@icon/wide-snippet.svg';
-import WideUnknown from '@icon/wide-unknown.svg';
-import AlarmIcon from '@phosphor/alarm.svg';
-import ArticleIcon from '@phosphor/article.svg';
-import BuildingsIcon from '@phosphor/buildings.svg';
-import CalendarIcon from '@phosphor/calendar-blank.svg';
-import ChatsIcon from '@phosphor/chats-circle.svg';
+import ContactIcon from '@phosphor/address-book.svg';
+import ReminderIcon from '@phosphor/bell-simple.svg';
+import SkillIcon from '@phosphor/blueprint.svg';
+import SnippetIcon from '@phosphor/brackets-curly.svg';
+import CompanyIcon from '@phosphor/building-office.svg';
+import CalendarIcon from '@phosphor/calendar.svg';
+import AutomationIcon from '@phosphor/clock-clockwise.svg';
import EnvelopeIcon from '@phosphor/envelope.svg';
import EnvelopeOpenIcon from '@phosphor/envelope-open.svg';
+import FileIcon from '@phosphor/file.svg';
import FileArchive from '@phosphor/file-archive.svg';
import FilePdf from '@phosphor/file-pdf.svg';
import FolderIcon from '@phosphor/folder-simple.svg';
import GitPullRequestIcon from '@phosphor/git-pull-request.svg';
-import HashIcon from '@phosphor/hash.svg';
-import LightningIcon from '@phosphor/lightning.svg';
+import HashIcon from '@phosphor/hash-straight.svg';
import ListChecksIcon from '@phosphor/list-checks.svg';
-import PhoneIcon from '@phosphor/phone.svg';
+import PhoneIcon from '@phosphor/phone-call.svg';
import SparkleIcon from '@phosphor/sparkle.svg';
-import UsersIcon from '@phosphor/users.svg';
+import DirectMessageIcon from '@phosphor/users.svg';
import { cleanup, render } from '@solidjs/testing-library';
+import { createSignal } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { EntityIcon, getEntityIconType, getIconConfig } from './EntityIcon';
-const flags = vi.hoisted(() => ({ wideIcons: false }));
-vi.mock('@core/constant/featureFlags', () => ({
- get USE_WIDE_ICONS() {
- return flags.wideIcons;
- },
-}));
vi.mock('@core/constant/allBlocks', () => ({
blockAcceptedFileExtensionSet: new Set(),
fileTypeToBlockName: vi.fn(),
@@ -45,15 +38,15 @@ type IconInput = Parameters<typeof getEntityIconType>[0];
const entityGlyphs: [
string,
IconInput,
- typeof ArticleIcon,
+ typeof FileIcon,
ReturnType<typeof itemToBlockName>?,
][] = [
- ['document', { type: 'document', fileType: 'md' }, ArticleIcon, 'md'],
- ['unresolved document', { type: 'document' }, ArticleIcon, 'unknown'],
+ ['document', { type: 'document', fileType: 'md' }, FileIcon, 'md'],
+ ['unresolved document', { type: 'document' }, FileIcon, 'unknown'],
[
'snippet document',
{ type: 'document', fileType: 'md', subType: { type: 'snippet' } },
- WideSnippet,
+ SnippetIcon,
'snippet',
],
[
@@ -69,12 +62,12 @@ const entityGlyphs: [
[
'direct message',
{ type: 'channel', channelType: 'direct_message' },
- ChatsIcon,
+ DirectMessageIcon,
],
[
'direct thread',
{ type: 'channel_thread', channelType: 'direct_message' },
- ChatsIcon,
+ DirectMessageIcon,
],
['email', { type: 'email', isRead: false }, EnvelopeIcon],
['read email', { type: 'email', isRead: true }, EnvelopeOpenIcon],
@@ -82,69 +75,89 @@ const entityGlyphs: [
['agent', { type: 'agent_session' }, SparkleIcon],
['project', { type: 'project' }, FolderIcon],
['calendar', { type: 'calendar_event' }, CalendarIcon],
- ['reminder', { type: 'reminder' }, AlarmIcon],
+ ['reminder', { type: 'reminder' }, ReminderIcon],
['call', { type: 'call' }, PhoneIcon],
- ['automation', { type: 'automation' }, LightningIcon],
+ ['automation', { type: 'automation' }, AutomationIcon],
[
'GitHub pull request',
{ type: 'foreign', foreignSource: 'github_pull_request' },
GitPullRequestIcon,
],
- ['company', { type: 'crm_company' }, BuildingsIcon],
- ['contact', { type: 'crm_contact' }, UsersIcon],
+ ['company', { type: 'crm_company' }, CompanyIcon],
+ ['contact', { type: 'crm_contact' }, ContactIcon],
];
afterEach(cleanup);
-describe.each([false, true])(
- 'entity glyphs with wide icons %s',
- (wideIcons) => {
- beforeEach(() => {
- flags.wideIcons = wideIcons;
- vi.mocked(itemToBlockName).mockReset();
- });
-
- it.each(entityGlyphs)(
- 'renders the shared %s glyph',
- (_, entity, Glyph, blockName) => {
- vi.mocked(itemToBlockName).mockReturnValue(blockName ?? 'unknown');
- const targetType = getEntityIconType(entity);
- expect(getIconConfig(targetType).icon).toBe(Glyph);
-
- const actual = render(() => <EntityIcon targetType={targetType} />);
- const expected = render(() => <Glyph />);
- const actualSvg = actual.container.querySelector('svg');
- const expectedSvg = expected.container.querySelector('svg');
- expect(actualSvg).not.toBeNull();
- expect(actualSvg?.innerHTML).toBe(expectedSvg?.innerHTML);
- }
- );
+describe('entity glyphs', () => {
+ beforeEach(() => {
+ vi.mocked(itemToBlockName).mockReset();
+ });
- it('keeps archive documents distinct from unresolved documents', () => {
- vi.mocked(itemToBlockName).mockReturnValue('unknown');
- const targetType = getEntityIconType({
- type: 'document',
- fileType: 'zip',
- });
- expect(targetType).toBe('archive');
- expect(getIconConfig(targetType).icon).toBe(
- wideIcons ? WideUnknown : FileArchive
- );
- });
-
- it('uses the selected file-format variant for PDF documents', () => {
- const entity = { type: 'document', fileType: 'pdf' } as const;
- vi.mocked(itemToBlockName).mockReturnValue('pdf');
+ it.each(entityGlyphs)(
+ 'renders the shared %s glyph',
+ (_, entity, Glyph, blockName) => {
+ vi.mocked(itemToBlockName).mockReturnValue(blockName ?? 'unknown');
const targetType = getEntityIconType(entity);
- expect(targetType).toBe('pdf');
- expect(itemToBlockName).toHaveBeenCalledWith(entity, true);
- const Glyph = wideIcons ? WideBook : FilePdf;
expect(getIconConfig(targetType).icon).toBe(Glyph);
+
const actual = render(() => <EntityIcon targetType={targetType} />);
const expected = render(() => <Glyph />);
- expect(actual.container.querySelector('svg')?.innerHTML).toBe(
- expected.container.querySelector('svg')?.innerHTML
- );
+ const actualSvg = actual.container.querySelector('svg');
+ const expectedSvg = expected.container.querySelector('svg');
+ expect(actualSvg).not.toBeNull();
+ expect(actualSvg?.innerHTML).toBe(expectedSvg?.innerHTML);
+ }
+ );
+
+ it('keeps archive documents distinct from unresolved documents', () => {
+ vi.mocked(itemToBlockName).mockReturnValue('unknown');
+ const targetType = getEntityIconType({
+ type: 'document',
+ fileType: 'zip',
});
- }
-);
+ expect(targetType).toBe('archive');
+ expect(getIconConfig(targetType).icon).toBe(FileArchive);
+ });
+
+ it('uses the Phosphor file-format icon for PDF documents', () => {
+ const entity = { type: 'document', fileType: 'pdf' } as const;
+ vi.mocked(itemToBlockName).mockReturnValue('pdf');
+ const targetType = getEntityIconType(entity);
+ expect(targetType).toBe('pdf');
+ expect(itemToBlockName).toHaveBeenCalledWith(entity, true);
+ const Glyph = FilePdf;
+ expect(getIconConfig(targetType).icon).toBe(Glyph);
+ const actual = render(() => <EntityIcon targetType={targetType} />);
+ const expected = render(() => <Glyph />);
+ expect(actual.container.querySelector('svg')?.innerHTML).toBe(
+ expected.container.querySelector('svg')?.innerHTML
+ );
+ });
+});
+
+describe('EntityIcon weight', () => {
+ it('uses the chat color treatment for agents', () => {
+ expect(getIconConfig('agent')).toMatchObject({
+ foreground: 'text-chat',
+ background: 'bg-chat/20',
+ });
+ });
+
+ it('selects the requested weight from the icon config', () => {
+ expect(getIconConfig('md', 'bold').icon).toBe(getIconConfig('md').boldIcon);
+ expect(getIconConfig('md').icon).not.toBe(getIconConfig('md').boldIcon);
+ });
+
+ it('reacts to weight changes', () => {
+ const [weight, setWeight] = createSignal<'regular' | 'bold'>('regular');
+ const view = render(() => <EntityIcon targetType="md" weight={weight()} />);
+ const regularPath = view.container.querySelector('path')?.getAttribute('d');
+
+ setWeight('bold');
+
+ expect(view.container.querySelector('path')?.getAttribute('d')).not.toBe(
+ regularPath
+ );
+ });
+});
diff --git a/apps/web/src/lib/core/component/EntityIcon.tsx b/apps/web/src/lib/core/component/EntityIcon.tsx
index 418d904786..5d58d56ba8 100644
--- a/apps/web/src/lib/core/component/EntityIcon.tsx
+++ b/apps/web/src/lib/core/component/EntityIcon.tsx
@@ -5,7 +5,6 @@ import {
isBlockAlias,
itemToBlockName,
} from '@core/constant/allBlocks';
-import { USE_WIDE_ICONS } from '@core/constant/featureFlags';
import type {
ChannelEntity,
DocumentEntity,
@@ -15,42 +14,72 @@ import type {
NamedSubType,
ReminderEntity,
} from '@entity';
-import SkillIcon from '@icon/skill.svg';
-import WideBook from '@icon/wide-book.svg';
-import WideCsv from '@icon/wide-csv.svg';
-import WideDiagram from '@icon/wide-diagram.svg';
-import WideFileCode from '@icon/wide-file-code.svg';
-import WideFileImage from '@icon/wide-file-image.svg';
-import WideFiles from '@icon/wide-files.svg';
-import WideSnippet from '@icon/wide-snippet.svg';
-import WideUnknown from '@icon/wide-unknown.svg';
-import WideVideo from '@icon/wide-video.svg';
-import AlarmIcon from '@phosphor/alarm.svg';
-import ArticleIcon from '@phosphor/article.svg';
+import AddressBook from '@phosphor/address-book.svg';
+import BellSimple from '@phosphor/bell-simple.svg';
+import Blueprint from '@phosphor/blueprint.svg';
+import BracketsCurly from '@phosphor/brackets-curly.svg';
import Building from '@phosphor/building.svg';
-import BuildingsIcon from '@phosphor/buildings.svg';
-import CalendarIcon from '@phosphor/calendar-blank.svg';
-import ChatsIcon from '@phosphor/chats-circle.svg';
-import FileCode from '@phosphor/code.svg';
+import BuildingOffice from '@phosphor/building-office.svg';
+import Calendar from '@phosphor/calendar.svg';
+import ClockClockwise from '@phosphor/clock-clockwise.svg';
+import Code from '@phosphor/code.svg';
import Email from '@phosphor/envelope.svg';
import EmailRead from '@phosphor/envelope-open.svg';
import File from '@phosphor/file.svg';
import FileArchive from '@phosphor/file-archive.svg';
+import FileCsv from '@phosphor/file-csv.svg';
+import FileDashed from '@phosphor/file-dashed.svg';
+import FileDoc from '@phosphor/file-doc.svg';
import FileHtml from '@phosphor/file-html.svg';
import FilePdf from '@phosphor/file-pdf.svg';
import FileVideo from '@phosphor/file-video.svg';
import Files from '@phosphor/files.svg';
import Folder from '@phosphor/folder-simple.svg';
-import GitMergeIcon from '@phosphor/git-merge.svg';
-import GitPullRequestIcon from '@phosphor/git-pull-request.svg';
-import HashIcon from '@phosphor/hash.svg';
+import FolderUser from '@phosphor/folder-simple-user.svg';
+import GitMerge from '@phosphor/git-merge.svg';
+import GitPullRequest from '@phosphor/git-pull-request.svg';
+import GlobeIcon from '@phosphor/globe.svg';
+import HashStraight from '@phosphor/hash-straight.svg';
import FileImage from '@phosphor/image.svg';
-import LightningIcon from '@phosphor/lightning.svg';
-import ListChecksIcon from '@phosphor/list-checks.svg';
-import Canvas from '@phosphor/pencil-circle.svg';
-import PhoneIcon from '@phosphor/phone.svg';
-import SparkleIcon from '@phosphor/sparkle.svg';
+import ListChecks from '@phosphor/list-checks.svg';
+import PhoneCall from '@phosphor/phone-call.svg';
+import Shapes from '@phosphor/shapes.svg';
+import Sparkle from '@phosphor/sparkle.svg';
import Users from '@phosphor/users.svg';
+import UsersThree from '@phosphor/users-three.svg';
+import AddressBookBold from '@phosphor-icons/core/bold/address-book-bold.svg';
+import BellSimpleBold from '@phosphor-icons/core/bold/bell-simple-bold.svg';
+import BlueprintBold from '@phosphor-icons/core/bold/blueprint-bold.svg';
+import BracketsCurlyBold from '@phosphor-icons/core/bold/brackets-curly-bold.svg';
+import BuildingBold from '@phosphor-icons/core/bold/building-bold.svg';
+import BuildingOfficeBold from '@phosphor-icons/core/bold/building-office-bold.svg';
+import CalendarBold from '@phosphor-icons/core/bold/calendar-bold.svg';
+import ClockClockwiseBold from '@phosphor-icons/core/bold/clock-clockwise-bold.svg';
+import CodeBold from '@phosphor-icons/core/bold/code-bold.svg';
+import EmailBold from '@phosphor-icons/core/bold/envelope-bold.svg';
+import EmailReadBold from '@phosphor-icons/core/bold/envelope-open-bold.svg';
+import FileArchiveBold from '@phosphor-icons/core/bold/file-archive-bold.svg';
+import FileBold from '@phosphor-icons/core/bold/file-bold.svg';
+import FileCsvBold from '@phosphor-icons/core/bold/file-csv-bold.svg';
+import FileDashedBold from '@phosphor-icons/core/bold/file-dashed-bold.svg';
+import FileDocBold from '@phosphor-icons/core/bold/file-doc-bold.svg';
+import FileHtmlBold from '@phosphor-icons/core/bold/file-html-bold.svg';
+import FilePdfBold from '@phosphor-icons/core/bold/file-pdf-bold.svg';
+import FileVideoBold from '@phosphor-icons/core/bold/file-video-bold.svg';
+import FilesBold from '@phosphor-icons/core/bold/files-bold.svg';
+import FolderBold from '@phosphor-icons/core/bold/folder-simple-bold.svg';
+import FolderUserBold from '@phosphor-icons/core/bold/folder-simple-user-bold.svg';
+import GitMergeBold from '@phosphor-icons/core/bold/git-merge-bold.svg';
+import GitPullRequestBold from '@phosphor-icons/core/bold/git-pull-request-bold.svg';
+import GlobeIconBold from '@phosphor-icons/core/bold/globe-bold.svg';
+import HashStraightBold from '@phosphor-icons/core/bold/hash-straight-bold.svg';
+import FileImageBold from '@phosphor-icons/core/bold/image-bold.svg';
+import ListChecksBold from '@phosphor-icons/core/bold/list-checks-bold.svg';
+import PhoneCallBold from '@phosphor-icons/core/bold/phone-call-bold.svg';
+import ShapesBold from '@phosphor-icons/core/bold/shapes-bold.svg';
+import SparkleBold from '@phosphor-icons/core/bold/sparkle-bold.svg';
+import UsersBold from '@phosphor-icons/core/bold/users-bold.svg';
+import UsersThreeBold from '@phosphor-icons/core/bold/users-three-bold.svg';
import type { PreviewItem } from '@queries/preview';
import type { ChannelType } from '@service-cognition/generated/schemas/channelType';
import { FileTypeMap } from '@service-storage/fileTypeMap';
@@ -62,6 +91,7 @@ import { match } from 'ts-pattern';
type IconConfig = {
icon: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
+ boldIcon: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
foreground: string;
background: string;
prettyName: string;
@@ -95,253 +125,295 @@ const ARCHIVE_EXTENSIONS = new Set(
export const ENTITY_ICON_CONFIGS: Record<EntityWithValidIcon, IconConfig> = {
document: {
- icon: ArticleIcon,
+ icon: File,
+ boldIcon: FileBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Document',
},
call: {
- icon: PhoneIcon,
+ icon: PhoneCall,
+ boldIcon: PhoneCallBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Call',
},
calendar: {
- icon: CalendarIcon,
+ icon: Calendar,
+ boldIcon: CalendarBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Calendar',
},
canvas: {
- icon: Canvas,
+ icon: Shapes,
+ boldIcon: ShapesBold,
foreground: 'text-canvas',
background: 'bg-canvas/20',
prettyName: 'Canvas',
},
html: {
icon: FileHtml,
+ boldIcon: FileHtmlBold,
foreground: 'text-html',
background: 'bg-html/20',
prettyName: 'Webpage',
},
channel: {
- icon: HashIcon,
+ icon: HashStraight,
+ boldIcon: HashStraightBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Channel',
},
public: {
- icon: HashIcon,
+ icon: GlobeIcon,
+ boldIcon: GlobeIconBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Public Channel',
},
organization: {
icon: Building,
+ boldIcon: BuildingBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Organization',
},
private: {
- icon: HashIcon,
+ icon: HashStraight,
+ boldIcon: HashStraightBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Private Channel',
},
direct_message: {
- icon: ChatsIcon,
+ icon: Users,
+ boldIcon: UsersBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Direct Message',
},
team: {
- icon: HashIcon,
+ icon: UsersThree,
+ boldIcon: UsersThreeBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Team Channel',
},
email: {
icon: Email,
+ boldIcon: EmailBold,
foreground: 'text-email',
background: 'bg-email/20',
prettyName: 'Email',
},
code: {
- icon: FileCode,
+ icon: Code,
+ boldIcon: CodeBold,
foreground: 'text-code',
background: 'bg-code/20',
prettyName: 'Code',
},
csv: {
- icon: WideCsv,
+ icon: FileCsv,
+ boldIcon: FileCsvBold,
foreground: 'text-code',
background: 'bg-code/20',
prettyName: 'CSV',
},
pdf: {
icon: FilePdf,
+ boldIcon: FilePdfBold,
foreground: 'text-pdf',
background: 'bg-pdf/20',
prettyName: 'PDF',
},
md: {
- icon: ArticleIcon,
+ icon: File,
+ boldIcon: FileBold,
foreground: 'text-note',
background: 'bg-note/20',
prettyName: 'Note',
},
image: {
icon: FileImage,
+ boldIcon: FileImageBold,
foreground: 'text-image',
background: 'bg-image/20',
prettyName: 'Image',
},
write: {
- icon: ArticleIcon,
+ icon: FileDoc,
+ boldIcon: FileDocBold,
foreground: 'text-write',
background: 'bg-write/20',
prettyName: 'Document',
},
chat: {
- icon: SparkleIcon,
+ icon: Sparkle,
+ boldIcon: SparkleBold,
foreground: 'text-chat',
background: 'bg-chat/20',
prettyName: 'Chat',
},
project: {
icon: Folder,
+ boldIcon: FolderBold,
foreground: 'text-folder',
background: 'bg-folder/20',
prettyName: 'Folder',
},
sharedProject: {
- icon: Folder,
+ icon: FolderUser,
+ boldIcon: FolderUserBold,
foreground: 'text-folder',
background: 'bg-folder/20',
prettyName: 'Shared Folder',
},
unknown: {
- icon: File,
+ icon: FileDashed,
+ boldIcon: FileDashedBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'File',
},
files: {
icon: Files,
+ boldIcon: FilesBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Files',
},
archive: {
icon: FileArchive,
+ boldIcon: FileArchiveBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Archive',
},
video: {
icon: FileVideo,
+ boldIcon: FileVideoBold,
foreground: 'text-video',
background: 'bg-video/20',
prettyName: 'Video',
},
contact: {
- icon: Users,
+ icon: AddressBook,
+ boldIcon: AddressBookBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Contact',
},
default: {
- icon: File,
+ icon: FileDashed,
+ boldIcon: FileDashedBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'File',
},
emailRead: {
icon: EmailRead,
+ boldIcon: EmailReadBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Read Email',
},
emailInvite: {
- icon: CalendarIcon,
+ icon: Calendar,
+ boldIcon: CalendarBold,
foreground: 'text-calendar',
background: 'bg-calendar/20',
prettyName: 'Calendar Invite',
},
githubPullRequest: {
- icon: GitPullRequestIcon,
+ icon: GitPullRequest,
+ boldIcon: GitPullRequestBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'GitHub Pull Request',
},
githubPullRequestOpen: {
- icon: GitPullRequestIcon,
+ icon: GitPullRequest,
+ boldIcon: GitPullRequestBold,
foreground: 'text-success',
background: 'bg-success/20',
prettyName: 'Open Pull Request',
},
githubPullRequestMerged: {
- icon: GitMergeIcon,
+ icon: GitMerge,
+ boldIcon: GitMergeBold,
foreground: 'text-note',
background: 'bg-note/20',
prettyName: 'Merged Pull Request',
},
githubPullRequestClosed: {
- icon: GitPullRequestIcon,
+ icon: GitPullRequest,
+ boldIcon: GitPullRequestBold,
foreground: 'text-failure',
background: 'bg-failure/20',
prettyName: 'Closed Pull Request',
},
pr: {
- icon: GitPullRequestIcon,
+ icon: GitPullRequest,
+ boldIcon: GitPullRequestBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Pull Request',
},
agent: {
- icon: SparkleIcon,
+ icon: Sparkle,
+ boldIcon: SparkleBold,
foreground: 'text-chat',
background: 'bg-chat/20',
prettyName: 'Agent',
},
task: {
- icon: ListChecksIcon,
+ icon: ListChecks,
+ boldIcon: ListChecksBold,
foreground: 'text-task',
background: 'bg-task/20',
prettyName: 'Task',
},
snippet: {
- icon: WideSnippet,
+ icon: BracketsCurly,
+ boldIcon: BracketsCurlyBold,
foreground: 'text-snippet',
background: 'bg-snippet/20',
prettyName: 'Snippet',
},
skill: {
- icon: SkillIcon,
+ icon: Blueprint,
+ boldIcon: BlueprintBold,
foreground: 'text-chat',
background: 'bg-chat/20',
prettyName: 'Skill',
},
automation: {
- icon: LightningIcon,
+ icon: ClockClockwise,
+ boldIcon: ClockClockwiseBold,
foreground: 'text-chat',
background: 'bg-chat/20',
prettyName: 'Automation',
},
crm_company: {
- icon: BuildingsIcon,
+ icon: BuildingOffice,
+ boldIcon: BuildingOfficeBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Company',
},
company: {
- icon: BuildingsIcon,
+ icon: BuildingOffice,
+ boldIcon: BuildingOfficeBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Company',
},
reminder: {
- icon: AlarmIcon,
+ icon: BellSimple,
+ boldIcon: BellSimpleBold,
foreground: 'text-default',
background: 'bg-default/20',
prettyName: 'Reminder',
@@ -373,23 +445,6 @@ function validateEntity(entity: string): EntityWithValidIcon {
}
}
-// File-format icons retain their wide variants; entity glyphs live in the
-// shared registry above so the feature flag cannot replace their mapping.
-const WIDE_ICONS: Partial<
- Record<EntityWithValidIcon, Component<JSX.SvgSVGAttributes<SVGSVGElement>>>
-> = {
- canvas: WideDiagram,
- html: WideFileCode,
- code: WideFileCode,
- pdf: WideBook,
- image: WideFileImage,
- unknown: WideUnknown,
- files: WideFiles,
- archive: WideUnknown,
- video: WideVideo,
- default: WideUnknown,
-};
-
const ICON_SIZES = {
xs: 'w-4 h-4',
sm: 'w-4.5 h-4.5',
@@ -425,6 +480,8 @@ export type EntityIconProps = {
* fill = "w-fill h-fill"
*/
size?: keyof typeof ICON_SIZE_CLASSES;
+ /** Use the matching Phosphor weight. Defaults to regular. */
+ weight?: 'regular' | 'bold';
theme?: 'monochrome';
/**
* Whether the item is shared. If true, certain icons will be rendered differently.
@@ -447,10 +504,10 @@ export function EntityIcon(props: EntityIconProps) {
const getName = () => {
// Special cases:
if (props.targetType === 'project' && props.shared) return 'sharedProject';
- return validateEntity(props.targetType || 'default');
+ return props.targetType || 'default';
};
- const config = () => getIconConfig(getName());
+ const config = () => getIconConfig(getName(), props.weight);
const sizeClass = () => ICON_SIZE_CLASSES[props.size ?? 'xs'];
const isMonochrome = () => props.theme === 'monochrome';
@@ -473,12 +530,19 @@ export function EntityIcon(props: EntityIconProps) {
export function CustomEntityIcon(
props: EntityIconProps & {
icon?: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
+ boldIcon?: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
}
) {
const config = () =>
ENTITY_ICON_CONFIGS[validateEntity(props.targetType || 'default')];
const sizeClass = () => ICON_SIZE_CLASSES[props.size ?? 'xs'];
const isMonochrome = () => props.theme === 'monochrome';
+ const icon = () => {
+ if (props.weight === 'bold') {
+ return props.boldIcon ?? props.icon ?? config().boldIcon;
+ }
+ return props.icon ?? config().icon;
+ };
return (
<div
class={sizeClass()}
@@ -491,20 +555,21 @@ export function CustomEntityIcon(
}}
>
{/* size-full: see EntityIcon (Safari). */}
- <Dynamic component={props.icon || config().icon} class="size-full" />
+ <Dynamic component={icon()} class="size-full" />
</div>
);
}
export function getIconConfig(
- targetType: EntityWithValidIcon | FileType | (string & {})
+ targetType: EntityWithValidIcon | FileType | (string & {}),
+ weight: NonNullable<EntityIconProps['weight']> = 'regular'
) {
const key = validateEntity(targetType);
- const config = { ...ENTITY_ICON_CONFIGS[key] };
- if (USE_WIDE_ICONS) {
- config.icon = WIDE_ICONS[key] ?? config.icon;
- }
- return config;
+ const config = ENTITY_ICON_CONFIGS[key];
+ return {
+ ...config,
+ icon: weight === 'bold' ? config.boldIcon : config.icon,
+ };
}
type EntityIconData = Pick<EntityData, 'type'> & {
@@ -589,8 +654,11 @@ export function reminderReferenceIconType(
return UNRESOLVED_ICONS.has(iconType) ? 'reminder' : iconType;
}
-export function getEntityIconConfig(entity: EntityData) {
- return getIconConfig(getEntityIconType(entity));
+export function getEntityIconConfig(
+ entity: EntityData,
+ weight?: EntityIconProps['weight']
+) {
+ return getIconConfig(getEntityIconType(entity), weight);
}
export function getPreviewItemIconType(item: PreviewItem): EntityWithValidIcon {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
index 340a87c538..52a8a739c9 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/AgentSessionMentionLabel.tsx
@@ -1,4 +1,4 @@
-import AgentIcon from '@icon/wide-star.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
/** A session reference uses the same icon and underline treatment as other mentions. */
export function AgentSessionMentionLabel(props: { label: string }) {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
index 7dcf22d630..db46b85590 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
@@ -13,7 +13,6 @@ import { canNestBlock, createBlockInstance } from '@core/orchestrator';
import { blockElementSignal } from '@core/signal/blockElement';
import { getDisplayName, tryMacroId } from '@core/user';
import { matches } from '@core/util/match';
-import DotsThree from '@icon/dots-three-large.svg';
import {
$convertCardToMention,
$getId,
@@ -27,6 +26,7 @@ import {
} from '@macro-inc/lexical-core';
import Minimize from '@phosphor/arrows-in.svg';
import Clipboard from '@phosphor/clipboard.svg';
+import DotsThree from '@phosphor/dots-three.svg';
import LoadingSpinner from '@phosphor/spinner.svg';
import TrashSimple from '@phosphor/trash-simple.svg';
import {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
index 4f8c58e3f8..a19c5a808b 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx
@@ -8,10 +8,10 @@
import { type PortalScope, ScopedPortal } from '@core/component/ScopedPortal';
import { isMobile } from '@core/mobile/isMobile';
import { debouncedDependent } from '@core/util/debounce';
-import DotsThreeLarge from '@icon/dots-three-large.svg';
import CaretDown from '@phosphor/caret-down.svg';
import TextCode from '@phosphor/code.svg';
import CodeBlock from '@phosphor/code-block.svg';
+import DotsThreeLarge from '@phosphor/dots-three.svg';
import BrokenLinkIcon from '@phosphor/link-break.svg';
import LinkIcon from '@phosphor/link-simple.svg';
import ListBullets from '@phosphor/list-bullets.svg';
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index 59e6dd05a8..482073e781 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -36,8 +36,6 @@ import { idToEmail } from '@core/user';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import type { ResultError } from '@core/util/result';
import { buildSimpleEntityUrl } from '@core/util/url';
-import UserCircle from '@icon/wide-user-circle.svg';
-import WideUsers from '@icon/wide-users.svg';
import { Dialog } from '@kobalte/core/dialog';
import ChevronDownIcon from '@phosphor/caret-down.svg';
import IconComment from '@phosphor/chat-teardrop.svg';
@@ -47,6 +45,8 @@ import IconEye from '@phosphor/eye.svg';
import IconLink from '@phosphor/link.svg';
import IconEdit from '@phosphor/pencil.svg';
import IconShared from '@phosphor/share.svg';
+import UserCircle from '@phosphor/user-circle.svg';
+import UsersIcon from '@phosphor/users.svg';
import IconX from '@phosphor/x.svg';
import { useCurrentTeamQuery } from '@queries/team/teams';
import { cognitionApiServiceClient } from '@service-cognition/client';
@@ -581,7 +581,7 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
props.navigateToChannel(recipient.channel_id)
}
>
- <Switch fallback={<WideUsers class="shrink-0 size-4" />}>
+ <Switch fallback={<UsersIcon class="shrink-0 size-4" />}>
<Match
when={
props.channelNameMap.get(recipient.channel_id)
@@ -593,7 +593,7 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
<Match
when={props.channelNameMap.get(recipient.channel_id)}
>
- <WideUsers class="shrink-0 size-4" />
+ <UsersIcon class="shrink-0 size-4" />
</Match>
</Switch>
<div class="font-medium truncate">
@@ -1278,7 +1278,7 @@ export function ShareModal(props: ShareModalProps) {
>
<Switch
fallback={
- <WideUsers class="shrink-0 size-4" />
+ <UsersIcon class="shrink-0 size-4" />
}
>
<Match
@@ -1297,7 +1297,7 @@ export function ShareModal(props: ShareModalProps) {
recipient.channel_id
)}
>
- <WideUsers class="shrink-0 size-4" />
+ <UsersIcon class="shrink-0 size-4" />
</Match>
</Switch>
<div class="font-medium truncate">
diff --git a/apps/web/src/lib/core/component/UserTooltip.tsx b/apps/web/src/lib/core/component/UserTooltip.tsx
index b30fecdd1b..d0a09a6698 100644
--- a/apps/web/src/lib/core/component/UserTooltip.tsx
+++ b/apps/web/src/lib/core/component/UserTooltip.tsx
@@ -5,11 +5,11 @@ import { enableCrm } from '@core/constant/featureFlags';
import { isBotPrincipalId } from '@core/constant/macroAgent';
import { useUserId } from '@core/context/user';
import { useIsConnectedSecondaryInbox } from '@core/user';
-import WideChat from '@icon/wide-chat.svg';
-import WideContact from '@icon/wide-contact.svg';
-import WideCopy from '@icon/wide-copy.svg';
-import WideTask from '@icon/wide-task.svg';
+import WideContact from '@phosphor/address-book.svg';
+import WideChat from '@phosphor/chat.svg';
import IconCheck from '@phosphor/check.svg';
+import CopyIcon from '@phosphor/copy.svg';
+import WideTask from '@phosphor/list-checks.svg';
import { useGetOrCreateDirectMessageMutation } from '@queries/channel/get-or-create-dm';
import { useCrmContactByEmailQuery } from '@queries/crm/contacts';
import { useCurrentTeamQuery } from '@queries/team/teams';
@@ -232,7 +232,7 @@ function CopyActionItem(props: {
{copied() ? (
<IconCheck class="size-3.5" />
) : (
- <WideCopy class="size-3.5" />
+ <CopyIcon class="size-3.5" />
)}
{props.children}
</ActionItem>
diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.ts
index 28a00a110b..1d9f0b4f2c 100644
--- a/apps/web/src/lib/core/constant/featureFlags.ts
+++ b/apps/web/src/lib/core/constant/featureFlags.ts
@@ -107,12 +107,14 @@ export function isFeatureEnabled(flag: Flag): boolean {
/**
* Switches Inbox, Tasks, and Channels from the current SoupView implementations
- * to the new composable view implementations. Override locally with
- * VITE_ENABLE_NEW_APP_VIEWS.
+ * to the new composable view implementations. Enabled by default in local
+ * development; production follows PostHog. Override locally with
+ * VITE_ENABLE_NEW_APP_VIEWS=false.
*/
export const enableNewAppViews = defineFlag({
key: 'enable-new-app-views',
env: 'ENABLE_NEW_APP_VIEWS',
+ default: DEV_MODE_ENV || undefined,
});
/**
@@ -274,16 +276,6 @@ export const ENABLE_SVG_PREVIEW = defineFlag({
default: true,
}).enabled;
-export const USE_WIDE_ICONS = defineFlag({
- env: 'USE_WIDE_ICONS',
- default: true,
-}).enabled;
-
-export const ENABLE_ANIMATED_ICONS = defineFlag({
- env: 'ENABLE_ANIMATED_ICONS',
- default: true,
-}).enabled;
-
export const ENABLE_TTFT = defineFlag({
env: 'ENABLE_TTFT',
default: DEV_MODE_ENV,
@@ -400,19 +392,6 @@ export const enableEmailSignatures = defineFlag({
default: onInDev,
});
-// SidebarNext: the rebuilt app sidebar — the narrow icon rail in
-// `components/app/sidebar-next` — rendered in place of `AppSidebar`.
-// PostHog-gated everywhere, dev included: no dev-mode default, so `AppSidebar`
-// stays the sidebar you get by default until the flag is on for you. Set
-// VITE_ENABLE_SIDEBAR_NEXT=true to force the rail on locally without PostHog.
-//
-// The PostHog key is deliberately broader than the local names: `enable-new-app-views`
-// is the rollout switch for the rebuilt app surfaces, of which this sidebar is one.
-export const enableSidebarNext = defineFlag({
- key: 'enable-new-app-views',
- env: 'ENABLE_SIDEBAR_NEXT',
-});
-
// CRM companies & contacts frontend: the Companies view + sidebar entry, the
// company/contact detail blocks, CRM mentions / quick-access, and CRM rows in
// global search. PostHog-gated (currently targeted at the Macro team in prod)
diff --git a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
index 2cf990fb14..08f6967638 100644
--- a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
+++ b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
@@ -1,5 +1,4 @@
import { useFeatureFlag } from '@app/lib/analytics/posthog';
-import BotIcon from '@icon/wide-bot.svg';
import BellIcon from '@phosphor/bell-simple.svg';
import BugIcon from '@phosphor/bug.svg';
import BuildingsIcon from '@phosphor/buildings.svg';
@@ -10,7 +9,8 @@ import HardDrivesIcon from '@phosphor/hard-drives.svg';
import KeyIcon from '@phosphor/key.svg';
import KeyboardIcon from '@phosphor/keyboard.svg';
import PlugIcon from '@phosphor/plug.svg';
-import RobotIcon from '@phosphor/robot.svg';
+import BotIcon from '@phosphor/robot.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import SwatchesIcon from '@phosphor/swatches.svg';
import TagIcon from '@phosphor/tag-simple.svg';
import UserIconPhosphor from '@phosphor/user.svg';
@@ -80,7 +80,7 @@ export const SETTINGS_TAB_GROUPS: SettingsTabGroup[] = [
{
label: 'Agents',
items: [
- { tab: 'Agents', label: 'Agents', icon: RobotIcon },
+ { tab: 'Agents', label: 'Agents', icon: AgentIcon },
{ tab: 'Harness', label: 'Harness', icon: HardDrivesIcon },
],
},
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index 78125314f0..2f9a23d978 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -86,6 +86,12 @@ Email, Tasks, and Agents use the same sidebar rows, including favorites, tags,
inboxes, and recent agent chats: 32px high on desktop and 44px on touch devices,
with regular-weight labels and consistent icon spacing.
+Entity rows and navigation use Phosphor icons. Entity icons share one mapping
+across lists, previews, and drag images, with regular and bold weights. Read email
+uses an open envelope, calendar invitations use a calendar, and pull requests
+retain their open/merged/closed glyphs and status colors. Direct messages may
+show the other participant's avatar instead of a glyph.
+
## List-row dragging
GraphQL-backed Soup rows initialize dragging on the first primary-button press;