diff --git a/.storybook/decorators.js b/.storybook/decorators.js index 0bd733476..734c13074 100644 --- a/.storybook/decorators.js +++ b/.storybook/decorators.js @@ -8,3 +8,11 @@ export const withClearSessionStorage = Story => { window.sessionStorage.clear(); return ; }; + +/** + * This decorator wraps stories so that they are inside a container with the class name "utrecht-document". This is + * needed so that components inherit the right font. + */ +export const utrechtDocumentDecorator = Story => { + return (
); +}; diff --git a/.storybook/preview.js b/.storybook/preview.js index 476d4eda3..5f0345076 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -18,7 +18,7 @@ import 'styles.scss'; import OpenFormsModule from 'formio/module'; import OFLibrary from 'formio/templates'; -import {withClearSessionStorage} from './decorators'; +import {utrechtDocumentDecorator, withClearSessionStorage} from './decorators'; import {reactIntl} from './reactIntl.js'; initialize({ @@ -36,7 +36,7 @@ Formio.use(OpenFormsModule); Templates.current = OFLibrary; export default { - decorators: [mswDecorator, withClearSessionStorage], + decorators: [mswDecorator, withClearSessionStorage, utrechtDocumentDecorator], globals: { locale: reactIntl.defaultLocale, locales: { diff --git a/CHANGELOG.rst b/CHANGELOG.rst index aef91da2e..e416ae5b5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -37,6 +37,18 @@ should be set: looks of the cursor when hovering over a submit button. For the Open Forms theme, this is now ``pointer``. +The alert component has also been refactored to use the Utrecht alert component. In order to +maintain the same styles as in the previous version, the following Utrecht design tokens should be +set: + +* ``--utrecht-alert-warning-background-color`` with the value of ``--of-alert-warning-bg``. +* ``--utrecht-alert-info-background-color`` with the value of ``--of-alert-info-bg``. +* ``--utrecht-alert-error-background-color`` with the value of ``--of-alert-error-bg``. +* ``--utrecht-alert-icon-error-color`` with the value of ``--of-color-danger``. +* ``--utrecht-alert-icon-info-color`` with the value of ``--of-color-info``. +* ``--utrecht-alert-icon-warning-color`` with the value of ``--of-color-warning``. +* ``--utrecht-alert-icon-ok-color`` with the value of ``--of-color-success``. + 1.5.4 (2023-10-30) ================== diff --git a/design-tokens b/design-tokens index 69ac09d49..0485a4657 160000 --- a/design-tokens +++ b/design-tokens @@ -1 +1 @@ -Subproject commit 69ac09d49dcd64e80a980f3e73fcd85873cd396e +Subproject commit 0485a4657b51d6e2ec50d19d7b1f2a690b432c08 diff --git a/package.json b/package.json index fb2938612..fffbf04ca 100644 --- a/package.json +++ b/package.json @@ -30,11 +30,12 @@ "@floating-ui/react": "^0.24.2", "@formio/protected-eval": "^1.2.1", "@fortawesome/fontawesome-free": "^6.1.1", - "@open-formulieren/design-tokens": "^0.45.1", + "@open-formulieren/design-tokens": "^0.46.0", "@sentry/react": "^6.13.2", "@sentry/tracing": "^6.13.2", "@trivago/prettier-plugin-sort-imports": "^4.0.0", "classnames": "^2.3.1", + "date-fns": "^2.30.0", "flatpickr": "^4.6.9", "formik": "^2.2.9", "formiojs": "4.13.12", @@ -136,10 +137,10 @@ "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", - "@utrecht/component-library-css": "^1.0.0-alpha.526", - "@utrecht/component-library-react": "^1.0.0-alpha.353", - "@utrecht/components": "^1.0.0-alpha.473", - "@utrecht/design-tokens": "^1.0.0-alpha.505", + "@utrecht/component-library-css": "1.0.0-alpha.604", + "@utrecht/component-library-react": "1.0.0-alpha.353", + "@utrecht/components": "1.0.0-alpha.565", + "@utrecht/design-tokens": "1.0.0-alpha.597", "babel-jest": "^27.4.2", "babel-loader": "^9.1.2", "babel-plugin-formatjs": "^10.3.8", diff --git a/public/index.html b/public/index.html index d2616d012..c5b679c7a 100644 --- a/public/index.html +++ b/public/index.html @@ -10,7 +10,7 @@ /> Open Forms SDK - +