Bugfix disable submit button #3537
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dwjohnston
force-pushed
the
bugfix-disable-submit-button
branch
from
6de623c
to
e48ca03
Compare
heath-freenome
requested changes
Mar 24, 2023
packages/core/src/components/templates/ButtonTemplates/SubmitButton.tsx
Outdated
Show resolved
Hide resolved
|
@dwjohnston Have you had a chance to look over my feedback? |
dwjohnston
force-pushed
the
bugfix-disable-submit-button
branch
from
e48ca03
to
a725f1d
Compare
Comment on lines
299
to
314
| const rawUiSchema: UiSchema<T, S, F> = ('uiSchema' in props ? props.uiSchema! : this.props.uiSchema!) || {}; | ||
|
|
||
| const uiSchema = props.disabled | ||
| ? { | ||
| ...rawUiSchema, | ||
| 'ui:submitButtonOptions': { | ||
| ...rawUiSchema['ui:submitButtonOptions'], | ||
| props: { | ||
| ...rawUiSchema['ui:submitButtonOptions']?.props, | ||
| disabled: true, | ||
| }, | ||
| }, | ||
| } | ||
| : rawUiSchema; |
There was a problem hiding this comment.
I can understand why this would seem like the right place to update the uiSchema used everywhere. There is one problem with this approach. ui:submitButtonOptions could also be defined as ui:options: { submitButtonOptions } ; The approach I suggested of providing a separately constructed uiSchema just to the SubmitButton handles either situation.
I would revert this whole change since the only use for submitButtonOptions really is the SubmitButton and move the code down in the the render and pass a one-off set of props just to the SubmitButton
packages/core/src/components/templates/ButtonTemplates/SubmitButton.tsx
Outdated
Show resolved
Hide resolved
| @@ -32,7 +32,7 @@ const liveSettingsSchema: RJSFSchema = { | |||
| type: 'object', | |||
| properties: { | |||
| liveValidate: { type: 'boolean', title: 'Live validation' }, | |||
| disable: { type: 'boolean', title: 'Disable whole form' }, | |||
| disabled: { type: 'boolean', title: 'Disable whole form' }, | |||
There was a problem hiding this comment.
This got fixed in another PR
dwjohnston
force-pushed
the
bugfix-disable-submit-button
branch
from
a725f1d
to
8e0a83f
Compare
dwjohnston
force-pushed
the
bugfix-disable-submit-button
branch
from
8e0a83f
to
69ccf88
Compare
dwjohnston
force-pushed
the
bugfix-disable-submit-button
branch
from
b2c2aef
to
dc2341c
Compare
heath-freenome
approved these changes
Apr 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reasons for making this change
Fixes #3264
Also fixes an issue with the Playground where the 'Disable whole form' button does not work.
The disabled button can be controlled via the
ui:submitButtonPropsproperties, or the top leveldisabledproperty. The logic I've gone for is a simple OR operator between these values. You could argue that theui:submitButtonPropsshould always take precedence, even if set to false, but I can't think of a scenario where that makes sense.Checklist
npm run test:updateto update snapshots, if needed.