From e77fe4368a830970bc38fb5e55a5ea44f4d706c0 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 6 Jul 2026 15:22:51 +0900 Subject: [PATCH] =?UTF-8?q?260706=5F01=5FENH:=20DataTable=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20Date=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .tooling/components/ui/calendar.tsx | 27 +++ package.json | 2 +- registry/components/KriAutoComplete.tsx | 8 +- registry/components/KriDatePicker.tsx | 82 +++++++ registry/components/KriDateRangePicker.tsx | 122 +++++----- registry/components/KriDateTimePicker.tsx | 103 +++++++++ registry/components/data-table/DataTable.tsx | 218 ++++++++++-------- .../components/data-table/DataTable.type.ts | 5 +- .../data-table/DataTablePagination.tsx | 126 +++++----- .../data-table/hooks-usePreventClickOnDrag.ts | 18 +- registry/components/layout/KriHeader.tsx | 2 +- .../multi-select/MultiSelectContent.tsx | 4 +- registry/components/registry.json | 3 +- 13 files changed, 476 insertions(+), 244 deletions(-) create mode 100644 .tooling/components/ui/calendar.tsx create mode 100644 registry/components/KriDatePicker.tsx create mode 100644 registry/components/KriDateTimePicker.tsx diff --git a/.tooling/components/ui/calendar.tsx b/.tooling/components/ui/calendar.tsx new file mode 100644 index 0000000..334849a --- /dev/null +++ b/.tooling/components/ui/calendar.tsx @@ -0,0 +1,27 @@ +import type { HTMLAttributes } from "react"; +import { cn } from "@/lib/utils"; + +export type CalendarDateRange = { + from?: Date; + to?: Date; +}; + +type CalendarBaseProps = Omit, "onSelect">; + +type CalendarSingleProps = CalendarBaseProps & { + mode: "single"; + selected?: Date; + onSelect?: (date: Date | undefined) => void; +}; + +type CalendarRangeProps = CalendarBaseProps & { + mode: "range"; + selected?: CalendarDateRange; + onSelect?: (range: CalendarDateRange | undefined) => void; +}; + +export type CalendarProps = CalendarSingleProps | CalendarRangeProps; + +export function Calendar({ className, ...props }: CalendarProps) { + return
; +} diff --git a/package.json b/package.json index 09be835..949a028 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kri-ui-registry", - "version": "0.2.0", + "version": "0.3.0", "private": true, "description": "KRI internal shadcn UI registry", "scripts": { diff --git a/registry/components/KriAutoComplete.tsx b/registry/components/KriAutoComplete.tsx index 1aa4c46..3df4746 100644 --- a/registry/components/KriAutoComplete.tsx +++ b/registry/components/KriAutoComplete.tsx @@ -78,7 +78,7 @@ export function KriMultiSelect({ ) return ( -
+
options={options} defaultValue={value} @@ -96,7 +96,7 @@ export function KriMultiSelect({ onSearchValueChange={onSearchValueChange} maxCount={maxCount} hideSelectAll={hideSelectAll} - autoSize + autoSize={!widthClassName} singleLine resetOnDefaultValueChange deduplicateOptions @@ -154,7 +154,7 @@ export function KriSingleSelect({ const selectedLabel = options.find((option) => option.value === value)?.label return ( -
+
ref={ref} options={options} @@ -194,7 +194,7 @@ export function KriSingleSelect({ preventDeselect={preventDeselect} hideOptionCheck={hideOptionCheck} hideSelectAll - autoSize + autoSize={!widthClassName} singleLine closeOnSelect resetOnDefaultValueChange diff --git a/registry/components/KriDatePicker.tsx b/registry/components/KriDatePicker.tsx new file mode 100644 index 0000000..88b7455 --- /dev/null +++ b/registry/components/KriDatePicker.tsx @@ -0,0 +1,82 @@ +"use client"; + +import {CalendarIcon, X} from "lucide-react"; +import {Button} from "@/components/ui/button"; +import {Calendar} from "@/components/ui/calendar"; +import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover"; +import {cn} from "@/lib/utils"; + +const parseDate = (value: string) => { + if (!value) return undefined + + const [year, month, day] = value.split('-').map(Number) + if (!year || !month || !day) return undefined + + const date = new Date(year, month - 1, day) + if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) { + return undefined + } + + return date +} + +const formatDate = (date: Date | undefined) => { + if (!date) return '' + + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + + return `${year}-${month}-${day}` +} + +export function KriDatePicker({ + value, + onChange, + placeholder = "날짜 선택", + className, +}: { + value: string; + onChange: (value: string) => void; + placeholder?: string; + className?: string; +}) { + const selected = parseDate(value); + + return ( +
+ + + + + + onChange(date ? formatDate(date) : "")} + /> + + + {value && ( + + )} +
+ ); +} diff --git a/registry/components/KriDateRangePicker.tsx b/registry/components/KriDateRangePicker.tsx index a048996..5718bb7 100644 --- a/registry/components/KriDateRangePicker.tsx +++ b/registry/components/KriDateRangePicker.tsx @@ -1,10 +1,8 @@ 'use client' -import { useRef } from 'react' -import { CalendarDays, X } from 'lucide-react' +import { CalendarIcon, X } from 'lucide-react' import { Button } from '@/components/ui/button' -import { Input } from '@/components/ui/input' -import { Label } from '@/components/ui/label' +import { Calendar } from '@/components/ui/calendar' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { cn } from '@/lib/utils' @@ -23,6 +21,30 @@ export type KriDateRangePickerProps = { disabled?: boolean } +const parseDate = (value: string) => { + if (!value) return undefined + + const [year, month, day] = value.split('-').map(Number) + if (!year || !month || !day) return undefined + + const date = new Date(year, month - 1, day) + if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) { + return undefined + } + + return date +} + +const formatDate = (date: Date | undefined) => { + if (!date) return '' + + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + + return `${year}-${month}-${day}` +} + export function KriDateRangePicker({ value, onChange, @@ -32,7 +54,11 @@ export function KriDateRangePicker({ contentClassName, disabled = false, }: KriDateRangePickerProps) { - const toInputRef = useRef(null) + const selected = { + from: parseDate(value.from), + to: parseDate(value.to), + } + const selectedRange = selected.from || selected.to ? selected : undefined const displayText = value.from && value.to ? `${value.from} ~ ${value.to}` @@ -43,76 +69,52 @@ export function KriDateRangePicker({ : placeholder const hasValue = value.from.length > 0 || value.to.length > 0 - const invalidRange = value.from.length > 0 && value.to.length > 0 && value.from > value.to - - const focusAndOpenToDate = () => { - const input = toInputRef.current - if (!input) return - - input.focus() - const inputWithPicker = input as HTMLInputElement & { showPicker?: () => void } - inputWithPicker.showPicker?.() - if (!inputWithPicker.showPicker) { - input.click() - } - } return ( -
+
- - - -
- { - const nextFrom = e.target.value - onChange({ ...value, from: nextFrom }) - if (nextFrom) { - requestAnimationFrame(() => { - focusAndOpenToDate() - }) - } - }} - /> - ~ - onChange({ ...value, to: e.target.value })} - /> -
- - {invalidRange && ( -

조회 시작일은 종료일보다 이후일 수 없습니다.

- )} + + { + onChange({ + from: formatDate(range?.from), + to: formatDate(range?.to), + }) + }} + />
- + {hasValue && !disabled ? ( + + ) : null}
) } diff --git a/registry/components/KriDateTimePicker.tsx b/registry/components/KriDateTimePicker.tsx new file mode 100644 index 0000000..bacf888 --- /dev/null +++ b/registry/components/KriDateTimePicker.tsx @@ -0,0 +1,103 @@ +'use client' + +import { CalendarIcon, X } from 'lucide-react' +import { Button } from '@/components/ui/button' +import { Calendar } from '@/components/ui/calendar' +import { Input } from '@/components/ui/input' +import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' +import { cn } from '@/lib/utils' + +export type KriDateTimePickerProps = { + value: string + onChange: (value: string) => void + placeholder?: string + className?: string + triggerClassName?: string + contentClassName?: string + disabled?: boolean +} + +// value는 과 동일한 'yyyy-MM-ddTHH:mm' 포맷을 쓴다 +const parseDateTime = (value: string): { date: Date | undefined; time: string } => { + if (!value) return { date: undefined, time: '' } + + const [datePart, timePart = ''] = value.split('T') + const [year, month, day] = datePart.split('-').map(Number) + if (!year || !month || !day) return { date: undefined, time: timePart } + + const date = new Date(year, month - 1, day) + if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) { + return { date: undefined, time: timePart } + } + + return { date, time: timePart } +} + +const toValue = (date: Date | undefined, time: string): string => { + if (!date) return '' + + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + + return `${year}-${month}-${day}T${time || '00:00'}` +} + +export function KriDateTimePicker({ + value, + onChange, + placeholder = '날짜/시간 선택', + className, + triggerClassName, + contentClassName, + disabled = false, +}: KriDateTimePickerProps) { + const { date, time } = parseDateTime(value) + const hasValue = date !== undefined + + return ( +
+ + + + + + onChange(toValue(nextDate, time || '00:00'))} /> + + + + onChange(toValue(date, event.target.value))} + /> + + {hasValue && !disabled ? ( + + ) : null} +
+ ) +} + +export default KriDateTimePicker diff --git a/registry/components/data-table/DataTable.tsx b/registry/components/data-table/DataTable.tsx index 77aea3f..accaed0 100644 --- a/registry/components/data-table/DataTable.tsx +++ b/registry/components/data-table/DataTable.tsx @@ -1,7 +1,7 @@ 'use client' -import { useEffect, useMemo, useState } from 'react' -import type { PaginationState, Row, RowSelectionState, SortingState } from '@tanstack/react-table' +import { useCallback, useEffect, useMemo, useState } from 'react' +import type { OnChangeFn, PaginationState, Row, RowSelectionState, SortingState } from '@tanstack/react-table' import { flexRender, getCoreRowModel, getPaginationRowModel, getSortedRowModel, useReactTable } from '@tanstack/react-table' import { ArrowDown, ArrowUp, ArrowUpDown } from 'lucide-react' import { Button } from '@/components/ui/button' @@ -13,25 +13,26 @@ import { DataTablePagination } from './DataTablePagination' import { usePreventClickOnDrag } from './hooks/usePreventClickOnDrag' export function DataTable({ - columns, - data, - getRowId, - highlightRowIds, - isClient = true, - pageCount: serverPageCount, - totalCount: serverTotalCount, - onPaginationChange: onServerPaginationChange, - onSortingChange: onServerSortingChange, - selectMode = 'none', - onRowClick, - onRowSelectionChange, - defaultPageSize = 10, - pageSizeOptions = [5, 10, 25, 50], - paginationItemsToDisplay = 5, - emptyText = '데이터가 없습니다.', - className, -}: Readonly>) { - const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: defaultPageSize }) + columns, + data, + getRowId, + highlightRowIds, + isClient = true, + pageCount: serverPageCount, + totalCount: serverTotalCount, + pagination: externalPagination, + onPaginationChange: onServerPaginationChange, + onSortingChange: onServerSortingChange, + selectMode = 'none', + onRowClick, + onRowSelectionChange, + defaultPageSize = 10, + pageSizeOptions = [5, 10, 25, 50], + paginationItemsToDisplay = 5, + emptyText = '데이터가 없습니다.', + className, + }: Readonly>) { + const [internalPagination, setInternalPagination] = useState({ pageIndex: 0, pageSize: defaultPageSize }) const [sorting, setSorting] = useState([]) const [rowSelection, setRowSelection] = useState({}) const drag = usePreventClickOnDrag() @@ -43,22 +44,22 @@ export function DataTable({ const selectionColumn = { id: 'select', header: ({ table }) => selectMode === 'multi' ? ( - table.toggleAllPageRowsSelected(Boolean(value))} - aria-label="전체 선택" - /> + table.toggleAllPageRowsSelected(Boolean(value))} + aria-label="전체 선택" + /> ) : null, cell: ({ row }) => ( - { - if (selectMode === 'single') table.resetRowSelection() - row.toggleSelected(Boolean(value)) - }} - aria-label="행 선택" - onClick={(event) => event.stopPropagation()} - /> + { + if (selectMode === 'single') table.resetRowSelection() + row.toggleSelected(Boolean(value)) + }} + aria-label="행 선택" + onClick={(event) => event.stopPropagation()} + /> ), size: 28, enableSorting: false, @@ -67,6 +68,25 @@ export function DataTable({ return [selectionColumn, ...columns] }, [columns, selectMode, selectionEnabled]) + const pagination = isClient ? internalPagination : (externalPagination ?? internalPagination) + + const handlePaginationChange = useCallback>( + (updater) => { + if (isClient) { + setInternalPagination(updater) + return + } + + if (onServerPaginationChange) { + onServerPaginationChange(updater) + return + } + + setInternalPagination(updater) + }, + [isClient, onServerPaginationChange], + ) + const table = useReactTable({ data, columns: enhancedColumns, @@ -75,7 +95,7 @@ export function DataTable({ enableRowSelection: selectionEnabled, onRowSelectionChange: setRowSelection, onSortingChange: setSorting, - onPaginationChange: setPagination, + onPaginationChange: handlePaginationChange, getCoreRowModel: getCoreRowModel(), getSortedRowModel: isClient ? getSortedRowModel() : undefined, getPaginationRowModel: isClient ? getPaginationRowModel() : undefined, @@ -85,10 +105,6 @@ export function DataTable({ ...(getRowId ? { getRowId } : {}), }) - useEffect(() => { - if (!isClient) onServerPaginationChange?.(pagination) - }, [isClient, onServerPaginationChange, pagination]) - useEffect(() => { if (!isClient) onServerSortingChange?.(sorting) }, [isClient, onServerSortingChange, sorting]) @@ -115,68 +131,68 @@ export function DataTable({ const totalCount = isClient ? data.length : (serverTotalCount ?? 0) return ( -
-
- - - {table.getHeaderGroups().map((headerGroup) => ( - - {headerGroup.headers.map((header) => { - const column = header.column - const sorted = column.getIsSorted() - const content = header.isPlaceholder ? null : flexRender(column.columnDef.header, header.getContext()) +
+
+
+ + {table.getHeaderGroups().map((headerGroup) => ( + + {headerGroup.headers.map((header) => { + const column = header.column + const sorted = column.getIsSorted() + const content = header.isPlaceholder ? null : flexRender(column.columnDef.header, header.getContext()) - return ( - - {!header.isPlaceholder && column.getCanSort() ? ( - - ) : content} - - ) - })} - - ))} - - - {table.getRowModel().rows.length ? table.getRowModel().rows.map((row) => ( - handleRowClick(row))} - className={cn( - 'text-sm [&>td]:px-2 [&>td]:py-0', - selectMode !== 'none' && 'cursor-pointer', - 'data-[state=selected]:bg-muted data-[state=selected]:font-semibold', - highlightRowIds?.includes(row.id) && 'bg-emerald-50', - )} - > - {row.getVisibleCells().map((cell) => {flexRender(cell.column.columnDef.cell, cell.getContext())})} - - )) : ( - {emptyText} - )} - -
+ return ( + + {!header.isPlaceholder && column.getCanSort() ? ( + + ) : content} + + ) + })} + + ))} + + + {table.getRowModel().rows.length ? table.getRowModel().rows.map((row) => ( + handleRowClick(row))} + className={cn( + 'text-sm [&>td]:px-2 [&>td]:py-0', + selectMode !== 'none' && 'cursor-pointer', + 'data-[state=selected]:bg-muted data-[state=selected]:font-semibold', + highlightRowIds?.includes(row.id) && 'bg-emerald-50', + )} + > + {row.getVisibleCells().map((cell) => {flexRender(cell.column.columnDef.cell, cell.getContext())})} + + )) : ( + {emptyText} + )} + + +
+ +
- - -
) } diff --git a/registry/components/data-table/DataTable.type.ts b/registry/components/data-table/DataTable.type.ts index f464706..d8b6ec7 100644 --- a/registry/components/data-table/DataTable.type.ts +++ b/registry/components/data-table/DataTable.type.ts @@ -1,4 +1,4 @@ -import type { ColumnDef, PaginationState, SortingState } from '@tanstack/react-table' +import type { ColumnDef, PaginationState, SortingState, Updater } from '@tanstack/react-table' export type SelectMode = 'none' | 'click-event' | 'single' | 'multi' export type DataTableColumn = ColumnDef @@ -23,7 +23,8 @@ export interface DataTableProps { isClient?: boolean pageCount?: number totalCount?: number - onPaginationChange?: (pagination: PaginationState) => void + pagination?: PaginationState + onPaginationChange?: (updater: Updater) => void onSortingChange?: (sorting: SortingState) => void selectMode?: SelectMode onRowClick?: (row: TData) => void diff --git a/registry/components/data-table/DataTablePagination.tsx b/registry/components/data-table/DataTablePagination.tsx index a8a2834..093ca57 100644 --- a/registry/components/data-table/DataTablePagination.tsx +++ b/registry/components/data-table/DataTablePagination.tsx @@ -16,12 +16,14 @@ interface DataTablePaginationProps { } export function DataTablePagination({ - table, - isClient, - totalCount, - pageSizeOptions, - paginationItemsToDisplay, -}: DataTablePaginationProps) { + table, + isClient, + totalCount, + pageSizeOptions, + paginationItemsToDisplay, + }: DataTablePaginationProps) { + 'use no memo' + const currentPage = table.getState().pagination.pageIndex + 1 const pageCount = table.getPageCount() const { pages, showLeftEllipsis, showRightEllipsis } = usePagination({ @@ -31,66 +33,66 @@ export function DataTablePagination({ }) return ( -
-

- Page {currentPage} of{' '} - {pageCount} - {!isClient && totalCount > 0 ? ( - (총 {totalCount}건) - ) : null} -

+
+

+ Page {currentPage} of{' '} + {pageCount} + {!isClient && totalCount > 0 ? ( + (총 {totalCount}건) + ) : null} +

-
- - - - - - - - - {showLeftEllipsis ? : null} - {pages.map((page) => ( - - - ))} - {showRightEllipsis ? : null} - - - - - - - - -
+ + + + {showLeftEllipsis ? : null} + {pages.map((page) => ( + + + + ))} + {showRightEllipsis ? : null} + + + + + + + + +
-
- +
+ +
-
) } diff --git a/registry/components/data-table/hooks-usePreventClickOnDrag.ts b/registry/components/data-table/hooks-usePreventClickOnDrag.ts index 4691cc0..94b0438 100644 --- a/registry/components/data-table/hooks-usePreventClickOnDrag.ts +++ b/registry/components/data-table/hooks-usePreventClickOnDrag.ts @@ -22,15 +22,15 @@ export function usePreventClickOnDrag(thresholdPx = 6) { }, []) const wrapClick = React.useCallback( - (callback: () => void) => (event: React.MouseEvent) => { - if (state.current.dragging) { - event.preventDefault() - event.stopPropagation() - return - } - callback() - }, - [], + (callback: () => void) => (event: React.MouseEvent) => { + if (state.current.dragging) { + event.preventDefault() + event.stopPropagation() + return + } + callback() + }, + [], ) return { onPointerDown, onPointerMove, onPointerUp, onPointerCancel: onPointerUp, wrapClick } diff --git a/registry/components/layout/KriHeader.tsx b/registry/components/layout/KriHeader.tsx index 2e25a64..536f340 100644 --- a/registry/components/layout/KriHeader.tsx +++ b/registry/components/layout/KriHeader.tsx @@ -48,7 +48,7 @@ export function KriHeader({ ) : null} {logo ? ( - ) : null} diff --git a/registry/components/multi-select/MultiSelectContent.tsx b/registry/components/multi-select/MultiSelectContent.tsx index 9711896..905f117 100644 --- a/registry/components/multi-select/MultiSelectContent.tsx +++ b/registry/components/multi-select/MultiSelectContent.tsx @@ -47,7 +47,7 @@ function OptionItem({ value={`${option.label} ${option.value}`} disabled={option.disabled} onSelect={onToggle} - className="flex items-center" + className="flex items-center cursor-pointer" > {!hideOptionCheck ? ( ({ {selectionMode === 'multiple' && !hideSelectAll && selectableOptions.length > 0 ? ( <> - +