Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2831 uisubmitbuttonoptions dont work #2833

Merged
merged 47 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
eef9605
Merge pull request #2 from rjsf-team/master
jacqueswho Apr 9, 2020
04b3d07
Merge pull request #4 from rjsf-team/master
jacqueswho Jun 1, 2020
9e2dff9
Merge branch 'rjsf-team:master' into master
jacqueswho Oct 28, 2021
28e86ba
feat: submit button props
jacqueswho Dec 29, 2021
0f4c77c
feat: ui options playground options
jacqueswho Dec 29, 2021
807a377
feat: other themes to implement widget
jacqueswho Dec 29, 2021
43a175f
feat: remove hidden option
jacqueswho Dec 30, 2021
7656dd3
chore: required to allowed
jacqueswho Jan 14, 2022
7b4673a
chore: requested changes
jacqueswho Jan 17, 2022
1c2800d
doc: change prop
jacqueswho Jan 17, 2022
4c5960c
chore: version bump changes
jacqueswho Jan 18, 2022
ff636fe
Update CHANGELOG.md
jacqueswho Jan 18, 2022
492a2bc
Update docs/api-reference/uiSchema.md
jacqueswho Jan 18, 2022
20cf440
Update docs/api-reference/uiSchema.md
jacqueswho Jan 18, 2022
1a484d5
Update docs/api-reference/uiSchema.md
jacqueswho Jan 18, 2022
16bc002
dox: updated
jacqueswho Jan 18, 2022
29a5f3a
chore: version changes
jacqueswho Jan 25, 2022
3aeae46
chore: revert version
jacqueswho Jan 25, 2022
36f57b3
Merge branch 'rjsf-team:master' into master
jacqueswho Jan 25, 2022
911d5f3
Squashed commit of the following:
jacqueswho Jan 25, 2022
2c1ed48
Merge branch 'master' into feature/submit_button_props
jacqueswho Jan 25, 2022
1b0c918
lint: cs-check
jacqueswho Jan 25, 2022
35f5bd2
linting: js format
jacqueswho Jan 25, 2022
24b8d80
feat: updated util types
jacqueswho Jan 26, 2022
e30ea18
feat: getSubmitButtonOptions type
jacqueswho Jan 26, 2022
73f515c
chore: update tests
jacqueswho Jan 26, 2022
45405be
chore: tests updated
jacqueswho Jan 26, 2022
9b16d83
hocer: snapshots updated
jacqueswho Jan 26, 2022
d9eb5c9
chore: test:update command
jacqueswho Jan 26, 2022
3654887
Update snapshots
epicfaace Jan 26, 2022
f3aebb5
Update PR template with snapshot update command
epicfaace Jan 26, 2022
cc6d90c
feat: remove default className
jacqueswho Jan 26, 2022
c94591f
chore: update util tests
jacqueswho Jan 26, 2022
5d98df6
chore: remove classname test
jacqueswho Jan 26, 2022
629e0bb
chore: snapshots updated
jacqueswho Jan 27, 2022
d6a09eb
Merge branch 'rjsf-team:master' into master
jacqueswho Feb 16, 2022
e91212c
Squashed commit of the following:
jacqueswho Feb 16, 2022
2e3a3d8
merge with master
jacqueswho Feb 16, 2022
81347a2
Merge branch 'feature/submit_button_props' of https://github.com/jacq…
jacqueswho Feb 16, 2022
fe2d6ae
Merge branch 'master' of https://github.com/rjsf-team/react-jsonschem…
jacqueswho Apr 13, 2022
8462132
chore: get latest version master
jacqueswho Apr 13, 2022
907fe3a
Merge branch 'master' of https://github.com/rjsf-team/react-jsonschem…
jacqueswho Apr 13, 2022
68386a4
chore: snapshots updated
jacqueswho Apr 13, 2022
b6ac263
chore: snapshots updated
jacqueswho Apr 14, 2022
e6c933b
Merge branch 'master' of https://github.com/rjsf-team/react-jsonschem…
jacqueswho Apr 27, 2022
0d00ab6
feat: include submit button options for material ui
jacqueswho Apr 27, 2022
281113c
fix: remove duplicate button declaration
jacqueswho Apr 27, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,29 @@ should change the heading of the (upcoming) version to include a major version b
-->
# v5.0.0 (coming soon)

# 4.2.0

## @rjsf/core
- Feature for ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## Dev / docs / playground
- Enable ui options in playground, to demonstrate submit button options (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/material-ui
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2833)

## @rjsf/bootstrap-4
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/semantic-ui
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/antd
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/fluent-ui
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

# v4.1.1 (upcoming)

## @rjsf/material-ui
Expand Down Expand Up @@ -98,21 +121,6 @@ should change the heading of the (upcoming) version to include a major version b
- Upgrade jsonpointer to 5.0.0 to address security vulnerability (https://github.com/rjsf-team/react-jsonschema-form/pull/2599)
- Feature for ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## Dev / docs / playground
- Enable ui options in playground, to demonstrate submit button options (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/bootstrap-4
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/semantic-ui
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/antd
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

## @rjsf/fluent-ui
- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)

# v3.2.0

## @rjsf/core
Expand Down
3 changes: 2 additions & 1 deletion packages/bootstrap-4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"scripts": {
"start": "tsdx watch",
"build": "rimraf dist && tsdx build",
"test": "tsdx test"
"test": "tsdx test",
"test:update":"tsdx test --u"
},
"peerDependencies": {
"@rjsf/core": "^4.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/chakra-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"start": "tsdx watch",
"build": "rimraf dist && tsdx build",
"test": "tsdx test",
"test:update": "tsdx test --u",
"test:watch": "tsdx test --watch"
},
"engineStrict": false,
Expand Down
5 changes: 2 additions & 3 deletions packages/material-ui/src/SubmitButton/SubmitButton.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';
import Box from "@material-ui/core/Box";
import { WidgetProps, utils } from '@rjsf/core';

import Button from '@material-ui/core/Button';
import { useMuiComponent } from '../MuiComponentContext';

const { getSubmitButtonOptions } = utils;
const SubmitButton: React.FC<WidgetProps> = props => {
const { Box, Button } = useMuiComponent();
const { submitText, norender, props: submitButtonProps }= getSubmitButtonOptions(props.uiSchema);
if(norender) return null;
return (
Expand Down