diff --git a/package-lock.json b/package-lock.json index 5386a39..1390186 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,6 +49,7 @@ "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", + "prettier": "^3.9.6", "qrcode": "^1.5.4", "radix-ui": "^1.6.1", "react": "^19.2.1", @@ -114,7 +115,6 @@ "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", @@ -282,7 +282,6 @@ "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", @@ -348,7 +347,6 @@ "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz", "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==", "license": "MIT", - "peer": true, "dependencies": { "@dnd-kit/accessibility": "^3.1.1", "@dnd-kit/utilities": "^3.2.2", @@ -561,7 +559,6 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz", "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==", - "peer": true, "dependencies": { "@floating-ui/core": "^1.7.3", "@floating-ui/utils": "^0.2.10" @@ -3127,7 +3124,6 @@ "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.21.tgz", "integrity": "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==", "license": "MIT", - "peer": true, "dependencies": { "@tanstack/query-core": "5.90.20" }, @@ -3174,7 +3170,6 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.13.0.tgz", "integrity": "sha512-iUelgiTMgPVMpY5ZqASUpk8mC8HuR9FWKaDzK27w9oWip9tuB54Z8mePTxNcQaSPb6ErzEaC8x8egrRt7OsdGQ==", - "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -3430,7 +3425,6 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.12.0.tgz", "integrity": "sha512-RCQb3MPsTsKZZ8Wf0maMnfcICcmYEbMfWJMUNwVUJCfEv1hGiA5J7jMEJWr7z6kH2ULDHmrkhg6BYCdLrJap/w==", - "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -3516,7 +3510,6 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.13.0.tgz", "integrity": "sha512-LcH9KE4QBUJ6IPwt1Uo5iU7zatFjUUvXbctIu2fKQ9nqJ7nNSFxRhkNyporVFkTWYH7/rb0qMoF1VxSUGefG5w==", - "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -3590,7 +3583,6 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.13.0.tgz", "integrity": "sha512-M7ob3pfYNYgFPihncEp33r9477hXQgC8j3iU8BsewvPlSx2bMSy5jp2XHDXyEX8dV6flr7acH4GkXXw+DHpaPA==", - "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -3615,7 +3607,6 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.13.0.tgz", "integrity": "sha512-i7O0ptSibEtTy+2PIPsNKEvhTvMaFJg1W4Oxfnbuxvaigs7cJV9Q0lwDUcc7CPsNw2T1+44wcxg431CzTvdYoA==", - "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -3629,7 +3620,6 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.13.0.tgz", "integrity": "sha512-WKR4ucALq+lwx0WJZW17CspeTpXorbIOpvKv5mulZica6QxqfMhn8n1IXCkDws/mCoLRx4Drk5d377tIjFNsvQ==", - "peer": true, "dependencies": { "prosemirror-changeset": "^2.3.0", "prosemirror-collab": "^1.3.1", @@ -3786,7 +3776,6 @@ "version": "19.2.4", "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.4.tgz", "integrity": "sha512-tBFxBp9Nfyy5rsmefN+WXc1JeW/j2BpBHFdLZbEVfs9wn3E3NRFxwV0pJg8M1qQAexFpvz73hJXFofV0ZAu92A==", - "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -3795,7 +3784,6 @@ "version": "19.2.3", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -3855,7 +3843,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.4.tgz", "integrity": "sha512-tK3GPFWbirvNgsNKto+UmB/cRtn6TZfyw0D6IKrW55n6Vbs7KJoZtI//kpTKzE/DUmmnAFD8/Ca46s7Obs92/w==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.4", "@typescript-eslint/types": "8.46.4", @@ -4368,7 +4355,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4664,7 +4650,6 @@ "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-1.0.0.tgz", "integrity": "sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==", "devOptional": true, - "peer": true, "dependencies": { "@babel/types": "^7.26.0" } @@ -4730,7 +4715,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.10.42", "caniuse-lite": "^1.0.30001803", @@ -5438,7 +5422,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -5616,7 +5599,6 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz", "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", "dev": true, - "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.9", @@ -6777,7 +6759,6 @@ "version": "2.15.1", "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.15.1.tgz", "integrity": "sha512-yHT1HAZ3ba2Q8wgaUQ+xfBzEtcS8ie687I8XVCBinfg4bNniyqLIN+utPXWKQE93LMF5fPbQSVRZqgpcN5yd6Q==", - "peer": true, "engines": { "node": ">=12.20.0" }, @@ -7792,6 +7773,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -7904,7 +7900,6 @@ "version": "1.25.4", "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz", "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==", - "peer": true, "dependencies": { "orderedmap": "^2.0.0" } @@ -7931,7 +7926,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz", "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==", - "peer": true, "dependencies": { "prosemirror-model": "^1.0.0", "prosemirror-transform": "^1.0.0", @@ -7976,7 +7970,6 @@ "version": "1.41.4", "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.4.tgz", "integrity": "sha512-WkKgnyjNncri03Gjaz3IFWvCAE94XoiEgvtr0/r2Xw7R8/IjK3sKLSiDoCHWcsXSAinVaKlGRZDvMCsF1kbzjA==", - "peer": true, "dependencies": { "prosemirror-model": "^1.20.0", "prosemirror-state": "^1.0.0", @@ -8118,7 +8111,6 @@ "version": "19.2.1", "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz", "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -8153,7 +8145,6 @@ "version": "19.2.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz", "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -8963,7 +8954,6 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -9124,7 +9114,6 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -9600,7 +9589,6 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz", "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==", "dev": true, - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/package.json b/package.json index 64bfdad..58f0c7a 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", + "prettier": "^3.9.6", "qrcode": "^1.5.4", "radix-ui": "^1.6.1", "react": "^19.2.1", diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index efc9718..6eb6564 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -100,7 +100,6 @@ const MainPage = () => { const [searchDept, setSearchDept] = useState([]); const [searchFw, setSearchFw] = useState([]); - const columns = getProjectColumns(users, groupCodeLabelMap); const userId = auth.user?.userId ?? ""; const userRole = auth.user?.userRole; const isInternal = isInternalManager(userRole); @@ -124,9 +123,7 @@ const MainPage = () => { showDialog('projectCreateDialog'); } - const handleSubmit = async (data: ProjectCreateRequest): Promise => { - const projectInfo = await createMutation.mutateAsync(data); - + const navigateWithProject = (projectInfo: ProjectInfo, path: string) => { setSelectedProject({ prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, @@ -137,22 +134,19 @@ const MainPage = () => { ff: projectInfo.ff } as SelectedProject); - router.push("/project/info"); + router.push(path); }; - const handleClick = (projectInfo:ProjectInfo) => { - setSelectedProject({ - prjctIdx: projectInfo.prjctIdx, - prjctCd: projectInfo.prjctCd, - prjctName: projectInfo.prjctName, - itrntPrjctCd: projectInfo.itrntPrjctCd, - ownerDept: projectInfo.ownerDept, - ownerFw: projectInfo.ownerFw, - ff: projectInfo.ff - } as SelectedProject); + const handleSubmit = async (data: ProjectCreateRequest): Promise => { + const projectInfo = await createMutation.mutateAsync(data); + navigateWithProject(projectInfo, "/project/info"); + }; - router.push(`/list/manage`); - } + const handleClick = (projectInfo: ProjectInfo) => navigateWithProject(projectInfo, "/list/manage"); + + const handleNavigateToInfo = (projectInfo: ProjectInfo) => navigateWithProject(projectInfo, "/project/info"); + + const columns = getProjectColumns(users, groupCodeLabelMap, isInternal ? handleNavigateToInfo : undefined); if (!mounted || isLoading) return ; diff --git a/src/components/kri-editor/KriEditorHtmlOnly.tsx b/src/components/kri-editor/KriEditorHtmlOnly.tsx index ff59ea6..0e4c845 100644 --- a/src/components/kri-editor/KriEditorHtmlOnly.tsx +++ b/src/components/kri-editor/KriEditorHtmlOnly.tsx @@ -9,6 +9,7 @@ import { compressImage } from './utils/imageCompression' import { useDebouncedChange } from './hooks/useDebouncedChange' import { sanitizeHtmlForPreview } from './utils/sanitizeHtml' import { preserveEmptyParagraphs } from './utils/emptyParagraph' +import { formatHtmlSource } from './utils/formatHtml' import { useTextareaInsert } from './hooks/useTextareaInsert' type HtmlOnlyProps = Omit & { mode: 'html' } @@ -47,12 +48,31 @@ export function KriEditorHtmlOnly({ else scheduleChange(next) }, [flushChange, scheduleChange]) + // 사용자가 타이핑한 값이 아니라 외부에서 새로 세팅된 데이터일 때만(최초 마운트 포함) + // prettier로 포맷팅해서 반영한다 — 편집 중(commitHtml 경로)에는 절대 재포맷하지 않는다. + const applyExternalValue = React.useCallback((next: string) => { + setHtml(next) + latestHtmlRef.current = next + formatHtmlSource(next) + .then((formatted) => { + if (latestHtmlRef.current !== next) return // 그 사이 값이 또 바뀌었으면 건너뜀 + setHtml(formatted) + latestHtmlRef.current = formatted + }) + .catch(() => {}) + }, []) + + React.useEffect(() => { + applyExternalValue(value || '') + // 최초 마운트 시 1회만 실행 — 이후 value 변경은 아래 effect가 처리한다. + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + React.useEffect(() => { if ((value || '') !== latestHtmlRef.current) { - setHtml(value || '') - latestHtmlRef.current = value || '' + applyExternalValue(value || '') } - }, [value]) + }, [value, applyExternalValue]) React.useEffect(() => { onEditorReady?.(textareaRef.current) @@ -122,6 +142,16 @@ export function KriEditorHtmlOnly({ } } + const handleFormatHtml = React.useCallback(async () => { + try { + const formatted = await formatHtmlSource(latestHtmlRef.current) + commitHtml(formatted) + } catch (error) { + toast.error('HTML 정렬에 실패했습니다.') + console.error(error) + } + }, [commitHtml]) + const previewHtml = React.useMemo( () => sanitizeHtmlForPreview(preserveEmptyParagraphs(html)), [html], @@ -133,11 +163,16 @@ export function KriEditorHtmlOnly({
HTML 모드 - {onImageUpload ? ( - - ) : null} + {onImageUpload ? ( + + ) : null} +