Skip to content

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

TypeScript

refactor: rename CollapsibleGroup → Collapsible, remove CloseButton (#295)

Cindy Zhang5f63d98f83f2
diff --git a/apps/storybook/stories/CloseButton.stories.tsx b/apps/storybook/stories/CloseButton.stories.tsx
deleted file mode 100644
index ae1cf67951..0000000000
--- a/apps/storybook/stories/CloseButton.stories.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import type {Meta, StoryObj} from '@storybook/react';
-import {XDSCloseButton} from '@xds/core/CloseButton';
-import {XDSHStack} from '@xds/core/Layout';
-import {XDSText} from '@xds/core/Text';
-
-const meta: Meta<typeof XDSCloseButton> = {
- title: 'Core/XDSCloseButton',
- component: XDSCloseButton,
- tags: ['autodocs'],
- argTypes: {
- size: {
- control: 'select',
- options: ['sm', 'md', 'lg'],
- description: 'Size of the close button',
- },
- isDisabled: {
- control: 'boolean',
- description: 'Whether the button is disabled',
- },
- },
-};
-
-export default meta;
-type Story = StoryObj<typeof XDSCloseButton>;
-
-/**
- * Default close button
- */
-export const Default: Story = {
- args: {
- onClick: () => alert('Close clicked'),
- },
-};
-
-/**
- * All sizes
- */
-export const Sizes: Story = {
- render: () => (
- <XDSHStack gap="space4" vAlign="center">
- <XDSHStack gap="space2" vAlign="center">
- <XDSCloseButton size="sm" />
- <XDSText type="supporting">sm</XDSText>
- </XDSHStack>
- <XDSHStack gap="space2" vAlign="center">
- <XDSCloseButton size="md" />
- <XDSText type="supporting">md</XDSText>
- </XDSHStack>
- <XDSHStack gap="space2" vAlign="center">
- <XDSCloseButton size="lg" />
- <XDSText type="supporting">lg</XDSText>
- </XDSHStack>
- </XDSHStack>
- ),
-};
-
-/**
- * Disabled state
- */
-export const Disabled: Story = {
- args: {
- isDisabled: true,
- },
-};
-
-/**
- * With custom aria-label
- */
-export const CustomAriaLabel: Story = {
- args: {
- 'aria-label': 'Dismiss notification',
- onClick: () => alert('Dismissed'),
- },
-};
diff --git a/apps/storybook/stories/Collapsible.stories.tsx b/apps/storybook/stories/Collapsible.stories.tsx
index 25cf8d44d1..b373cf7214 100644
--- a/apps/storybook/stories/Collapsible.stories.tsx
+++ b/apps/storybook/stories/Collapsible.stories.tsx
@@ -1,7 +1,7 @@
import {useState} from 'react';
import type {Meta, StoryObj} from '@storybook/react';
import * as stylex from '@stylexjs/stylex';
-import {XDSCollapsible, XDSCollapsibleGroup} from '@xds/core/CollapsibleGroup';
+import {XDSCollapsible, XDSCollapsibleGroup} from '@xds/core/Collapsible';
import {XDSCard} from '@xds/core/Card';
import {XDSVStack} from '@xds/core/Layout';
import {
diff --git a/internal/vibe-tests/app/src/report/CodeModal.tsx b/internal/vibe-tests/app/src/report/CodeModal.tsx
index ae442b4c06..f527de094d 100644
--- a/internal/vibe-tests/app/src/report/CodeModal.tsx
+++ b/internal/vibe-tests/app/src/report/CodeModal.tsx
@@ -3,7 +3,8 @@ import {XDSDialog} from '@xds/core/Dialog';
import {XDSVStack} from '@xds/core/Stack';
import {XDSText} from '@xds/core/Text';
import {XDSHeading} from '@xds/core/Text';
-import {XDSCloseButton} from '@xds/core/CloseButton';
+import {XDSButton} from '@xds/core/Button';
+import {XDSIcon} from '@xds/core/Icon';
import {spacingVars, colorVars} from '@xds/core/theme/tokens.stylex';
const styles = stylex.create({
@@ -64,7 +65,13 @@ export function CodeModal({
</XDSHeading>
<XDSText type="supporting">{lineCount} lines</XDSText>
</XDSVStack>
- <XDSCloseButton onClick={onHide} />
+ <XDSButton
+ variant="ghost"
+ label="Close"
+ tooltip="Close"
+ icon={<XDSIcon icon="close" color="inherit" />}
+ onClick={onHide}
+ />
</div>
<div {...stylex.props(styles.content)}>
<div {...stylex.props(styles.codeBlock)}>{code}</div>
diff --git a/internal/vibe-tests/src/universal-eval.ts b/internal/vibe-tests/src/universal-eval.ts
index c960b32411..749a63d778 100644
--- a/internal/vibe-tests/src/universal-eval.ts
+++ b/internal/vibe-tests/src/universal-eval.ts
@@ -85,7 +85,6 @@ function discoverXDSComponents(): Set<string> {
'XDSCard',
'XDSCenter',
'XDSCheckboxInput',
- 'XDSCloseButton',
'XDSDateInput',
'XDSDialog',
'XDSDialogHeader',
diff --git a/packages/core/package.json b/packages/core/package.json
index 91f0be80b4..5249392ec7 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -94,17 +94,11 @@
"import": "./dist/CheckboxInput/index.mjs",
"require": "./dist/CheckboxInput/index.js"
},
- "./CloseButton": {
- "source": "./src/CloseButton/index.ts",
- "types": "./dist/CloseButton/index.d.ts",
- "import": "./dist/CloseButton/index.mjs",
- "require": "./dist/CloseButton/index.js"
- },
- "./CollapsibleGroup": {
- "source": "./src/CollapsibleGroup/index.ts",
- "types": "./dist/CollapsibleGroup/index.d.ts",
- "import": "./dist/CollapsibleGroup/index.mjs",
- "require": "./dist/CollapsibleGroup/index.js"
+ "./Collapsible": {
+ "source": "./src/Collapsible/index.ts",
+ "types": "./dist/Collapsible/index.d.ts",
+ "import": "./dist/Collapsible/index.mjs",
+ "require": "./dist/Collapsible/index.js"
},
"./DateInput": {
"source": "./src/DateInput/index.ts",
diff --git a/packages/core/src/Banner/XDSBanner.tsx b/packages/core/src/Banner/XDSBanner.tsx
index 20c2fbaffc..37ca22f94f 100644
--- a/packages/core/src/Banner/XDSBanner.tsx
+++ b/packages/core/src/Banner/XDSBanner.tsx
@@ -1,6 +1,6 @@
/**
* @file XDSBanner.tsx
- * @input Uses React forwardRef/useState, @heroicons/react/24/solid icons, XDSCloseButton, StyleX
+ * @input Uses React forwardRef/useState, @heroicons/react/24/solid icons, XDSButton, XDSIcon, StyleX
* @output Exports XDSBanner component, XDSBannerProps, XDSBannerStatus, XDSBannerVariant types
* @position Core implementation; consumed by index.ts, tested by XDSBanner.test.tsx
*
@@ -25,7 +25,7 @@ import {
XCircleIcon,
CheckCircleIcon,
} from '@heroicons/react/24/solid';
-import {XDSCloseButton} from '../CloseButton';
+import {XDSButton} from '../Button';
import {XDSIcon} from '../Icon';
import {
colorVars,
@@ -346,9 +346,12 @@ export const XDSBanner = forwardRef<HTMLDivElement, XDSBannerProps>(
<div {...stylex.props(styles.endArea)}>
{endButton}
{isDismissable && (
- <XDSCloseButton
- label="Dismiss"
+ <XDSButton
+ variant="ghost"
size="sm"
+ label="Dismiss"
+ tooltip="Dismiss"
+ icon={<XDSIcon icon="close" size="sm" color="inherit" />}
onClick={handleDismiss}
/>
)}
diff --git a/packages/core/src/CloseButton/README.md b/packages/core/src/CloseButton/README.md
deleted file mode 100644
index 2774e174f0..0000000000
--- a/packages/core/src/CloseButton/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# /packages/core/src/CloseButton
-
-XDSCloseButton component for dismissing dialogs, panels, and other closeable UI elements.
-
-<!-- SYNC: When files in this directory change, update this document. -->
-
-## Features
-
-- **Theme-configurable icon**: Default Heroicons XMarkIcon, customizable via theme
-- **Sizes**: `sm`, `md`, `lg` matching standard size tokens
-- **Accessible**: Includes `aria-label="Close"` by default
-- **Ghost styling**: Transparent background with hover/active states
-
-## Usage
-
-```tsx
-import {XDSCloseButton} from '@xds/core/CloseButton';
-
-<XDSCloseButton onClick={handleClose} />
-
-// With custom label (used for aria-label and tooltip)
-<XDSCloseButton onClick={handleClose} label="Dismiss notification" />
-
-// Different sizes
-<XDSCloseButton size="sm" onClick={handleClose} />
-<XDSCloseButton size="lg" onClick={handleClose} />
-```
-
-## Props
-
-| Prop | Type | Default | Description |
-| ------------ | ---------------------- | --------- | ---------------------------------------------- |
-| `size` | `'sm' \| 'md' \| 'lg'` | `'md'` | Size of the button |
-| `label` | `string` | `'Close'` | Accessible label (aria-label) and tooltip text |
-| `isDisabled` | `boolean` | `false` | Whether the button is disabled |
-
-## Customizing the Icon
-
-The icon can be customized via the theme's `components.closeButton.icon` setting:
-
-```tsx
-import {XCircleIcon} from '@heroicons/react/24/solid';
-
-const customTheme = {
- ...baseTheme,
- components: {
- closeButton: {
- icon: XCircleIcon,
- },
- },
-};
-```
-
-## Files
-
-| File | Role | Purpose |
-| ------------------------- | ----- | ------------------------------------------ |
-| `index.ts` | Entry | Exports XDSCloseButton component and types |
-| `XDSCloseButton.tsx` | Core | XDSCloseButton component implementation |
-| `XDSCloseButton.test.tsx` | Test | Unit tests for XDSCloseButton component |
-
-## Implementation Notes
-
-- Uses ghost-style button with hover/active overlays
-- Icon size scales with button size (sm: 16px, md: 20px, lg: 24px)
-- Theme augmentation allows icon customization without component imports
diff --git a/packages/core/src/CloseButton/XDSCloseButton.test.tsx b/packages/core/src/CloseButton/XDSCloseButton.test.tsx
deleted file mode 100644
index 5caaa08509..0000000000
--- a/packages/core/src/CloseButton/XDSCloseButton.test.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @file XDSCloseButton.test.tsx
- * @input Uses vitest, @testing-library/react, XDSCloseButton component
- * @output Unit tests for XDSCloseButton component behavior
- * @position Testing; validates XDSCloseButton.tsx implementation
- *
- * SYNC: When XDSCloseButton.tsx changes, update tests to match new behavior
- */
-
-import {describe, it, expect, vi} from 'vitest';
-import {render, screen} from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import {XDSCloseButton} from './XDSCloseButton';
-
-describe('XDSCloseButton', () => {
- it('renders a button element', () => {
- render(<XDSCloseButton />);
- expect(screen.getByRole('button')).toBeInTheDocument();
- });
-
- it('has aria-label="Close" by default', () => {
- render(<XDSCloseButton />);
- expect(screen.getByRole('button')).toHaveAttribute('aria-label', 'Close');
- });
-
- it('allows custom label for aria-label', () => {
- render(<XDSCloseButton label="Dismiss" />);
- expect(screen.getByRole('button')).toHaveAttribute('aria-label', 'Dismiss');
- });
-
- it('uses label as tooltip content via aria-describedby', () => {
- render(<XDSCloseButton label="Dismiss notification" />);
- const button = screen.getByRole('button');
- // XDSTooltip sets aria-describedby on the button
- expect(button).toHaveAttribute('aria-describedby');
- });
-
- it('has tooltip with default "Close" label', () => {
- render(<XDSCloseButton />);
- const button = screen.getByRole('button');
- // XDSTooltip sets aria-describedby on the button
- expect(button).toHaveAttribute('aria-describedby');
- });
-
- it('calls onClick when clicked', async () => {
- const user = userEvent.setup();
- const handleClick = vi.fn();
- render(<XDSCloseButton onClick={handleClick} />);
-
- await user.click(screen.getByRole('button'));
- expect(handleClick).toHaveBeenCalledTimes(1);
- });
-
- it('does not call onClick when disabled', async () => {
- const user = userEvent.setup();
- const handleClick = vi.fn();
- render(<XDSCloseButton onClick={handleClick} isDisabled />);
-
- await user.click(screen.getByRole('button'));
- expect(handleClick).not.toHaveBeenCalled();
- });
-
- it('renders with type="button"', () => {
- render(<XDSCloseButton />);
- expect(screen.getByRole('button')).toHaveAttribute('type', 'button');
- });
-
- it('can be disabled', () => {
- render(<XDSCloseButton isDisabled />);
- expect(screen.getByRole('button')).toBeDisabled();
- });
-
- it('renders an SVG icon', () => {
- render(<XDSCloseButton />);
- const button = screen.getByRole('button');
- const svg = button.querySelector('svg');
- expect(svg).toBeInTheDocument();
- expect(svg).toHaveAttribute('aria-hidden', 'true');
- });
-
- describe('sizes', () => {
- it('renders with default md size', () => {
- render(<XDSCloseButton />);
- expect(screen.getByRole('button')).toBeInTheDocument();
- });
-
- it('renders with sm size', () => {
- render(<XDSCloseButton size="sm" />);
- expect(screen.getByRole('button')).toBeInTheDocument();
- });
-
- it('renders with lg size', () => {
- render(<XDSCloseButton size="lg" />);
- expect(screen.getByRole('button')).toBeInTheDocument();
- });
- });
-});
diff --git a/packages/core/src/CloseButton/XDSCloseButton.tsx b/packages/core/src/CloseButton/XDSCloseButton.tsx
deleted file mode 100644
index bdbb868c1f..0000000000
--- a/packages/core/src/CloseButton/XDSCloseButton.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @file XDSCloseButton.tsx
- * @input Uses React forwardRef, XDSButton, XDSIcon
- * @output Exports XDSCloseButton component, XDSCloseButtonProps, XDSCloseButtonSize types
- * @position Core implementation; consumed by index.ts, tested by XDSCloseButton.test.tsx
- *
- * SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/CloseButton/README.md (props table, features, implementation notes)
- * - /packages/core/src/CloseButton/XDSCloseButton.test.tsx (tests for new/changed behavior)
- * - /packages/core/src/CloseButton/index.ts (exports if types change)
- * - /apps/storybook/stories/CloseButton.stories.tsx (storybook stories)
- */
-
-'use client';
-
-import {forwardRef, type ButtonHTMLAttributes} from 'react';
-import {XDSButton, type XDSButtonSize} from '../Button';
-import {XDSIcon, type XDSIconSize} from '../Icon';
-
-// =============================================================================
-// Types
-// =============================================================================
-
-export type XDSCloseButtonSize = XDSButtonSize;
-
-// Map button sizes to icon sizes
-const buttonSizeToIconSize: Record<XDSCloseButtonSize, XDSIconSize> = {
- sm: 'sm',
- md: 'md',
- lg: 'lg',
-};
-
-export interface XDSCloseButtonProps extends Omit<
- ButtonHTMLAttributes<HTMLButtonElement>,
- 'children' | 'disabled'
-> {
- /**
- * The size of the close button.
- * @default 'md'
- */
- size?: XDSCloseButtonSize;
- /**
- * Accessible label for the button, also used as tooltip.
- * @default 'Close'
- */
- label?: string;
- /**
- * Whether the button is disabled.
- * @default false
- */
- isDisabled?: boolean;
-}
-
-// =============================================================================
-// Component
-// =============================================================================
-
-/**
- * A close button component.
- *
- * The close icon is provided by the theme's icon registry.
- * Falls back to a built-in lightweight SVG when no theme is present.
- *
- * @example
- * ```tsx
- * <XDSCloseButton onClick={handleClose} />
- * <XDSCloseButton onClick={handleClose} label="Dismiss notification" />
- * ```
- */
-export const XDSCloseButton = forwardRef<
- HTMLButtonElement,
- XDSCloseButtonProps
->(({size = 'md', label = 'Close', isDisabled, ...props}, ref) => {
- const iconSize = buttonSizeToIconSize[size];
-
- return (
- <XDSButton
- ref={ref}
- type="button"
- variant="ghost"
- size={size}
- label={label}
- tooltip={label}
- isDisabled={isDisabled}
- icon={<XDSIcon icon="close" size={iconSize} color="inherit" />}
- {...props}
- />
- );
-});
-
-XDSCloseButton.displayName = 'XDSCloseButton';
diff --git a/packages/core/src/CloseButton/index.ts b/packages/core/src/CloseButton/index.ts
deleted file mode 100644
index 5eadf7712e..0000000000
--- a/packages/core/src/CloseButton/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @file index.ts
- * @input Imports XDSCloseButton component and types from XDSCloseButton.tsx
- * @output Exports XDSCloseButton, XDSCloseButtonProps, XDSCloseButtonSize
- * @position Component entry point; re-exported by /packages/core/src/index.ts
- *
- * SYNC: When modified, update this header and /packages/core/src/CloseButton/README.md
- */
-
-export {XDSCloseButton} from './XDSCloseButton';
-export type {XDSCloseButtonProps, XDSCloseButtonSize} from './XDSCloseButton';
diff --git a/packages/core/src/CollapsibleGroup/README.md b/packages/core/src/Collapsible/README.md
similarity index 99%
rename from packages/core/src/CollapsibleGroup/README.md
rename to packages/core/src/Collapsible/README.md
index fad399e92e..c501a9ff41 100644
--- a/packages/core/src/CollapsibleGroup/README.md
+++ b/packages/core/src/Collapsible/README.md
@@ -13,7 +13,7 @@ XDSCollapsibleGroup coordinates multiple XDSCollapsible instances so only one (o
## Import
```tsx
-import {XDSCollapsible, XDSCollapsibleGroup} from '@xds/core/CollapsibleGroup';
+import {XDSCollapsible, XDSCollapsibleGroup} from '@xds/core/Collapsible';
```
## Usage
diff --git a/packages/core/src/CollapsibleGroup/XDSCollapsible.tsx b/packages/core/src/Collapsible/XDSCollapsible.tsx
similarity index 96%
rename from packages/core/src/CollapsibleGroup/XDSCollapsible.tsx
rename to packages/core/src/Collapsible/XDSCollapsible.tsx
index 7eea603efa..d4fc1acc06 100644
--- a/packages/core/src/CollapsibleGroup/XDSCollapsible.tsx
+++ b/packages/core/src/Collapsible/XDSCollapsible.tsx
@@ -11,9 +11,9 @@
* Works standalone or coordinated by XDSCollapsibleGroup via the `value` prop.
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/CollapsibleGroup/index.ts (exports)
- * - /packages/core/src/CollapsibleGroup/README.md
- * - /apps/storybook/stories/CollapsibleGroup.stories.tsx
+ * - /packages/core/src/Collapsible/index.ts (exports)
+ * - /packages/core/src/Collapsible/README.md
+ * - /apps/storybook/stories/Collapsible.stories.tsx
*/
'use client';
diff --git a/packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.test.tsx b/packages/core/src/Collapsible/XDSCollapsibleGroup.test.tsx
similarity index 100%
rename from packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.test.tsx
rename to packages/core/src/Collapsible/XDSCollapsibleGroup.test.tsx
diff --git a/packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.tsx b/packages/core/src/Collapsible/XDSCollapsibleGroup.tsx
similarity index 95%
rename from packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.tsx
rename to packages/core/src/Collapsible/XDSCollapsibleGroup.tsx
index bf68f58179..64d8aedffb 100644
--- a/packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.tsx
+++ b/packages/core/src/Collapsible/XDSCollapsibleGroup.tsx
@@ -12,10 +12,10 @@
* In "multiple" mode, any number of items can be open simultaneously.
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/CollapsibleGroup/XDSCollapsibleGroupContext.tsx (context type)
- * - /packages/core/src/CollapsibleGroup/README.md
- * - /packages/core/src/CollapsibleGroup/index.ts (exports)
- * - /apps/storybook/stories/CollapsibleGroup.stories.tsx
+ * - /packages/core/src/Collapsible/XDSCollapsibleGroupContext.tsx (context type)
+ * - /packages/core/src/Collapsible/README.md
+ * - /packages/core/src/Collapsible/index.ts (exports)
+ * - /apps/storybook/stories/Collapsible.stories.tsx
*/
'use client';
diff --git a/packages/core/src/CollapsibleGroup/XDSCollapsibleGroupContext.tsx b/packages/core/src/Collapsible/XDSCollapsibleGroupContext.tsx
similarity index 87%
rename from packages/core/src/CollapsibleGroup/XDSCollapsibleGroupContext.tsx
rename to packages/core/src/Collapsible/XDSCollapsibleGroupContext.tsx
index 98f3e91b8a..21615acebe 100644
--- a/packages/core/src/CollapsibleGroup/XDSCollapsibleGroupContext.tsx
+++ b/packages/core/src/Collapsible/XDSCollapsibleGroupContext.tsx
@@ -5,8 +5,8 @@
* @position Context definition for collapsible group coordination
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/CollapsibleGroup/XDSCollapsibleGroup.tsx (provider)
- * - /packages/core/src/CollapsibleGroup/README.md
+ * - /packages/core/src/Collapsible/XDSCollapsibleGroup.tsx (provider)
+ * - /packages/core/src/Collapsible/README.md
*/
import {createContext} from 'react';
diff --git a/packages/core/src/CollapsibleGroup/index.ts b/packages/core/src/Collapsible/index.ts
similarity index 80%
rename from packages/core/src/CollapsibleGroup/index.ts
rename to packages/core/src/Collapsible/index.ts
index 21369d44a4..e3dad11eaf 100644
--- a/packages/core/src/CollapsibleGroup/index.ts
+++ b/packages/core/src/Collapsible/index.ts
@@ -2,9 +2,9 @@
* @file index.ts
* @input Imports XDSCollapsible, XDSCollapsibleGroup, and useXDSCollapsible
* @output Exports components, hook, and types
- * @position Entry point for @xds/core/CollapsibleGroup module
+ * @position Entry point for @xds/core/Collapsible module
*
- * SYNC: When modified, update /packages/core/src/CollapsibleGroup/README.md
+ * SYNC: When modified, update /packages/core/src/Collapsible/README.md
*/
export {XDSCollapsible} from './XDSCollapsible';
diff --git a/packages/core/src/CollapsibleGroup/useXDSCollapsible.ts b/packages/core/src/Collapsible/useXDSCollapsible.ts
similarity index 97%
rename from packages/core/src/CollapsibleGroup/useXDSCollapsible.ts
rename to packages/core/src/Collapsible/useXDSCollapsible.ts
index 7586546c80..512f3424bd 100644
--- a/packages/core/src/CollapsibleGroup/useXDSCollapsible.ts
+++ b/packages/core/src/Collapsible/useXDSCollapsible.ts
@@ -11,8 +11,8 @@
* - Providing a unified toggle handler
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/CollapsibleGroup/index.ts (exports)
- * - /packages/core/src/CollapsibleGroup/README.md
+ * - /packages/core/src/Collapsible/index.ts (exports)
+ * - /packages/core/src/Collapsible/README.md
*
* NOTE: Public hooks use the `useXDS` prefix per XDS naming conventions.
*/
diff --git a/packages/core/src/Dialog/XDSDialogHeader.tsx b/packages/core/src/Dialog/XDSDialogHeader.tsx
index 5862af9ee2..500489a35f 100644
--- a/packages/core/src/Dialog/XDSDialogHeader.tsx
+++ b/packages/core/src/Dialog/XDSDialogHeader.tsx
@@ -1,6 +1,6 @@
/**
* @file XDSDialogHeader.tsx
- * @input Uses React forwardRef, useEffect, useRef, XDSLayoutHeader, XDSHeading, XDSText
+ * @input Uses React forwardRef, useEffect, useRef, XDSLayoutHeader, XDSButton, XDSIcon, XDSHeading, XDSText
* @output Exports XDSDialogHeader component and XDSDialogHeaderProps
* @position Dialog header component; used with XDSDialog and XDSLayout
*
@@ -15,7 +15,8 @@ import {forwardRef, useEffect, useRef, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
import {XDSLayoutHeader} from '../Layout/XDSLayoutHeader';
-import {XDSCloseButton} from '../CloseButton';
+import {XDSButton} from '../Button';
+import {XDSIcon} from '../Icon';
import {XDSHeading} from '../Text/XDSHeading';
import {XDSText} from '../Text/XDSText';
@@ -131,7 +132,15 @@ export const XDSDialogHeader = forwardRef<HTMLElement, XDSDialogHeaderProps>(
{(endContent || onHide) && (
<div {...stylex.props(styles.actions)}>
{endContent}
- {onHide && <XDSCloseButton onClick={onHide} />}
+ {onHide && (
+ <XDSButton
+ variant="ghost"
+ label="Close"
+ tooltip="Close"
+ icon={<XDSIcon icon="close" color="inherit" />}
+ onClick={onHide}
+ />
+ )}
</div>
)}
</div>
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 4c0942e2cd..f6bd4bce2c 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -8,7 +8,7 @@
*/
// Components
-export * from './CollapsibleGroup';
+export * from './Collapsible';
export * from './AppShell';
export * from './AspectRatio';
export * from './Avatar';
@@ -21,7 +21,6 @@ export * from './Calendar';
export * from './Center';
export * from './CheckboxInput';
export * from './RadioList';
-export * from './CloseButton';
export * from './Divider';
export * from './EmptyState';
export * from './Link';