diff --git a/src/components/ExistingSubmissionOptions.js b/src/components/ExistingSubmissionOptions.js index c004897f1..da201ba34 100644 --- a/src/components/ExistingSubmissionOptions.js +++ b/src/components/ExistingSubmissionOptions.js @@ -1,9 +1,9 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import PropTypes from 'prop-types'; import React from 'react'; import {FormattedMessage} from 'react-intl'; import {useNavigate} from 'react-router-dom'; -import Button from 'components/Button'; import {Toolbar, ToolbarList} from 'components/Toolbar'; import Types from 'types'; @@ -15,20 +15,20 @@ const ExistingSubmissionOptions = ({form, onFormAbort}) => { return ( - + - + ); diff --git a/src/components/LogoutButton.js b/src/components/LogoutButton.js index 4353fabca..58d7ae6b9 100644 --- a/src/components/LogoutButton.js +++ b/src/components/LogoutButton.js @@ -1,17 +1,17 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import PropTypes from 'prop-types'; import React from 'react'; import {FormattedMessage} from 'react-intl'; -import Button from 'components/Button'; import {Toolbar, ToolbarList} from 'components/Toolbar'; const LogoutButton = ({onLogout}) => { return ( - + ); diff --git a/src/components/PaymentForm.js b/src/components/PaymentForm.js index b5f84a0fd..cb4f7c6dd 100644 --- a/src/components/PaymentForm.js +++ b/src/components/PaymentForm.js @@ -1,9 +1,8 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import PropTypes from 'prop-types'; import React, {useEffect, useRef} from 'react'; import {FormattedMessage} from 'react-intl'; -import Button from 'components/Button'; - const AUTOSUBMIT_AFTER = 5000; /** @@ -31,9 +30,9 @@ const PaymentForm = ({method, url, data, autoSubmit = true}) => { return (
{dataFields} - +
); }; diff --git a/src/components/Sessions/RequireSession.js b/src/components/Sessions/RequireSession.js index b573f9676..f066ef41f 100644 --- a/src/components/Sessions/RequireSession.js +++ b/src/components/Sessions/RequireSession.js @@ -1,3 +1,4 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useState} from 'react'; import {FormattedMessage, FormattedRelativeTime} from 'react-intl'; @@ -5,7 +6,6 @@ import {useTimeout, useTimeoutFn} from 'react-use'; import {ConfigContext} from 'Context'; import {apiCall} from 'api'; -import Button from 'components/Button'; import Card from 'components/Card'; import ErrorMessage from 'components/ErrorMessage'; import Link from 'components/Link'; @@ -148,9 +148,9 @@ const ExpiryModal = ({showWarning, secondsToExpiry, setWarningDismissed}) => { - + diff --git a/src/components/SubmissionConfirmation.js b/src/components/SubmissionConfirmation.js index 46cc41519..493538646 100644 --- a/src/components/SubmissionConfirmation.js +++ b/src/components/SubmissionConfirmation.js @@ -1,3 +1,4 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import PropTypes from 'prop-types'; import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; @@ -6,7 +7,6 @@ import {useAsync} from 'react-use'; import {post} from 'api'; import Anchor from 'components/Anchor'; import Body from 'components/Body'; -import Button from 'components/Button'; import Card from 'components/Card'; import ErrorBoundary from 'components/ErrorBoundary'; import FAIcon from 'components/FAIcon'; @@ -175,12 +175,12 @@ const SubmissionConfirmation = ({statusUrl, onFailure, onConfirmed, donwloadPDFT - + diff --git a/src/components/appointments/cancel/CancelAppointment.js b/src/components/appointments/cancel/CancelAppointment.js index 07aaa197d..1399d236b 100644 --- a/src/components/appointments/cancel/CancelAppointment.js +++ b/src/components/appointments/cancel/CancelAppointment.js @@ -1,3 +1,4 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import {Formik} from 'formik'; import React, {useContext, useState} from 'react'; import {FormattedDate, FormattedMessage} from 'react-intl'; @@ -6,7 +7,6 @@ import {useNavigate} from 'react-router-dom'; import {ConfigContext} from 'Context'; import {post} from 'api'; import Body from 'components/Body'; -import Button from 'components/Button'; import Card from 'components/Card'; import ErrorMessage from 'components/ErrorMessage'; import {Toolbar, ToolbarList} from 'components/Toolbar'; @@ -124,12 +124,12 @@ out your email address for verification purposes.`} - + diff --git a/src/components/appointments/steps/ChooseProductStep.js b/src/components/appointments/steps/ChooseProductStep.js index acf93ca8f..bf1ac718a 100644 --- a/src/components/appointments/steps/ChooseProductStep.js +++ b/src/components/appointments/steps/ChooseProductStep.js @@ -1,3 +1,4 @@ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import {FieldArray, Form, Formik} from 'formik'; import produce from 'immer'; import PropTypes from 'prop-types'; @@ -8,7 +9,6 @@ import {useNavigate} from 'react-router-dom'; import {z} from 'zod'; import {toFormikValidationSchema} from 'zod-formik-adapter'; -import Button from 'components/Button'; import {CardTitle} from 'components/Card'; import FAIcon from 'components/FAIcon'; import {Toolbar, ToolbarList} from 'components/Toolbar'; @@ -79,9 +79,8 @@ const ChooseProductStepFields = ({values: {products = []}, validateForm}) => { {supportsMultipleProducts && (
- +
)} @@ -134,12 +133,12 @@ const ProductWrapper = ({index, numProducts, onRemove, children}) => { {numProducts > 1 && ( - + )} diff --git a/src/components/modals/FormStepSaveModal.js b/src/components/modals/FormStepSaveModal.js index 27eb14bc7..c7bee8e8f 100644 --- a/src/components/modals/FormStepSaveModal.js +++ b/src/components/modals/FormStepSaveModal.js @@ -1,6 +1,7 @@ /** * Display a modal to allow the user to save the form step in it's current state. */ +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import {Formik} from 'formik'; import PropTypes from 'prop-types'; import React, {useContext} from 'react'; @@ -10,7 +11,6 @@ import {useImmerReducer} from 'use-immer'; import {ConfigContext} from 'Context'; import {destroy, post} from 'api'; import Body from 'components/Body'; -import Button from 'components/Button'; import ErrorMessage from 'components/ErrorMessage'; import Loader from 'components/Loader'; import {Toolbar, ToolbarList} from 'components/Toolbar'; @@ -158,12 +158,12 @@ const FormStepSaveModal = ({ - + diff --git a/src/components/modals/FormStepSaveModal.stories.js b/src/components/modals/FormStepSaveModal.stories.js index 666dd54e3..c64b0eeda 100644 --- a/src/components/modals/FormStepSaveModal.stories.js +++ b/src/components/modals/FormStepSaveModal.stories.js @@ -1,10 +1,10 @@ import {useArgs} from '@storybook/client-api'; +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import {rest} from 'msw'; import React from 'react'; import {BASE_URL} from 'api-mocks'; -import Button from 'components/Button'; -import {ConfigDecorator, DeprecatedRouterDecorator} from 'story-utils/decorators'; +import {ConfigDecorator} from 'story-utils/decorators'; import {default as FormStepSaveModalComponent} from './FormStepSaveModal'; @@ -49,9 +49,12 @@ export const FormStepSaveModal = { const [_, updateArgs] = useArgs(); return ( <> - + { diff --git a/src/i18n-zod.stories.js b/src/i18n-zod.stories.js index d1902388f..dc94d3dc1 100644 --- a/src/i18n-zod.stories.js +++ b/src/i18n-zod.stories.js @@ -1,10 +1,10 @@ import {userEvent, within} from '@storybook/testing-library'; +import {Button as UtrechtButton} from '@utrecht/component-library-react'; import {Form, Formik} from 'formik'; import {useIntl} from 'react-intl'; import {z} from 'zod'; import {toFormikValidationSchema} from 'zod-formik-adapter'; -import Button from 'components/Button'; import {EmailField, TextField} from 'components/forms'; import useZodErrorMap from 'hooks/useZodErrorMap'; @@ -106,9 +106,9 @@ const AccessibleErrorsExample = ({onSubmit}) => { className="openforms-form-control" style={{display: 'flex', justifyContent: 'flex-end'}} > - +