Merge branch 'main' into react-components/form-field

.changeset/fair-tigers-eat.md

@@ -1,5 +1,5 @@
 ---
-"@lux-design-system/components-react": minor
+"@lux-design-system/components-react": major
 ---
 
 In deze commit:

.changeset/soft-peaches-collect.md

@@ -0,0 +1,5 @@
+---
+"@lux-design-system/design-tokens": minor
+---
+
+Nieuwe tokens: Utrecht Fieldset

.changeset/tiny-hairs-enjoy.md

@@ -0,0 +1,7 @@
+---
+"@lux-design-system/components-react": major
+---
+
+In deze commit:
+
+- Nieuw component: LuxButton

.github/ISSUE_TEMPLATE/new_component_template.md

@@ -9,8 +9,32 @@ about: Nieuw component in LUX Design System
 Beschrijf het component en als er een community component gebruik wordt als basis welke wijzigingen er zijn.
 -->
 
+## Links
+
+- Component: <!-- link naar https://www.nldesignsystem.nl/[component] -->
+- Figma: <!-- link naar Figma design of design tokens -->
+- Community component:
+  - CSS: <!-- link naar CSS Storybook van gebruikte component -->
+  - React: <!-- link naar React Storybook van gebruikte component -->
+  - Code: <!-- link naar Code van gebruikte component -->
+  <!-- - Extra links -->
+
+## Checks
+
+### Definition of ready
+
+<!--  Surround an item with double tildes `~~` to indicate that it does not apply to this issue -->
+
+- [ ] Code check op community component (door LUX)
+- [ ] Styling check op community component (door LUX)
+- [ ] Plan voor missende features of bugs community component beschreven in ticket
+- [ ] Component tokens zijn beschikbaar op `main`
+- [ ] Ticket doorgenomen met uitvoerder
+
 ### Definition of done
 
+<!--  Surround an item with double tildes `~~` to indicate that it does not apply to this issue -->
+
 #### Component
 
 - [ ] Component is beschikbaar in de index
@@ -22,22 +46,11 @@ Beschrijf het component en als er een community component gebruik wordt als basi
 - [ ] States en properties stories
 - [ ] Korte beschrijving van het component
   - Wat doet het
