Skip to content

Commit 71f6a22

Browse files
committed
refactor: code cleanup
1 parent 7ba5467 commit 71f6a22

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

packages/pluggableWidgets/rich-text-web/src/components/ModalDialog/DialogContent.tsx

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,21 @@ interface PropsWithChildrenWithClass extends PropsWithChildren {
66
className?: string;
77
}
88

9-
export function DialogContent(props: PropsWithChildrenWithClass): ReactElement {
10-
const { children, className } = props;
9+
export interface DialogContentProps extends PropsWithChildrenWithClass {
10+
formOrientation: "horizontal" | "vertical";
11+
}
12+
13+
export function DialogContent(props: DialogContentProps): ReactElement {
14+
const { children, className, formOrientation } = props;
1115

1216
return (
13-
<div className={classNames("widget-rich-text-modal-body modal-dialog mx-window mx-window-active", className)}>
17+
<div
18+
className={classNames(
19+
"widget-rich-text-modal-body modal-dialog mx-window mx-window-active",
20+
{ "form-vertical": formOrientation === "vertical" },
21+
className
22+
)}
23+
>
1424
<div className="modal-content mx-window-content">{children}</div>
1525
</div>
1626
);
@@ -36,16 +46,21 @@ export function DialogHeader(props: DialogHeaderProps): ReactElement {
3646
);
3747
}
3848

39-
export function DialogBody(
40-
props: PropsWithChildrenWithClass & { formOrientation: "horizontal" | "vertical" }
41-
): ReactElement {
49+
export interface DialogBodyProps extends PropsWithChildrenWithClass {
50+
formOrientation: "horizontal" | "vertical";
51+
}
52+
53+
export function DialogBody(props: DialogBodyProps): ReactElement {
4254
const { children, className, formOrientation } = props;
4355

4456
return (
4557
<div
4658
className={classNames(
4759
"widget-rich-text-modal-content",
48-
formOrientation === "vertical" ? "form-vertical" : "form-horizontal",
60+
{
61+
"form-vertical": formOrientation === "vertical",
62+
"form-horizontal": formOrientation !== "vertical"
63+
},
4964
className
5065
)}
5166
>
@@ -70,7 +85,7 @@ export function FormControl(props: FormControlProps): ReactElement {
7085
<label
7186
htmlFor={inputId}
7287
id={`${inputId}-label`}
73-
className={classNames("control-label", formOrientation !== "vertical" && "col-sm-3")}
88+
className={classNames("control-label", { "col-sm-3": formOrientation !== "vertical" })}
7489
>
7590
{label}
7691
</label>

packages/pluggableWidgets/rich-text-web/src/components/ModalDialog/ImageDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export default function ImageDialog(props: ImageDialogProps): ReactElement {
131131
}, [imageUploadElementRef.current]);
132132

133133
return (
134-
<DialogContent className={classNames("image-dialog", formOrientation === "vertical" ? "form-vertical" : "")}>
134+
<DialogContent className={"image-dialog"} formOrientation={formOrientation}>
135135
<DialogHeader onClose={onClose}>{activeTab === "general" ? "Insert/Edit" : "Embed"} Images</DialogHeader>
136136
<DialogBody formOrientation={formOrientation}>
137137
<div ref={imageUploadElementRef}>

packages/pluggableWidgets/rich-text-web/src/components/ModalDialog/LinkDialog.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ChangeEvent, createElement, ReactElement, useState } from "react";
2-
import classNames from "classnames";
32
import { type linkConfigType } from "../../utils/formats";
43
import { DialogBody, DialogContent, DialogFooter, DialogHeader, FormControl } from "./DialogContent";
54

@@ -24,7 +23,7 @@ export default function LinkDialog(props: LinkDialogProps): ReactElement {
2423
};
2524

2625
return (
27-
<DialogContent className={classNames("link-dialog", formOrientation === "vertical" ? "form-vertical" : "")}>
26+
<DialogContent className={"link-dialog"} formOrientation={formOrientation}>
2827
<DialogHeader onClose={onClose}>Insert/Edit Link</DialogHeader>
2928
<DialogBody formOrientation={formOrientation}>
3029
<FormControl label="Text" formOrientation={formOrientation} inputId="rich-text-link-text-input">

packages/pluggableWidgets/rich-text-web/src/components/ModalDialog/VideoDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export default function VideoDialog(props: VideoDialogProps): ReactElement {
121121
// disable embed tab if it is about modifying current video
122122
const disableEmbed = defaultValue?.src && defaultValue.src.length > 0;
123123
return (
124-
<DialogContent className={classNames("video-dialog", formOrientation === "vertical" ? "form-vertical" : "")}>
124+
<DialogContent className={"video-dialog"} formOrientation={formOrientation}>
125125
<DialogHeader onClose={onClose}>{activeTab === "general" ? "Insert/Edit" : "Embed"} Media</DialogHeader>
126126
<DialogBody formOrientation={formOrientation}>
127127
<div>

packages/pluggableWidgets/rich-text-web/src/components/ModalDialog/ViewCodeDialog.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const BEAUTIFY_OPTIONS: beautify.HTMLBeautifyOptions = {
2727
};
2828

2929
export default function ViewCodeDialog(props: ViewCodeDialogProps): ReactElement {
30-
const { onSubmit, onClose, currentCode } = props;
30+
const { onSubmit, onClose, currentCode, formOrientation } = props;
3131
const [formState, setFormState] = useState({
3232
src: beautify.html(currentCode ?? "", BEAUTIFY_OPTIONS) || ""
3333
});
@@ -36,13 +36,13 @@ export default function ViewCodeDialog(props: ViewCodeDialogProps): ReactElement
3636
}, []);
3737

3838
return (
39-
<DialogContent className="view-code-dialog">
39+
<DialogContent className={"view-code-dialog"} formOrientation={formOrientation}>
4040
<DialogHeader onClose={onClose}>View/Edit Code</DialogHeader>
4141
<DialogBody formOrientation={props.formOrientation}>
4242
<div>
4343
<label>Source Code</label>
4444
</div>
45-
<FormControl label="Title" formOrientation={props.formOrientation} inputId="rich-text-view-code-input">
45+
<FormControl label="Code input" formOrientation={props.formOrientation} inputId="rich-text-code-input">
4646
<CodeMirror
4747
className="form-control mx-textarea-input mx-textarea-noresize code-input"
4848
value={formState.src}

0 commit comments

Comments
 (0)