@qijenchen/design-system 0.1.0-beta.13 → 0.1.0-beta.130

package/src/components/DataTable/data-table-column-visibility-panel.tsx

@@ -10,7 +10,7 @@
  *   - Locked 欄位(`lockedIds`)— 顯 Lock icon,不可 toggle / 不可 drag
  *   - 可選 search filter(`searchable`,跨欄位 label match)
  *   - 可選 column drag reorder(`onColumnOrderChange` 傳 → 啟 DnD)
- *   - 可選 reset 按鈕(`onReset`,header 區 RotateCcw)
+ *   - 可選 reset 按鈕(`resettable: boolean` opt-in,header 區 RotateCcw;點擊 `onVisibilityChange({})` 還原全顯示,無獨立 onReset prop)
  *   - Bidirectional bulk toggle(footer button:全可見 → 全部隱藏 / 任一隱藏 → 顯示全部)
  *
  * **Why 抽 primitive**(per Issue 3 Rule-of-3):RoadmapAllInOne + WithBulkActions + 未來 product
@@ -27,8 +27,7 @@ import { Eye, EyeOff, Lock, GripVertical, Search, RotateCcw, X as XIcon } from '
 import { Button } from '@/design-system/components/Button/button'
 import { ButtonDivider } from '@/design-system/components/Button/button-group'
 import { Input } from '@/design-system/components/Input/input'
-import { ScrollArea } from '@/design-system/components/ScrollArea/scroll-area'
-import { PopoverHeader, PopoverFooter, PopoverTitle, PopoverClose } from '@/design-system/components/Popover/popover'
+import { PopoverHeader, PopoverBody, PopoverFooter, PopoverTitle, PopoverClose } from '@/design-system/components/Popover/popover'
 import { ItemPrefix, ItemLabel, ItemInlineActionButton, ROW_PADDING_BY_SIZE } from '@/design-system/patterns/element-anatomy/item-anatomy'
 import { cn } from '@/lib/utils'
 import { DndContext, closestCenter, type DragEndEvent } from '@dnd-kit/core'
@@ -43,7 +42,7 @@ interface ColumnVisibilityPanelColumn {
   label: string
 }
 
