260714_01_ENH: 테스트 서버에서 기동 후 중간 테스트를 위한 커밋
This commit is contained in:
@@ -18,9 +18,10 @@ import TableHeader from "@tiptap/extension-table-header";
|
||||
import TableCell from "@tiptap/extension-table-cell";
|
||||
|
||||
import { toast } from "sonner";
|
||||
import { cn } from "@kri/common/ui";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
import type { KriEditorProps, KriEditorMode, ToolbarState } from "./types";
|
||||
import type { KriEditorProps, ToolbarState } from "./types";
|
||||
import { resolveUploadUrl } from "./types";
|
||||
import { FontSize } from "./extensions/font-size";
|
||||
import { Div } from "./extensions/div";
|
||||
import { compressImage } from "./utils/imageCompression";
|
||||
@@ -31,10 +32,6 @@ import { useTextareaInsert } from "./hooks/useTextareaInsert";
|
||||
|
||||
type ViewMode = "wysiwyg" | "html";
|
||||
|
||||
function resolveMode(mode?: KriEditorMode, editorMode?: KriEditorMode): KriEditorMode {
|
||||
return mode ?? editorMode ?? "wysiwyg";
|
||||
}
|
||||
|
||||
function getToolbarState(editor: Editor): ToolbarState {
|
||||
const ts = editor.getAttributes("textStyle") as { fontSize?: string | null; color?: string | null };
|
||||
const hl = editor.getAttributes("highlight") as { color?: string | null };
|
||||
@@ -76,8 +73,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
showPreview = false,
|
||||
previewClassName,
|
||||
|
||||
mode: modeProp,
|
||||
editorMode,
|
||||
mode = "wysiwyg",
|
||||
debounceMs = 350,
|
||||
|
||||
onImageUpload,
|
||||
@@ -90,9 +86,9 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
|
||||
allowBase64 = false,
|
||||
sanitizeHtml: sanitizeHtmlOpt = true,
|
||||
toolbar = {},
|
||||
} = props;
|
||||
|
||||
const mode = resolveMode(modeProp, editorMode);
|
||||
const showHtmlToggle = mode === "both";
|
||||
|
||||
const LINK_HTML_ATTRS = {
|
||||
@@ -108,6 +104,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
|
||||
const [view, setView] = useState<ViewMode>("wysiwyg");
|
||||
const [wysiwygKey, setWysiwygKey] = useState<number>(0);
|
||||
const [previewSource, setPreviewSource] = useState(value ?? "");
|
||||
const viewRef = useRef<ViewMode>("wysiwyg");
|
||||
|
||||
useEffect(() => {
|
||||
@@ -188,7 +185,9 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
|
||||
onUpdate: ({ editor }) => {
|
||||
if (viewRef.current === "html") return;
|
||||
scheduleChange(editor.getHTML());
|
||||
const nextHtml = editor.getHTML();
|
||||
setPreviewSource(nextHtml);
|
||||
scheduleChange(nextHtml);
|
||||
},
|
||||
|
||||
editorProps: {
|
||||
@@ -225,8 +224,11 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
if (pos && linkType) {
|
||||
const $pos = view.state.doc.resolve(pos.pos);
|
||||
|
||||
const pickHref = (marks: readonly any[] | null | undefined) =>
|
||||
marks?.find(m => m.type === linkType)?.attrs?.href as string | undefined;
|
||||
const pickHref = (marks: readonly { type: unknown; attrs?: Record<string, unknown> }[] | null | undefined) => {
|
||||
const mark = marks?.find((candidate) => candidate.type === linkType);
|
||||
const value = mark?.attrs?.href;
|
||||
return typeof value === "string" ? value : undefined;
|
||||
};
|
||||
|
||||
href =
|
||||
pickHref($pos.marks()) ||
|
||||
@@ -245,7 +247,6 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
// 링크 열기 + 에디터 클릭 처리(커서 이동 등) 막기
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
console.log(LINK_HTML_ATTRS.rel.replaceAll(" ",","))
|
||||
window.open(href, LINK_HTML_ATTRS.target, LINK_HTML_ATTRS.rel.replaceAll(" ",","));
|
||||
return true;
|
||||
},
|
||||
@@ -300,40 +301,31 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
|
||||
}, [editor, restoreSelection]);
|
||||
|
||||
|
||||
const normalizeLinkUrl = (raw: string): string => {
|
||||
const trimmed = raw.trim();
|
||||
if (!trimmed) return "";
|
||||
const normalizeLinkUrl = (raw: string): string => {
|
||||
const trimmed = raw.trim();
|
||||
if (!trimmed) return "";
|
||||
|
||||
// 이미 프로토콜이 있으면 그대로 사용
|
||||
if (/^https?:\/\//i.test(trimmed) || /^mailto:/i.test(trimmed) || /^tel:/i.test(trimmed)) {
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
// 프로토콜이 없으면 https:// 를 기본으로 붙여준다.
|
||||
return `https://${trimmed}`;
|
||||
};
|
||||
|
||||
const toggleLink = useCallback(() => {
|
||||
if (!editor) return;
|
||||
restoreSelection();
|
||||
|
||||
const prev = (editor.getAttributes("link").href as string | undefined) ?? "";
|
||||
if (editor.isActive("link")) {
|
||||
if(confirm(`링크를 해제 하시겠습니까?\r\nLink: ${prev}`)){
|
||||
editor.chain().focus().unsetLink().run();
|
||||
return;
|
||||
}
|
||||
if (/^https?:\/\//i.test(trimmed) || /^mailto:/i.test(trimmed) || /^tel:/i.test(trimmed)) {
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
const url = window.prompt("링크 URL을 입력하세요", prev);
|
||||
if (url === null) return;
|
||||
return `https://${trimmed}`;
|
||||
};
|
||||
|
||||
const setLink = useCallback((url: string) => {
|
||||
if (!editor) return;
|
||||
restoreSelection();
|
||||
const normalized = normalizeLinkUrl(url);
|
||||
if (!normalized) return;
|
||||
|
||||
editor.chain().focus().extendMarkRange("link").setLink({ href: normalized }).run();
|
||||
}, [editor, restoreSelection]);
|
||||
|
||||
const unsetLink = useCallback(() => {
|
||||
if (!editor) return;
|
||||
restoreSelection();
|
||||
editor.chain().focus().extendMarkRange("link").unsetLink().run();
|
||||
}, [editor, restoreSelection]);
|
||||
|
||||
const insertTable = useCallback(() => {
|
||||
if (!editor) return;
|
||||
restoreSelection();
|
||||
@@ -403,7 +395,7 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
return;
|
||||
}
|
||||
|
||||
const { url } = await onImageUpload(compressed);
|
||||
const url = resolveUploadUrl(await onImageUpload(compressed));
|
||||
|
||||
if (!url || typeof url !== "string") {
|
||||
toast.error("이미지 업로드 응답이 올바르지 않습니다.");
|
||||
@@ -480,6 +472,7 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
}, [editor, view, props.onEditorReady]);
|
||||
|
||||
useEffect(() => {
|
||||
setPreviewSource(value ?? "");
|
||||
if (!editor) return;
|
||||
if (viewRef.current === "html") return;
|
||||
if (value == null) return;
|
||||
@@ -564,13 +557,12 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
}, [editor, props.onCommandReady, restoreSelection, flushChange, htmlTi]);
|
||||
|
||||
const previewHtml = useMemo(() => {
|
||||
const raw = optimisticHtmlRef.current || "";
|
||||
return sanitizeHtmlOpt ? sanitizeHtml(raw) : raw;
|
||||
}, [optimisticHtmlRef, sanitizeHtmlOpt]);
|
||||
return sanitizeHtmlOpt ? sanitizeHtml(previewSource) : previewSource;
|
||||
}, [previewSource, sanitizeHtmlOpt]);
|
||||
|
||||
if (!editor) {
|
||||
return (
|
||||
<div className={cn("rounded-lg border bg-white", className)}>
|
||||
<div className={cn("rounded-lg border bg-background", className)}>
|
||||
{label?.trim() ? <div className="border-b p-2 font-semibold">{label}</div> : null}
|
||||
<div className="p-3 text-sm text-muted-foreground">에디터 로딩 중…</div>
|
||||
</div>
|
||||
@@ -578,31 +570,36 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={cn("rounded-lg border bg-white", className)}>
|
||||
<div className={cn("rounded-lg border bg-background", className)}>
|
||||
{label?.trim() ? <div className="border-b p-2 font-semibold">{label}</div> : null}
|
||||
|
||||
<div className="border-b">
|
||||
<Toolbar
|
||||
editor={editor}
|
||||
state={tb}
|
||||
className="flex-nowrap"
|
||||
canImageUpload={canImageUpload}
|
||||
onPickImage={handlePickImage}
|
||||
showHtmlToggle={showHtmlToggle}
|
||||
isHtmlView={view === "html"}
|
||||
onToggleHtmlView={onToggleHtmlView}
|
||||
onSetFontSize={setFontSize}
|
||||
onSetTextColor={setTextColor}
|
||||
onUnsetTextColor={unsetTextColor}
|
||||
onSetHighlight={setHighlight}
|
||||
onUnsetHighlight={unsetHighlight}
|
||||
onToggleLink={toggleLink}
|
||||
onInsertTable={insertTable}
|
||||
onAddRow={addRow}
|
||||
onAddColumn={addColumn}
|
||||
onDeleteTable={deleteTable}
|
||||
/>
|
||||
</div>
|
||||
{toolbar !== false ? (
|
||||
<div className="border-b">
|
||||
<Toolbar
|
||||
editor={editor}
|
||||
state={tb}
|
||||
config={toolbar}
|
||||
className="flex-nowrap"
|
||||
canImageUpload={canImageUpload}
|
||||
onPickImage={handlePickImage}
|
||||
showHtmlToggle={showHtmlToggle}
|
||||
isHtmlView={view === "html"}
|
||||
onToggleHtmlView={onToggleHtmlView}
|
||||
onSetFontSize={setFontSize}
|
||||
onSetTextColor={setTextColor}
|
||||
onUnsetTextColor={unsetTextColor}
|
||||
onSetHighlight={setHighlight}
|
||||
onUnsetHighlight={unsetHighlight}
|
||||
linkUrl={(editor.getAttributes("link").href as string | undefined) ?? ""}
|
||||
onSetLink={setLink}
|
||||
onUnsetLink={unsetLink}
|
||||
onInsertTable={insertTable}
|
||||
onAddRow={addRow}
|
||||
onAddColumn={addColumn}
|
||||
onDeleteTable={deleteTable}
|
||||
/>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<input ref={fileRef} type="file" accept="image/*" className="hidden" onChange={handleFile} disabled={!canImageUpload} />
|
||||
|
||||
@@ -617,6 +614,7 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
onMouseDown={(e) => e.stopPropagation()}
|
||||
onChange={(e) => {
|
||||
htmlDraftRef.current = e.target.value;
|
||||
setPreviewSource(htmlDraftRef.current);
|
||||
scheduleChange(htmlDraftRef.current);
|
||||
}}
|
||||
onBlur={() => flushChange(htmlDraftRef.current)}
|
||||
@@ -629,7 +627,7 @@ const normalizeLinkUrl = (raw: string): string => {
|
||||
{showPreview && (
|
||||
<div className={cn("border-t p-3", previewClassName)}>
|
||||
<div className="mb-2 text-sm font-semibold">미리보기</div>
|
||||
<div className="rounded-md border bg-gray-50 p-3">
|
||||
<div className="rounded-md border bg-muted/30 p-3">
|
||||
<div dangerouslySetInnerHTML={{ __html: previewHtml }} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user