tldraw 3.16.0-canary.fa3749606e52 → 3.16.0-next.282b7be564ae

package/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx

@@ -35,6 +35,11 @@ import { TldrawUiToolbar, TldrawUiToolbarButton } from '../primitives/TldrawUiTo
 import { DoubleDropdownPicker } from './DoubleDropdownPicker'
 import { DropdownPicker } from './DropdownPicker'
 
+// Local component for style panel subheadings
+function StylePanelSubheading({ children }: { children: React.ReactNode }) {
+	return <h3 className="tlui-style-panel__subheading">{children}</h3>
+}
+
 /** @public */
 export interface TLUiStylePanelContentProps {
 	styles: ReturnType<typeof useRelevantStyles>
@@ -115,6 +120,7 @@ export function CommonStylePickerSet({ styles, theme }: ThemeStylePickerSetProps
 	const editor = useEditor()
 
 	const onHistoryMark = useCallback((id: string) => editor.markHistoryStoppingPoint(id), [editor])
+	const showUiLabels = useValue('showUiLabels', () => editor.user.getShowUiLabels(), [editor])
 
 	const handleValueChange = useStyleChangeCallback()
 
@@ -129,70 +135,90 @@ export function CommonStylePickerSet({ styles, theme }: ThemeStylePickerSetProps
 		<>
 			<div className="tlui-style-panel__section__common" data-testid="style.panel">
 				{color === undefined ? null : (
-					<TldrawUiToolbar label={msg('style-panel.color')}>
-						<TldrawUiButtonPicker
-							title={msg('style-panel.color')}
-							uiType="color"
-							style={DefaultColorStyle}
-							items={STYLES.color}
-							value={color}
-							onValueChange={handleValueChange}
-							theme={theme}
-							onHistoryMark={onHistoryMark}
-						/>
-					</TldrawUiToolbar>
-				)}
-				<OpacitySlider />
-			</div>
-			{showPickers && (
-				<div className="tlui-style-panel__section">
-					{fill === undefined ? null : (
-						<TldrawUiToolbar label={msg('style-panel.fill')}>
+					<>
+						{showUiLabels && (
+							<StylePanelSubheading>{msg('style-panel.color')}</StylePanelSubheading>
+						)}
+						<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.color')}>
 							<TldrawUiButtonPicker
-								title={msg('style-panel.fill')}
-								uiType="fill"
-								style={DefaultFillStyle}
-								items={STYLES.fill}
-								value={fill}
+								title={msg('style-panel.color')}
+								uiType="color"
+								style={DefaultColorStyle}
+								items={STYLES.color}
+								value={color}
 								onValueChange={handleValueChange}
 								theme={theme}
 								onHistoryMark={onHistoryMark}
 							/>
 						</TldrawUiToolbar>
+					</>
+				)}
+				<OpacitySlider />
+			</div>
+			{showPickers && (
+				<div className="tlui-style-panel__section">
+					{fill === undefined ? null : (
+						<>
+							{showUiLabels && (
+								<StylePanelSubheading>{msg('style-panel.fill')}</StylePanelSubheading>
+							)}
+							<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.fill')}>
+								<TldrawUiButtonPicker
+									title={msg('style-panel.fill')}
+									uiType="fill"
+									style={DefaultFillStyle}
+									items={STYLES.fill}
+									value={fill}
+									onValueChange={handleValueChange}
+									theme={theme}
+									onHistoryMark={onHistoryMark}
+								/>
+							</TldrawUiToolbar>
+						</>
 					)}
 					{dash === undefined ? null : (
-						<TldrawUiToolbar label={msg('style-panel.dash')}>
-							<TldrawUiButtonPicker
-								title={msg('style-panel.dash')}
-								uiType="dash"
-								style={DefaultDashStyle}
-								items={STYLES.dash}
-								value={dash}
-								onValueChange={handleValueChange}
-								theme={theme}
-								onHistoryMark={onHistoryMark}
-							/>
-						</TldrawUiToolbar>
+						<>
+							{showUiLabels && (
+								<StylePanelSubheading>{msg('style-panel.dash')}</StylePanelSubheading>
+							)}
+							<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.dash')}>
+								<TldrawUiButtonPicker
+									title={msg('style-panel.dash')}
+									uiType="dash"
+									style={DefaultDashStyle}
+									items={STYLES.dash}
+									value={dash}
+									onValueChange={handleValueChange}
+									theme={theme}
+									onHistoryMark={onHistoryMark}
+								/>
+							</TldrawUiToolbar>
+						</>
 					)}
 					{size === undefined ? null : (
-						<TldrawUiToolbar label={msg('style-panel.size')}>
-							<TldrawUiButtonPicker
-								title={msg('style-panel.size')}
-								uiType="size"
-								style={DefaultSizeStyle}
-								items={STYLES.size}
-								value={size}
-								onValueChange={(style, value) => {
-									handleValueChange(style, value)
-									const selectedShapeIds = editor.getSelectedShapeIds()
-									if (selectedShapeIds.length > 0) {
-										kickoutOccludedShapes(editor, selectedShapeIds)
-									}
-								}}
-								theme={theme}
-								onHistoryMark={onHistoryMark}
-							/>
-						</TldrawUiToolbar>
+						<>
+							{showUiLabels && (
+								<StylePanelSubheading>{msg('style-panel.size')}</StylePanelSubheading>
+							)}
+							<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.size')}>
+								<TldrawUiButtonPicker
+									title={msg('style-panel.size')}
+									uiType="size"
+									style={DefaultSizeStyle}
+									items={STYLES.size}
+									value={size}
+									onValueChange={(style, value) => {
+										handleValueChange(style, value)
+										const selectedShapeIds = editor.getSelectedShapeIds()
+										if (selectedShapeIds.length > 0) {
+											kickoutOccludedShapes(editor, selectedShapeIds)
+										}
+									}}
+									theme={theme}
+									onHistoryMark={onHistoryMark}
+								/>
+							</TldrawUiToolbar>
+						</>
 					)}
 				</div>
 			)}
@@ -207,6 +233,8 @@ export function TextStylePickerSet({ theme, styles }: ThemeStylePickerSetProps)
 
 	const editor = useEditor()
 	const onHistoryMark = useCallback((id: string) => editor.markHistoryStoppingPoint(id), [editor])
+	const showUiLabels = useValue('showUiLabels', () => editor.user.getShowUiLabels(), [editor])
+	const labelStr = showUiLabels && msg('style-panel.font')
 
 	const font = styles.get(DefaultFontStyle)
 	const textAlign = styles.get(DefaultTextAlignStyle)
@@ -219,33 +247,37 @@ export function TextStylePickerSet({ theme, styles }: ThemeStylePickerSetProps)
 	return (
 		<div className="tlui-style-panel__section">
 			{font === undefined ? null : (
-				<TldrawUiToolbar label={msg('style-panel.font')}>
-					<TldrawUiButtonPicker
-						title={msg('style-panel.font')}
-						uiType="font"
-						style={DefaultFontStyle}
-						items={STYLES.font}
-						value={font}
-						onValueChange={handleValueChange}
-						theme={theme}
-						onHistoryMark={onHistoryMark}
-					/>
-				</TldrawUiToolbar>
+				<>
+					{labelStr && <StylePanelSubheading>{labelStr}</StylePanelSubheading>}
+					<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.font')}>
+						<TldrawUiButtonPicker
+							title={msg('style-panel.font')}
+							uiType="font"
+							style={DefaultFontStyle}
+							items={STYLES.font}
+							value={font}
+							onValueChange={handleValueChange}
+							theme={theme}
+							onHistoryMark={onHistoryMark}
+						/>
+					</TldrawUiToolbar>
+				</>
 			)}
 
 			{textAlign === undefined ? null : (
-				<TldrawUiToolbar label={msg('style-panel.align')} className="tlui-style-panel__row">
-					<TldrawUiButtonPicker
-						title={msg('style-panel.align')}
-						uiType="align"
-						style={DefaultTextAlignStyle}
-						items={STYLES.textAlign}
-						value={textAlign}
-						onValueChange={handleValueChange}
-						theme={theme}
-						onHistoryMark={onHistoryMark}
-					/>
-					<div className="tlui-style-panel__row__extra-button">
+				<>
+					{showUiLabels && <StylePanelSubheading>{msg('style-panel.align')}</StylePanelSubheading>}
+					<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.align')}>
+						<TldrawUiButtonPicker
+							title={msg('style-panel.align')}
+							uiType="align"
+							style={DefaultTextAlignStyle}
+							items={STYLES.textAlign}
+							value={textAlign}
+							onValueChange={handleValueChange}
+							theme={theme}
+							onHistoryMark={onHistoryMark}
+						/>
 						<TldrawUiToolbarButton
 							type="icon"
 							title={msg('style-panel.vertical-align')}
@@ -254,23 +286,26 @@ export function TextStylePickerSet({ theme, styles }: ThemeStylePickerSetProps)
 						>
 							<TldrawUiButtonIcon icon="vertical-align-middle" />
 						</TldrawUiToolbarButton>
-					</div>
-				</TldrawUiToolbar>
+					</TldrawUiToolbar>
+				</>
 			)}
 
 			{labelAlign === undefined ? null : (
-				<TldrawUiToolbar label={msg('style-panel.label-align')} className="tlui-style-panel__row">
-					<TldrawUiButtonPicker
-						title={msg('style-panel.label-align')}
-						uiType="align"
-						style={DefaultHorizontalAlignStyle}
-						items={STYLES.horizontalAlign}
-						value={labelAlign}
-						onValueChange={handleValueChange}
-						theme={theme}
-						onHistoryMark={onHistoryMark}
-					/>
-					<div className="tlui-style-panel__row__extra-button">
+				<>
+					{showUiLabels && (
+						<StylePanelSubheading>{msg('style-panel.label-align')}</StylePanelSubheading>
+					)}
+					<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.label-align')}>
+						<TldrawUiButtonPicker
+							title={msg('style-panel.label-align')}
+							uiType="align"
+							style={DefaultHorizontalAlignStyle}
+							items={STYLES.horizontalAlign}
+							value={labelAlign}
+							onValueChange={handleValueChange}
+							theme={theme}
+							onHistoryMark={onHistoryMark}
+						/>
 						{verticalLabelAlign === undefined ? (
 							<TldrawUiToolbarButton
 								type="icon"
@@ -292,8 +327,8 @@ export function TextStylePickerSet({ theme, styles }: ThemeStylePickerSetProps)
 								onValueChange={handleValueChange}
 							/>
 						)}
-					</div>
-				</TldrawUiToolbar>
+					</TldrawUiToolbar>
+				</>
 			)}
 		</div>
 	)
@@ -309,7 +344,7 @@ export function GeoStylePickerSet({ styles }: StylePickerSetProps) {
 	}
 
 	return (
-		<TldrawUiToolbar label={msg('style-panel.geo')}>
+		<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.geo')}>
 			<DropdownPicker
 				id="geo"
 				type="menu"
@@ -335,7 +370,7 @@ export function SplineStylePickerSet({ styles }: StylePickerSetProps) {
 	}
 
 	return (
-		<TldrawUiToolbar label={msg('style-panel.spline')}>
+		<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.spline')}>
 			<DropdownPicker
 				id="spline"
 				type="menu"
@@ -361,7 +396,7 @@ export function ArrowStylePickerSet({ styles }: StylePickerSetProps) {
 	}
 
 	return (
-		<TldrawUiToolbar label={msg('style-panel.arrow-kind')}>
+		<TldrawUiToolbar orientation="horizontal" label={msg('style-panel.arrow-kind')}>
 			<DropdownPicker
 				id="arrow-kind"
 				type="menu"
@@ -410,6 +445,7 @@ export function OpacitySlider() {
 	const editor = useEditor()
 
 	const onHistoryMark = useCallback((id: string) => editor.markHistoryStoppingPoint(id), [editor])
+	const showUiLabels = useValue('showUiLabels', () => editor.user.getShowUiLabels(), [editor])
 
 	const opacity = useValue('opacity', () => editor.getSharedOpacity(), [editor])
 	const trackEvent = useUiEvents()
@@ -443,15 +479,18 @@ export function OpacitySlider() {
 				)
 
 	return (
-		<TldrawUiSlider
-			data-testid="style.opacity"
-			value={opacityIndex >= 0 ? opacityIndex : tldrawSupportedOpacities.length - 1}
-			label={opacity.type === 'mixed' ? 'style-panel.mixed' : `opacity-style.${opacity.value}`}
-			onValueChange={handleOpacityValueChange}
-			steps={tldrawSupportedOpacities.length - 1}
-			title={msg('style-panel.opacity')}
-			onHistoryMark={onHistoryMark}
-			ariaValueModifier={25}
-		/>
+		<>
+			{showUiLabels && <StylePanelSubheading>{msg('style-panel.opacity')}</StylePanelSubheading>}
+			<TldrawUiSlider
+				data-testid="style.opacity"
+				value={opacityIndex >= 0 ? opacityIndex : tldrawSupportedOpacities.length - 1}
+				label={opacity.type === 'mixed' ? 'style-panel.mixed' : `opacity-style.${opacity.value}`}
+				onValueChange={handleOpacityValueChange}
+				steps={tldrawSupportedOpacities.length - 1}
+				title={msg('style-panel.opacity')}
+				onHistoryMark={onHistoryMark}
+				ariaValueModifier={25}
+			/>
+		</>
 	)
 }

package/src/lib/ui/components/StylePanel/DoubleDropdownPicker.tsx

@@ -68,7 +68,7 @@ function DoubleDropdownPickerInner<T extends string>({
 			<div title={msg(label)} className="tlui-style-panel__double-select-picker-label">
 				{msg(label)}
 			</div>
-			<TldrawUiToolbar label={msg(label)} className="tlui-buttons__horizontal">
+			<TldrawUiToolbar orientation="horizontal" label={msg(label)}>
 				<TldrawUiPopover id={idA} open={isOpenA} onOpenChange={setIsOpenA}>
 					<TldrawUiPopoverTrigger>
 						<TldrawUiToolbarButton
@@ -86,7 +86,7 @@ function DoubleDropdownPickerInner<T extends string>({
 						</TldrawUiToolbarButton>
 					</TldrawUiPopoverTrigger>
 					<TldrawUiPopoverContent side="left" align="center" sideOffset={80} alignOffset={0}>
-						<TldrawUiToolbar label={msg(labelA)} className="tlui-buttons__grid">
+						<TldrawUiToolbar orientation="grid" label={msg(labelA)}>
 							<TldrawUiMenuContextProvider type="icons" sourceId="style-panel">
 								{itemsA.map((item) => {
 									return (
@@ -126,7 +126,7 @@ function DoubleDropdownPickerInner<T extends string>({
 						</TldrawUiToolbarButton>
 					</TldrawUiPopoverTrigger>
 					<TldrawUiPopoverContent side="left" align="center" sideOffset={116} alignOffset={0}>
-						<TldrawUiToolbar label={msg(labelB)} className="tlui-buttons__grid">
+						<TldrawUiToolbar orientation="grid" label={msg(labelB)}>
 							<TldrawUiMenuContextProvider type="icons" sourceId="style-panel">
 								{itemsB.map((item) => {
 									return (

package/src/lib/ui/components/StylePanel/DropdownPicker.tsx

@@ -1,5 +1,4 @@
 import { SharedStyle, StyleProp, tlmenus, useEditor } from '@tldraw/editor'
-import classNames from 'classnames'
 import * as React from 'react'
 import { StyleValuesForUi } from '../../../styles'
 import { TLUiTranslationKey } from '../../hooks/useTranslation/TLUiTranslationKey'
@@ -57,7 +56,12 @@ function DropdownPickerInner<T extends string>({
 
 	const popoverId = `style panel ${id}`
 	return (
-		<TldrawUiPopover id={popoverId} open={isOpen} onOpenChange={setIsOpen}>
+		<TldrawUiPopover
+			id={popoverId}
+			open={isOpen}
+			onOpenChange={setIsOpen}
+			className="tlui-style-panel__dropdown-picker"
+		>
 			<TldrawUiPopoverTrigger>
 				<TldrawUiToolbarButton
 					type={type}
@@ -70,10 +74,7 @@ function DropdownPickerInner<T extends string>({
 				</TldrawUiToolbarButton>
 			</TldrawUiPopoverTrigger>
 			<TldrawUiPopoverContent side="left" align="center">
-				<TldrawUiToolbar
-					label={labelStr}
-					className={classNames('tlui-buttons__grid', `tlui-buttons__${stylePanelType}`)}
-				>
+				<TldrawUiToolbar orientation="grid" label={labelStr}>
 					<TldrawUiMenuContextProvider type="icons" sourceId="style-panel">
 						{items.map((item) => {
 							return (

package/src/lib/ui/components/Toolbar/DefaultImageToolbarContent.tsx

@@ -272,7 +272,7 @@ export const DefaultImageToolbarContent = track(function DefaultImageToolbarCont
 					type="icon"
 					onClick={onManipulatingEnd}
 					data-testid="tool.image-confirm"
-					style={{ borderLeft: '1px solid var(--color-divider)', marginLeft: '2px' }}
+					style={{ borderLeft: '1px solid var(--tl-color-divider)', marginLeft: '2px' }}
 				>
 					<TldrawUiButtonIcon small icon="check" />
 				</TldrawUiButton>

package/src/lib/ui/components/Toolbar/DefaultToolbar.tsx

@@ -1,4 +1,5 @@
 import { useEditor, usePassThroughWheelEvents, useValue } from '@tldraw/editor'
+import classNames from 'classnames'
 import { ReactNode, memo, useRef } from 'react'
 import { PORTRAIT_BREAKPOINT } from '../../constants'
 import { useBreakpoint } from '../../context/breakpoints'
@@ -6,6 +7,7 @@ import { useTldrawUiComponents } from '../../context/components'
 import { useReadonly } from '../../hooks/useReadonly'
 import { useTranslation } from '../../hooks/useTranslation/useTranslation'
 import { MobileStylePanel } from '../MobileStylePanel'
+import { TldrawUiOrientationProvider } from '../primitives/layout'
 import { TldrawUiToolbar } from '../primitives/TldrawUiToolbar'
 import { DefaultToolbarContent } from './DefaultToolbarContent'
 import { OverflowingToolbar } from './OverflowingToolbar'
@@ -14,6 +16,11 @@ import { ToggleToolLockedButton } from './ToggleToolLockedButton'
 /** @public */
 export interface DefaultToolbarProps {
 	children?: ReactNode
+	orientation?: 'horizontal' | 'vertical'
+	minItems?: number
+	minSizePx?: number
+	maxItems?: number
+	maxSizePx?: number
 }
 
 /**
@@ -24,7 +31,14 @@ export interface DefaultToolbarProps {
  * @public
  * @react
  */
-export const DefaultToolbar = memo(function DefaultToolbar({ children }: DefaultToolbarProps) {
+export const DefaultToolbar = memo(function DefaultToolbar({
+	children,
+	orientation = 'horizontal',
+	minItems = 4,
+	minSizePx = 310,
+	maxItems = 8,
+	maxSizePx = 470,
+}: DefaultToolbarProps) {
 	const editor = useEditor()
 	const msg = useTranslation()
 	const breakpoint = useBreakpoint()
@@ -44,31 +58,49 @@ export const DefaultToolbar = memo(function DefaultToolbar({ children }: Default
 				: breakpoint < PORTRAIT_BREAKPOINT.TABLET
 
 	return (
-		<div ref={ref} className="tlui-toolbar">
-			<div className="tlui-toolbar__inner">
-				<div className="tlui-toolbar__left">
-					{!isReadonlyMode && (
-						<div className="tlui-toolbar__extras">
-							{showQuickActions && (
-								<TldrawUiToolbar
-									className="tlui-toolbar__extras__controls tlui-buttons__horizontal"
-									label={msg('actions-menu.title')}
-								>
-									{QuickActions && <QuickActions />}
-									{ActionsMenu && <ActionsMenu />}
-								</TldrawUiToolbar>
-							)}
-							<ToggleToolLockedButton activeToolId={activeToolId} />
+		<TldrawUiOrientationProvider
+			orientation={orientation}
+			tooltipSide={orientation === 'horizontal' ? 'top' : 'right'}
+		>
+			<div
+				ref={ref}
+				className={classNames('tlui-main-toolbar', `tlui-main-toolbar--${orientation}`)}
+			>
+				<div className="tlui-main-toolbar__inner">
+					<div className="tlui-main-toolbar__left">
+						{!isReadonlyMode && (
+							<div className="tlui-main-toolbar__extras">
+								{showQuickActions && (
+									<TldrawUiToolbar
+										orientation={orientation}
+										className="tlui-main-toolbar__extras__controls"
+										label={msg('actions-menu.title')}
+									>
+										{QuickActions && <QuickActions />}
+										{ActionsMenu && <ActionsMenu />}
+									</TldrawUiToolbar>
+								)}
+								<ToggleToolLockedButton activeToolId={activeToolId} />
+							</div>
+						)}
+						<OverflowingToolbar
+							orientation={orientation}
+							sizingParentClassName="tlui-main-toolbar"
+							minItems={minItems}
+							maxItems={maxItems}
+							minSizePx={minSizePx}
+							maxSizePx={maxSizePx}
+						>
+							{children ?? <DefaultToolbarContent />}
+						</OverflowingToolbar>
+					</div>
+					{breakpoint < PORTRAIT_BREAKPOINT.TABLET_SM && !isReadonlyMode && (
+						<div className="tlui-main-toolbar__tools tlui-main-toolbar__mobile-style-panel">
+							<MobileStylePanel />
 						</div>
 					)}
-					<OverflowingToolbar>{children ?? <DefaultToolbarContent />}</OverflowingToolbar>
 				</div>
-				{breakpoint < PORTRAIT_BREAKPOINT.TABLET_SM && !isReadonlyMode && (
-					<div className="tlui-toolbar__tools">
-						<MobileStylePanel />
-					</div>
-				)}
 			</div>
-		</div>
+		</TldrawUiOrientationProvider>
 	)
 })