Skip to content

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

TypeScript

fix(core): use 4px compact Toolbar inset without breaking alignment (#6954)

Ernest3338a6c75ccf
diff --git a/.changeset/compact-toolbar-padding-alignment-7zb3.md b/.changeset/compact-toolbar-padding-alignment-7zb3.md
new file mode 100644
index 0000000000..9f660c4f40
--- /dev/null
+++ b/.changeset/compact-toolbar-padding-alignment-7zb3.md
@@ -0,0 +1,6 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Compact Toolbar uses a 4px block inset while preserving container-owned inline alignment; the RichText formatting row opts into the matching 4px edge inset (#6954)
+@ernestt
diff --git a/packages/core/src/Toolbar/Toolbar.doc.mjs b/packages/core/src/Toolbar/Toolbar.doc.mjs
index 79f9a2e928..67509f803e 100644
--- a/packages/core/src/Toolbar/Toolbar.doc.mjs
+++ b/packages/core/src/Toolbar/Toolbar.doc.mjs
@@ -127,7 +127,7 @@ export const docs = {
name: 'size',
type: "'sm' | 'md' | 'lg'",
description:
- 'Size of the toolbar. Controls minimum height and coordinates with Button, TextInput, TabList, and Selector; children inherit this size as their default via SizeContext.',
+ 'Size of the toolbar. Controls block padding and minimum height, and coordinates with Button, TextInput, TabList, and Selector; children inherit this size as their default via SizeContext. Compact (sm) toolbars use a 4px block inset while inline padding remains container-owned for alignment.',
default: "'md'",
},
{
@@ -190,7 +190,7 @@ export const docsZh = {
startContent: '起始内容(LTR 中靠左对齐)。',
centerContent: '居中内容。切换为 CSS grid(1fr auto 1fr)。',
endContent: '结束内容(LTR 中靠右对齐)。',
- size: '工具栏尺寸。控制最小高度,子组件通过 SizeContext 继承此尺寸作为默认值。',
+ size: '工具栏尺寸。控制块轴内边距和最小高度,子组件通过 SizeContext 继承此尺寸作为默认值。sm 工具栏使用 4px 块轴内边距;行内内边距由容器控制以保持对齐。',
gap: '插槽内项目间距。',
orientation: '键盘导航方向。控制方向键方向。',
variant: '传递给 Section 的视觉变体。',
@@ -241,7 +241,7 @@ export const docsDense = {
startContent: 'Start-aligned content.',
centerContent: 'Centered content; switches to 3-col grid.',
endContent: 'End-aligned content.',
- size: 'Toolbar size; controls min-height + cascades to children via SizeContext.',
+ size: 'Toolbar size; controls block padding + min-height and cascades to children via SizeContext. sm uses a 4px block inset; inline padding remains container-owned.',
gap: 'Gap between slot items.',
orientation: 'Keyboard nav direction.',
variant: 'Visual variant for Section.',
diff --git a/packages/core/src/Toolbar/Toolbar.test.tsx b/packages/core/src/Toolbar/Toolbar.test.tsx
index c8ac8ae56c..ec3f4d5a64 100644
--- a/packages/core/src/Toolbar/Toolbar.test.tsx
+++ b/packages/core/src/Toolbar/Toolbar.test.tsx
@@ -12,7 +12,12 @@
import {describe, it, expect, vi} from 'vitest';
import {render, screen} from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import * as stylex from '@stylexjs/stylex';
import {Toolbar} from './Toolbar';
+import {
+ paddingBlockStyles,
+ paddingInlineStyles,
+} from '../Layout/padding.stylex';
describe('Toolbar', () => {
it('renders with toolbar role', () => {
@@ -148,6 +153,30 @@ describe('Toolbar', () => {
expect(toolbar).toHaveAttribute('data-size', 'sm');
});
+ it.each([
+ ['sm', 1],
+ ['md', 2],
+ ] as const)(
+ 'uses the %s block inset without overriding container inline padding',
+ (size, blockPadding) => {
+ const {container} = render(<Toolbar label="Actions" size={size} />);
+ const sectionInner = container.querySelector('.astryx-section');
+ const expectedBlockClasses = stylex
+ .props(paddingBlockStyles[blockPadding])
+ .className?.split(' ')
+ .filter(Boolean);
+ const compactInlineClasses = stylex
+ .props(paddingInlineStyles[1])
+ .className?.split(' ')
+ .filter(Boolean);
+
+ expect(sectionInner).toBeInTheDocument();
+ expect(expectedBlockClasses).not.toHaveLength(0);
+ expect(sectionInner).toHaveClass(...(expectedBlockClasses ?? []));
+ expect(sectionInner).not.toHaveClass(...(compactInlineClasses ?? []));
+ },
+ );
+
it('defaults to md size', () => {
render(<Toolbar label="Actions" />);
const toolbar = screen.getByRole('toolbar');
diff --git a/packages/core/src/Toolbar/Toolbar.tsx b/packages/core/src/Toolbar/Toolbar.tsx
index 5cd21a49f4..37b81abcff 100644
--- a/packages/core/src/Toolbar/Toolbar.tsx
+++ b/packages/core/src/Toolbar/Toolbar.tsx
@@ -113,18 +113,18 @@ const dynamicStyles = stylex.create({
});
/**
- * Default block padding per toolbar size. Inline padding comes from the
- * parent container (Card, Section, LayoutHeader) via the Section's
- * theme default — the toolbar only controls its vertical tightness.
+ * Default block padding per toolbar size. Inline padding stays owned by the
+ * surrounding Section/container so nested toolbars preserve the same content
+ * line as adjacent body content.
*/
const defaultBlockPaddingForSize: Record<ElementSize, SpacingStep> = {
- sm: 2,
+ sm: 1,
md: 2,
lg: 2,
};
const blockPaddingVarForSize: Record<ElementSize, string> = {
- sm: spacingVars['--spacing-2'],
+ sm: spacingVars['--spacing-1'],
md: spacingVars['--spacing-2'],
lg: spacingVars['--spacing-2'],
};
@@ -135,7 +135,7 @@ const blockPaddingVarForSize: Record<ElementSize, string> = {
* creating even spacing around edge-compensated items (ghost buttons, tabs).
*/
const edgeCompInsetForSize: Record<ElementSize, string> = {
- sm: `calc(var(--container-padding-inline-start, ${spacingVars['--spacing-4']}) - ${spacingVars['--spacing-2']})`,
+ sm: `calc(var(--container-padding-inline-start, ${spacingVars['--spacing-4']}) - ${spacingVars['--spacing-1']})`,
md: `calc(var(--container-padding-inline-start, ${spacingVars['--spacing-4']}) - ${spacingVars['--spacing-2']})`,
lg: `calc(var(--container-padding-inline-start, ${spacingVars['--spacing-4']}) - ${spacingVars['--spacing-2']})`,
};
@@ -164,10 +164,11 @@ export interface ToolbarProps extends BaseProps<HTMLDivElement> {
*/
label: string;
/**
- * Size of the toolbar. Coordinates with Button, TextInput, TabList, and Selector —
- * children inherit this size as their default via SizeContext.
+ * Size of the toolbar. Coordinates block padding and child components through
+ * SizeContext. Inline padding remains container-owned so nested toolbars share
+ * the surrounding content line.
*
- * - `'sm'`: Compact — fits sm buttons/inputs (28px elements)
+ * - `'sm'`: Compact — 4px block inset, fits sm buttons/inputs (28px elements)
* - `'md'`: Standard — fits md buttons/inputs (32px elements)
* - `'lg'`: Spacious — fits lg buttons/inputs (36px elements)
* @default 'md'
diff --git a/packages/richtext/src/RichTextEditor.test.tsx b/packages/richtext/src/RichTextEditor.test.tsx
index be45990d7b..c4fba070af 100644
--- a/packages/richtext/src/RichTextEditor.test.tsx
+++ b/packages/richtext/src/RichTextEditor.test.tsx
@@ -41,6 +41,7 @@ import {
} from './markdownSerializers';
import {RichTextEditorToolbar} from './RichTextEditorToolbar';
import {registerIcons, resetIcons} from '@astryxdesign/core/Icon';
+import {EDGE_COMP_ATTR} from '@astryxdesign/core/Layout';
import {Theme, defineTheme} from '@astryxdesign/core/theme';
import {rtlStyles} from '@astryxdesign/core/utils';
import {InternationalizationProvider} from '@astryxdesign/core/i18n';
@@ -1420,6 +1421,7 @@ describe('RichTextEditorToolbar', () => {
const actionRow = screen.getByRole('group', {
name: 'Formatting actions',
});
+ expect(actionRow).toHaveAttribute(EDGE_COMP_ATTR);
for (const name of [
'Bold',
'Italic',
diff --git a/packages/richtext/src/RichTextEditorToolbar.tsx b/packages/richtext/src/RichTextEditorToolbar.tsx
index 9635696951..e354d07ef5 100644
--- a/packages/richtext/src/RichTextEditorToolbar.tsx
+++ b/packages/richtext/src/RichTextEditorToolbar.tsx
@@ -70,6 +70,7 @@ import {TextInput} from '@astryxdesign/core/TextInput';
import {Button} from '@astryxdesign/core/Button';
import {Stack} from '@astryxdesign/core/Stack';
import {
+ EDGE_COMP_ATTR,
HStack,
Layout,
LayoutContent,
@@ -165,6 +166,12 @@ const toolbarScrollStyles = stylex.create({
},
});
+// The scroll row is this standalone toolbar's sole slot child. Opting it into
+// Toolbar's container-owned edge compensation gives the formatting surface a
+// 4px inline inset at `sm` without moving generic nested Toolbar content off
+// its surrounding Card/Section content line.
+const toolbarEdgeCompensationProps = {[EDGE_COMP_ATTR]: ''};
+
/**
* Whether `event` is the insert-link shortcut (Cmd/Ctrl+K). Uses Lexical's
* `isExactShortcutMatch`, which — unlike a loose `metaKey || ctrlKey` check —
@@ -889,6 +896,7 @@ export function RichTextEditorToolbar({
size={size}
startContent={
<HStack
+ {...toolbarEdgeCompensationProps}
gap={1}
role="group"
aria-label={t('@astryx.richTextEditor.toolbar.actions')}