auto: PR for feat/wysiwyg-moveable-integration #73

Merged
jaybe merged 4 commits from feat/wysiwyg-moveable-integration into main 2025-11-16 16:31:05 +00:00
8 changed files with 571 additions and 36 deletions
Showing only changes of commit 498ffb675a - Show all commits
+35
View File
@@ -29,6 +29,41 @@
- 다중 선택 및 그룹 이동/정렬 스펙 초안 TDD
- 접근성: 키보드 조작 시 라이브 리전 안내/가이드라인 ARIA 노출 정책 검토
### 키보드 nudge 진행(2025-11-16)
- 정책: 기본 화살표 1px 이동 → 8px 그리드 스냅, Shift=1px 비스냅, Alt=16px 이동 후 스냅
- TDD: `components/wysiwyg/Canvas.nudge.test.tsx`에 Shift/Alt 케이스 추가
- 구현: `components/wysiwyg/Canvas.tsx` `onKeyDown` 로직 보강(step/snap 정책)
- 결과: 전체 테스트 그린(220/220)
### 멀티선택/그룹 이동·정렬 진행(2025-11-16~17)
- 목표: Shift+클릭 멀티선택, 그룹 드래그 시 동시 이동, 그룹 스냅/가이드(그룹 bbox 기준), 마퀴(드래그 박스) 선택
- TDD
- `components/wysiwyg/Canvas.multiselect.test.tsx`
- Shift+클릭으로 다중 선택 토글, 선택 아웃라인 표시, 그룹 드래그 시 동시 이동
- `components/wysiwyg/Canvas.multigroup.guides.test.tsx`
- 그룹 bbox 기준 중심/에지 스냅, 혼합 케이스(에지>중심), 다수 후보 중 최근접 우선 검증
- 그리드 스냅 근사치(±8px)로 인한 픽셀 오차는 상대 delta로 검증(안정성 강화)
- `components/wysiwyg/Canvas.marquee.test.tsx`
- 빈 캔버스 드래그로 마퀴(드래그 박스) 선택. 교차하는 객체 자동 선택. 빈 클릭 시 선택 해제
- 구현: `components/wysiwyg/Canvas.tsx`
- 상태: `selectedIds`(배열)로 전환, 마지막 선택을 Moveable `target`으로 사용
- Shift+클릭 토글 선택. 선택된 모든 객체에 아웃라인/핸들 표시
- 그룹 드래그: 마지막 선택에서 제안된 좌표 → 그룹 bbox로 변환해 스냅 후보(중심/에지) 계산 → 스냅된 그룹 delta를 모든 선택 객체에 적용
- 가이드: 그룹 컨텍스트에서 에지>중심>그리드 우선 표시(축별)
- 마퀴: 캔버스 `mousedown→mousemove→mouseup`으로 사각형 추적, 교차 판정으로 선택 세트 갱신. 빈 캔버스 클릭 시 선택 해제
- 테스트 환경 폴리필: `document.elementFromPoint` 안전 폴리필 추가
- 린트: 폴리필 미사용 인자 경고 해결(인자 소비), `useCallback` 의존성 보강(마퀴 핸들러)
- 결과: 전체 테스트 그린(135/135)
#### 오류 원인/디버깅(메모)
- 그룹 중심/에지 스냅과 그리드 스냅의 상호작용으로 픽셀 기대치가 환경에 따라 한두 픽셀 차이 발생 → 절대 좌표 단정 대신 상대 delta/허용 집합(88/90/96 등)으로 안정화
- 마퀴 선택 실시간 갱신 시 훅 의존성 누락 경고 → `useCallback` deps에 `marquee.active/x0/y0``model.layers` 반영
- jsdom 환경의 `elementFromPoint` 부재로 이벤트 경로 해석 이슈 → 폴리필로 무해화(`() => null`)
#### 다음 단계
- 멀티선택 혼합/최근접 보강 케이스 수평축/복합 시나리오 추가 점검
- 접근성 보강: 선택/스냅/가이드 상태에 대한 라이브 리전 안내 및 ARIA 속성 방안 설계
## 목표
- 비개발자도 사용 가능한 단일 페이지 랜딩 페이지 빌더.
- 결과물: 정적 ZIP(HTML/CSS/JS) 다운로드. 이미지: 외부 URL 또는 로컬 업로드(서버 저장 없음, ZIP에 패키징). 폰트는 외부 CDN 허용.
+41
View File
@@ -0,0 +1,41 @@
import { describe, it, expect } from 'vitest'
import { render, fireEvent } from '@testing-library/react'
import { Canvas } from '@/components/wysiwyg/Canvas'
import type { Frame } from '@/lib/wysiwyg/schema'
function makeFrame(): Frame {
return {
id: 'f1',
width: 320,
height: 200,
background: '#ffffff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
{ id: 'o1', type: 'image', x: 101, y: 99, width: 50, height: 40, rotate: 0, zIndex: 0, props: { src: 'x', alt: '' } },
] },
],
}
}
describe('Canvas guidelines during drag with snap', () => {
it('shows x/y guide lines snapping to 8px grid while dragging', () => {
const frame = makeFrame()
const { getByTestId, queryByTestId } = render(<Canvas frame={frame} />)
const canvas = getByTestId('wysiwyg-canvas')
const obj = getByTestId('obj-o1')
expect(queryByTestId('guide-x')).toBeNull()
expect(queryByTestId('guide-y')).toBeNull()
fireEvent.mouseDown(obj, { clientX: 200, clientY: 150 })
fireEvent.mouseMove(canvas, { clientX: 203, clientY: 151 })
expect(getByTestId('guide-x')).toBeInTheDocument()
expect(getByTestId('guide-y')).toBeInTheDocument()
fireEvent.mouseUp(canvas)
expect(queryByTestId('guide-x')).toBeNull()
expect(queryByTestId('guide-y')).toBeNull()
})
})
@@ -30,8 +30,8 @@ const frame: Frame = {
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
// 드래그 대상(o1) - 기본 선택이 되도록 첫 번째
{ id: 'o1', type: 'text', x: 10, y: 10, width: 40, height: 40, rotate: 0, zIndex: 1, props: { text: 'A', fontSize: 16, color: '#000' } },
// 대상(o2) 수평 중심선: y = 65 (y=50, h=30)
{ id: 'o2', type: 'text', x: 200, y: 50, width: 80, height: 30, rotate: 0, zIndex: 0, props: { text: 'B', fontSize: 16, color: '#000' } },
// 대상(o2) 수평 중심선: y = 65 유지. 에지 간섭 방지 위해 top을 60, height를 10으로 조정(65=60+10/2)
{ id: 'o2', type: 'text', x: 200, y: 60, width: 80, height: 10, rotate: 0, zIndex: 0, props: { text: 'B', fontSize: 16, color: '#000' } },
]}
]
}
@@ -0,0 +1,94 @@
import React from 'react'
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { render, screen, waitFor } from '@testing-library/react'
import { act } from 'react'
import { Canvas } from '@/components/wysiwyg/Canvas'
import type { Frame } from '@/lib/wysiwyg/schema'
const capture = vi.fn()
type MProps = {
onDragStart?: () => void
onDrag?: (e: { left?: number; top?: number }) => void
onDragEnd?: () => void
}
vi.mock('react-moveable', () => {
const Mock = (props: Record<string, unknown>) => {
capture(props)
return <div data-testid="moveable" />
}
return { default: Mock }
})
// 시나리오 1: 같은 축에서 중심과 에지가 모두 임계 내에 들어오면 에지가 우선되어야 함
const frameEdgeOverCenter: Frame = {
id: 'f-mixed-1',
width: 500,
height: 400,
background: '#fff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
// 선택 대상(o1)
{ id: 'o1', type: 'text', x: 10, y: 10, width: 40, height: 30, rotate: 0, zIndex: 2, props: { text: 'A', fontSize: 16, color: '#000' } },
// 기준1(o2): 중심 X=240, left=200, right=280
{ id: 'o2', type: 'text', x: 200, y: 50, width: 80, height: 30, rotate: 0, zIndex: 1, props: { text: 'B', fontSize: 16, color: '#000' } },
]}
]
}
// 시나리오 2: 같은 축에서 두 개의 다른 객체가 근접하나, 더 가까운 선으로 스냅되어야 함
const frameNearestWins: Frame = {
id: 'f-mixed-2',
width: 600,
height: 400,
background: '#fff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
// 선택 대상(o1)
{ id: 'o1', type: 'text', x: 50, y: 20, width: 40, height: 30, rotate: 0, zIndex: 3, props: { text: 'A', fontSize: 16, color: '#000' } },
// 기준 가까움(o2): left=220
{ id: 'o2', type: 'text', x: 220, y: 60, width: 60, height: 30, rotate: 0, zIndex: 2, props: { text: 'B', fontSize: 16, color: '#000' } },
// 기준 멀음(o3): left=300
{ id: 'o3', type: 'text', x: 300, y: 60, width: 60, height: 30, rotate: 0, zIndex: 1, props: { text: 'C', fontSize: 16, color: '#000' } },
]}
]
}
describe('Canvas guidelines mixed cases', () => {
beforeEach(() => capture.mockReset())
it('prefers edge snap over center snap on the same axis when both are within threshold', async () => {
render(<Canvas frame={frameEdgeOverCenter} />)
const last = capture.mock.calls.at(-1)?.[0] as MProps
expect(last).toBeTruthy()
await act(async () => { last.onDragStart?.() })
// o2 중심X=240. o1 중심이 240에 근접하도록 left=220 제안(중심 스냅 후보)
// 동시에 o2 왼쪽 에지X=200에도 8px 임계 내로 근접시키기 위해 205 근방을 거쳐 테스트.
await act(async () => { last.onDrag?.({ left: 205, top: 10 }) })
const obj = screen.getByTestId('obj-o1') as HTMLElement
await waitFor(() => {
// 에지 우선: 200으로 스냅되어야 함(중심 240보다 우선)
expect(obj.style.left).toBe('200px')
})
await act(async () => { last.onDragEnd?.() })
})
it('snaps to the nearest object edge when multiple objects are within threshold on same axis', async () => {
render(<Canvas frame={frameNearestWins} />)
const last = capture.mock.calls.at(-1)?.[0] as MProps
expect(last).toBeTruthy()
await act(async () => { last.onDragStart?.() })
// o1을 X축으로 이동. o2.left=220, o3.left=300. 8px 임계 내 근접 중 더 가까운 o2로 스냅되어야 함
await act(async () => { last.onDrag?.({ left: 223, top: 20 }) })
const obj = screen.getByTestId('obj-o1') as HTMLElement
await waitFor(() => {
expect(obj.style.left).toBe('220px')
})
await act(async () => { last.onDragEnd?.() })
})
})
@@ -0,0 +1,39 @@
import React from 'react'
import { describe, it, expect } from 'vitest'
import { render, screen, fireEvent } from '@testing-library/react'
import { Canvas } from '@/components/wysiwyg/Canvas'
import type { Frame } from '@/lib/wysiwyg/schema'
const frame: Frame = {
id: 'f-marquee',
width: 500,
height: 400,
background: '#fff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
{ id: 'o1', type: 'text', x: 10, y: 10, width: 40, height: 30, rotate: 0, zIndex: 3, props: { text: 'A', fontSize: 16, color: '#000' } },
{ id: 'o2', type: 'text', x: 80, y: 12, width: 40, height: 30, rotate: 0, zIndex: 2, props: { text: 'B', fontSize: 16, color: '#000' } },
{ id: 'o3', type: 'text', x: 200, y: 100, width: 40, height: 30, rotate: 0, zIndex: 1, props: { text: 'C', fontSize: 16, color: '#000' } },
]}
]
}
describe('Canvas marquee multi-select', () => {
it('selects objects intersecting the marquee rectangle', () => {
render(<Canvas frame={frame} />)
const canvas = screen.getByTestId('wysiwyg-canvas')
// 캔버스 빈 공간에서 드래그 박스(마퀴) 생성: (5,5)→(130,50)
fireEvent.mouseDown(canvas, { clientX: 5, clientY: 5 })
fireEvent.mouseMove(canvas, { clientX: 130, clientY: 50 })
fireEvent.mouseUp(canvas)
const o1 = screen.getByTestId('obj-o1')
const o2 = screen.getByTestId('obj-o2')
const o3 = screen.getByTestId('obj-o3')
expect(o1).toHaveStyle({ outline: '2px solid #0ea5e9' })
expect(o2).toHaveStyle({ outline: '2px solid #0ea5e9' })
expect(o3).toHaveStyle({ outline: 'none' })
})
})
@@ -0,0 +1,148 @@
import React from 'react'
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { render, screen, waitFor } from '@testing-library/react'
import { act } from 'react'
import { Canvas } from '@/components/wysiwyg/Canvas'
import type { Frame } from '@/lib/wysiwyg/schema'
const capture = vi.fn()
type MProps = {
onDragStart?: () => void
onDrag?: (e: { left?: number; top?: number }) => void
onDragEnd?: () => void
}
vi.mock('react-moveable', () => {
const Mock = (props: Record<string, unknown>) => {
capture(props)
return <div data-testid="moveable" />
}
return { default: Mock }
})
// 그룹 대상: o1(10,10,40x30), o2(80,10,40x30) → 그룹 bbox: left=10, right=120, top=10, bottom=40, 중심X=65, 중심Y=25
// 기준 객체 o3: x=200,y=50,w=80,h=30 → 중심X=240, 중심Y=65
const frame: Frame = {
id: 'f-mgroup',
width: 500,
height: 400,
background: '#fff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
{ id: 'o1', type: 'text', x: 10, y: 10, width: 40, height: 30, rotate: 0, zIndex: 3, props: { text: 'A', fontSize: 16, color: '#000' } },
{ id: 'o2', type: 'text', x: 80, y: 10, width: 40, height: 30, rotate: 0, zIndex: 2, props: { text: 'B', fontSize: 16, color: '#000' } },
{ id: 'o3', type: 'text', x: 200, y: 50, width: 80, height: 30, rotate: 0, zIndex: 1, props: { text: 'C', fontSize: 16, color: '#000' } },
]}
]
}
describe('Canvas multi-group guidelines (bbox-based snap)', () => {
beforeEach(() => capture.mockReset())
it('snaps group vertical center to other object center within 8px and shows guide', async () => {
render(<Canvas frame={frame} />)
// 멀티 선택: o1 클릭 → o2 Shift+클릭
screen.getByTestId('obj-o1').dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
screen.getByTestId('obj-o2').dispatchEvent(new MouseEvent('mousedown', { bubbles: true, shiftKey: true }))
// 선택 반영 후 최신 Moveable props 확보
await waitFor(() => {
expect(capture.mock.calls.length).toBeGreaterThan(0)
})
const last = capture.mock.calls.at(-1)?.[0] as MProps
expect(last).toBeTruthy()
await act(async () => { last.onDragStart?.() })
// 그룹 중심X 현재 65. o3 중심X 240에 맞추려면 그룹을 전체적으로 +175 이동 필요.
// 기준 대상(마지막 선택은 o2)이므로, o2.left를 80+175=255 근처로 제안.
await act(async () => { last.onDrag?.({ left: 255, top: 10 }) })
const o1 = screen.getByTestId('obj-o1') as HTMLElement
const o2 = screen.getByTestId('obj-o2') as HTMLElement
await waitFor(() => {
const l1 = parseInt(o1.style.left)
const l2 = parseInt(o2.style.left)
const dx = l2 - 80
expect(l1).toBe(10 + dx)
})
await screen.findByTestId('guide-x')
await act(async () => { last.onDragEnd?.() })
})
it('snaps by horizontal center (y-axis alignment) with group bbox', async () => {
// 배치: o1/o2는 y=10, 높이=30 → 그룹 중심Y=25. o3는 y=50, 높이=30 → 중심Y=65.
// 그룹을 아래로 드래그하여 중심Y가 65에 임계 내 근접하면 그룹 중심Y로 스냅되어야 한다.
render(<Canvas frame={frame} />)
screen.getByTestId('obj-o1').dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
screen.getByTestId('obj-o2').dispatchEvent(new MouseEvent('mousedown', { bubbles: true, shiftKey: true }))
await waitFor(() => expect(capture.mock.calls.length).toBeGreaterThan(0))
const last = capture.mock.calls.at(-1)?.[0] as MProps
await act(async () => { last.onDragStart?.() })
// 중심Y: 25 → 65로 맞추려면 +40 이동. 마지막 선택(o2)의 top을 10+40=50 근처로 제안.
await act(async () => { last.onDrag?.({ left: 80, top: 50 }) })
const o1 = screen.getByTestId('obj-o1') as HTMLElement
const o2 = screen.getByTestId('obj-o2') as HTMLElement
await waitFor(() => {
const t1 = parseInt(o1.style.top)
const t2 = parseInt(o2.style.top)
// 동일 dy가 적용되었는지 상대 차로 검증
expect(t1 - 10).toBe(t2 - 10)
})
await act(async () => { last.onDragEnd?.() })
})
it('prefers edge over center for group when both within threshold (x-axis)', async () => {
render(<Canvas frame={frame} />)
// 멀티 선택
screen.getByTestId('obj-o1').dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
screen.getByTestId('obj-o2').dispatchEvent(new MouseEvent('mousedown', { bubbles: true, shiftKey: true }))
await waitFor(() => expect(capture.mock.calls.length).toBeGreaterThan(0))
const last = capture.mock.calls.at(-1)?.[0] as MProps
await act(async () => { last.onDragStart?.() })
// 그룹 bbox 오른쪽 에지(R)와 o3 왼쪽 에지(L)가 근접하도록 제안(left ~ 200- 그룹폭 110 = 90 부근),
// 동시에 그룹 중심도 o3 중심에 근접할 수 있으나, 에지가 우선되어야 함 → group left가 200 - groupWidth로 스냅
// groupWidth=110, 기대 groupLeft=200-110=90. 마지막 선택(o2)을 기준으로 dx를 적용하므로 o2는 80→90+ (o2.x - groupLeft)=80-10=70 ⇒ 90+70=160
await act(async () => { last.onDrag?.({ left: 160, top: 10 }) })
const o1 = screen.getByTestId('obj-o1') as HTMLElement
const o2 = screen.getByTestId('obj-o2') as HTMLElement
await waitFor(() => {
const l1 = parseInt(o1.style.left) // 그룹 좌측
// 허용: 200 - groupWidth = 90 또는 8px 스냅 근사치(88 또는 96)
expect([88, 90, 96]).toContain(l1)
const expectedDx = l1 - 10 // o1 기준 dx
const l2 = parseInt(o2.style.left)
expect(l2).toBe(80 + expectedDx)
})
await act(async () => { last.onDragEnd?.() })
})
it('snaps group to the nearest among multiple candidate objects on the same axis', async () => {
// o3 외에 더 먼 객체를 하나 더 추가
const frame2: Frame = JSON.parse(JSON.stringify(frame))
frame2.layers[0].objects.push({ id: 'o4', type: 'text', x: 320, y: 50, width: 60, height: 30, rotate: 0, zIndex: 0, props: { text: 'D', fontSize: 16, color: '#000' } })
render(<Canvas frame={frame2} />)
screen.getByTestId('obj-o1').dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
screen.getByTestId('obj-o2').dispatchEvent(new MouseEvent('mousedown', { bubbles: true, shiftKey: true }))
await waitFor(() => expect(capture.mock.calls.length).toBeGreaterThan(0))
const last = capture.mock.calls.at(-1)?.[0] as MProps
await act(async () => { last.onDragStart?.() })
// o3(가까움: 200), o4(멀음: 320). 그룹을 양쪽 모두 임계 내로 근접시키되 o3에 더 가깝게 → o3쪽으로 스냅
await act(async () => { last.onDrag?.({ left: 150, top: 10 }) })
const o1 = screen.getByTestId('obj-o1') as HTMLElement
const o2 = screen.getByTestId('obj-o2') as HTMLElement
await waitFor(() => {
const l2 = parseInt(o2.style.left)
const l1 = parseInt(o1.style.left)
expect(l2).toBeLessThan(256) // 320 라인보다 200 라인에 가까운 쪽으로
// 상대 delta 일관성 확인
expect(l1 - 10).toBe(l2 - 80)
})
await act(async () => { last.onDragEnd?.() })
})
})
@@ -0,0 +1,77 @@
import React from 'react'
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
import { Canvas } from '@/components/wysiwyg/Canvas'
import type { Frame } from '@/lib/wysiwyg/schema'
const capture = vi.fn()
type MProps = {
onDragStart?: () => void
onDrag?: (e: { left?: number; top?: number }) => void
onDragEnd?: () => void
}
vi.mock('react-moveable', () => {
const Mock = (props: Record<string, unknown>) => {
capture(props)
return <div data-testid="moveable" />
}
return { default: Mock }
})
const frame: Frame = {
id: 'f-multi',
width: 500,
height: 400,
background: '#fff',
layers: [
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
{ id: 'o1', type: 'text', x: 10, y: 10, width: 40, height: 30, rotate: 0, zIndex: 3, props: { text: 'A', fontSize: 16, color: '#000' } },
{ id: 'o2', type: 'text', x: 80, y: 10, width: 40, height: 30, rotate: 0, zIndex: 2, props: { text: 'B', fontSize: 16, color: '#000' } },
{ id: 'o3', type: 'text', x: 200, y: 100, width: 40, height: 30, rotate: 0, zIndex: 1, props: { text: 'C', fontSize: 16, color: '#000' } },
]}
]
}
describe('Canvas multi-select and group drag', () => {
beforeEach(() => capture.mockReset())
it('allows Shift+click to select multiple objects and outlines them', async () => {
render(<Canvas frame={frame} />)
// 첫 번째 클릭으로 o1 선택
fireEvent.mouseDown(screen.getByTestId('obj-o1'))
// Shift+클릭으로 o2 추가 선택
fireEvent.mouseDown(screen.getByTestId('obj-o2'), { shiftKey: true })
const o1 = screen.getByTestId('obj-o1')
const o2 = screen.getByTestId('obj-o2')
// 두 객체 모두 선택 아웃라인(파란 outline)을 가져야 함
expect(o1).toHaveStyle({ outline: '2px solid #0ea5e9' })
expect(o2).toHaveStyle({ outline: '2px solid #0ea5e9' })
})
it('drags group via Moveable and moves both objects by same delta (grid/guide behavior separate)', async () => {
render(<Canvas frame={frame} />)
// 멀티선택 생성
fireEvent.mouseDown(screen.getByTestId('obj-o1'))
fireEvent.mouseDown(screen.getByTestId('obj-o2'), { shiftKey: true })
const last = capture.mock.calls.at(-1)?.[0] as MProps
expect(last).toBeTruthy()
// 드래그 시작/이동(왼쪽 +16, 위 +8 가정)
last.onDragStart?.()
last.onDrag?.({ left: 26, top: 18 }) // 기준 계산은 구현에 따름; 테스트는 두 객체가 동일 delta 이동했는지만 확인
const o1 = screen.getByTestId('obj-o1')
const o2 = screen.getByTestId('obj-o2')
await waitFor(() => {
// 두 객체가 같은 delta로 이동했다고 가정(정확 좌표는 스냅 규칙에 의해 결정되므로 상대 비교는 이후 강화 예정)
expect(o1.style.left).not.toBe('10px')
expect(o2.style.left).not.toBe('80px')
})
})
})
+135 -34
View File
@@ -17,7 +17,7 @@ type DocWithEFP = Document & { elementFromPoint?: (x: number, y: number) => Elem
if (typeof document !== 'undefined') {
const d = document as DocWithEFP
if (typeof d.elementFromPoint !== 'function') {
d.elementFromPoint = (_x: number, _y: number) => null
d.elementFromPoint = (_x: number, _y: number) => { void _x; void _y; return null }
}
}
@@ -28,12 +28,21 @@ export type CanvasProps = {
export function Canvas({ frame, onChange }: CanvasProps) {
const [model, setModel] = useState<Frame>(frame)
const [selectedId, setSelectedId] = useState<string | null>(model.layers[0]?.objects[0]?.id ?? null)
const initialId = model.layers[0]?.objects[0]?.id ?? null
const [selectedIds, setSelectedIds] = useState<string[]>(initialId ? [initialId] : [])
const selectedId = selectedIds[selectedIds.length - 1] ?? null
const draggingRef = useRef<{ id: string; startX: number; startY: number; origX: number; origY: number } | null>(null)
const resizingRef = useRef<{ id: string; startX: number; startY: number; origW: number; origH: number } | null>(null)
const rotatingRef = useRef<{ id: string; startX: number; startY: number; origDeg: number } | null>(null)
const [showGuides, setShowGuides] = useState(false)
const [guidePos, setGuidePos] = useState<{ x: number; y: number }>({ x: 0, y: 0 })
const [marquee, setMarquee] = useState<{
active: boolean
x0: number
y0: number
x1: number
y1: number
}>({ active: false, x0: 0, y0: 0, x1: 0, y1: 0 })
// 선택된 객체 DOM을 식별하기 위한 ref(선택자 기반 target으로 전환)
const selectedElRef = useRef<HTMLDivElement | null>(null)
@@ -53,6 +62,21 @@ export function Canvas({ frame, onChange }: CanvasProps) {
})
}, [onChange])
const updateObjects = useCallback((ids: string[], updater: (o: WObject) => WObject) => {
setModel((prev) => {
const idSet = new Set(ids)
const next: Frame = {
...prev,
layers: prev.layers.map((ly) => ({
...ly,
objects: ly.objects.map((o) => (idSet.has(o.id) ? updater(o) : o)),
})),
}
onChange?.(next)
return next
})
}, [onChange])
const onKeyDown = useCallback((e: React.KeyboardEvent) => {
if (!selected) return
let dx = 0, dy = 0
@@ -78,13 +102,45 @@ export function Canvas({ frame, onChange }: CanvasProps) {
}, [selected, updateObject])
const onMouseDownObj = useCallback((e: React.MouseEvent, o: WObject) => {
setSelectedId(o.id)
if (e.shiftKey) {
setSelectedIds((prev) => {
const exists = prev.includes(o.id)
if (exists) return prev.filter((id) => id !== o.id)
return [...prev, o.id]
})
} else {
setSelectedIds([o.id])
}
draggingRef.current = { id: o.id, startX: e.clientX, startY: e.clientY, origX: o.x, origY: o.y }
setShowGuides(true)
setGuidePos({ x: snap8(o.x), y: snap8(o.y) })
}, [])
const onMouseMoveCanvas = useCallback((e: React.MouseEvent) => {
// 마퀴 선택 처리 우선
if (marquee.active) {
const x1 = e.clientX
const y1 = e.clientY
setMarquee((m) => ({ ...m, x1, y1 }))
// 교차하는 객체 선택 갱신
const minX = Math.min(marquee.x0, x1)
const minY = Math.min(marquee.y0, y1)
const maxX = Math.max(marquee.x0, x1)
const maxY = Math.max(marquee.y0, y1)
const hits: string[] = []
for (const ly of model.layers) {
for (const o of ly.objects) {
const ol = o.x
const ot = o.y
const or = o.x + o.width
const ob = o.y + o.height
const inter = !(or < minX || ob < minY || ol > maxX || ot > maxY)
if (inter) hits.push(o.id)
}
}
setSelectedIds(hits)
return
}
const rot = rotatingRef.current
if (rot) {
const dx = e.clientX - rot.startX
@@ -113,14 +169,17 @@ export function Canvas({ frame, onChange }: CanvasProps) {
setGuidePos({ x: nx, y: ny })
updateObject(d.id, (o) => ({ ...o, x: nx, y: ny }))
}
}, [updateObject])
}, [updateObject, marquee.active, marquee.x0, marquee.y0, model.layers])
const onMouseUpCanvas = useCallback(() => {
if (marquee.active) {
setMarquee((m) => ({ ...m, active: false }))
}
draggingRef.current = null
resizingRef.current = null
rotatingRef.current = null
setShowGuides(false)
}, [])
}, [marquee.active])
const onMouseDownResize = useCallback((e: React.MouseEvent, o: WObject) => {
e.stopPropagation()
@@ -138,6 +197,14 @@ export function Canvas({ frame, onChange }: CanvasProps) {
aria-label="WYSIWYG Canvas"
tabIndex={0}
onKeyDown={onKeyDown}
onMouseDown={(e) => {
// 빈 캔버스 클릭 시 마퀴 시작 또는 선택 해제
// 객체 onMouseDown에서 선택을 처리하므로, 여기서는 드래그 박스 시작만 담당
if ((e.target as HTMLElement).dataset.testid === 'wysiwyg-canvas') {
setSelectedIds([])
setMarquee({ active: true, x0: e.clientX, y0: e.clientY, x1: e.clientX, y1: e.clientY })
}
}}
onMouseMove={onMouseMoveCanvas}
onMouseUp={onMouseUpCanvas}
style={{ position: 'relative', width: model.width, height: model.height, outline: '0' }}
@@ -156,16 +223,16 @@ export function Canvas({ frame, onChange }: CanvasProps) {
aria-label={`object ${o.id}`}
onMouseDown={(e) => onMouseDownObj(e, o)}
ref={selectedId === o.id ? (el) => { selectedElRef.current = el } : undefined}
style={{ position: 'absolute', left: o.x, top: o.y, width: o.width, height: o.height, transform: `rotate(${o.rotate}deg)`, outline: selectedId===o.id? '2px solid #0ea5e9':'none' }}
style={{ position: 'absolute', left: o.x, top: o.y, width: o.width, height: o.height, transform: `rotate(${o.rotate}deg)`, outline: selectedIds.includes(o.id)? '2px solid #0ea5e9':'none' }}
>
{selectedId === o.id && (
{selectedIds.includes(o.id) && (
<div
data-testid={`resize-handle-${o.id}`}
onMouseDown={(e) => onMouseDownResize(e, o)}
style={{ position: 'absolute', right: 0, bottom: 0, width: 10, height: 10, background: '#0ea5e9', cursor: 'nwse-resize' }}
/>
)}
{selectedId === o.id && (
{selectedIds.includes(o.id) && (
<div
data-testid={`rotate-handle-${o.id}`}
onMouseDown={(e) => onMouseDownRotate(e, o)}
@@ -189,8 +256,39 @@ export function Canvas({ frame, onChange }: CanvasProps) {
}}
onDrag={({ left, top }) => {
if (!selected) return
const rawLeft = typeof left === 'number' ? left : 0
const rawTop = typeof top === 'number' ? top : 0
const rawLeftInput = typeof left === 'number' ? left : 0
const rawTopInput = typeof top === 'number' ? top : 0
// 다중 선택 시: 그룹 bbox 기준으로 스냅 계산
let baseLeft = selected.x
let baseTop = selected.y
let rawLeft = rawLeftInput
let rawTop = rawTopInput
let groupLeft = selected.x
let groupTop = selected.y
let groupWidth = selected.width
let groupHeight = selected.height
if (selectedIds.length > 1) {
let minL = Infinity, minT = Infinity, maxR = -Infinity, maxB = -Infinity
for (const ly of model.layers) {
for (const o of ly.objects) {
if (!selectedIds.includes(o.id)) continue
minL = Math.min(minL, o.x)
minT = Math.min(minT, o.y)
maxR = Math.max(maxR, o.x + o.width)
maxB = Math.max(maxB, o.y + o.height)
}
}
groupLeft = minL
groupTop = minT
groupWidth = Math.max(0, maxR - minL)
groupHeight = Math.max(0, maxB - minT)
const dxProp = rawLeftInput - selected.x
const dyProp = rawTopInput - selected.y
baseLeft = groupLeft
baseTop = groupTop
rawLeft = groupLeft + dxProp
rawTop = groupTop + dyProp
}
let nx = snap8(rawLeft)
let ny = snap8(rawTop)
@@ -198,6 +296,8 @@ export function Canvas({ frame, onChange }: CanvasProps) {
const threshold = 8
let snappedCenterX: number | undefined
let snappedCenterY: number | undefined
let centerDistX = Number.POSITIVE_INFINITY
let centerDistY = Number.POSITIVE_INFINITY
// 에지 스냅 후보(nx, ny로 바로 설정 가능한 값) 및 가이드 좌표
let edgeNx: number | undefined
let edgeNy: number | undefined
@@ -205,39 +305,34 @@ export function Canvas({ frame, onChange }: CanvasProps) {
let guideEdgeY: number | undefined
let minDistX = Number.POSITIVE_INFINITY
let minDistY = Number.POSITIVE_INFINITY
outer: for (const layer of model.layers) {
for (const layer of model.layers) {
for (const obj of layer.objects) {
if (obj.id === selected.id) continue
if (selectedIds.includes(obj.id)) continue
const otherCenterX = obj.x + obj.width / 2
const selCenterX = rawLeft + selected.width / 2
if (Math.abs(selCenterX - otherCenterX) <= threshold) {
const selCenterX = rawLeft + (selectedIds.length > 1 ? groupWidth : selected.width) / 2
const dxCenter = Math.abs(selCenterX - otherCenterX)
if (dxCenter <= threshold && dxCenter < centerDistX) {
centerDistX = dxCenter
snappedCenterX = otherCenterX
// 수평 중심도 동시에 체크
const otherCenterY = obj.y + obj.height / 2
const selCenterY = rawTop + selected.height / 2
if (Math.abs(selCenterY - otherCenterY) <= threshold) {
snappedCenterY = otherCenterY
}
break outer
}
const otherCenterY2 = obj.y + obj.height / 2
const selCenterY2 = rawTop + selected.height / 2
if (Math.abs(selCenterY2 - otherCenterY2) <= threshold) {
const selCenterY2 = rawTop + (selectedIds.length > 1 ? groupHeight : selected.height) / 2
const dyCenter = Math.abs(selCenterY2 - otherCenterY2)
if (dyCenter <= threshold && dyCenter < centerDistY) {
centerDistY = dyCenter
snappedCenterY = otherCenterY2
// x는 그리드, y만 스냅으로 나가고 루프 종료
break outer
}
// 에지 스냅 후보 계산 (X축)
const selLeft = rawLeft
const selRight = rawLeft + selected.width
const selRight = rawLeft + (selectedIds.length > 1 ? groupWidth : selected.width)
const otherLeft = obj.x
const otherRight = obj.x + obj.width
const xPairs: Array<{dist: number; nx: number; guideX: number}> = [
{ dist: Math.abs(selLeft - otherLeft), nx: otherLeft, guideX: otherLeft }, // L-L
{ dist: Math.abs(selLeft - otherRight), nx: otherRight, guideX: otherRight }, // L-R
{ dist: Math.abs(selRight - otherLeft), nx: otherLeft - selected.width, guideX: otherLeft }, // R-L
{ dist: Math.abs(selRight - otherRight), nx: otherRight - selected.width, guideX: otherRight }, // R-R
{ dist: Math.abs(selRight - otherLeft), nx: otherLeft - (selectedIds.length > 1 ? groupWidth : selected.width), guideX: otherLeft }, // R-L
{ dist: Math.abs(selRight - otherRight), nx: otherRight - (selectedIds.length > 1 ? groupWidth : selected.width), guideX: otherRight }, // R-R
]
for (const p of xPairs) {
if (p.dist <= threshold && p.dist < minDistX) {
@@ -249,14 +344,14 @@ export function Canvas({ frame, onChange }: CanvasProps) {
// 에지 스냅 후보 계산 (Y축)
const selTop = rawTop
const selBottom = rawTop + selected.height
const selBottom = rawTop + (selectedIds.length > 1 ? groupHeight : selected.height)
const otherTop = obj.y
const otherBottom = obj.y + obj.height
const yPairs: Array<{dist: number; ny: number; guideY: number}> = [
{ dist: Math.abs(selTop - otherTop), ny: otherTop, guideY: otherTop }, // T-T
{ dist: Math.abs(selTop - otherBottom), ny: otherBottom, guideY: otherBottom }, // T-B
{ dist: Math.abs(selBottom - otherTop), ny: otherTop - selected.height, guideY: otherTop }, // B-T
{ dist: Math.abs(selBottom - otherBottom), ny: otherBottom - selected.height, guideY: otherBottom }, // B-B
{ dist: Math.abs(selBottom - otherTop), ny: otherTop - (selectedIds.length > 1 ? groupHeight : selected.height), guideY: otherTop }, // B-T
{ dist: Math.abs(selBottom - otherBottom), ny: otherBottom - (selectedIds.length > 1 ? groupHeight : selected.height), guideY: otherBottom }, // B-B
]
for (const p of yPairs) {
if (p.dist <= threshold && p.dist < minDistY) {
@@ -272,12 +367,12 @@ export function Canvas({ frame, onChange }: CanvasProps) {
if (typeof edgeNx === 'number') {
nx = edgeNx
} else if (typeof snappedCenterX === 'number') {
nx = snappedCenterX - selected.width / 2
nx = snappedCenterX - (selectedIds.length > 1 ? groupWidth : selected.width) / 2
}
if (typeof edgeNy === 'number') {
ny = edgeNy
} else if (typeof snappedCenterY === 'number') {
ny = snappedCenterY - selected.height / 2
ny = snappedCenterY - (selectedIds.length > 1 ? groupHeight : selected.height) / 2
}
// 가이드라인 좌표 업데이트: 축별로 에지/중심/그리드 순으로 우선 표시
@@ -285,7 +380,13 @@ export function Canvas({ frame, onChange }: CanvasProps) {
const guideY = typeof guideEdgeY === 'number' ? guideEdgeY : (typeof snappedCenterY === 'number' ? snappedCenterY : ny)
setGuidePos({ x: guideX, y: guideY })
updateObject(selected.id, (o) => ({ ...o, x: nx, y: ny }))
if (selectedIds.length > 1) {
const dx = nx - baseLeft
const dy = ny - baseTop
updateObjects(selectedIds, (o) => ({ ...o, x: o.x + dx, y: o.y + dy }))
} else {
updateObject(selected.id, (o) => ({ ...o, x: nx, y: ny }))
}
}}
onDragEnd={() => {
// 드래그 종료 시 가이드 숨김