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.

Sign up for GitHub

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

feat: replace TextEditor to Markdown #1231

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+86 −78
Open

feat: replace TextEditor to Markdown #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions packages/web/src/common/components/Markdown/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ import FlexWrapper from "@sparcs-clubs/web/common/components/FlexWrapper";

interface MarkdownProps {
placeholder?: string;
initialValue?: string;
onChange?: (content: string) => void;
}

const ButtonWrapper = styled.div`
Expand All @@ -68,7 +70,11 @@ const ProtectedParagraph = Node.create({
},
});

const Markdown = ({ placeholder = "" }: MarkdownProps) => {
const Markdown = ({
placeholder = "",
initialValue = "",
onChange = () => {},
}: MarkdownProps) => {
const editor = useEditor({
extensions: [
Document,
Expand Down Expand Up @@ -105,7 +111,13 @@ const Markdown = ({ placeholder = "" }: MarkdownProps) => {
TableHeader,
Text,
],
content: ``,
content: initialValue,
onUpdate: () => {
const content = editor?.getHTML();
if (content) {
onChange(content); // 부모로 HTML 전달
}
},
});

// 테이블 삽입, 이후 삭제 방지된 텍스트 노드 삽입
Expand Down
10 changes: 6 additions & 4 deletions packages/web/src/features/meeting/agenda/create/components/AgendaBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ const AgendaBlock = forwardRef<HTMLDivElement, AgendaBlockProps>(
(isEditMode ? (
<AgendaEditor
agendaContent={agenda}
onDelete={deleteAgenda}
onSave={() => setEditMode(false)}
onChange={(newContent: AgendaContent) => {
editAgenda(newContent);
onCancel={() => {
setEditMode(false);
}}
onSave={(agendaContent: AgendaContent) => {
editAgenda(agendaContent);
setEditMode(false);
}}
/>
) : (
Expand Down
138 changes: 66 additions & 72 deletions packages/web/src/features/meeting/agenda/create/components/AgendaEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import isPropValid from "@emotion/is-prop-valid";
import styled from "styled-components";
import { useState } from "react";

import Button from "@sparcs-clubs/web/common/components/Button";
import Card from "@sparcs-clubs/web/common/components/Card";
import FlexWrapper from "@sparcs-clubs/web/common/components/FlexWrapper";
import TextInput from "@sparcs-clubs/web/common/components/Forms/TextInput";
import Markdown from "@sparcs-clubs/web/common/components/Markdown";
import Select from "@sparcs-clubs/web/common/components/Select";
import Typography from "@sparcs-clubs/web/common/components/Typography";
import AgendaContent from "@sparcs-clubs/web/features/meeting/agenda/constants/agendaContent";
Expand All @@ -16,82 +16,76 @@ import {

interface AgendaEditorProps {
agendaContent: AgendaContent;
onDelete: () => void;
onSave: () => void;
onChange: (agendaContent: AgendaContent) => void;
onCancel: () => void;
onSave: (agendaContent: AgendaContent) => void;
}

// TODO: Impl TextArea
const TextEditor = styled.input.withConfig({
shouldForwardProp: prop => isPropValid(prop),
})`
border: 1px solid ${({ theme }) => theme.colors.PRIMARY};
padding: 32px;
`;
// const TextEditor = styled.input.withConfig({
// shouldForwardProp: prop => isPropValid(prop),
// })`
// border: 1px solid ${({ theme }) => theme.colors.PRIMARY};
// padding: 32px;
// `;
Comment on lines 23 to +29
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거 지워도 될듯!


const AgendaEditor: React.FC<AgendaEditorProps> = ({
agendaContent,
onDelete,
onCancel,
onSave,
onChange,
}: AgendaEditorProps) => (
<Card outline gap={32}>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 종류
</Typography>
<Select
items={(
Object.values(AgendaTypeEnum).filter(
value => typeof value === "number",
) as Array<AgendaTypeEnum>
).map((value: AgendaTypeEnum) => ({
label: AgendaTypeName[value],
value,
}))}
value={agendaContent.type}
onChange={(value: AgendaTypeEnum) => {
onChange({
...agendaContent,
type: value,
});
}}
/>
</FlexWrapper>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 제목
</Typography>
<TextInput
placeholder="안건 제목을 입력해주세요"
value={agendaContent.title}
handleChange={(title: string) =>
onChange({
...agendaContent,
title,
})
}
/>
</FlexWrapper>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 내용
</Typography>
<TextEditor
value={agendaContent.content}
onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
onChange({
...agendaContent,
content: event.target.value,
});
}}
/>
</FlexWrapper>
<FlexWrapper gap={10} direction="row" style={{ marginLeft: "auto" }}>
<Button onClick={onDelete}>삭제</Button>
<Button onClick={onSave}>저장</Button>
</FlexWrapper>
</Card>
);
}: AgendaEditorProps) => {
const [currentAgenda, setCurrentAgenda] = useState(agendaContent);

return (
<Card outline gap={32}>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 종류
</Typography>
<Select
items={(
Object.values(AgendaTypeEnum).filter(
value => typeof value === "number",
) as Array<AgendaTypeEnum>
).map((value: AgendaTypeEnum) => ({
label: AgendaTypeName[value],
value,
}))}
value={currentAgenda.type}
onChange={(value: AgendaTypeEnum) => {
setCurrentAgenda({ ...currentAgenda, type: value });
}}
/>
</FlexWrapper>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 제목
</Typography>
<TextInput
placeholder="안건 제목을 입력해주세요"
value={currentAgenda.title}
handleChange={(title: string) => {
setCurrentAgenda({ ...currentAgenda, title });
}}
/>
</FlexWrapper>
<FlexWrapper gap={4} direction="column">
<Typography fs={16} lh={20} fw="MEDIUM">
안건 내용
</Typography>
<Markdown
placeholder="안건 내용을 입력해주세요"
initialValue={currentAgenda.content}
onChange={(content: string) => {
setCurrentAgenda({ ...currentAgenda, content });
}}
/>
</FlexWrapper>
<FlexWrapper gap={10} direction="row" style={{ marginLeft: "auto" }}>
<Button onClick={onCancel}>취소</Button>
<Button onClick={() => onSave(currentAgenda)}>저장</Button>
</FlexWrapper>
</Card>
);
};

export default AgendaEditor;