From aa69a9c87aa91e85c49191fca31f0d9d6a835ab2 Mon Sep 17 00:00:00 2001 From: Sean Lynch Date: Thu, 12 Nov 2026 13:08:28 -0500 Subject: [PATCH 1/2] Replace tailwind-merge with clsx to reduce install and bundle size --- .changeset/brush-default-styles.md | 5 +++ .changeset/remove-tailwind-merge.md | 5 +++ .../components/Rule/data-x-band.svelte | 2 +- packages/layerchart/package.json | 2 +- .../AnnotationLine/AnnotationLine.base.svelte | 6 +-- .../AnnotationPoint.base.svelte | 8 ++-- .../AnnotationRange.base.svelte | 6 +-- .../src/lib/components/Arc/Arc.base.svelte | 4 +- .../src/lib/components/Axis/Axis.base.svelte | 6 +-- .../lib/components/Axis/Axis.shared.svelte.ts | 8 ++-- .../src/lib/components/Bin/Bin.base.svelte | 6 +-- .../components/BoxPlot/BoxPlot.base.svelte | 30 +++++++-------- .../lib/components/Brush/Brush.base.svelte | 38 ++++++++++++------- .../src/lib/components/BrushContext.svelte | 16 ++++---- .../components/Circle/Circle.canvas.svelte | 4 +- .../lib/components/Circle/Circle.html.svelte | 6 +-- .../lib/components/Circle/Circle.svg.svelte | 6 +-- .../src/lib/components/CircleLegend.svelte | 14 +++---- .../src/lib/components/ComputedStyles.svelte | 4 +- .../components/Contour/Contour.base.svelte | 4 +- .../components/Density/Density.base.svelte | 4 +- .../components/Ellipse/Ellipse.canvas.svelte | 4 +- .../components/Ellipse/Ellipse.html.svelte | 6 +-- .../lib/components/Ellipse/Ellipse.svg.svelte | 6 +-- .../src/lib/components/Grid/Grid.base.svelte | 20 +++++----- .../src/lib/components/Grid/GridWalls.svelte | 4 +- .../src/lib/components/Hull/Hull.base.svelte | 4 +- .../lib/components/Image/Image.html.svelte | 6 +-- .../src/lib/components/Image/Image.svg.svelte | 6 +-- .../lib/components/Labels/Labels.base.svelte | 4 +- .../src/lib/components/Legend.svelte | 22 +++++------ .../lib/components/Line/Line.canvas.svelte | 4 +- .../src/lib/components/Line/Line.html.svelte | 6 +-- .../src/lib/components/Line/Line.svg.svelte | 6 +-- .../LinearGradient/LinearGradient.svg.svelte | 6 +-- .../src/lib/components/Link/Link.base.svelte | 6 +-- .../src/lib/components/Marker.svelte | 4 +- .../src/lib/components/MonthPath.svelte | 4 +- .../lib/components/Path/Path.canvas.svelte | 6 +-- .../src/lib/components/Path/Path.svg.svelte | 6 +-- .../components/Path/PathExtruded.svg.svelte | 4 +- .../components/Polygon/Polygon.canvas.svelte | 4 +- .../lib/components/Polygon/Polygon.svg.svelte | 8 ++-- .../RadialGradient/RadialGradient.svg.svelte | 4 +- .../lib/components/Raster/Raster.base.svelte | 4 +- .../lib/components/Rect/Rect.canvas.svelte | 4 +- .../src/lib/components/Rect/Rect.html.svelte | 6 +-- .../src/lib/components/Rect/Rect.svg.svelte | 10 ++--- .../lib/components/Rect/RectBox.html.svelte | 4 +- .../lib/components/Rect/RectBox.svg.svelte | 4 +- .../src/lib/components/Rule/Rule.base.svelte | 8 ++-- .../lib/components/Text/Text.canvas.svelte | 4 +- .../lib/components/Trail/Trail.base.svelte | 4 +- .../lib/components/Vector/Vector.base.svelte | 4 +- .../lib/components/Violin/Violin.base.svelte | 12 +++--- .../components/Voronoi/Voronoi.base.svelte | 4 +- .../src/lib/components/Waffle/Waffle.svelte | 4 +- .../charts/ArcChart/ArcChart.base.svelte | 4 +- .../components/geo/GeoLegend/GeoLegend.svelte | 14 +++---- .../geo/GeoPath/GeoPath.base.svelte | 4 +- .../graph/Ribbon/Ribbon.base.svelte | 4 +- .../src/lib/components/tooltip/Tooltip.svelte | 8 ++-- .../components/tooltip/TooltipContext.svelte | 10 ++--- .../components/tooltip/TooltipHeader.svelte | 6 +-- .../lib/components/tooltip/TooltipItem.svelte | 10 ++--- .../lib/components/tooltip/TooltipList.svelte | 4 +- .../tooltip/TooltipSeparator.svelte | 4 +- .../layerchart/src/lib/utils/attributes.ts | 6 +-- packages/layerchart/src/lib/utils/canvas.ts | 4 +- pnpm-lock.yaml | 6 +-- 70 files changed, 256 insertions(+), 234 deletions(-) create mode 100644 .changeset/brush-default-styles.md create mode 100644 .changeset/remove-tailwind-merge.md diff --git a/.changeset/brush-default-styles.md b/.changeset/brush-default-styles.md new file mode 100644 index 0000000000..2075cc0c6d --- /dev/null +++ b/.changeset/brush-default-styles.md @@ -0,0 +1,5 @@ +--- +'layerchart': patch +--- + +fix(Brush): Style the region and handle cursors with CSS instead of Tailwind classes, so top and bottom handles now show a resize cursor diff --git a/.changeset/remove-tailwind-merge.md b/.changeset/remove-tailwind-merge.md new file mode 100644 index 0000000000..d4040c6c4e --- /dev/null +++ b/.changeset/remove-tailwind-merge.md @@ -0,0 +1,5 @@ +--- +'layerchart': patch +--- + +chore: Replace `tailwind-merge` with `clsx` (~10 KB gzipped smaller) diff --git a/docs/src/examples/components/Rule/data-x-band.svelte b/docs/src/examples/components/Rule/data-x-band.svelte index 16115089dd..78ef177323 100644 --- a/docs/src/examples/components/Rule/data-x-band.svelte +++ b/docs/src/examples/components/Rule/data-x-band.svelte @@ -41,6 +41,6 @@ - + diff --git a/packages/layerchart/package.json b/packages/layerchart/package.json index 8a25da2650..e04d0759db 100644 --- a/packages/layerchart/package.json +++ b/packages/layerchart/package.json @@ -73,8 +73,8 @@ "@dagrejs/dagre": "^2.0.4", "@layerstack/svelte-actions": "1.0.1-next.20", "@layerstack/svelte-state": "0.1.0-next.25", - "@layerstack/tailwind": "2.0.0-next.21", "@layerstack/utils": "2.0.0-next.19", + "clsx": "^2.1.1", "d3-array": "^3.2.4", "d3-chord": "^3.0.1", "d3-color": "^3.1.0", diff --git a/packages/layerchart/src/lib/components/AnnotationLine/AnnotationLine.base.svelte b/packages/layerchart/src/lib/components/AnnotationLine/AnnotationLine.base.svelte index bc75e18d0f..e98557f8a8 100644 --- a/packages/layerchart/src/lib/components/AnnotationLine/AnnotationLine.base.svelte +++ b/packages/layerchart/src/lib/components/AnnotationLine/AnnotationLine.base.svelte @@ -12,7 +12,7 @@ diff --git a/packages/layerchart/src/lib/components/AnnotationPoint/AnnotationPoint.base.svelte b/packages/layerchart/src/lib/components/AnnotationPoint/AnnotationPoint.base.svelte index 766def0106..14c476a719 100644 --- a/packages/layerchart/src/lib/components/AnnotationPoint/AnnotationPoint.base.svelte +++ b/packages/layerchart/src/lib/components/AnnotationPoint/AnnotationPoint.base.svelte @@ -22,7 +22,7 @@ import { isScaleBand } from '$lib/utils/scales.svelte.js'; import { getPointLabelLayout } from '$lib/utils/labelPlacement.js'; import { getPixelValue } from '../Text/Text.shared.svelte.js'; - import { cls } from '@layerstack/tailwind'; + import { clsx } from 'clsx'; import type { CircleProps } from '../Circle/Circle.shared.svelte.js'; import type { TextProps } from '../Text/Text.shared.svelte.js'; @@ -154,14 +154,14 @@ onmouseleave: onPointerLeave, ontouchend: onPointerLeave, ...props?.circle, - class: cls('lc-annotation-point', link && 'lc-annotation-point-ring', props?.circle?.class), + class: clsx('lc-annotation-point', link && 'lc-annotation-point-ring', props?.circle?.class), } as CircleProps); const resolvedLabelProps = $derived({ ...labelProps, z: height, ...props?.label, - class: cls('lc-annotation-point-label', props?.label?.class), + class: clsx('lc-annotation-point-label', props?.label?.class), } as TextProps); @@ -181,7 +181,7 @@ z2={height} type="straight" {...linkProps} - class={cls( + class={clsx( 'lc-annotation-point-link', typeof linkProps.class === 'string' ? linkProps.class : undefined )} diff --git a/packages/layerchart/src/lib/components/AnnotationRange/AnnotationRange.base.svelte b/packages/layerchart/src/lib/components/AnnotationRange/AnnotationRange.base.svelte index 4b6214ee2d..d6024135f5 100644 --- a/packages/layerchart/src/lib/components/AnnotationRange/AnnotationRange.base.svelte +++ b/packages/layerchart/src/lib/components/AnnotationRange/AnnotationRange.base.svelte @@ -15,7 +15,7 @@ diff --git a/packages/layerchart/src/lib/components/Arc/Arc.base.svelte b/packages/layerchart/src/lib/components/Arc/Arc.base.svelte index adca12847a..d3f897d5d4 100644 --- a/packages/layerchart/src/lib/components/Arc/Arc.base.svelte +++ b/packages/layerchart/src/lib/components/Arc/Arc.base.svelte @@ -11,7 +11,7 @@
(styles = _styles)} >
diff --git a/packages/layerchart/src/lib/components/Contour/Contour.base.svelte b/packages/layerchart/src/lib/components/Contour/Contour.base.svelte index e58b6613e2..25ca054a4b 100644 --- a/packages/layerchart/src/lib/components/Contour/Contour.base.svelte +++ b/packages/layerchart/src/lib/components/Contour/Contour.base.svelte @@ -11,7 +11,7 @@ - + {#if x} {@const splineProps = extractLayerProps(x, 'lc-grid-x-line')} @@ -96,7 +96,7 @@ {stroke} motion={c.tweenConfig} {...splineProps} - class={cls('lc-grid-x-radial-line', classes.line, splineProps?.class)} + class={clsx('lc-grid-x-radial-line', classes.line, splineProps?.class)} /> {:else} {/if} {/each} @@ -118,7 +118,7 @@ {stroke} {motion} {...splineProps} - class={cls('lc-grid-x-end-rule', classes.line, splineProps?.class)} + class={clsx('lc-grid-x-end-rule', classes.line, splineProps?.class)} /> {/if} @@ -135,7 +135,7 @@ {stroke} {motion} {...splineProps} - class={cls('lc-grid-y-radial-circle', classes.line, splineProps?.class)} + class={clsx('lc-grid-y-radial-circle', classes.line, splineProps?.class)} /> {:else} {#await import('../Spline/Spline.svelte') then { default: Spline }} @@ -147,7 +147,7 @@ motion={c.tweenConfig} curve={curveLinearClosed} {...splineProps} - class={cls('lc-grid-y-radial-line', classes.line, splineProps?.class)} + class={clsx('lc-grid-y-radial-line', classes.line, splineProps?.class)} /> {/await} {/if} @@ -160,7 +160,7 @@ {stroke} {motion} {...splineProps} - class={cls('lc-grid-y-rule', classes.line, splineProps?.class)} + class={clsx('lc-grid-y-rule', classes.line, splineProps?.class)} /> {/if} {/each} @@ -175,7 +175,7 @@ {stroke} {motion} {...splineProps} - class={cls('lc-grid-y-radial-circle', classes.line, splineProps?.class)} + class={clsx('lc-grid-y-radial-circle', classes.line, splineProps?.class)} /> {:else} {@const yEnd = @@ -190,7 +190,7 @@ {stroke} {motion} {...splineProps} - class={cls('lc-grid-y-end-rule', classes.line, splineProps?.class)} + class={clsx('lc-grid-y-end-rule', classes.line, splineProps?.class)} /> {/if} {/if} diff --git a/packages/layerchart/src/lib/components/Grid/GridWalls.svelte b/packages/layerchart/src/lib/components/Grid/GridWalls.svelte index c34904a1d9..86275f27a5 100644 --- a/packages/layerchart/src/lib/components/Grid/GridWalls.svelte +++ b/packages/layerchart/src/lib/components/Grid/GridWalls.svelte @@ -5,7 +5,7 @@ --> - + {#if geo.projection} {@const polygon = geoVoronoi().hull(points)} - +