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

Fix SaveButton submitting state display #7860

Merged
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions packages/ra-ui-materialui/src/button/SaveButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,18 @@ export const SaveButton = <RecordType extends RaRecord = any>(
const translate = useTranslate();
const form = useFormContext();
const saveContext = useSaveContext();
const { isDirty, isValidating } = useFormState();
const { isDirty, isValidating, isSubmitting } = useFormState();
// Use form isDirty, isValidating and form context saving to enable or disable the save button
// if alwaysEnable is undefined
const disabled = valueOrDefault(
alwaysEnable === false || alwaysEnable === undefined
? undefined
: !alwaysEnable,
disabledProp || !isDirty || isValidating || saveContext?.saving
disabledProp ||
!isDirty ||
isValidating ||
saveContext?.saving ||
isSubmitting
);

warning(
Expand Down Expand Up @@ -119,7 +123,9 @@ export const SaveButton = <RecordType extends RaRecord = any>(

const displayedLabel = label && translate(label, { _: label });
const finalSaving =
typeof saving !== 'undefined' ? saving : saveContext?.saving;
typeof saving !== 'undefined'
? saving
: saveContext?.saving || isSubmitting;

return (
<StyledButton
Expand Down