-export interface DataTableColumnVisibilityPanelProps {
+export interface DataTableColumnVisibilityPanelProps extends React.HTMLAttributes<HTMLDivElement> {
   /** 全部可 toggle 欄位(consumer 已過濾掉 system cols 如 __select__)*/
   columns: ColumnVisibilityPanelColumn[]
   /** 受控 visibility map(`true` / undefined = visible / `false` = hidden)*/
@@ -64,7 +63,7 @@ export interface DataTableColumnVisibilityPanelProps {
   // 已自帶 popover dismiss,沒 concrete consumer 需 callback。Future 若需要再加。
 }
 
-export function DataTableColumnVisibilityPanel({
+export const DataTableColumnVisibilityPanel = React.forwardRef<HTMLDivElement, DataTableColumnVisibilityPanelProps>(({
   columns,
   visibility,
   onVisibilityChange,
@@ -73,7 +72,9 @@ export function DataTableColumnVisibilityPanel({
   lockedIds = [],
   searchable = false,
   resettable = false,
-}: DataTableColumnVisibilityPanelProps) {
+  className,
+  ...props
+}, ref) => {
   const [search, setSearch] = React.useState('')
   const lockedSet = React.useMemo(() => new Set(lockedIds), [lockedIds])
   const dndEnabled = !!(columnOrder && onColumnOrderChange)
@@ -130,8 +131,19 @@ export function DataTableColumnVisibilityPanel({
     onColumnOrderChange!(next)
   }
 
+  // 2026-07-18 決策16 錯誤史(明記以免再犯):原本這個 panel 是 Fragment + fixed `ScrollArea max-h-72`,
+  //   與 sibling FilterPanel/SortManager(root-div + viewport-aware SurfaceBody)不一致。我給過**兩個都錯**
+  //   的辯護理由 —— (1)「PopoverHeader 用 -mx 負邊距、包 root 會破壞」= 錯(SurfaceHeader 用正 px-loose+border-b,
+  //   無 -mx);(2)「sibling 自刻 header 不用 primitive」= 錯(三 panel 皆消費 SurfaceHeader/PopoverHeader primitive)。
+  //   真正差異只是 body/scroll 策略。multi-agent SSOT consistency 稽核定案:**是 drift,該統一**(fixed 288px cap
+  //   在高螢幕多欄下劣於 sibling 的 viewport-adaptive;且是唯一不能當 template 複製的 panel)。故下方已改成 canonical shape。
   return (
-    <>
+    // 決策16 定案(2026-07-18,SSOT consistency 稽核後):對齊 sibling FilterPanel/SortManager 的
+    //   overlay-surface canonical shape —— root `<div flex flex-col h-full min-h-0>`(M25 viewport-aware
+    //   scroll chain)+ viewport-adaptive `PopoverBody`(取代原 fixed `ScrollArea max-h-72`)。三個
+    //   DataTable state-panel 收斂成同一形狀,body 隨視窗高度自適應(高螢幕多欄不再硬卡 288px)。
+    //   寬度仍由 consumer 的 `<PopoverContent w-72>` 提供(panel root w-full 撐滿)。
+    <div ref={ref} className={cn('flex flex-col h-full min-h-0 w-full', className)} {...props}>
       <PopoverHeader hideClose>
         <div className="flex items-center gap-1 w-full min-w-0">
           <PopoverTitle className="flex-1">欄位顯示</PopoverTitle>
@@ -151,17 +163,20 @@ export function DataTableColumnVisibilityPanel({
         </div>
       </PopoverHeader>
       {searchable && (
-        <div className="px-[var(--layout-space-loose)] pt-[var(--layout-space-tight)]">
+        <div className="shrink-0 px-[var(--layout-space-loose)] pt-[var(--layout-space-tight)]">
           <Input
             size="md"
             placeholder="搜尋欄位…"
+            aria-label="搜尋欄位"
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             startIcon={Search}
           />
         </div>
       )}
-      <ScrollArea className="max-h-72">
+      {/* viewport-adaptive body(List-as-region idiom:PopoverBody !px-0 !py-0 撤 chrome padding,
+          內層 py-2 給垂直呼吸、row 自帶 px-loose 水平 padding)。取代原 fixed ScrollArea max-h-72。 */}
+      <PopoverBody className="!px-0 !py-0">
         <div className="py-2 flex flex-col" style={{ '--item-prefix-slot': '16px' } as React.CSSProperties}>
           {dndEnabled ? (
             <DndContext collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
@@ -196,15 +211,16 @@ export function DataTableColumnVisibilityPanel({
             ))
           )}
         </div>
-      </ScrollArea>
+      </PopoverBody>
       <PopoverFooter className="justify-start">
         <Button variant="tertiary" size="sm" onClick={handleBulkToggle}>
           {allVisible ? '全部隱藏' : '顯示全部'}
         </Button>
       </PopoverFooter>
-    </>
+    </div>
   )
-}
+})
+DataTableColumnVisibilityPanel.displayName = 'DataTableColumnVisibilityPanel'
 
 // VisibilityRow:single column row。Draggable mode → GripVertical handle / static mode → 無 handle。
 function VisibilityRow({

package/src/components/DataTable/data-table-filter-group.tsx

@@ -0,0 +1,248 @@
+// @benchmark-unverified-blanket: file-level retraction per M22 (d) — claims herein not individually URL-cited; treat as unverified visual/usage rumor unless retrofit per-claim. Hook escape preserved(2026-07-14 自 data-table-filter-panel.tsx 拆檔搬移,原檔級 escape 隨段落帶入)。
+// @internal — DS-internal 單元(filter row / nested-group renderer + 共用 column/operator
+// helpers;GroupBlock 為 nested-group renderer,FilterRow / ConjunctionLabel 為其 row 構件、
+// flat mode 共用。只被 data-table-filter-panel.tsx 消費);不隨 index.ts re-export 進 npm public surface。
+// ────────────────────────────── 消費的 SSOT ──────────────────────────────
+// - FieldControlGroup:field + op + value border-collapse 接合(field-control-group.spec.md;
+//   FilterValuePicker 為 direct child,className forward 不開 wrapper div — 2026-05-04 #2 fix)
+// - Button(variant="text" iconOnly)row meta trash / Select(size="sm")conjunction・field・op
+//   (data-table.spec.md「四、UI canonical」:trash = form-control row text Button;A6 conjunction)
+// - Width tokens:--data-table-filter-field-width / --data-table-filter-op-width(uiSize.css SSOT,
+//   2026-05-23 Phase A.4 Decision 2)
+// - Operator SSOT:./filter-operators.ts OPERATOR_REGISTRY(禁 hardcode op 字串)
+// - Group container 灰底 bg-muted:color.spec.md L651-654 靜態低重要 surface semantic(2026-05-09 Q3 A)
+// 設計規則:./filter-operators.spec.md + ./data-table.spec.md「進階篩選」段
+
+import { Plus, Trash2 } from 'lucide-react'
+import { Button } from '@/design-system/components/Button/button'
+import { Select, type SelectOption } from '@/design-system/components/Select/select'
+import { FieldControlGroup } from '@/design-system/components/FieldControlGroup/field-control-group'
+import type { ColumnType } from './column-types'
+import {
+  OPERATOR_REGISTRY,
+  DEFAULT_OPERATOR,
+  getOperatorSpec,
+  getValueShape,
+  type ValueShape,
+} from './filter-operators'
+import type { Conjunction, FilterCondition, FilterGroup } from './filter-tree'
+import { FilterValuePicker } from './data-table-filter-value-picker'
+import type { DataTableFilterPanelLabels } from './data-table-filter-labels'
+
+// ── Shared internal types + operator helpers(panel orchestration 也消費)────
+
+export interface FilterColumn {
+  id: string
+  label: string
+  type: ColumnType
+  options?: Array<{ value: string; label: string }>
+  /** People pool for person/multiPerson filter picker(對齊 cell-registry meta.people SSOT)*/
+  people?: Array<{ name: string; avatarUrl?: string; description?: string }>
+  includeTime?: boolean
+}
+
+function getOperatorOptions(
+  type: ColumnType | undefined,
+  operatorLabels: DataTableFilterPanelLabels['operatorLabels'],
+): SelectOption[] {
+  const registry = type && OPERATOR_REGISTRY[type] ? OPERATOR_REGISTRY[type] : OPERATOR_REGISTRY.string
+  return registry.map((op) => ({ value: op.op, label: operatorLabels[op.op] ?? op.label }))
+}
+
+export function getDefaultOperator(type?: ColumnType): string {
+  return (type && DEFAULT_OPERATOR[type]) || DEFAULT_OPERATOR.string
+}
+
+// Q6(2026-07-04):date 欄位把比對精度寫進 condition(includeTime=true → ms,否則 day)。
+// 'time' 欄暫不寫(值非完整日期,truncate 語意不成立;見 filter-operators.spec v3 time 註)。
+export const datePrecisionOf = (col: FilterColumn | undefined): 'day' | 'ms' | undefined =>
+  col?.type === 'date' ? (col.includeTime ? 'ms' : 'day') : undefined
+
+// ── ConjunctionLabel ───────────────────────────────────────────────────
+
+function ConjunctionLabel({
+  index, conjunction, onChange, labels,
+}: {
+  index: number
+  conjunction: Conjunction
+  onChange: (c: Conjunction) => void
+  labels: DataTableFilterPanelLabels
+}) {
+  // index === 0:首 row 顯示靜態「Where」label
+  // index === 1:**唯一可改**的 AND/OR Select(連動整 group conjunction)
+  // index ≥ 2:被連動的 row,read-only 顯示當前 conjunction 文字(同 Where 視覺,A6 canonical)
+  //   對齊 Airtable / Notion / Linear 共識 @benchmark-unverified(non-OSS)
+  //   px-[var(--field-px)] 對齊 Field 內部 padding 12px(Q13)
+  if (index === 0) {
+    return <div className="w-20 shrink-0 text-body text-fg-secondary px-[var(--field-px)] self-center">{labels.where}</div>
+  }
+  if (index >= 2) {
+    const label = conjunction === 'and' ? labels.and : labels.or
+    return <div className="w-20 shrink-0 text-body text-fg-secondary px-[var(--field-px)] self-center">{label}</div>
+  }
+  // index === 1:可切換的 AND/OR Select
+  // minRows={2} — And/Or 2 選項,顯式縮 menu 高度避免 reserve 3 row 空白(Q5)
+  return (
+    <div className="w-20 shrink-0">
+      <Select
+        size="sm"
+        options={[
+          { value: 'and', label: labels.and },
+          { value: 'or', label: labels.or },
+        ]}
+        value={conjunction}
+        onChange={(v) => onChange(v as Conjunction)}
+        minRows={2}
+        aria-label={labels.conjunctionAriaLabel}
+      />
+    </div>
+  )
+}
+
+// ── FilterRow(flat 用 + group 內共用) ──────────────────────────────
+
+export function FilterRow({
+  index, condition, conjunction, filterableColumns, fieldOptions,
+  onChangeConjunction, onChangeField, onChangeOp, onChangeValue, onRemove, labels,
+}: {
+  index: number
+  condition: FilterCondition
+  conjunction: Conjunction
+  filterableColumns: FilterColumn[]
+  fieldOptions: SelectOption[]
+  onChangeConjunction: (c: Conjunction) => void
+  onChangeField: (v: string) => void
+  onChangeOp: (v: string) => void
+  onChangeValue: (v: unknown) => void
+  onRemove: () => void
+  labels: DataTableFilterPanelLabels
+}) {
+  const colInfo = filterableColumns.find((c) => c.id === condition.field)
+  const operatorOptions = getOperatorOptions(colInfo?.type, labels.operatorLabels)
+  const hasField = !!condition.field
+  const opSpec = colInfo ? getOperatorSpec(colInfo.type, condition.op) : null
+  const valueShape: ValueShape | null = colInfo && opSpec
+    ? getValueShape(opSpec, colInfo.type, colInfo.includeTime)
+    : null
+  // op 'is_set' / 'is_not_set' 等 shape='none' → 無 value cell,op 自動 expand 填剩餘寬
+  // 對齊 Notion / Airtable / Linear filter row 行為
+  // 注意:valueShape=null(初始無 field 選)時仍 render value cell(disabled placeholder)— 只 'none' 才 fold
+  const hasValueCell = valueShape !== 'none'
+
+  // FieldControlGroup 接合 field + op + value 視覺(2026-05-04 E refactor + 多輪 fix):
+  //   - border collapse 取代 3 顆獨立 Select 並排,對齊 Airtable / Linear / Notion filter row idiom
+  //   - ConjunctionLabel + Trash 在 group 外層(meta actions,不屬 control 一體)
+  //   - **#5 fix**:row 內水平 gap = `gap-2` (8px),layoutSpace 規則 5 緊密相關
+  //   - **#9 fix**:cell 用 `min-w-[]`(field 160 / op 120),value flex-1 min-w-0,讓 long label 可撐寬
+  //   - **#2 fix**:FilterValuePicker 直接是 FieldControlGroup direct child(無 wrapper div),CSS variants 命中正確
+  return (
+    <div className="flex items-center gap-2">
+      <ConjunctionLabel index={index} conjunction={conjunction} onChange={onChangeConjunction} labels={labels} />
+      {/* **#9 fix(2026-05-04 v4)**:Field controls trigger `w-full` override 外 className,改用 Tailwind `!`
+          important 強制 override(`!w-[160px]` / `!w-[120px]`),value 用 `!flex-1 !min-w-0`。
+          Select 元件本身沒 destructure `style` prop 所以 inline style flex-basis 行不通,只能用 className。 */}
+      <FieldControlGroup block className="flex-1 min-w-0">
+        {/* 2026-05-23 Phase A.4 Decision 2:`!w-[160px]` / `!w-[120px]` → tokens
+            `--data-table-filter-field-width` / `--data-table-filter-op-width`(SSOT in uiSize.css)
+            Behavior preserved 完好如初:flat + nested 同 width(token 是 design constant) */}
+        <Select
+          className="!w-[var(--data-table-filter-field-width)] flex-shrink-0 [&_.text-fg-muted]:!text-fg-secondary"
+          size="sm"
+          options={fieldOptions}
+          value={condition.field}
+          onChange={onChangeField}
+          placeholder={labels.fieldPlaceholder}
+          aria-label={labels.fieldAriaLabel}
+        />
+        <Select
+          className={hasValueCell ? '!w-[var(--data-table-filter-op-width)] flex-shrink-0' : '!flex-1 !min-w-0'}
+          size="sm"
+          options={operatorOptions}
+          value={condition.op}
+          onChange={onChangeOp}
+          disabled={!hasField}
+          placeholder={labels.operatorPlaceholder}
+          aria-label={labels.operatorAriaLabel}
+        />
+        {hasValueCell && (
+          <FilterValuePicker
+            shape={valueShape}
+            value={condition.value}
+            onChange={onChangeValue}
+            colInfo={colInfo}
+            disabled={!hasField}
+            ariaLabel={labels.filterValueAriaLabel(colInfo?.label)}
+            labels={labels}
+            className="!flex-1 !min-w-0"
+          />
+        )}
+      </FieldControlGroup>
+      {/* Trash 用 text Button — filter row 是 form-control row,Field 同高對齊(28 md) */}
+      <Button variant="text" size="sm" iconOnly startIcon={Trash2} aria-label={labels.deleteCondition} onClick={onRemove} />
+    </div>
+  )
+}
+
+// ── GroupBlock(nested 用) ────────────────────────────────────────────
+
+export function GroupBlock({
+  index, group, rootConjunction, filterableColumns, fieldOptions,
+  onChangeRootConjunction, onChangeGroupConjunction,
+  onChangeCondition, onRemoveCondition, onAddCondition, onRemoveGroup,
+  canAddCondition, labels,
+}: {
+  index: number
+  group: FilterGroup
+  rootConjunction: Conjunction
+  filterableColumns: FilterColumn[]
+  fieldOptions: SelectOption[]
+  onChangeRootConjunction: (c: Conjunction) => void
+  onChangeGroupConjunction: (c: Conjunction) => void
+  onChangeCondition: (condId: string, patch: Partial<FilterCondition>) => void
+  onRemoveCondition: (condId: string) => void
+  onAddCondition: () => void
+  onRemoveGroup: () => void
+  canAddCondition: boolean
+  labels: DataTableFilterPanelLabels
+}) {
+  return (
+    <div className="flex items-start gap-2">
+      <div className="pt-2">
+        <ConjunctionLabel index={index} conjunction={rootConjunction} onChange={onChangeRootConjunction} labels={labels} />
+      </div>
+      {/* Group container 灰底 — `bg-muted`(`--muted` neutral-2,user 2026-05-09 拍板 Q3 A)。對齊 color.spec.md L651-654 「table header / tab / code block / skeleton」靜態低重要 surface semantic */}
+      <div className="flex-1 min-w-0 rounded-md bg-muted p-2 flex flex-col gap-2">
+        {group.children.map((cond, cIdx) => (
+          <FilterRow
+            key={cond.id}
+            index={cIdx}
+            condition={cond}
+            conjunction={group.conjunction}
+            filterableColumns={filterableColumns}
+            fieldOptions={fieldOptions}
+            onChangeConjunction={onChangeGroupConjunction}
+            onChangeField={(v) => {
+              const newCol = filterableColumns.find((c) => c.id === v)
+              onChangeCondition(cond.id, { field: v, op: getDefaultOperator(newCol?.type), value: '', datePrecision: datePrecisionOf(newCol) })
+            }}
+            onChangeOp={(v) => onChangeCondition(cond.id, { op: v, value: '' })}
+            onChangeValue={(v) => onChangeCondition(cond.id, { value: v })}
+            onRemove={() => onRemoveCondition(cond.id)}
+            labels={labels}
+          />
+        ))}
+        {/* Q9 — text variant 對齊 inline 派 + 視覺輕量 */}
+        <div className="flex items-center justify-between">
+          <Button variant="text" size="sm" startIcon={Plus} onClick={onAddCondition} disabled={!canAddCondition}>
+            {labels.addNestedFilter}
+          </Button>
+          {group.children.length === 0 && (
+            <Button variant="text" size="sm" startIcon={Trash2} danger onClick={onRemoveGroup}>
+              {labels.removeEmptyGroup}
+            </Button>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}

package/src/components/DataTable/data-table-filter-labels.ts

@@ -0,0 +1,100 @@
+// @internal — DataTableFilterPanel chrome/operator/value-picker labels shared by
+// panel orchestration, row/group rendering, and value-picker dispatch.
+
+import type { DATE_RELATIVE_GROUPS, DATE_RELATIVE_OPTIONS } from './filter-operators'
+
+type RelativeDateGroupKey = (typeof DATE_RELATIVE_GROUPS)[number]['key']
+type RelativeDateValue = (typeof DATE_RELATIVE_OPTIONS)[number]['value']
+
+export interface DataTableFilterPanelLabels {
+  title: string
+  resetToDefault: string
+  close: string
+  where: string
+  and: string
+  or: string
+  conjunctionAriaLabel: string
+  fieldPlaceholder: string
+  fieldAriaLabel: string
+  operatorPlaceholder: string
+  operatorAriaLabel: string
+  valuePlaceholder: string
+  numberPlaceholder: string
+  relativeDatePlaceholder: string
+  singleSelectPlaceholder: string
+  multiSelectPlaceholder: string
+  multiSelectEmptyText: string
+  peoplePlaceholder: string
+  peopleSearchPlaceholder: string
+  peopleSearchAriaLabel: string
+  peopleEmptyText: string
+  filterValueAriaLabel: (columnLabel?: string) => string
+  deleteCondition: string
+  addFilter: string
+  addGroup: string
+  addNestedFilter: string
+  removeEmptyGroup: string
+  /**
+   * Operator key → visible label override. Missing keys fall back to
+   * `OPERATOR_REGISTRY` labels, preserving the registry as the default SSOT.
+   */
+  operatorLabels: Partial<Record<string, string>>
+  /** Relative-date group/value overrides; missing keys retain registry defaults. */
+  relativeDateGroupLabels: Partial<Record<RelativeDateGroupKey, string>>
+  relativeDateOptionLabels: Partial<Record<RelativeDateValue, string>>
+}
+
+// code-quality-allow: dead-export — public i18n defaults, re-exported by panel.
+export const DATA_TABLE_FILTER_PANEL_DEFAULT_LABELS: DataTableFilterPanelLabels = {
+  title: '篩選',
+  resetToDefault: '恢復預設',
+  close: '關閉',
+  where: 'Where',
+  and: 'And',
+  or: 'Or',
+  conjunctionAriaLabel: '連接詞 — 同 group 共用',
+  fieldPlaceholder: '選擇欄位',
+  fieldAriaLabel: '篩選欄位',
+  operatorPlaceholder: '運算子',
+  operatorAriaLabel: '篩選運算子',
+  valuePlaceholder: '輸入值…',
+  numberPlaceholder: '輸入數字…',
+  relativeDatePlaceholder: '選擇相對日期',
+  singleSelectPlaceholder: '選擇值',
+  multiSelectPlaceholder: '選擇值…',
+  multiSelectEmptyText: '沒有符合的值',
+  peoplePlaceholder: '選擇人員',
+  peopleSearchPlaceholder: '搜尋人員…',
+  peopleSearchAriaLabel: '搜尋篩選人員',
+  peopleEmptyText: '沒有符合的人員',
+  filterValueAriaLabel: (columnLabel) => columnLabel ? `${columnLabel} 篩選值` : '篩選值',
+  deleteCondition: '刪除',
+  addFilter: '加篩選',
+  addGroup: '加入篩選器',
+  addNestedFilter: '加入巢狀篩選',
+  removeEmptyGroup: '移除空群組',
+  operatorLabels: {},
+  relativeDateGroupLabels: {},
+  relativeDateOptionLabels: {},
+}
+
+export function resolveDataTableFilterPanelLabels(
+  overrides?: Partial<DataTableFilterPanelLabels>,
+): DataTableFilterPanelLabels {
+  return {
+    ...DATA_TABLE_FILTER_PANEL_DEFAULT_LABELS,
+    ...overrides,
+    operatorLabels: {
+      ...DATA_TABLE_FILTER_PANEL_DEFAULT_LABELS.operatorLabels,
+      ...overrides?.operatorLabels,
+    },
+    relativeDateGroupLabels: {
+      ...DATA_TABLE_FILTER_PANEL_DEFAULT_LABELS.relativeDateGroupLabels,
+      ...overrides?.relativeDateGroupLabels,
+    },
+    relativeDateOptionLabels: {
+      ...DATA_TABLE_FILTER_PANEL_DEFAULT_LABELS.relativeDateOptionLabels,
+      ...overrides?.relativeDateOptionLabels,
+    },
+  }
+}