Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

docsite: swap Heroicons for Lucide (#2500)

rubyycheungd4ebfc66e4b5
diff --git a/apps/docsite/package.json b/apps/docsite/package.json
index d67f6dccb8..fb2b7a342d 100644
--- a/apps/docsite/package.json
+++ b/apps/docsite/package.json
@@ -13,7 +13,6 @@
"test:watch": "vitest"
},
"dependencies": {
- "@heroicons/react": "^2.2.0",
"@monaco-editor/react": "^4.7.0",
"@stylexjs/stylex": "^0.18.3",
"@xds/cli": "*",
@@ -25,6 +24,8 @@
"@xds/theme-neutral": "*",
"@xds/theme-stone": "*",
"@xds/theme-y2k": "*",
+ "@heroicons/react": "^2.2.0",
+ "lucide-react": "^1.17.0",
"lz-string": "^1.5.0",
"monaco-editor": "^0.55.1",
"next": "^15.5.16",
diff --git a/apps/docsite/scripts/generate-scope.mjs b/apps/docsite/scripts/generate-scope.mjs
index 030a338807..6d12f5c9ec 100644
--- a/apps/docsite/scripts/generate-scope.mjs
+++ b/apps/docsite/scripts/generate-scope.mjs
@@ -41,7 +41,11 @@ const SCOPE_THEMES = [
{pkg: '@xds/theme-matcha', name: 'matchaTheme', subpath: '/built'},
];
-// Heroicons variants
+// Heroicons variants — exposed alongside Lucide so playground snippets
+// and shared template code that still import from '@heroicons/react/*'
+// keep rendering. The docsite itself authors new code against Lucide;
+// these entries are purely for playground runtime compatibility with
+// template / example code that hasn't been migrated.
const HEROICON_VARIANTS = [
{path: '16/solid', alias: 'Heroicons16Solid'},
{path: '20/solid', alias: 'Heroicons20Solid'},
@@ -49,6 +53,7 @@ const HEROICON_VARIANTS = [
{path: '24/solid', alias: 'Heroicons24Solid'},
];
+
// Build output
const lines = [HEADER, ''];
@@ -83,7 +88,10 @@ lines.push("import {XDSTheme} from '@xds/core/theme';");
lines.push("import * as xdsTokens from '@xds/core/theme/tokens.stylex';");
lines.push('');
-// Heroicons
+// Lucide icons (the docsite's primary icon library going forward)
+// plus Heroicons (kept for backward compatibility with template /
+// example code that still imports from '@heroicons/react/*').
+lines.push("import * as LucideIcons from 'lucide-react';");
for (const h of HEROICON_VARIANTS) {
lines.push(`import * as ${h.alias} from '@heroicons/react/${h.path}';`);
}
@@ -133,7 +141,8 @@ for (const name of components) {
// Barrel export — all components spread
lines.push(` '@xds/core': {${components.map((n) => `...${n}`).join(', ')}},`);
-// Heroicons
+// Lucide icons + Heroicons (both available to playground code)
+lines.push(" 'lucide-react': LucideIcons,");
for (const h of HEROICON_VARIANTS) {
lines.push(` '@heroicons/react/${h.path}': ${h.alias},`);
}
@@ -150,4 +159,4 @@ writeFileSync(OUT, lines.join('\n'));
console.log(`✓ Generated ${OUT}`);
console.log(` ${components.length} components`);
console.log(` ${SCOPE_THEMES.length} themes`);
-console.log(` ${HEROICON_VARIANTS.length} heroicon variants`);
+console.log(` lucide-react icons + ${HEROICON_VARIANTS.length} heroicon variants`);
diff --git a/apps/docsite/src/app/(preview)/playground-preview/scope.ts b/apps/docsite/src/app/(preview)/playground-preview/scope.ts
index effaeffdb1..959225f868 100644
--- a/apps/docsite/src/app/(preview)/playground-preview/scope.ts
+++ b/apps/docsite/src/app/(preview)/playground-preview/scope.ts
@@ -119,6 +119,11 @@ import type {XDSDefinedTheme} from '@xds/core/theme';
import {createElement, type ComponentProps} from 'react';
import * as xdsTokens from '@xds/core/theme/tokens.stylex';
+import * as LucideIcons from 'lucide-react';
+// Heroicons kept available in the playground scope alongside Lucide
+// so template / example code that still imports from
+// '@heroicons/react/*' continues to render. New docsite code authors
+// against Lucide; these entries are purely for backwards compat.
import * as Heroicons16Solid from '@heroicons/react/16/solid';
import * as Heroicons20Solid from '@heroicons/react/20/solid';
import * as Heroicons24Outline from '@heroicons/react/24/outline';
@@ -324,6 +329,7 @@ export const scope: Record<string, Record<string, unknown>> = {
...TreeList,
...Typeahead,
},
+ 'lucide-react': LucideIcons,
'@heroicons/react/16/solid': Heroicons16Solid,
'@heroicons/react/20/solid': Heroicons20Solid,
'@heroicons/react/24/outline': Heroicons24Outline,
diff --git a/apps/docsite/src/app/(site)/community/page.tsx b/apps/docsite/src/app/(site)/community/page.tsx
index 7438eec116..b1e758d06d 100644
--- a/apps/docsite/src/app/(site)/community/page.tsx
+++ b/apps/docsite/src/app/(site)/community/page.tsx
@@ -25,7 +25,7 @@
* is Astryx.
*/
-import {DocumentTextIcon, ScaleIcon} from '@heroicons/react/24/outline';
+import {FileText, Scale} from 'lucide-react';
import {NavSurfaceMode} from './NavSurfaceMode';
import * as stylex from '@stylexjs/stylex';
import {XDSCard} from '@xds/core/Card';
@@ -677,10 +677,14 @@ function BlockCard({label, description, href, badge, image}: BlockCardProps) {
// size (~20px). Inline SVGs keep the bundle lean and avoid
// pulling in a brand-icon package for just three glyphs.
-const GitHubGlyph = ({width = 20, height = 20}) => (
+// Brand glyphs accept the same `size` prop as Lucide icons so all
+// three of them slot uniformly into the Resource.icon shape (see
+// the interface comment below) and the render site can call any
+// icon component with `<Icon size={n} />` regardless of source.
+const GitHubGlyph = ({size = 20}: {size?: number}) => (
<svg
- width={width}
- height={height}
+ width={size}
+ height={size}
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
@@ -690,10 +694,10 @@ const GitHubGlyph = ({width = 20, height = 20}) => (
);
// X (formerly Twitter) glyph — the post-2023 wordmark/logo.
-const TwitterGlyph = ({width = 20, height = 20}) => (
+const TwitterGlyph = ({size = 20}: {size?: number}) => (
<svg
- width={width}
- height={height}
+ width={size}
+ height={size}
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
@@ -702,10 +706,10 @@ const TwitterGlyph = ({width = 20, height = 20}) => (
</svg>
);
-const DiscordGlyph = ({width = 20, height = 20}) => (
+const DiscordGlyph = ({size = 20}: {size?: number}) => (
<svg
- width={width}
- height={height}
+ width={size}
+ height={size}
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
@@ -718,13 +722,20 @@ const DiscordGlyph = ({width = 20, height = 20}) => (
// Resources grid (long-form guides, legal pages, and community
// channels all use this). title/description/href feed the
// XDSListItem chrome; icon renders in the startContent slot at
-// ~20px (Heroicons + the brand glyphs above are interchangeable
-// since both accept the same width/height prop shape).
+// ~20px (Lucide icons + the brand glyphs above are interchangeable
+// since both accept the same `size` prop shape).
interface Resource {
title: string;
description: string;
href: string;
- icon: React.ComponentType<{width?: number; height?: number}>;
+ /**
+ * Icon component rendered in each resource row's startContent
+ * slot. Accepts `size` so Lucide icons (FileText / Scale / etc.)
+ * and the hand-rolled brand glyphs below (GitHubGlyph /
+ * TwitterGlyph / DiscordGlyph) can be called with the same prop
+ * shape at the render site.
+ */
+ icon: React.ComponentType<{size?: number}>;
}
// Communications channels — where the community talks. Same
@@ -883,33 +894,33 @@ const RESOURCE_CATEGORIES: ReadonlyArray<ResourceCategory> = [
description:
'The full process, what we accept, and how proposals get reviewed.',
href: `${WIKI_BASE}/Contributing`,
- icon: DocumentTextIcon,
+ icon: FileText,
},
{
title: 'Contributing with AI',
description:
'How to use AI assistants effectively within Astryx conventions.',
href: `${WIKI_BASE}/Contributing-with-AI-Assistants`,
- icon: DocumentTextIcon,
+ icon: FileText,
},
{
title: 'Dev Setup',
description: 'Clone, install, build, and run Storybook locally.',
href: `${GITHUB_REPO}/blob/main/CONTRIBUTING.md`,
- icon: DocumentTextIcon,
+ icon: FileText,
},
{
title: 'API Conventions',
description:
'How components in Astryx are named, shaped, and composed.',
href: `${WIKI_BASE}/API-Conventions`,
- icon: DocumentTextIcon,
+ icon: FileText,
},
{
title: 'API Arbitration',
description: 'How we settle design disagreements using vibe testing.',
href: `${WIKI_BASE}/API-Arbitration`,
- icon: DocumentTextIcon,
+ icon: FileText,
},
],
},
@@ -921,14 +932,14 @@ const RESOURCE_CATEGORIES: ReadonlyArray<ResourceCategory> = [
description:
'Our standards for respectful collaboration and how we handle reports.',
href: `${GITHUB_REPO}/blob/main/CODE_OF_CONDUCT.md`,
- icon: ScaleIcon,
+ icon: Scale,
},
{
title: 'MIT License',
description:
'Astryx is open source under the MIT License. Free to use.',
href: `${GITHUB_REPO}/blob/main/LICENSE`,
- icon: ScaleIcon,
+ icon: Scale,
},
],
},
@@ -1138,7 +1149,7 @@ export default async function CommunityPage() {
target="_blank"
startContent={
<span {...stylex.props(styles.iconTile)}>
- <Icon width={18} height={18} />
+ <Icon size={18} />
</span>
}
/>
diff --git a/apps/docsite/src/app/playground/CraftPanel.tsx b/apps/docsite/src/app/playground/CraftPanel.tsx
index b78c451cdd..c5201a669c 100644
--- a/apps/docsite/src/app/playground/CraftPanel.tsx
+++ b/apps/docsite/src/app/playground/CraftPanel.tsx
@@ -11,7 +11,7 @@
import * as stylex from '@stylexjs/stylex';
import {XDSChatMessageList, XDSChatComposer} from '@xds/core/Chat';
import {XDSEmptyState} from '@xds/core/EmptyState';
-import {SparklesIcon} from '@heroicons/react/24/outline';
+import {Sparkles} from 'lucide-react';
const s = stylex.create({
root: {
@@ -48,7 +48,7 @@ export function CraftPanel() {
<XDSEmptyState
icon={
<span aria-hidden="true" {...stylex.props(s.icon)}>
- <SparklesIcon width={24} height={24} />
+ <Sparkles size={24} />
</span>
}
title="Craft with AI"
diff --git a/apps/docsite/src/app/playground/PlaygroundClient.tsx b/apps/docsite/src/app/playground/PlaygroundClient.tsx
index 600c69faba..b3e9f2f432 100644
--- a/apps/docsite/src/app/playground/PlaygroundClient.tsx
+++ b/apps/docsite/src/app/playground/PlaygroundClient.tsx
@@ -42,14 +42,14 @@ import {
} from '@xds/core/SegmentedControl';
import {useXDSResizable, XDSResizeHandle} from '@xds/core/Resizable';
import {
- ArrowLeftIcon,
- MoonIcon,
- SunIcon,
- ComputerDesktopIcon,
- DevicePhoneMobileIcon,
- ArrowsPointingOutIcon,
- ArrowPathIcon,
-} from '@heroicons/react/24/outline';
+ ArrowLeft,
+ Moon,
+ Sun,
+ Monitor,
+ Smartphone,
+ Maximize2,
+ RotateCw,
+} from 'lucide-react';
import githubLight from './themes/github-light.json';
import githubDark from './themes/github-dark.json';
import {useThemeMode} from '../providers';
@@ -200,13 +200,12 @@ function configureMonaco(monaco: MonacoInstance) {
'file:///globals.d.ts',
);
- // Heroicons wildcard stub
+ // Lucide icons wildcard stub — gives Monaco a sense of the
+ // module's shape so import { Icon } from 'lucide-react' doesn't
+ // light up with red squigglies in the playground editor.
ts.addExtraLib(
- `declare module '@heroicons/react/16/solid' { const icons: Record<string, React.ComponentType<{width?: number; height?: number; className?: string}>>; export = icons; }
- declare module '@heroicons/react/20/solid' { const icons: Record<string, React.ComponentType<{width?: number; height?: number; className?: string}>>; export = icons; }
- declare module '@heroicons/react/24/outline' { const icons: Record<string, React.ComponentType<{width?: number; height?: number; className?: string}>>; export = icons; }
- declare module '@heroicons/react/24/solid' { const icons: Record<string, React.ComponentType<{width?: number; height?: number; className?: string}>>; export = icons; }`,
- 'file:///node_modules/@heroicons/react/index.d.ts',
+ `declare module 'lucide-react' { const icons: Record<string, React.ComponentType<{size?: number | string; color?: string; strokeWidth?: number | string; className?: string}>>; export = icons; }`,
+ 'file:///node_modules/lucide-react/index.d.ts',
);
// Load real type definitions from the pre-built JSON bundle
@@ -645,7 +644,7 @@ export function PlaygroundClient() {
variant="ghost"
size="md"
isIconOnly
- icon={<ArrowLeftIcon width={20} height={20} />}
+ icon={<ArrowLeft size={20} />}
onClick={() => router.back()}
/>
<XDSTabList
@@ -710,13 +709,7 @@ export function PlaygroundClient() {
variant="ghost"
size="md"
isIconOnly
- icon={
- mode === 'light' ? (
- <MoonIcon width={20} height={20} />
- ) : (
- <SunIcon width={20} height={20} />
- )
- }
+ icon={mode === 'light' ? <Moon size={20} /> : <Sun size={20} />}
onClick={() => setMode(m => (m === 'light' ? 'dark' : 'light'))}
/>
</XDSHStack>
@@ -731,13 +724,13 @@ export function PlaygroundClient() {
value="desktop"
label="Desktop"
isLabelHidden
- icon={<ComputerDesktopIcon width={20} height={20} />}
+ icon={<Monitor size={20} />}
/>
<XDSSegmentedControlItem
value="phone"
label="Phone"
isLabelHidden
- icon={<DevicePhoneMobileIcon width={20} height={20} />}
+ icon={<Smartphone size={20} />}
/>
</XDSSegmentedControl>
}
@@ -762,7 +755,7 @@ export function PlaygroundClient() {
variant="ghost"
size="sm"
isIconOnly
- icon={<ArrowPathIcon width={16} height={16} />}
+ icon={<RotateCw size={16} />}
onClick={handleRebuild}
/>
)}
@@ -774,7 +767,7 @@ export function PlaygroundClient() {
variant="ghost"
size="md"
isIconOnly
- icon={<ArrowsPointingOutIcon width={20} height={20} />}
+ icon={<Maximize2 size={20} />}
onClick={() => setIsFullscreen(true)}
/>
<XDSButton
diff --git a/apps/docsite/src/app/playground/PreviewStage.tsx b/apps/docsite/src/app/playground/PreviewStage.tsx
index 4b3e8663da..974af09b5a 100644
--- a/apps/docsite/src/app/playground/PreviewStage.tsx
+++ b/apps/docsite/src/app/playground/PreviewStage.tsx
@@ -18,7 +18,7 @@
import * as stylex from '@stylexjs/stylex';
import {XDSCard} from '@xds/core/Card';
import {XDSButton} from '@xds/core/Button';
-import {ArrowsPointingInIcon} from '@heroicons/react/24/outline';
+import {Minimize2} from 'lucide-react';
export type Viewport = 'desktop' | 'phone';
@@ -124,7 +124,7 @@ export function PreviewStage({
variant="ghost"
size="sm"
isIconOnly
- icon={<ArrowsPointingInIcon width={16} height={16} />}
+ icon={<Minimize2 size={16} />}
onClick={onExitFullscreen}
/>
</XDSCard>
diff --git a/apps/docsite/src/components/DocsShell.tsx b/apps/docsite/src/components/DocsShell.tsx
index 32a4b1b87d..10820c9a43 100644
--- a/apps/docsite/src/components/DocsShell.tsx
+++ b/apps/docsite/src/components/DocsShell.tsx
@@ -4,7 +4,7 @@
import {useState, useMemo} from 'react';
import {usePathname} from 'next/navigation';
-import {MagnifyingGlassIcon} from '@heroicons/react/24/outline';
+import {Search} from 'lucide-react';
import {XDSAppShell} from '@xds/core/AppShell';
import {XDSSideNav, XDSSideNavItem, XDSSideNavSection} from '@xds/core/SideNav';
import {XDSTextInput} from '@xds/core/TextInput';
@@ -209,7 +209,7 @@ export function DocsShell({
value={componentQuery}
onChange={setComponentQuery}
placeholder="Search components…"
- startIcon={MagnifyingGlassIcon}
+ startIcon={Search}
hasClear
style={{marginBottom: 'var(--spacing-3)'}}
/>
diff --git a/apps/docsite/src/components/SharedTopNav.tsx b/apps/docsite/src/components/SharedTopNav.tsx
index 616981cc3a..3308e2b49f 100644
--- a/apps/docsite/src/components/SharedTopNav.tsx
+++ b/apps/docsite/src/components/SharedTopNav.tsx
@@ -7,12 +7,7 @@ import {usePathname} from 'next/navigation';
import {XDSTopNav, XDSTopNavHeading, XDSTopNavItem} from '@xds/core/TopNav';
import {XDSButton} from '@xds/core/Button';
import {XDSHStack} from '@xds/core/Layout';
-import {
- MagnifyingGlassIcon,
- HeartIcon,
- SunIcon,
- MoonIcon,
-} from '@heroicons/react/24/outline';
+import {Search, HandHeart, Sun, Moon} from 'lucide-react';
import {GITHUB_REPO} from '../constants';
import {XDS_BRAND_ICON} from './XDSWordmark';
import {SearchPalette} from './SearchPalette';
@@ -108,9 +103,10 @@ export function SharedTopNav() {
<XDSHStack gap={0.5}>
<XDSButton
label="Search"
+ tooltip="Search"
variant="ghost"
isIconOnly
- icon={<MagnifyingGlassIcon width={20} height={20} />}
+ icon={<Search size={20} />}
onClick={() => setIsSearchOpen(true)}
/>
<XDSButton
@@ -119,26 +115,27 @@ export function SharedTopNav() {
? 'Switch to dark mode'
: 'Switch to light mode'
}
+ tooltip={
+ mode === 'light'
+ ? 'Switch to dark mode'
+ : 'Switch to light mode'
+ }
variant="ghost"
isIconOnly
- icon={
- mode === 'light' ? (
- <MoonIcon width={20} height={20} />
- ) : (
- <SunIcon width={20} height={20} />
- )
- }
+ icon={mode === 'light' ? <Moon size={20} /> : <Sun size={20} />}
onClick={toggleMode}
/>
<XDSButton
label="Community"
+ tooltip="Community"
variant="ghost"
isIconOnly
- icon={<HeartIcon width={20} height={20} />}
+ icon={<HandHeart size={20} />}
href="/community"
/>
<XDSButton
label="GitHub"
+ tooltip="GitHub"
variant="ghost"
isIconOnly
icon={<GitHubIcon />}
diff --git a/apps/docsite/src/components/ThemeCardShowcase.tsx b/apps/docsite/src/components/ThemeCardShowcase.tsx
index f0f3979480..596d2e6224 100644
--- a/apps/docsite/src/components/ThemeCardShowcase.tsx
+++ b/apps/docsite/src/components/ThemeCardShowcase.tsx
@@ -18,23 +18,23 @@
import {type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {
- PlusIcon,
- MagnifyingGlassIcon,
- TagIcon,
- FolderIcon,
- MapPinIcon,
- ListBulletIcon,
- Squares2X2Icon,
- ShoppingBagIcon,
- BanknotesIcon,
- MicrophoneIcon,
- CreditCardIcon,
- LockClosedIcon,
- XMarkIcon,
- ArrowDownTrayIcon,
- DevicePhoneMobileIcon,
- WalletIcon,
-} from '@heroicons/react/24/outline';
+ Plus,
+ Search,
+ Tag,
+ Folder,
+ MapPin,
+ List,
+ LayoutGrid,
+ ShoppingBag,
+ Banknote,
+ Mic,
+ CreditCard,
+ Lock,
+ X,
+ Download,
+ Smartphone,
+ Wallet,
+} from 'lucide-react';
import {XDSText, XDSHeading} from '@xds/core/Text';
import {XDSVStack, XDSHStack} from '@xds/core/Layout';
import {XDSGrid, XDSGridSpan} from '@xds/core/Grid';
@@ -443,7 +443,7 @@ function CheckoutCard() {
gap={1}
hAlign="center"
xstyle={styles.paymentCardContent}>
- <CreditCardIcon width={20} height={20} />
+ <CreditCard size={20} />
<XDSText type="supporting" weight="bold">
Card
</XDSText>
@@ -458,7 +458,7 @@ function CheckoutCard() {
gap={1}
hAlign="center"
xstyle={styles.paymentCardContent}>
- <DevicePhoneMobileIcon width={20} height={20} />
+ <Smartphone size={20} />
<XDSText type="supporting" weight="bold">
Apple Pay
</XDSText>
@@ -473,7 +473,7 @@ function CheckoutCard() {
gap={1}
hAlign="center"
xstyle={styles.paymentCardContent}>
- <WalletIcon width={20} height={20} />
+ <Wallet size={20} />
<XDSText type="supporting" weight="bold">
Google Pay
</XDSText>
@@ -487,7 +487,7 @@ function CheckoutCard() {
placeholder="1234 1234 1234 1234"
value=""
onChange={() => {}}
- startIcon={<CreditCardIcon width={16} height={16} />}
+ startIcon={<CreditCard size={16} />}
size="lg"
/>
@@ -546,7 +546,7 @@ function CheckoutCard() {
variant="primary"
size="lg"
label="Pay now"
- icon={<LockClosedIcon width={16} height={16} />}
+ icon={<Lock size={16} />}
/>
</XDSVStack>
</XDSCard>
@@ -596,14 +596,16 @@ function ChatCard() {
size="sm"
isIconOnly
label="Export conversation"
- icon={<ArrowDownTrayIcon width={16} height={16} />}
+ tooltip="Export conversation"
+ icon={<Download size={16} />}
/>
<XDSButton
variant="ghost"
size="sm"
isIconOnly
label="Close chat"
- icon={<XMarkIcon width={16} height={16} />}
+ tooltip="Close chat"
+ icon={<X size={16} />}
/>
</XDSHStack>
</XDSHStack>
@@ -725,7 +727,8 @@ function ChatCard() {
size="md"
isIconOnly
label="Attach"
- icon={<PlusIcon width={16} height={16} />}
+ tooltip="Attach"
+ icon={<Plus size={16} />}
/>
}
sendActions={
@@ -734,7 +737,8 @@ function ChatCard() {
size="md"
isIconOnly
label="Voice input"
- icon={<MicrophoneIcon width={16} height={16} />}
+ tooltip="Voice input"
+ icon={<Mic size={16} />}
/>
}
/>
@@ -774,7 +778,7 @@ interface ActivityRow {
const ACTIVITY: ActivityRow[] = [
{
id: '1',
- icon: <ShoppingBagIcon width={16} height={16} />,
+ icon: <ShoppingBag size={16} />,
label: 'Order #1043',
detail: 'Placed · 1:59 pm',
time: '1:59 pm',
@@ -782,7 +786,7 @@ const ACTIVITY: ActivityRow[] = [
},
{
id: '2',
- icon: <BanknotesIcon width={16} height={16} />,
+ icon: <Banknote size={16} />,
label: 'Order #1041',
detail: 'Refunded · 12:40 pm',
time: '12:40 pm',
@@ -790,7 +794,7 @@ const ACTIVITY: ActivityRow[] = [
},
{
id: '3',
- icon: <ShoppingBagIcon width={16} height={16} />,
+ icon: <ShoppingBag size={16} />,
label: 'Order #1040',
detail: 'Placed · 10:30 am',
time: '10:30 am',
@@ -798,7 +802,7 @@ const ACTIVITY: ActivityRow[] = [
},
{
id: '4',
- icon: <ShoppingBagIcon width={16} height={16} />,
+ icon: <ShoppingBag size={16} />,
label: 'Order #1038',
detail: 'Placed · 9:11 am',
time: '9:11 am',
@@ -806,7 +810,7 @@ const ACTIVITY: ActivityRow[] = [
},
{
id: '5',
- icon: <ShoppingBagIcon width={16} height={16} />,
+ icon: <ShoppingBag size={16} />,
label: 'Order #1037',
detail: 'Placed · 8:42 am',
time: '8:42 am',
@@ -909,7 +913,7 @@ function LatestActivityCard() {
// XDSTextInput (with start icon), XDSCheckboxInput, XDSTable (custom
// renderers + proportional widths + dividers + hover), XDSBadge
// (categorical variants), XDSMoreMenu, XDSCard, XDSDivider, XDSIcon
-// (via heroicons).
+// (via lucide-react).
// =============================================================================
type TagSpec = {label: string; variant: 'blue' | 'green' | 'orange' | 'yellow'};
@@ -1091,7 +1095,7 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
label="Add item"
variant="primary"
size="sm"
- icon={<PlusIcon width={16} height={16} />}
+ icon={<Plus size={16} />}
/>
</XDSHStack>
@@ -1110,7 +1114,7 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
placeholder="Type and hit enter…"
value=""
onChange={() => {}}
- startIcon={<MagnifyingGlassIcon width={16} height={16} />}
+ startIcon={<Search size={16} />}
xstyle={styles.searchInput}
/>
<XDSSelector
@@ -1118,7 +1122,7 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
isLabelHidden
placeholder="Categories"
size="sm"
- startIcon={<FolderIcon width={16} height={16} />}
+ startIcon={<Folder size={16} />}
value={undefined}
onChange={() => {}}
options={['Wearables', 'Audio', 'Bags', 'Drinkware', 'Home']}
@@ -1128,7 +1132,7 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
isLabelHidden
placeholder="Locations"
size="sm"
- startIcon={<MapPinIcon width={16} height={16} />}
+ startIcon={<MapPin size={16} />}
value={undefined}
onChange={() => {}}
options={[
@@ -1145,7 +1149,7 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
isLabelHidden
placeholder="Tags"
size="sm"
- startIcon={<TagIcon width={16} height={16} />}
+ startIcon={<Tag size={16} />}
value={undefined}
onChange={() => {}}
options={[
@@ -1164,14 +1168,16 @@ function InventoryCard({images}: {images: ThemeImageSet}) {
size="sm"
isIconOnly
label="List view"
- icon={<ListBulletIcon width={18} height={18} />}
+ tooltip="List view"
+ icon={<List size={18} />}
/>
<XDSButton
variant="ghost"
size="sm"
isIconOnly
label="Grid view"
- icon={<Squares2X2Icon width={18} height={18} />}
+ tooltip="Grid view"
+ icon={<LayoutGrid size={18} />}
/>
</XDSHStack>
</XDSHStack>
diff --git a/apps/docsite/src/components/ThemePackagePage.tsx b/apps/docsite/src/components/ThemePackagePage.tsx
index 8c9e2cc4d1..8b77863989 100644
--- a/apps/docsite/src/components/ThemePackagePage.tsx
+++ b/apps/docsite/src/components/ThemePackagePage.tsx
@@ -4,7 +4,7 @@
import {useState} from 'react';
import stylex from '@stylexjs/stylex';
-import {ArrowLeftIcon, SunIcon, MoonIcon} from '@heroicons/react/24/outline';
+import {ArrowLeft, Sun, Moon} from 'lucide-react';
import {XDSText} from '@xds/core/Text';
import {
XDSVStack,
@@ -247,8 +247,9 @@ export function ThemePackagePage({
variant="ghost"
size="md"
label="Back to all themes"
+ tooltip="Back to all themes"
isIconOnly
- icon={<ArrowLeftIcon />}
+ icon={<ArrowLeft />}
href="/themes"
/>
<XDSVStack gap={0} xstyle={styles.floatingFooterTitle}>
@@ -276,12 +277,13 @@ export function ThemePackagePage({
? 'Switch preview to dark mode'
: 'Switch preview to light mode'
}
+ tooltip={
+ mode === 'light'
+ ? 'Switch preview to dark mode'
+ : 'Switch preview to light mode'
+ }
icon={
- mode === 'light' ? (
- <MoonIcon width={20} height={20} />
- ) : (
- <SunIcon width={20} height={20} />
- )
+ mode === 'light' ? <Moon size={20} /> : <Sun size={20} />
}
onClick={() => setMode(mode === 'light' ? 'dark' : 'light')}
/>
diff --git a/apps/docsite/src/components/ThemeShowcasePreview.tsx b/apps/docsite/src/components/ThemeShowcasePreview.tsx
index 96260042f5..74ddc98b33 100644
--- a/apps/docsite/src/components/ThemeShowcasePreview.tsx
+++ b/apps/docsite/src/components/ThemeShowcasePreview.tsx
@@ -3,11 +3,7 @@
'use client';
import stylex from '@stylexjs/stylex';
-import {
- MagnifyingGlassIcon,
- UserIcon,
- ShoppingBagIcon,
-} from '@heroicons/react/24/outline';
+import {Search, User, ShoppingBag} from 'lucide-react';
import {XDSText, XDSHeading} from '@xds/core/Text';
import {XDSVStack, XDSHStack} from '@xds/core/Layout';
import {XDSButton} from '@xds/core/Button';
@@ -156,23 +152,26 @@ export function ThemeShowcasePreview({
<XDSHStack gap={0.5}>
<XDSButton
label="Search"
+ tooltip="Search"
variant="ghost"
isIconOnly
- icon={<MagnifyingGlassIcon width={20} height={20} />}
+ icon={<Search size={20} />}
href="#"
/>
<XDSButton
label="Account"
+ tooltip="Account"
variant="ghost"
isIconOnly
- icon={<UserIcon width={20} height={20} />}
+ icon={<User size={20} />}
href="#"
/>
<XDSButton
label="Cart"
+ tooltip="Cart"
variant="ghost"
isIconOnly
- icon={<ShoppingBagIcon width={20} height={20} />}
+ icon={<ShoppingBag size={20} />}
href="#"
/>
</XDSHStack>
diff --git a/apps/docsite/src/components/ThemeShowcaseTile.tsx b/apps/docsite/src/components/ThemeShowcaseTile.tsx
index 6f857bdca3..c214d46420 100644
--- a/apps/docsite/src/components/ThemeShowcaseTile.tsx
+++ b/apps/docsite/src/components/ThemeShowcaseTile.tsx
@@ -3,7 +3,7 @@
'use client';
import {useEffect, useMemo, useRef, useState} from 'react';
-import {PlusIcon} from '@heroicons/react/24/outline';
+import {Plus} from 'lucide-react';
import * as stylex from '@stylexjs/stylex';
import {
colorVars,
@@ -640,7 +640,7 @@ export function ThemeShowcaseTile({
size="sm"
label="Add"
isIconOnly
- icon={<PlusIcon />}
+ icon={<Plus />}
/>
</XDSTableCell>
</XDSTableRow>
@@ -655,7 +655,7 @@ export function ThemeShowcaseTile({
size="sm"
label="Add"
isIconOnly
- icon={<PlusIcon />}
+ icon={<Plus />}
/>
</XDSTableCell>
</XDSTableRow>
diff --git a/apps/docsite/src/components/component-detail/InteractivePreview.tsx b/apps/docsite/src/components/component-detail/InteractivePreview.tsx
index d7d1f97c12..ea75b16183 100644
--- a/apps/docsite/src/components/component-detail/InteractivePreview.tsx
+++ b/apps/docsite/src/components/component-detail/InteractivePreview.tsx
@@ -21,7 +21,7 @@ import {XDSText} from '@xds/core/Text';
import {XDSTheme} from '@xds/core/theme';
import {neutralTheme} from '@xds/theme-neutral/built';
import {useThemeMode} from '../../app/providers';
-import {CodeBracketIcon} from '@heroicons/react/24/outline';
+import {Code} from 'lucide-react';
import {
coerceDefault,
parsePropType,
@@ -278,7 +278,7 @@ export function InteractivePreviewStage({
<XDSButton
label="Show code"
tooltip="Show code"
- icon={<CodeBracketIcon width={16} height={16} />}
+ icon={<Code size={16} />}
isIconOnly
variant={showCode ? 'secondary' : 'ghost'}
size="sm"
diff --git a/apps/docsite/src/components/component-detail/PlaygroundPropsTable.tsx b/apps/docsite/src/components/component-detail/PlaygroundPropsTable.tsx
index 7ca908d254..9cee998342 100644
--- a/apps/docsite/src/components/component-detail/PlaygroundPropsTable.tsx
+++ b/apps/docsite/src/components/component-detail/PlaygroundPropsTable.tsx
@@ -13,7 +13,7 @@ import {XDSSelector} from '@xds/core/Selector';
import {XDSIcon} from '@xds/core/Icon';
import {XDSBadge} from '@xds/core/Badge';
import {XDSIconButton} from '@xds/core/IconButton';
-import {MinusIcon, PlusIcon} from '@heroicons/react/24/outline';
+import {Minus, Plus} from 'lucide-react';
import {useMediaQuery} from '@xds/core/hooks';
import type {PropControlDescriptor} from './parsePropType';
import type {KnobProp} from './InteractivePreview';
@@ -186,7 +186,8 @@ function SlotListControl({
<XDSHStack gap={1}>
<XDSIconButton
label="Remove item"
- icon={<MinusIcon width={16} height={16} />}
+ tooltip="Remove item"
+ icon={<Minus size={16} />}
variant="ghost"
size="sm"
isDisabled={count === 0}
@@ -194,7 +195,8 @@ function SlotListControl({
/>
<XDSIconButton
label="Add item"
- icon={<PlusIcon width={16} height={16} />}
+ tooltip="Add item"
+ icon={<Plus size={16} />}
variant="ghost"
size="sm"
onClick={addItem}
diff --git a/apps/docsite/src/components/themePlayground/RawTokensPanel.tsx b/apps/docsite/src/components/themePlayground/RawTokensPanel.tsx
index 2232ab4eb0..b3c4a15349 100644
--- a/apps/docsite/src/components/themePlayground/RawTokensPanel.tsx
+++ b/apps/docsite/src/components/themePlayground/RawTokensPanel.tsx
@@ -242,6 +242,7 @@ export function RawTokensPanel({
<XDSToggleButton
key={groupKey}
label={TOKEN_GROUPS[groupKey].label}
+ tooltip={TOKEN_GROUPS[groupKey].label}
value={groupKey}
icon={TOKEN_ICONS[groupKey]}
isIconOnly={activeGroup !== groupKey}
diff --git a/apps/docsite/src/components/themePlayground/ThemeEditorView.tsx b/apps/docsite/src/components/themePlayground/ThemeEditorView.tsx
index 565954de6d..6a7905168d 100644
--- a/apps/docsite/src/components/themePlayground/ThemeEditorView.tsx
+++ b/apps/docsite/src/components/themePlayground/ThemeEditorView.tsx
@@ -299,7 +299,9 @@ export function ThemeEditorView({
const applyUnifiedPreset = React.useCallback((presetKey: string) => {
const p = UNIFIED_PRESETS[presetKey as keyof typeof UNIFIED_PRESETS];
- if (!p) {return;}
+ if (!p) {
+ return;
+ }
setActivePreset(presetKey);
setTypeScaleBase(p.typeBase);
setTypeScaleRatio(p.typeRatio);
@@ -426,6 +428,7 @@ export function ThemeEditorView({
<XDSHStack gap={2} vAlign="center" style={{padding: '8px 12px 0'}}>
<XDSButton
label="Back"
+ tooltip="Back to all themes"
variant="ghost"
size="md"
isIconOnly
diff --git a/apps/docsite/src/components/themePlayground/icons.tsx b/apps/docsite/src/components/themePlayground/icons.tsx
index 846b0d1d83..d20965a907 100644
--- a/apps/docsite/src/components/themePlayground/icons.tsx
+++ b/apps/docsite/src/components/themePlayground/icons.tsx
@@ -2,45 +2,42 @@
/**
* Icon shim for the theme playground. The tool was authored against internal
- * `@xds/*` icon packages; the OSS docsite uses Heroicons. Each export keeps
- * the original icon name (aliased to the closest Heroicon) and renders at the
+ * `@xds/*` icon packages; the OSS docsite uses Lucide. Each export keeps the
+ * original icon name (aliased to the closest Lucide icon) and renders at the
* 16px size the editor expects, so the ported component code stays unchanged.
*/
import * as React from 'react';
import {
- ArrowLeftIcon,
- SunIcon,
- MoonIcon,
- SwatchIcon,
- Squares2X2Icon,
- Square2StackIcon,
- LanguageIcon,
- ArrowsPointingOutIcon,
- Square3Stack3DIcon,
- ClockIcon,
- BoltIcon,
-} from '@heroicons/react/24/outline';
-
-type IconProps = React.SVGProps<SVGSVGElement>;
+ ArrowLeft,
+ Sun,
+ Moon,
+ Palette,
+ LayoutGrid,
+ Copy,
+ Languages,
+ Maximize2,
+ Layers,
+ Clock,
+ Zap,
+ type LucideProps,
+} from 'lucide-react';
const sized =
- (Icon: React.ComponentType<IconProps>) =>
- (props: IconProps): React.ReactElement => (
- <Icon width={16} height={16} {...props} />
- );
+ (Icon: React.ComponentType<LucideProps>) =>
+ (props: LucideProps): React.ReactElement => <Icon size={16} {...props} />;
// ThemeEditorView
-export const ArrowLeftFilled16Icon = sized(ArrowLeftIcon);
-export const LargeHalfCircle8RaysLargeOutline16Icon = sized(SunIcon);
-export const CrescentOutline16Icon = sized(MoonIcon);
+export const ArrowLeftFilled16Icon = sized(ArrowLeft);
+export const LargeHalfCircle8RaysLargeOutline16Icon = sized(Sun);
+export const CrescentOutline16Icon = sized(Moon);
// RawTokensPanel token-category icons
-export const PaletteOutline16Icon = sized(SwatchIcon);
-export const FourRectangleGridOutline16Icon = sized(Squares2X2Icon);
-export const FrameDashedOutline16Icon = sized(Square2StackIcon);
-export const BigALittleAOutline16Icon = sized(LanguageIcon);
-export const AspectRatioOutline16Icon = sized(ArrowsPointingOutIcon);
-export const SquareOutline16Icon = sized(Square3Stack3DIcon);
-export const StopwatchOutline16Icon = sized(ClockIcon);
-export const BoltOutline16Icon = sized(BoltIcon);
+export const PaletteOutline16Icon = sized(Palette);
+export const FourRectangleGridOutline16Icon = sized(LayoutGrid);
+export const FrameDashedOutline16Icon = sized(Copy);
+export const BigALittleAOutline16Icon = sized(Languages);
+export const AspectRatioOutline16Icon = sized(Maximize2);
+export const SquareOutline16Icon = sized(Layers);
+export const StopwatchOutline16Icon = sized(Clock);
+export const BoltOutline16Icon = sized(Zap);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8eca70d559..11da5cd982 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -130,6 +130,9 @@ importers:
'@xds/theme-y2k':
specifier: '*'
version: link:../../packages/themes/y2k
+ lucide-react:
+ specifier: ^1.17.0
+ version: 1.17.0([email protected])
lz-string:
specifier: ^1.5.0
version: 1.5.0