Merge branch 'claude/confident-bell-efa28b' into hub
# Conflicts: # app/(protected)/(basic)/system/merchants/_components/merchant-row-actions.tsx
@eb74cc52056269a665ade13ea9f21947b24872ed
--- app/(protected)/(basic)/boards/_components/board-row-actions.tsx
+++ app/(protected)/(basic)/boards/_components/board-row-actions.tsx
... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 |
|
| 84 | 84 |
return ( |
| 85 | 85 |
<> |
| 86 |
- <FoxButtonGroup size="sm"> |
|
| 86 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 87 | 87 |
<FoxIconButton |
| 88 | 88 |
type="default" |
| 89 | 89 |
size="sm" |
--- app/(protected)/(basic)/contents/_components/content-row-actions.tsx
+++ app/(protected)/(basic)/contents/_components/content-row-actions.tsx
... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 | 54 |
return ( |
| 55 |
- <FoxButtonGroup size="sm"> |
|
| 55 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 56 | 56 |
<FoxIconButton |
| 57 | 57 |
type="default" |
| 58 | 58 |
size="sm" |
--- app/(protected)/(basic)/decoration-items/_components/decoration-item-row-actions.tsx
+++ app/(protected)/(basic)/decoration-items/_components/decoration-item-row-actions.tsx
... | ... | @@ -65,7 +65,7 @@ |
| 65 | 65 |
|
| 66 | 66 |
return ( |
| 67 | 67 |
<> |
| 68 |
- <FoxButtonGroup size="sm"> |
|
| 68 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 69 | 69 |
<FoxIconButton |
| 70 | 70 |
type="default" |
| 71 | 71 |
size="sm" |
--- app/(protected)/(basic)/points/standards/_components/point-standard-row-actions.tsx
+++ app/(protected)/(basic)/points/standards/_components/point-standard-row-actions.tsx
... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 |
|
| 53 | 53 |
return ( |
| 54 | 54 |
<> |
| 55 |
- <FoxButtonGroup size="sm"> |
|
| 55 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 56 | 56 |
<FoxIconButton |
| 57 | 57 |
type="default" |
| 58 | 58 |
size="sm" |
--- app/(protected)/(basic)/system/codes/_components/code-row-actions.tsx
+++ app/(protected)/(basic)/system/codes/_components/code-row-actions.tsx
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
onClick={(event) => event.stopPropagation()}
|
| 29 | 29 |
onKeyDown={(event) => event.stopPropagation()}
|
| 30 | 30 |
> |
| 31 |
- <FoxButtonGroup size="sm"> |
|
| 31 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 32 | 32 |
<FoxIconButton |
| 33 | 33 |
type="default" |
| 34 | 34 |
size="sm" |
--- app/(protected)/(basic)/system/merchants/_components/merchant-row-actions.tsx
+++ app/(protected)/(basic)/system/merchants/_components/merchant-row-actions.tsx
... | ... | @@ -1,6 +1,7 @@ |
| 1 | 1 |
'use client'; |
| 2 | 2 |
|
| 3 | 3 |
import { useState } from 'react';
|
| 4 |
+import { FoxButtonGroup } from '@fox/core/components/fox-button-group';
|
|
| 4 | 5 |
import { FoxIconButton } from '@fox/core/components/fox-icon-button';
|
| 5 | 6 |
import { useFeedback } from '@/app/_hooks/use-feedback';
|
| 6 | 7 |
import type { Merchant } from '@/lib/domain/merchant';
|
... | ... | @@ -17,32 +18,37 @@ |
| 17 | 18 |
* |
| 18 | 19 |
* TODO(백엔드): 삭제 API도 없다(`/api/v1/mngr/voc`는 목록·등록뿐). 시안의 자리는 두되 |
| 19 | 20 |
* 눌러도 할 수 있는 일이 없어 사유를 알린다. |
| 21 |
+ * |
|
| 22 |
+ * 어느 행의 버튼인지는 각 버튼 라벨이 말한다 — 감싼 요소의 `aria-label`은 의미 없는 |
|
| 23 |
+ * 요소에 붙어 읽히지 않을 수 있다(공통코드 행과 같은 방식). |
|
| 20 | 24 |
*/ |
| 21 | 25 |
export function MerchantRowActions({ merchant }: MerchantRowActionsProps) {
|
| 22 | 26 |
const { showToast } = useFeedback();
|
| 23 | 27 |
const [isDetailOpen, setIsDetailOpen] = useState(false); |
| 24 | 28 |
|
| 25 | 29 |
return ( |
| 26 |
- <span aria-label={`${merchant.name} 관리`}>
|
|
| 27 |
- <FoxIconButton |
|
| 28 |
- type="default" |
|
| 29 |
- size="sm" |
|
| 30 |
- icon={<i className="fox-ico fox-ico-PencilSimple" aria-hidden="true" />}
|
|
| 31 |
- label="수정" |
|
| 32 |
- onAction={() => setIsDetailOpen(true)}
|
|
| 33 |
- /> |
|
| 34 |
- <FoxIconButton |
|
| 35 |
- type="default" |
|
| 36 |
- size="sm" |
|
| 37 |
- icon={<i className="fox-ico fox-ico-Trash" aria-hidden="true" />}
|
|
| 38 |
- label="삭제" |
|
| 39 |
- onAction={() =>
|
|
| 40 |
- showToast({
|
|
| 41 |
- variant: 'warning', |
|
| 42 |
- message: '가맹점 삭제 기능은 백엔드 준비 중입니다.', |
|
| 43 |
- }) |
|
| 44 |
- } |
|
| 45 |
- /> |
|
| 30 |
+ <> |
|
| 31 |
+ <FoxButtonGroup size="sm" align="center"> |
|
| 32 |
+ <FoxIconButton |
|
| 33 |
+ type="default" |
|
| 34 |
+ size="sm" |
|
| 35 |
+ icon={<i className="fox-ico fox-ico-PencilSimple" aria-hidden="true" />}
|
|
| 36 |
+ label={`${merchant.name} 수정`}
|
|
| 37 |
+ onAction={() => setIsDetailOpen(true)}
|
|
| 38 |
+ /> |
|
| 39 |
+ <FoxIconButton |
|
| 40 |
+ type="default" |
|
| 41 |
+ size="sm" |
|
| 42 |
+ icon={<i className="fox-ico fox-ico-Trash" aria-hidden="true" />}
|
|
| 43 |
+ label={`${merchant.name} 삭제`}
|
|
| 44 |
+ onAction={() =>
|
|
| 45 |
+ showToast({
|
|
| 46 |
+ variant: 'warning', |
|
| 47 |
+ message: '가맹점 삭제 기능은 백엔드 준비 중입니다.', |
|
| 48 |
+ }) |
|
| 49 |
+ } |
|
| 50 |
+ /> |
|
| 51 |
+ </FoxButtonGroup> |
|
| 46 | 52 |
|
| 47 | 53 |
{isDetailOpen && (
|
| 48 | 54 |
<MerchantFormModal |
... | ... | @@ -50,6 +56,6 @@ |
| 50 | 56 |
onClose={() => setIsDetailOpen(false)}
|
| 51 | 57 |
/> |
| 52 | 58 |
)} |
| 53 |
- </span> |
|
| 59 |
+ </> |
|
| 54 | 60 |
); |
| 55 | 61 |
} |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?