From d9398c5675404ffa4325a8b4c289189f9953c42a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 10 Aug 2026 10:05:10 +0900 Subject: [PATCH 1/7] =?UTF-8?q?260810=5F01=5FENH:=20sid=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EB=B3=B5=EB=B6=99,=20=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EB=B0=B0=EC=A0=95=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=20=EC=84=A0=ED=83=9D=EC=8B=9C=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EC=9E=90=EB=8F=99=EC=A0=81=EC=9A=A9,=20pw=20?= =?UTF-8?q?=EC=A0=9C=ED=95=9C,=20timepicker=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/assign/list/page.tsx | 11 +- src/components/assign/AssignTargetList.tsx | 8 +- src/components/common/KriDateTimePicker.tsx | 126 ++++++++++-------- src/components/common/KriPassword.tsx | 17 +-- src/components/common/KriTimePicker.tsx | 117 ++++++++++------ .../list-contact/ListContactEventPanel.tsx | 2 +- src/components/list/ListSearchTable.tsx | 16 ++- src/const/validationConst.ts | 3 +- 8 files changed, 181 insertions(+), 119 deletions(-) diff --git a/src/app/(pages)/(main)/assign/list/page.tsx b/src/app/(pages)/(main)/assign/list/page.tsx index 8e59f40..043e8cb 100644 --- a/src/app/(pages)/(main)/assign/list/page.tsx +++ b/src/app/(pages)/(main)/assign/list/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { useEffect, useMemo, useState } from 'react' +import { useMemo, useState } from 'react' import { useMounted } from '@kri/common/hooks' import { LoadingOverlayAdapter } from '@/components/app-shell/LoadingOverlayAdapter' import { useAuth } from '@/hooks/useAuth' @@ -19,9 +19,9 @@ import { createEmptyListFilter, type ListFilter, type ListHeaderAssignType, type import type { ResultCode } from '@/types/project' const ASSIGN_TAB_TYPES: ListHeaderAssignType[] = [ - ListHeaderAssignConst.OUTSOURCE, ListHeaderAssignConst.CONTACT_INTERVIEWER, ListHeaderAssignConst.FIELD_INTERVIEWER, + ListHeaderAssignConst.OUTSOURCE, ] const ASSIGNED_SENTINEL = '__ASSIGNED__' @@ -37,7 +37,7 @@ const ListAssignPage = () => { const enabled = mounted && prjctIdx > 0 const userRole = auth?.user?.userRole ?? 0 - const [assignType, setAssignType] = useState(ListHeaderAssignConst.OUTSOURCE) + const [assignType, setAssignType] = useState(ListHeaderAssignConst.CONTACT_INTERVIEWER) const [selectedAssignId, setSelectedAssignId] = useState(undefined) const [assignFilterIds, setAssignFilterIds] = useState([]) const [transferResve, setTransferResve] = useState(false) @@ -60,11 +60,6 @@ const ListAssignPage = () => { setSelectedAssignId(undefined) } - // 좌측 테이블 선택값이 바뀌면 결과 필터 multiselect도 그 값으로 맞춘다. - useEffect(() => { - setAssignFilterIds(selectedAssignId ? [selectedAssignId] : []) - }, [selectedAssignId]) - // "배정됨"/"배정되지 않음"은 실제 대상 선택과 동시에 선택될 수 없다: 새로 클릭된 쪽만 남긴다. const handleAssignFilterChange = (next: string[]) => { const addedSentinel = next.find((value) => isAssignFilterSentinel(value) && !assignFilterIds.includes(value)) diff --git a/src/components/assign/AssignTargetList.tsx b/src/components/assign/AssignTargetList.tsx index bf590e1..9e7d5b6 100644 --- a/src/components/assign/AssignTargetList.tsx +++ b/src/components/assign/AssignTargetList.tsx @@ -61,7 +61,13 @@ export function useAssignTargetRows({ prjctIdx, enabled, assignType }: UseAssign ]) } -export function AssignTargetList({ prjctIdx, enabled, assignType, selectedId, onSelect }: AssignTargetListProps) { +export function AssignTargetList({ + prjctIdx, + enabled, + assignType, + selectedId, + onSelect +}: AssignTargetListProps) { const rows = useAssignTargetRows({ prjctIdx, enabled, assignType }) return ( diff --git a/src/components/common/KriDateTimePicker.tsx b/src/components/common/KriDateTimePicker.tsx index 5d04f08..07fb8ba 100644 --- a/src/components/common/KriDateTimePicker.tsx +++ b/src/components/common/KriDateTimePicker.tsx @@ -17,6 +17,11 @@ export type KriDateTimePickerProps = { contentClassName?: string disabled?: boolean modalPopover?: boolean + startHour?: number + endHour?: number + minuteStep?: number + hourLabel?: string + minuteLabel?: string } const parseDateTime = (value: string): { date: Date | undefined; time: string } => { @@ -59,15 +64,20 @@ const toDisplayText = (date: Date | undefined, time: string, placeholder: string } export function KriDateTimePicker({ - value, - onChange, - placeholder = '날짜/시간 선택', - className, - triggerClassName, - contentClassName, - disabled = false, - modalPopover = true, - }: KriDateTimePickerProps) { + value, + onChange, + placeholder = '날짜/시간 선택', + className, + triggerClassName, + contentClassName, + disabled = false, + modalPopover = true, + startHour, + endHour, + minuteStep, + hourLabel, + minuteLabel, +}: KriDateTimePickerProps) { const [open, setOpen] = React.useState(false) const { date, time } = parseDateTime(value) const hasValue = date !== undefined @@ -83,53 +93,59 @@ export function KriDateTimePicker({ } return ( -
- - - - - -
- - -
-
-
+
+ + + + + +
+ + +
+
+
- {hasValue && !disabled ? ( - - ) : null} -
+ {hasValue && !disabled ? ( + + ) : null} +
) } diff --git a/src/components/common/KriPassword.tsx b/src/components/common/KriPassword.tsx index bb08188..5b9182d 100644 --- a/src/components/common/KriPassword.tsx +++ b/src/components/common/KriPassword.tsx @@ -9,10 +9,10 @@ import { cn } from '@/lib/utils' import { KRI_PW_REGEX, ONLY_ALLOWED_PW_REGEX } from '@/const/validationConst' const requirements = [ - { test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' }, - { test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' }, - { test: (value: string) => value.length >= 8 && value.length <= 20, text: '8~20자' }, - { test: (value: string) => !value || ONLY_ALLOWED_PW_REGEX.test(value), text: '허용 문자만 사용' }, + //{ test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' }, + //{ test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' }, + //{ test: (value: string) => value.length >= 1 && value.length <= 20, text: '1~20자' }, + { test: (value: string) => !value || KRI_PW_REGEX.test(value), text: '영문, 숫자, 허용된 특수문자를 사용하여 1~20자로 입력해야 합니다.' }, ] export type KriPasswordRef = { @@ -55,12 +55,13 @@ export const KriPassword = forwardRef(function const score = checks.filter((item) => item.met).length const statusText = useMemo(() => { - if (!value) return '비밀번호를 입력하세요' - if (!hasOnlyAllowedChars) return '허용되지 않는 문자가 포함되어 있어요' - return isValid ? '사용 가능한 비밀번호입니다' : '영문과 숫자를 포함한 8~20자로 입력하세요' + if (!value) return '비밀번호를 입력하세요.' + if (!hasOnlyAllowedChars) return '허용되지 않는 문자가 포함되어 있습니다.' + return isValid ? '사용 가능한 비밀번호입니다' : '영문, 숫자, 허용된 특수문자를 사용하여 1~20자로 입력해야 합니다.' }, [hasOnlyAllowedChars, isValid, value]) - const barClass = score <= 1 ? 'bg-destructive' : score === 2 ? 'bg-orange-500' : score === 3 ? 'bg-yellow-400' : 'bg-green-500' + //const barClass = score <= 1 ? 'bg-destructive' : score === 2 ? 'bg-orange-500' : score === 3 ? 'bg-yellow-400' : 'bg-green-500' + const barClass = 'bg-green-500' return (
diff --git a/src/components/common/KriTimePicker.tsx b/src/components/common/KriTimePicker.tsx index 67d1e13..d73ca67 100644 --- a/src/components/common/KriTimePicker.tsx +++ b/src/components/common/KriTimePicker.tsx @@ -9,6 +9,10 @@ export type KriTimePickerProps = { onChange: (value: string) => void disabled?: boolean minuteStep?: number + startHour?: number + endHour?: number + hourLabel?: string + minuteLabel?: string className?: string } @@ -27,72 +31,97 @@ const formatTime = (hour: number, minute: number) => { return `${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}` } +const normalizeHour = (hour: number, fallback: number) => { + return Number.isFinite(hour) ? Math.min(23, Math.max(0, Math.trunc(hour))) : fallback +} + export function KriTimePicker({ - value, - onChange, - disabled = false, - minuteStep = 5, - className, - }: KriTimePickerProps) { + value, + onChange, + disabled = false, + minuteStep = 5, + startHour = 0, + endHour = 23, + hourLabel = '시', + minuteLabel = '분', + className, +}: KriTimePickerProps) { const { hour: selectedHour, minute: selectedMinute } = parseTime(value) const normalizedMinuteStep = Number.isFinite(minuteStep) && minuteStep > 0 - ? Math.min(Math.floor(minuteStep), 60) - : 5 - const hours = Array.from({ length: 24 }, (_, index) => index) + ? Math.min(Math.floor(minuteStep), 60) + : 5 + + const clampedStartHour = normalizeHour(startHour, 0) + const clampedEndHour = normalizeHour(endHour, 23) + // startHour > endHour로 잘못 지정된 경우, 두 값을 뒤바꿔 유효한 범위로 되돌린다. + const [normalizedStartHour, normalizedEndHour] = clampedStartHour > clampedEndHour + ? [clampedEndHour, clampedStartHour] + : [clampedStartHour, clampedEndHour] + + const hours = Array.from( + { length: normalizedEndHour - normalizedStartHour + 1 }, + (_, index) => normalizedStartHour + index, + ) const minutes = Array.from( - { length: Math.ceil(60 / normalizedMinuteStep) }, - (_, index) => index * normalizedMinuteStep, + { length: Math.ceil(60 / normalizedMinuteStep) }, + (_, index) => index * normalizedMinuteStep, ).filter((minute) => minute < 60) const handleTimeChange = (type: 'hour' | 'minute', nextValue: number) => { if (disabled) return - const nextHour = type === 'hour' ? nextValue : selectedHour ?? 0 + const nextHour = type === 'hour' ? nextValue : selectedHour ?? normalizedStartHour const nextMinute = type === 'minute' ? nextValue : selectedMinute ?? 0 onChange(formatTime(nextHour, nextMinute)) } return ( -
- +
+
+
{hourLabel}
+
{hours.map((hour) => ( - - ))} -
- -
- - -
- {minutes.map((minute) => ( - + ))}
+ +
+
{minuteLabel}
+ +
+ {minutes.map((minute) => ( + + ))} +
+ +
+
+
) } diff --git a/src/components/list-contact/ListContactEventPanel.tsx b/src/components/list-contact/ListContactEventPanel.tsx index 3d18bb3..e32d6a7 100644 --- a/src/components/list-contact/ListContactEventPanel.tsx +++ b/src/components/list-contact/ListContactEventPanel.tsx @@ -375,7 +375,7 @@ const ListContactEventPanel = ({ {useFF && .map((item) => item.trim()) .filter((item) => item.length > 0) +const deduplicateSidInput = (value: string) => [...new Set(toSidSet(value))].join(',') + const sanitizeSidInput = (value: string) => { let result = '' let lastChar: 'digit' | 'comma' | 'tilde' | null = null @@ -485,6 +487,17 @@ export function ListSearchTable({ setPagination((prev) => ({ ...prev, pageIndex: 0 })) } + const handleSidPaste = (e: ClipboardEvent) => { + const pastedText = e.clipboardData.getData('text') + const normalizedText = pastedText.replace(/\t|\r\n|\r|\n/g, ',') + + e.preventDefault() + const selectionStart = e.currentTarget.selectionStart ?? searchText.length + const selectionEnd = e.currentTarget.selectionEnd ?? selectionStart + const nextValue = `${searchText.slice(0, selectionStart)}${normalizedText}${searchText.slice(selectionEnd)}` + setSearchText(deduplicateSidInput(sanitizeSidInput(nextValue))) + } + const handleFilterConfirm = async (rows: FilterRow[]) => { setFilterRows(rows) setPagination((prev) => ({ ...prev, pageIndex: 0 })) @@ -565,6 +578,7 @@ export function ListSearchTable({ className="h-9 bg-white flex-1 min-w-0 max-w-xs" value={searchText} onChange={(e) => setSearchText(sanitizeSidInput(e.target.value))} + onPaste={handleSidPaste} />
,.?/]+$/ // 영문 1개 이상 + 숫자 1개 이상 포함, 8~20자, 허용된 문자만 사용 -export const KRI_PW_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]{8,20}$/ +//export const KRI_PW_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]{1,20}$/ +export const KRI_PW_REGEX = /^[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]{1,20}$/ -- 2.49.0.windows.1 From 10ace4fe53fcd3bf0b9954fa748ec0d6ffe5415a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 10 Aug 2026 11:32:25 +0900 Subject: [PATCH 2/7] docs: refresh UI registry contract --- AGENTS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AGENTS.md b/AGENTS.md index 8c9f904..caab611 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -270,6 +270,7 @@ When implementing or changing frontend UI, use this order: ### Installation and Ownership - Inspect the registry item and its dependencies before installation. Use the shadcn CLI with the approved registry endpoint under `https://ui-registry.kric.com/r/` instead of copying files from `dist/r` manually. +- `kri-data-table` uses the TanStack Table v8 API. Keep `@tanstack/react-table` within the supported `^8.21.3` range and do not upgrade it to v9 until KriUiRegistry provides an explicitly migrated component contract. - Respect the consumer project's component aliases, target paths, package manager, styling system, React version, and existing design tokens. - The shadcn workflow copies component source into the consumer repository. After installation, treat that copy as project-owned code; do not assume registry updates propagate automatically. - Do not overwrite an existing project component without reviewing the diff and confirming that local behavior and accessibility are preserved. -- 2.49.0.windows.1 From aad991b16ba5647f65cdb1ebcbb04430226dab09 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 10 Aug 2026 11:53:33 +0900 Subject: [PATCH 3/7] =?UTF-8?q?260810=5F02=5FENH:=20=EC=A7=81=EC=9B=90?= =?UTF-8?q?=EB=A7=8C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=B3=B4=EC=9D=B4=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/page.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index 3a93d9d..efc9718 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -26,7 +26,8 @@ import {useRouter} from "next/navigation"; import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery} from "@/query/project"; import {useGroupCodeListQuery} from "@/query/intranet"; import {PROJECT_STATUS_LABEL} from "@/const/projectConst"; -import {isManager} from "@/utils/userRole"; +import {isInternalManager, isManager} from "@/utils/userRole"; +import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst"; const MainPage = () => { const router = useRouter(); @@ -41,7 +42,6 @@ const MainPage = () => { const [sorting, setSorting] = useState([]); const [query, setQuery] = useState(); - const statusArray: MultiSelectOption[] = useMemo(() => { return (Object.values(ProjectStatus).filter((v) => typeof v === "number") as number[]) .sort((a, b) => a - b) @@ -103,6 +103,7 @@ const MainPage = () => { const columns = getProjectColumns(users, groupCodeLabelMap); const userId = auth.user?.userId ?? ""; const userRole = auth.user?.userRole; + const isInternal = isInternalManager(userRole); const handleSearchClick = () => { const searchStatusCode:ProjectStatus[] = searchStatus @@ -211,11 +212,13 @@ const MainPage = () => { 검색
- + > + 프로젝트 등록 + + )}
-- 2.49.0.windows.1 From ef748142f8cb22ee53ae3e4d9ecb4ddd1355db7a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 10 Aug 2026 11:54:41 +0900 Subject: [PATCH 4/7] =?UTF-8?q?260810=5F03=5FENH:=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=97=90=20=ED=8F=B0=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 42 +++++++++++++++++++ package.json | 1 + .../kri-editor/KriEditorHtmlOnly.tsx | 5 ++- .../kri-editor/KriEditorWysiwyg.tsx | 24 ++++++++++- src/components/kri-editor/index.ts | 2 + src/components/kri-editor/toolbar/Toolbar.tsx | 22 +++++++++- src/components/kri-editor/types.ts | 9 +++- .../kri-editor/utils/emptyParagraph.ts | 4 +- .../kri-editor/utils/fontFamilyOptions.ts | 29 +++++++++++++ .../kri-editor/utils/sanitizeHtml.ts | 25 +++++++---- 10 files changed, 149 insertions(+), 14 deletions(-) create mode 100644 src/components/kri-editor/utils/fontFamilyOptions.ts diff --git a/package-lock.json b/package-lock.json index 13f6efa..5386a39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", + "@tiptap/extension-font-family": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", "@tiptap/extension-image": "^3.13.0", "@tiptap/extension-link": "^3.13.0", @@ -113,6 +114,7 @@ "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", @@ -280,6 +282,7 @@ "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", @@ -345,6 +348,7 @@ "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", @@ -557,6 +561,7 @@ "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" @@ -3122,6 +3127,7 @@ "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" }, @@ -3168,6 +3174,7 @@ "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" @@ -3305,6 +3312,19 @@ "@tiptap/pm": "^3.12.0" } }, + "node_modules/@tiptap/extension-font-family": { + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-font-family/-/extension-font-family-3.13.0.tgz", + "integrity": "sha512-ZJ+P7qYK4dIRjncRibeYT1HI2P/blUe8/CWcmKJmp1e1DE9m6Q+jdllehNCr7a30yZzFxn9yJPJPDmHi5D3c0w==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/extension-text-style": "^3.13.0" + } + }, "node_modules/@tiptap/extension-gapcursor": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.12.0.tgz", @@ -3410,6 +3430,7 @@ "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" @@ -3495,6 +3516,7 @@ "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" @@ -3568,6 +3590,7 @@ "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" @@ -3592,6 +3615,7 @@ "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" @@ -3605,6 +3629,7 @@ "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", @@ -3761,6 +3786,7 @@ "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" } @@ -3769,6 +3795,7 @@ "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" } @@ -3828,6 +3855,7 @@ "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", @@ -4340,6 +4368,7 @@ "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" }, @@ -4635,6 +4664,7 @@ "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" } @@ -4700,6 +4730,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.10.42", "caniuse-lite": "^1.0.30001803", @@ -5407,6 +5438,7 @@ "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", @@ -5584,6 +5616,7 @@ "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", @@ -6744,6 +6777,7 @@ "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" }, @@ -7870,6 +7904,7 @@ "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" } @@ -7896,6 +7931,7 @@ "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", @@ -7940,6 +7976,7 @@ "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", @@ -8081,6 +8118,7 @@ "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" } @@ -8115,6 +8153,7 @@ "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" }, @@ -8924,6 +8963,7 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -9084,6 +9124,7 @@ "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" @@ -9559,6 +9600,7 @@ "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 886050e..64bfdad 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", + "@tiptap/extension-font-family": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", "@tiptap/extension-image": "^3.13.0", "@tiptap/extension-link": "^3.13.0", diff --git a/src/components/kri-editor/KriEditorHtmlOnly.tsx b/src/components/kri-editor/KriEditorHtmlOnly.tsx index 254e38b..ff59ea6 100644 --- a/src/components/kri-editor/KriEditorHtmlOnly.tsx +++ b/src/components/kri-editor/KriEditorHtmlOnly.tsx @@ -122,7 +122,10 @@ export function KriEditorHtmlOnly({ } } - const previewHtml = React.useMemo(() => sanitizeHtmlForPreview(preserveEmptyParagraphs(html)), [html]) + const previewHtml = React.useMemo( + () => sanitizeHtmlForPreview(preserveEmptyParagraphs(html)), + [html], + ) return (
diff --git a/src/components/kri-editor/KriEditorWysiwyg.tsx b/src/components/kri-editor/KriEditorWysiwyg.tsx index c5bd6ea..d266c54 100644 --- a/src/components/kri-editor/KriEditorWysiwyg.tsx +++ b/src/components/kri-editor/KriEditorWysiwyg.tsx @@ -5,6 +5,7 @@ import { EditorContent, useEditor, type Editor } from "@tiptap/react"; import StarterKit from "@tiptap/starter-kit"; import Underline from "@tiptap/extension-underline"; import { TextStyle } from "@tiptap/extension-text-style"; +import FontFamily from "@tiptap/extension-font-family"; import Color from "@tiptap/extension-color"; import Highlight from "@tiptap/extension-highlight"; import TiptapImage from "@tiptap/extension-image"; @@ -27,6 +28,7 @@ import { Div } from "./extensions/div"; import { compressImage } from "./utils/imageCompression"; import { sanitizeHtml } from "./utils/sanitizeHtml"; import { preserveEmptyParagraphs } from "./utils/emptyParagraph"; +import { DEFAULT_FONT_FAMILY_OPTIONS } from "./utils/fontFamilyOptions"; import { applyLinkPreviewClass, KRI_EDITOR_LINK_CLASS } from "./utils/linkPreview"; import { Toolbar } from "./toolbar/Toolbar"; import { useDebouncedChange } from "./hooks/useDebouncedChange"; @@ -35,9 +37,10 @@ import { useTextareaInsert } from "./hooks/useTextareaInsert"; type ViewMode = "wysiwyg" | "html"; function getToolbarState(editor: Editor): ToolbarState { - const ts = editor.getAttributes("textStyle") as { fontSize?: string | null; color?: string | null }; + const ts = editor.getAttributes("textStyle") as { fontSize?: string | null; fontFamily?: string | null; color?: string | null }; const hl = editor.getAttributes("highlight") as { color?: string | null }; + const fontFamily = (ts?.fontFamily ?? null) as string | null; const fontSize = (ts?.fontSize ?? "16px") as string; const textColor = (ts?.color ?? null) as string | null; const highlightColor = (hl?.color ?? null) as string | null; @@ -48,6 +51,7 @@ function getToolbarState(editor: Editor): ToolbarState { "left"; return { + fontFamily, fontSize, textColor, highlightColor, @@ -89,6 +93,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) { allowBase64 = false, sanitizeHtml: sanitizeHtmlOpt = true, toolbar = {}, + fontFamilyOptions = DEFAULT_FONT_FAMILY_OPTIONS, editorExtensions = [], allowedCustomHtml, transformPreviewHtml, @@ -122,6 +127,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) { const selectionRef = useRef<{ from: number; to: number } | null>(null); const [tb, setTb] = useState({ + fontFamily: null, fontSize: "16px", textColor: null, highlightColor: null, @@ -150,6 +156,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) { Underline, TextStyle, FontSize, + FontFamily, Color, Highlight.configure({ multicolor: true }), Div, @@ -276,6 +283,19 @@ export function KriEditorWysiwyg(props: KriEditorProps) { [editor, restoreSelection] ); + const setFontFamily = useCallback( + (value: string) => { + if (!editor) return; + restoreSelection(); + if (!value) { + editor.chain().focus().unsetFontFamily().run(); + return; + } + editor.chain().focus().setFontFamily(value).run(); + }, + [editor, restoreSelection] + ); + const setTextColor = useCallback( (hex: string) => { if (!editor) return; @@ -595,6 +615,8 @@ export function KriEditorWysiwyg(props: KriEditorProps) { showHtmlToggle={showHtmlToggle} isHtmlView={view === "html"} onToggleHtmlView={onToggleHtmlView} + fontFamilyOptions={fontFamilyOptions} + onSetFontFamily={setFontFamily} onSetFontSize={setFontSize} onSetTextColor={setTextColor} onUnsetTextColor={unsetTextColor} diff --git a/src/components/kri-editor/index.ts b/src/components/kri-editor/index.ts index 11bfa8f..6f684c7 100644 --- a/src/components/kri-editor/index.ts +++ b/src/components/kri-editor/index.ts @@ -3,9 +3,11 @@ export { KriEditorHtmlOnly } from './KriEditorHtmlOnly' export { KriEditorSms } from './KriEditorSms' export { KriEditorWysiwyg } from './KriEditorWysiwyg' export { ToolbarButton as KriEditorToolbarButton } from './toolbar/ToolbarButton' +export { DEFAULT_FONT_FAMILY_OPTIONS } from './utils/fontFamilyOptions' export type { KriEditorAllowedHtml, KriEditorCommand, + KriEditorFontFamilyOption, KriEditorMode, KriEditorProps, KriEditorToolbarConfig, diff --git a/src/components/kri-editor/toolbar/Toolbar.tsx b/src/components/kri-editor/toolbar/Toolbar.tsx index 0b87723..b313d5a 100644 --- a/src/components/kri-editor/toolbar/Toolbar.tsx +++ b/src/components/kri-editor/toolbar/Toolbar.tsx @@ -25,7 +25,7 @@ import { Input } from '@/components/ui/input' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { Separator } from '@/components/ui/separator' import { cn } from '@/lib/utils' -import type { KriEditorToolbarConfig, KriEditorToolbarFeature, ToolbarState } from '../types' +import type { KriEditorFontFamilyOption, KriEditorToolbarConfig, KriEditorToolbarFeature, ToolbarState } from '../types' import { ToolbarButton } from './ToolbarButton' interface ToolbarProps { @@ -38,6 +38,8 @@ interface ToolbarProps { showHtmlToggle: boolean isHtmlView: boolean onToggleHtmlView: () => void + fontFamilyOptions: KriEditorFontFamilyOption[] + onSetFontFamily: (value: string) => void onSetFontSize: (value: string) => void onSetTextColor: (value: string) => void onUnsetTextColor: () => void @@ -74,6 +76,8 @@ export function Toolbar({ showHtmlToggle, isHtmlView, onToggleHtmlView, + fontFamilyOptions, + onSetFontFamily, onSetFontSize, onSetTextColor, onUnsetTextColor, @@ -89,6 +93,7 @@ export function Toolbar({ customContent, }: ToolbarProps) { const enabled = (feature: KriEditorToolbarFeature) => config?.[feature] !== false + const showFontControls = enabled('fontFamily') || enabled('fontSize') const showTextStyle = enabled('bold') || enabled('italic') || enabled('underline') || enabled('strike') const showColors = enabled('textColor') || enabled('highlight') const showLists = enabled('bulletList') || enabled('orderedList') @@ -108,6 +113,19 @@ export function Toolbar({ return (
+ {enabled('fontFamily') ? ( + + ) : null} + {enabled('fontSize') ? ( {visibleHeaders.map((header) => { @@ -180,7 +187,7 @@ const ListContactInfoPanel = ({ if (header.listHderTy === ListHeaderConst.MEMO) { return ( - +