aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FrontEnd/src/views/common/button/FlatButton.tsx7
-rw-r--r--FrontEnd/src/views/common/button/TextButton.tsx7
-rw-r--r--FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx13
3 files changed, 17 insertions, 10 deletions
diff --git a/FrontEnd/src/views/common/button/FlatButton.tsx b/FrontEnd/src/views/common/button/FlatButton.tsx
index 24f47785..f5349765 100644
--- a/FrontEnd/src/views/common/button/FlatButton.tsx
+++ b/FrontEnd/src/views/common/button/FlatButton.tsx
@@ -12,10 +12,14 @@ function _FlatButton(
text,
color,
onClick,
+ className,
+ style,
}: {
text: I18nText;
color?: PaletteColorType;
onClick?: () => void;
+ className?: string;
+ style?: React.CSSProperties;
},
ref: React.ForwardedRef<HTMLButtonElement>
): React.ReactElement | null {
@@ -24,8 +28,9 @@ function _FlatButton(
return (
<button
ref={ref}
- className={classNames("cru-flat-button", color ?? "primary")}
+ className={classNames("cru-flat-button", color ?? "primary", className)}
onClick={onClick}
+ style={style}
>
{convertI18nText(text, t)}
</button>
diff --git a/FrontEnd/src/views/common/button/TextButton.tsx b/FrontEnd/src/views/common/button/TextButton.tsx
index 2014158a..1e2b4873 100644
--- a/FrontEnd/src/views/common/button/TextButton.tsx
+++ b/FrontEnd/src/views/common/button/TextButton.tsx
@@ -12,10 +12,14 @@ function _TextButton(
text,
color,
onClick,
+ className,
+ style,
}: {
text: I18nText;
color?: PaletteColorType;
onClick?: () => void;
+ className?: string;
+ style?: React.CSSProperties;
},
ref: React.ForwardedRef<HTMLButtonElement>
): React.ReactElement | null {
@@ -24,8 +28,9 @@ function _TextButton(
return (
<button
ref={ref}
- className={classNames("cru-text-button", color ?? "primary")}
+ className={classNames("cru-text-button", color ?? "primary", className)}
onClick={onClick}
+ style={style}
>
{convertI18nText(text, t)}
</button>
diff --git a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
index 685e17be..005da933 100644
--- a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
+++ b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
@@ -6,7 +6,7 @@ import { Prompt } from "react-router";
import { getHttpTimelineClient, HttpTimelinePostInfo } from "@/http/timeline";
-import FlatButton from "../common/FlatButton";
+import FlatButton from "../common/button/FlatButton";
import TabPages from "../common/TabPages";
import TimelinePostBuilder from "@/services/TimelinePostBuilder";
import ConfirmDialog from "../common/ConfirmDialog";
@@ -106,8 +106,9 @@ const MarkdownPostEdit: React.FC<MarkdownPostEditProps> = ({
) : (
<>
<FlatButton
+ text="operationDialog.cancel"
className="me-2"
- variant="danger"
+ color="danger"
onClick={() => {
if (canLeave) {
onClose();
@@ -115,12 +116,8 @@ const MarkdownPostEdit: React.FC<MarkdownPostEditProps> = ({
setShowLeaveConfirmDialog(true);
}
}}
- >
- {t("operationDialog.cancel")}
- </FlatButton>
- <FlatButton onClick={send} disabled={!canSend}>
- {t("timeline.send")}
- </FlatButton>
+ />
+ {canSend && <FlatButton text="timeline.send" onClick={send} />}
</>
)
}