@pantoia/ui 0.16.3 → 0.17.0

package/date-picker/index.tsx

@@ -23,6 +23,11 @@ export const pickerShell = tv({
       + ' read-only:text-fg disabled:cursor-not-allowed',
     text: 'min-w-0 truncate tabular-nums',
     icon: 'text-fg-subtle size-4 shrink-0',
+    root: 'relative flex min-w-0',
+    spacer: 'ms-auto size-5 shrink-0',
+    clear: 'text-fg-subtle absolute top-1/2 right-8 grid size-5 -translate-y-1/2 place-items-center rounded-full'
+      + ' transition-state press-shrink hover:text-fg'
+      + ' focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-line-focus-ring',
   },
 
   variants: {
@@ -251,6 +256,10 @@ export interface PickerTriggerProps {
   'aria-invalid'?: boolean
 }
 
+export type PickerClearProps =
+  | { clearable?: false, clearLabel?: never, onValueChange?: (value: string) => void }
+  | { clearable: true, clearLabel?: string, onValueChange?: (value: string | null) => void }
+
 export type PickerShellProps = PickerTriggerProps & {
   value: string | null
   text: ReactNode
@@ -258,13 +267,18 @@ export type PickerShellProps = PickerTriggerProps & {
   title: string
   open: boolean
   onOpenChange: (open: boolean) => void
+  clearable?: boolean
+  clearLabel?: string
+  onClear?: () => void
   children: ReactNode
 }
 
-export function PickerShell({ title, open, onOpenChange, children, value, text, placeholder, id, disabled, surface = 'bare', size, className, ...aria }: PickerShellProps) {
+export function PickerShell({ title, open, onOpenChange, clearable = false, clearLabel = '지우기', onClear, children, value, text, placeholder, id, disabled, surface = 'bare', size, className, ...aria }: PickerShellProps) {
   const wide = useSyncExternalStore(subscribe, () => media()?.matches ?? false, () => false)
   const popup = useRef<HTMLDivElement>(null)
+  const root = useRef<HTMLSpanElement>(null)
   const ui = pickerShell({ surface, empty: value === null })
+  const showClear = clearable && value !== null && !disabled
 
   const trigger = (onClick?: () => void) => (
     <FieldPrimitive.Control
@@ -286,6 +300,7 @@ export function PickerShell({ title, open, onOpenChange, children, value, text,
             className={input({ surface, size, className: ui.trigger({ className }) })}
           >
             <span className={ui.text()}>{value === null ? placeholder : text}</span>
+            {showClear ? <span aria-hidden="true" className={ui.spacer()} /> : null}
             <svg className={ui.icon()} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
               <path d="m6 9 6 6 6-6" />
             </svg>
@@ -295,10 +310,38 @@ export function PickerShell({ title, open, onOpenChange, children, value, text,
     />
   )
 
+  const withClear = (node: ReactNode) => {
+    if (!clearable) return node
+
+    return (
+      <span ref={root} className={ui.root()}>
+        {node}
+        {showClear
+          ? (
+              <button
+                type="button"
+                aria-label={clearLabel}
+                className={ui.clear()}
+                onClick={() => {
+                  onClear?.()
+                  root.current?.querySelector('button')?.focus()
+                }}
+              >
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" aria-hidden="true" className="size-4">
+                  <path d="M18 6 6 18" />
+                  <path d="m6 6 12 12" />
+                </svg>
+              </button>
+            )
+          : null}
+      </span>
+    )
+  }
+
   if (!wide) {
     return (
       <>
-        {trigger(() => onOpenChange(true))}
+        {withClear(trigger(() => onOpenChange(true)))}
         <BottomSheet open={open} onOpenChange={next => onOpenChange(next)}>
           <BottomSheetContent initialFocus={false}>
             <BottomSheetHeader closable>
@@ -313,7 +356,7 @@ export function PickerShell({ title, open, onOpenChange, children, value, text,
 
   return (
     <Popover open={open} onOpenChange={next => onOpenChange(next)}>
-      <PopoverTrigger render={trigger()} />
+      {withClear(<PopoverTrigger render={trigger()} />)}
       <PopoverContent
         ref={popup}
         aria-label={title}
@@ -328,10 +371,9 @@ export function PickerShell({ title, open, onOpenChange, children, value, text,
   )
 }
 
-export type DatePickerProps = PickerTriggerProps & {
+export type DatePickerProps = PickerTriggerProps & PickerClearProps & {
   value?: string | null
   defaultValue?: string | null
-  onValueChange?: (value: string) => void
   min?: string
   max?: string
   today?: string
@@ -344,6 +386,8 @@ export function DatePicker({
   value,
   defaultValue = null,
   onValueChange,
+  clearable,
+  clearLabel,
   min,
   max,
   today,
@@ -355,9 +399,24 @@ export function DatePicker({
   const [open, setOpen] = useState(false)
   const [inner, setInner] = useState<string | null>(defaultValue)
   const current = value === undefined ? inner : value
+  const change = onValueChange as ((next: string | null) => void) | undefined
 
   return (
-    <PickerShell {...trigger} title={title} value={current} text={current === null ? null : format(current)} placeholder={placeholder} open={open} onOpenChange={setOpen}>
+    <PickerShell
+      {...trigger}
+      title={title}
+      value={current}
+      text={current === null ? null : format(current)}
+      placeholder={placeholder}
+      open={open}
+      onOpenChange={setOpen}
+      clearable={clearable}
+      clearLabel={clearLabel}
+      onClear={() => {
+        change?.(null)
+        if (value === undefined) setInner(null)
+      }}
+    >
       <Calendar
         value={current}
         min={min}
@@ -367,7 +426,7 @@ export function DatePicker({
           setOpen(false)
           if (next === current) return
 
-          onValueChange?.(next)
+          change?.(next)
           if (value === undefined) setInner(next)
         }}
       />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pantoia/ui",
-  "version": "0.16.3",
+  "version": "0.17.0",
   "description": "Pantoia Design System",
   "homepage": "https://design.pantoia.com",
   "repository": {

package/skills/pantoia-design/SKILL.md

@@ -228,6 +228,7 @@ Dialog, AlertDialog, Drawer, BottomSheet의 Footer는 layout으로 버튼을 배
 Modal은 기준 폭(기본 xs, 480px)보다 넓으면 Dialog, 좁으면 BottomSheet로 연다.
 
 DatePicker는 `YYYY-MM-DD`, TimePicker는 `HH:mm` 글자 값을 쓴다. 48rem보다 넓으면 Popover, 좁으면 BottomSheet로 연다. 폭은 wrapper로 정한다.
+DatePicker와 TimePicker는 기본으로 값을 비울 수 없다. 비울 수 있어야 하면 `clearable`을 켠다. 값이 있을 때 지우기 버튼이 보이고, 누르면 `onValueChange`가 `null`을 받는다. 버튼 이름은 `clearLabel`로 바꾼다.
 
 Input, Textarea, NumberField, Select, ComboboxAnchor, DatePicker, TimePicker의 surface는 폼에서는 bare나 well을 쓰고, 표 셀, 헤더, 문장 안에서 값을 바로 고칠 때는 ghost를 쓴다.
 

package/time-picker/index.tsx

@@ -2,7 +2,7 @@
 
 import { useState, type KeyboardEvent } from 'react'
 
-import { PickerShell, type PickerTriggerProps } from '../date-picker'
+import { type PickerClearProps, PickerShell, type PickerTriggerProps } from '../date-picker'
 import { tv } from '../tv'
 
 const DEFAULT_HOUR = 9
@@ -89,10 +89,9 @@ function Column({ label, items, anchor, picked, focusFirst, onPick }: ColumnProp
   )
 }
 
-export type TimePickerProps = PickerTriggerProps & {
+export type TimePickerProps = PickerTriggerProps & PickerClearProps & {
   value?: string | null
   defaultValue?: string | null
-  onValueChange?: (value: string) => void
   step?: number
   title?: string
   placeholder?: string
@@ -102,6 +101,8 @@ export function TimePicker({
   value,
   defaultValue = null,
   onValueChange,
+  clearable,
+  clearLabel,
   step = 1,
   title = '시각 선택',
   placeholder = '시각을 선택하세요',
@@ -114,10 +115,12 @@ export function TimePicker({
   const { hour, minute } = partsOf(current)
   const minutes = Array.from({ length: Math.ceil(60 / step) }, (_, index) => index * step)
 
+  const change = onValueChange as ((next: string | null) => void) | undefined
+
   const set = (nextHour: number, nextMinute: number) => {
     const next = `${pad(nextHour)}:${pad(nextMinute)}`
 
-    onValueChange?.(next)
+    change?.(next)
     if (value === undefined) setInner(next)
   }
 
@@ -127,7 +130,21 @@ export function TimePicker({
   }
 
   return (
-    <PickerShell {...trigger} title={title} value={current} text={current === null ? null : clockText(current)} placeholder={placeholder} open={open} onOpenChange={setOpen}>
+    <PickerShell
+      {...trigger}
+      title={title}
+      value={current}
+      text={current === null ? null : clockText(current)}
+      placeholder={placeholder}
+      open={open}
+      onOpenChange={setOpen}
+      clearable={clearable}
+      clearLabel={clearLabel}
+      onClear={() => {
+        change?.(null)
+        if (value === undefined) setInner(null)
+      }}
+    >
       <div className={timePicker().root()}>
         <Column
           label="오전 오후"