diff --git a/src/components/Buttons/LoadingButton.tsx b/src/components/Buttons/LoadingButton.tsx index 1f00dd5ee7..c3e39d631a 100644 --- a/src/components/Buttons/LoadingButton.tsx +++ b/src/components/Buttons/LoadingButton.tsx @@ -1,24 +1,24 @@ import { Button, CircularProgress } from "@mui/material"; -import { ButtonProps } from "@mui/material/Button"; -import React, { ReactElement } from "react"; +import { type ButtonProps } from "@mui/material/Button"; +import { type ReactElement, type ReactNode } from "react"; import { themeColors } from "types/theme"; interface LoadingProps { buttonProps?: ButtonProps & { "data-testid"?: string }; - children?: React.ReactNode; + children?: ReactNode; disabled?: boolean; loading?: boolean; } -/** - * A button that shows a spinning wheel when loading=true - */ +/** A button that shows a spinning wheel when `loading = true`. + * Default button props: `color: "primary", variant: "contained"`. */ export default function LoadingButton(props: LoadingProps): ReactElement { return ( {t("buttons.confirm")} diff --git a/src/components/Dialogs/CancelConfirmDialog.tsx b/src/components/Dialogs/CancelConfirmDialog.tsx index e6daa72b13..42936c2abc 100644 --- a/src/components/Dialogs/CancelConfirmDialog.tsx +++ b/src/components/Dialogs/CancelConfirmDialog.tsx @@ -6,14 +6,16 @@ import { DialogContentText, DialogTitle, } from "@mui/material"; -import { ReactElement } from "react"; +import { type ReactElement, useState } from "react"; import { useTranslation } from "react-i18next"; +import LoadingButton from "components/Buttons/LoadingButton"; + interface CancelConfirmDialogProps { open: boolean; textId: string; handleCancel: () => void; - handleConfirm: () => void; + handleConfirm: () => Promise | void; buttonIdCancel?: string; buttonIdConfirm?: string; } @@ -24,8 +26,14 @@ interface CancelConfirmDialogProps { export default function CancelConfirmDialog( props: CancelConfirmDialogProps ): ReactElement { + const [loading, setLoading] = useState(false); const { t } = useTranslation(); + const onConfirm = async (): Promise => { + setLoading(true); + await props.handleConfirm(); + }; + return ( - + ); diff --git a/src/components/Dialogs/DeleteEditTextDialog.tsx b/src/components/Dialogs/DeleteEditTextDialog.tsx index ab27fe933c..d50307e9f1 100644 --- a/src/components/Dialogs/DeleteEditTextDialog.tsx +++ b/src/components/Dialogs/DeleteEditTextDialog.tsx @@ -127,12 +127,7 @@ export default function DeleteEditTextDialog( {t(props.buttonTextIdSave ?? "buttons.save")} diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx index f498f08f84..fa00ca5907 100644 --- a/src/components/Login/Login.tsx +++ b/src/components/Login/Login.tsx @@ -185,11 +185,7 @@ export default function Login(): ReactElement { diff --git a/src/components/ProjectExport/ExportButton.tsx b/src/components/ProjectExport/ExportButton.tsx index 4b17e033f0..5b304500e2 100644 --- a/src/components/ProjectExport/ExportButton.tsx +++ b/src/components/ProjectExport/ExportButton.tsx @@ -45,7 +45,6 @@ export default function ExportButton(props: ExportButtonProps): ReactElement { buttonProps={{ ...props.buttonProps, onClick: exportProj, - color: "primary", id: `project-${props.projectId}-export`, }} > diff --git a/src/components/ProjectSettings/ProjectSchedule/DateScheduleEdit.tsx b/src/components/ProjectSettings/ProjectSchedule/DateScheduleEdit.tsx index 5094f5a671..1ea9e8cc65 100644 --- a/src/components/ProjectSettings/ProjectSchedule/DateScheduleEdit.tsx +++ b/src/components/ProjectSettings/ProjectSchedule/DateScheduleEdit.tsx @@ -84,8 +84,6 @@ export default function DateScheduleEdit( buttonProps={{ id: "DateSelectorSubmitButton", onClick: handleSubmit, - variant: "contained", - color: "primary", }} > {t("buttons.confirm")} diff --git a/src/components/ProjectSettings/ProjectSchedule/DateSelector.tsx b/src/components/ProjectSettings/ProjectSchedule/DateSelector.tsx index 7bcd1ec0e6..212c4ad9cb 100644 --- a/src/components/ProjectSettings/ProjectSchedule/DateSelector.tsx +++ b/src/components/ProjectSettings/ProjectSchedule/DateSelector.tsx @@ -88,8 +88,6 @@ export default function DateSelector(props: DateSelectorProps): ReactElement { buttonProps={{ id: "DateSelectorSubmitButton", onClick: () => handleSubmit(), - variant: "contained", - color: "primary", }} > {t("buttons.confirm")} diff --git a/src/goals/CharacterInventory/CharInv/index.tsx b/src/goals/CharacterInventory/CharInv/index.tsx index 34a853cc27..0dcce33f16 100644 --- a/src/goals/CharacterInventory/CharInv/index.tsx +++ b/src/goals/CharacterInventory/CharInv/index.tsx @@ -95,7 +95,6 @@ export default function CharacterInventory(): ReactElement { loading={saveInProgress} buttonProps={{ id: buttonIdSave, - color: "primary", onClick: () => save(), style: { margin: theme.spacing(1) }, }} @@ -103,6 +102,7 @@ export default function CharacterInventory(): ReactElement { {t("buttons.save")}