-  - Basis van het component (bijv Utrecht)
-  - Aanpassingen en/of uitbreidingen
+  - Wat doen (speciale) features
   - Relatie met andere componenten (bijv. Form field label en Form field)
 
 #### Tests
 
 - [ ] Het component rendert
 - [ ] Aanpassingen en/of uitbreidingen werken (zie ook [Testing components](https://nl-design-system.github.io/utrecht/storybook/?path=/docs/react_react-testing--docs))
 - [ ] Visual regression test (door LUX)
-
-## Links
-
-- Component: <!-- link naar https://www.nldesignsystem.nl/[component] -->
-- Figma: <!-- link naar Figma design of design tokens -->
-- Community component:
-  - CSS: <!-- link naar CSS Storybook van gebruikte component -->
-  - React: <!-- link naar React Storybook van gebruikte component -->
-  - Code: <!-- link naar Code van gebruikte component -->
-  <!-- - Extra links -->

packages/components-react/package.json

@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@utrecht/component-library-css": "6.0.0",
-    "@utrecht/component-library-react": "7.0.0",
+    "@utrecht/component-library-react": "7.1.0",
     "clsx": "2.1.1",
     "date-fns": "3.6.0",
     "lodash.chunk": "4.2.0"
@@ -55,9 +55,6 @@
     "@babel/runtime": "7.25.0",
     "@jest/globals": "29.7.0",
     "@lux-design-system/components-css": "workspace:*",
-    "@rollup/plugin-babel": "6.0.4",
-    "@rollup/plugin-commonjs": "26.0.1",
-    "@rollup/plugin-node-resolve": "15.2.3",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.5.0",
     "@testing-library/react": "16.0.0",
@@ -76,18 +73,13 @@
     "react-dom": "18.3.1",
     "rimraf": "6.0.1",
     "rollup": "4.20.0",
-    "rollup-plugin-filesize": "10.0.0",
-    "rollup-plugin-node-externals": "7.1.2",
-    "rollup-plugin-node-polyfills": "0.2.1",
-    "rollup-plugin-peer-deps-external": "2.2.4",
-    "rollup-plugin-postcss": "4.0.2",
-    "rollup-plugin-typescript2": "0.36.0",
     "sass": "1.77.8",
     "tslib": "2.6.3",
     "typescript": "5.5.4",
     "vite": "5.3.5",
     "vite-plugin-dts": "4.2.3",
-    "vite-plugin-runtime-config": "1.0.2"
+    "vite-plugin-runtime-config": "1.0.2",
+    "vite-plugin-css-injected-by-js": "3.5.2"
   },
   "peerDependencies": {
     "react": "18",

packages/components-react/src/button/Button.css

@@ -0,0 +1,18 @@
+.lux-button {
+  display: inline-flex;
+}
+
+.lux-button--small {
+  padding-block-start: var(--lux-button-small-padding-block-start);
+  padding-block-end: var(--lux-button-small-padding-block-end);
+  min-inline-size: var(--lux-button-small-min-inline-size);
+  min-block-size: var(--lux-button-small-min-block-size);
+}
+
+.lux-button-icon--start {
+  order: 0;
+}
+
+.lux-button-icon--end {
+  order: 1;
+}

packages/components-react/src/button/Button.tsx

@@ -0,0 +1,45 @@
+import {
+  Button as UtrechtButton,
+  type ButtonProps as UtrechtButtonProps,
+} from '@utrecht/component-library-react/dist/css-module';
+import './Button.css';
+import React, { ReactElement } from 'react';
+
+type IconPosition = 'start' | 'end';
+type Size = 'small';
+
+export type LuxButtonProps = UtrechtButtonProps & {
+  size?: Size;
+  iconPosition?: IconPosition;
+};
+
+const SIZE_CLASSNAME: { [key: string]: string } = {
+  small: 'lux-button--small',
+};
+
+const ICON_POSITIONS: { [key: string]: string } = {
+  start: 'lux-button-icon--start',
+  end: 'lux-button-icon--end',
+};
+
+export const LuxButton = (props: LuxButtonProps) => {
+  const { size, icon: iconNode, iconPosition, ...otherProps } = props;
+
+  const className = `lux-button ${size !== undefined ? SIZE_CLASSNAME[size] : ''}`;
+
+  const positionedIcon = React.Children.map(iconNode, (iconElement) => {
+    if (!iconElement) {
+      return null;
+    }
+
+    if (!React.isValidElement<HTMLElement>(iconElement)) {
+      return iconElement;
+    }
+
+    return React.cloneElement(iconElement as ReactElement, {
+      className: `${iconElement?.props?.className || ''}${iconPosition !== undefined ? ICON_POSITIONS[iconPosition] : ''}`,
+    });
+  });
+
+  return <UtrechtButton {...otherProps} className={className} {...(positionedIcon ? { icon: positionedIcon } : {})} />;
+};

packages/components-react/src/button/test/Button.spec.tsx

@@ -0,0 +1,51 @@
+import { describe, expect, it } from '@jest/globals';
+import { render, screen } from '@testing-library/react';
+import { LuxButton } from '../Button';
+
+//TODO replace icon in #308
+const ExampleIcon = (
+  <svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
+    <circle r="6" cx="7" cy="7" fill="white" stroke="green" />
+  </svg>
+);
+
+describe('Button', () => {
+  it('renders a button', () => {
+    render(<LuxButton label="LUX Button" />);
+
+    const button = screen.getByRole('button', {
+      name: 'LUX Button',
+    });
+    expect(button).toBeInTheDocument();
+  });
+
+  it('renders a small button', () => {
+    render(<LuxButton label="LUX Button" size="small" />);
+
+    const button = screen.getByRole('button', {
+      name: 'LUX Button',
+    });
+
+    expect(button).toHaveClass('lux-button--small');
+  });
+
+  it('renders a button with a start icon', () => {
+    render(<LuxButton label="LUX Button" icon={ExampleIcon} iconPosition="start" />);
+
+    const button = screen.getByRole('button', {
+      name: 'LUX Button',
+    });
+
+    expect(button.children[0].getAttribute('class')).toEqual('lux-button-icon--start');
+  });
+
+  it('renders a button with an end icon', () => {
+    render(<LuxButton label="LUX Button" icon={ExampleIcon} iconPosition="end" />);
+
+    const button = screen.getByRole('button', {
+      name: 'LUX Button',
+    });
+
+    expect(button.children[0].getAttribute('class')).toEqual('lux-button-icon--end');
+  });
+});

packages/components-react/src/index.ts

@@ -1,4 +1,4 @@
-import '@utrecht/component-library-css/dist/index.css';
+export { LuxButton, type LuxButtonProps } from './button/Button';
 export { LuxDocument, type LuxDocumentProps } from './document/Document';
 export {
   LuxHeading,

packages/components-react/vite.config.ts

@@ -2,6 +2,7 @@
 import react from '@vitejs/plugin-react';
 import { resolve } from 'path';
 import { defineConfig } from 'vite';
+import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
 import dts from 'vite-plugin-dts';
 
 export default defineConfig({
@@ -23,9 +24,10 @@ export default defineConfig({
         globals: {
           react: 'React',
         },
+        manualChunks: undefined,
       },
     },
     minify: false,
   },
-  plugins: [dts(), react()],
+  plugins: [dts(), react(), cssInjectedByJsPlugin({ topExecutionPriority: false })],
 });

packages/storybook/config/main.ts

@@ -14,6 +14,7 @@ const config: StorybookConfig = {
     '@storybook/addon-actions',
     '@storybook/addon-interactions',
     '@storybook/addon-links',
+    'storybook-addon-pseudo-states',
   ],
   framework: {
     name: '@storybook/react-vite',

packages/storybook/package.json

@@ -69,6 +69,7 @@
     "rimraf": "6.0.1",
     "shadow-dom-testing-library": "1.11.2",
     "storybook": "8.2.7",
+    "storybook-addon-pseudo-states": "4.0.2",
     "typescript": "5.5.4",
     "vite": "5.3.5"
   },

packages/storybook/src/react-components/button/button.mdx

@@ -0,0 +1,49 @@
+import { Canvas, Controls, Markdown, Meta } from "@storybook/blocks";
+import markdown from "@utrecht/button-css/README.md?raw";
+import * as ButtonStories from "./button.stories.tsx";
+import { CitationDocumentation } from "../../utils/CitationDocumentation.tsx";
+
+<Meta of={ButtonStories} />
+
+# Button
+
+<CitationDocumentation
+  component="Utrecht Button"
+  url="https://nl-design-system.github.io/utrecht/storybook-css/index.html?path=/docs/css-heading--docs"
+/>
+
+<Markdown>{markdown}</Markdown>
+
+## Opmerkingen
+
+- De `iconPosition` property is toegevoegd om het icoon te positioneren binnen de button.
+- Met de `size` property kan de grootte van de button ingesteld worden.
+
+## Playground
+
+<Canvas of={ButtonStories.Playground} />
+<Controls of={ButtonStories.Playground} />
+
+## Small Button
+
+<Canvas of={ButtonStories.SmallButton} />
+
+## Variants
+
+<Canvas of={ButtonStories.Primary} />
+<Canvas of={ButtonStories.Secondary} />
+<Canvas of={ButtonStories.Tertiary} />
+
+## Button states
+
+<Canvas of={ButtonStories.Active} />
+<Canvas of={ButtonStories.Focus} />
+<Canvas of={ButtonStories.Hover} />
+<Canvas of={ButtonStories.Disabled} />
+<Canvas of={ButtonStories.Busy} />
+<Canvas of={ButtonStories.Toggle} />
+
+## Button With Icon
+
+<Canvas of={ButtonStories.ButtonWithIconAtPositionStart} />
+<Canvas of={ButtonStories.ButtonWithIconAtPositionEnd} />