diff --git a/.storybook/preview.ts b/.storybook/preview.ts index 9652e59..dbcb332 100644 --- a/.storybook/preview.ts +++ b/.storybook/preview.ts @@ -11,17 +11,14 @@ Templates.framework = "tailwind"; /** @type { import('@storybook/react').Preview } */ const preview = { parameters: { - // actions: { argTypesRegex: "^on[A-Z].*" }, - controls: { - matchers: { - color: /(background|color)$/i, - date: /Date$/ - } + docs: { + source: { language: "tsx" } } }, viewport: { viewports: INITIAL_VIEWPORTS - } + }, + tags: ["autodocs"] }; export default preview; diff --git a/package.json b/package.json index b9f44f7..9cfea7c 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "react-redux": "7.2.6", "react-router": "5.2.1", "react-router-dom": "5.2.1", + "react-select": "^5.9.0", "react-table": "^7.8.0", "redux-thunk": "^2.4.1", "tooltip.js": "^1.3.3" diff --git a/packages/react-formio-container/src/views/forms.stories.tsx b/packages/react-formio-container/src/views/forms.stories.tsx index 1075c23..1740500 100644 --- a/packages/react-formio-container/src/views/forms.stories.tsx +++ b/packages/react-formio-container/src/views/forms.stories.tsx @@ -5,9 +5,7 @@ export default { component: FormsComponent, argTypes: { data: { - control: { - type: "object" - } + control: "object" }, setParameters: { action: "setParameters" }, dispatchOperation: { action: "dispatchOperation" } diff --git a/packages/react-formio-container/src/views/submissions.stories.tsx b/packages/react-formio-container/src/views/submissions.stories.tsx index ff064dc..9758aeb 100644 --- a/packages/react-formio-container/src/views/submissions.stories.tsx +++ b/packages/react-formio-container/src/views/submissions.stories.tsx @@ -7,9 +7,7 @@ export default { component: SubmissionsComponent, argTypes: { data: { - control: { - type: "object" - } + control: "object" }, setParameters: { action: "setParameters" }, dispatchOperation: { action: "dispatchOperation" } diff --git a/packages/react-formio/package.json b/packages/react-formio/package.json index 679da2f..65f530f 100644 --- a/packages/react-formio/package.json +++ b/packages/react-formio/package.json @@ -38,6 +38,7 @@ "react-dnd": ">=16.0.1", "react-dnd-html5-backend": ">=16.0.1", "react-dom": ">=16.14.0", + "react-select": ">=5.9.0", "react-table": ">=7.6.3", "tooltip.js": ">=1.3.3" }, diff --git a/packages/react-formio/src/molecules/alert/Alert.stories.tsx b/packages/react-formio/src/molecules/alert/Alert.stories.tsx index 03ca06e..515e0d6 100644 --- a/packages/react-formio/src/molecules/alert/Alert.stories.tsx +++ b/packages/react-formio/src/molecules/alert/Alert.stories.tsx @@ -16,18 +16,18 @@ export default { component: Alert, argTypes: { message: { - control: { - type: "text" - } + control: "text" }, type: { - control: { - type: "select", - options: ["primary", "secondary", "success", "danger", "warning", "info", "light", "dark"] - } + control: "select", + options: ["primary", "secondary", "success", "danger", "warning", "info", "light", "dark"] + } + }, + parameters: { + docs: { + source: { language: "tsx" } } }, - parameters: {}, tags: ["autodocs"] }; diff --git a/packages/react-formio/src/molecules/forms/form-control/FormControl.stories.tsx b/packages/react-formio/src/molecules/forms/form-control/FormControl.stories.tsx index b457bb3..f922e7b 100644 --- a/packages/react-formio/src/molecules/forms/form-control/FormControl.stories.tsx +++ b/packages/react-formio/src/molecules/forms/form-control/FormControl.stories.tsx @@ -12,19 +12,13 @@ export default { component: FormControl, argTypes: { label: { - control: { - type: "text" - } + control: "text" }, name: { - control: { - type: "text" - } + control: "text" }, children: { - control: { - type: "object" - } + control: "object" } }, parameters: {}, diff --git a/packages/react-formio/src/molecules/forms/form-control/FormControl.tsx b/packages/react-formio/src/molecules/forms/form-control/FormControl.tsx index 1eba2da..003ae35 100644 --- a/packages/react-formio/src/molecules/forms/form-control/FormControl.tsx +++ b/packages/react-formio/src/molecules/forms/form-control/FormControl.tsx @@ -2,6 +2,7 @@ import classnames from "classnames"; import type { PropsWithChildren, ReactNode } from "react"; export interface FormControlProps { + id?: string; name: string; value?: Data; required?: boolean; @@ -17,6 +18,7 @@ export interface FormControlProps { export function FormControl({ children, name, + id = name, required, prefix, suffix, @@ -27,7 +29,7 @@ export function FormControl({ return (
{label && ( -