Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d08f050bfd | |||
| d2575c9b19 | |||
| dc54226351 | |||
| 5bf78b3e01 | |||
| 1c607f6331 | |||
| 9ced249015 | |||
| e34a2c9192 | |||
| 971b609305 | |||
| 2070b52023 | |||
| 713648fb3a | |||
| 498ffb675a | |||
| 302ab79dd4 | |||
| 1b1b916a30 | |||
| ccb706de5b | |||
| 66cb36cd9d |
@@ -36,6 +36,8 @@ yarn-error.log*
|
||||
# vercel
|
||||
.vercel
|
||||
|
||||
.windsurf
|
||||
|
||||
# typescript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
|
||||
+267
@@ -1,5 +1,253 @@
|
||||
# 메인플랜: 랜딩 페이지 빌더
|
||||
|
||||
## [정렬] WYSIWYG 빌더 목표/요구사항/수용기준 (2025-11-17)
|
||||
- **목표**
|
||||
- /[locale]/wysiwyg 에서 비개발자도 랜딩을 시각적으로 제작(Add→편집→Export)할 수 있다.
|
||||
- Export 산출물은 ZIP(index.html/css/js/assets/*, site.webmanifest, robots.txt, 무결성 파일)을 포함한다.
|
||||
|
||||
- **확정 요구사항**
|
||||
- R1: 텍스트/이미지/버튼 추가 및 속성 편집(X/Y/W/H/Rotate + 타입별 속성)
|
||||
- R2: 조작 UX(드래그/리사이즈/회전, 8px/15° 스냅, 멀티선택·마퀴, 키보드 너지, 가이드 표시, a11y 라이브 리전)
|
||||
- R3: 레이어 관리(순서 이동, lock, visible 토글)
|
||||
- R4: Export ZIP 생성(무결성 파일 포함) 및 verify ok
|
||||
- R5: 경로 고정(/[locale]/wysiwyg)
|
||||
|
||||
- **수용 기준(DoD)**
|
||||
- A1: /wysiwyg에서 Add Text → 속성 수정 → Export 실행 시 ZIP 생성, HTML/CSS에 수정 반영
|
||||
- A2: 드래그/리사이즈/회전 스냅 동작 및 가이드 표시 스모크 그린
|
||||
- A3: 라이브 리전 문구가 선택/가이드/너지에 맞춰 갱신
|
||||
- A4: 생성된 ZIP에 대해 verifyIntegrity 결과 ok=true
|
||||
- A5: 레이어 순서 변경이 렌더에 반영
|
||||
|
||||
- **TDD 매핑**
|
||||
- R1 → PropsPanel.test(기존) + WysiwygBuilderPage 추가/수정 반영 스모크(신규)
|
||||
- R2 → Canvas.*.test(기존) + 빌더 멀티선택/마퀴 스모크(신규)
|
||||
- R3 → LayersPanel.test(기존) + 빌더 순서 반영(신규)
|
||||
- R4 → exportFrame/buildZip/무결성(기존) + 빌더 Export 스모크(신규)
|
||||
- R5 → 라우트 스모크(기존)
|
||||
|
||||
- **순차 작업 계획**
|
||||
1) 수용 테스트 추가(빌더 Add→Edit→Export, 레이어 순서 반영, 멀티선택/마퀴 스모크)
|
||||
2) /wysiwyg Export에 무결성 파일 포함 연동
|
||||
3) 최소 UI 토글(가이드/그리드) 노출 및 문서 업데이트
|
||||
4) 전체 그린 확인 후 브랜치 범위 점검 → 푸쉬
|
||||
|
||||
### Guides 토글 안정화 + 리사이즈 UX 2차(방향 핸들) (2025-11-17)
|
||||
- TDD
|
||||
- `components/wysiwyg/WysiwygBuilder.guides.acceptance.test.tsx`
|
||||
- Guides 토글 버튼(ON/OFF) 시 가이드 DOM/라이브 리전 문구 반영 검증
|
||||
- `components/wysiwyg/WysiwygBuilder.resize.acceptance.test.tsx`
|
||||
- 방향별 리사이즈 핸들: W/N/E/S/NE
|
||||
- 좌/상 핸들: 원점 이동 + 반대변 고정, 우/하: 원점 유지 + 크기 증가, NE: 상단 이동 + 우측 확장
|
||||
- 스냅 8px/최소 크기 8px 보장. 스냅으로 인한 픽셀 변화는 snap8 기대값으로 검증
|
||||
- 구현
|
||||
- `components/wysiwyg/Canvas.tsx`
|
||||
- enableGuides에 따라 드래그 중에만 가이드 노출, 종료 시 해제
|
||||
- 커스텀 리사이즈 핸들 5종(W/N/E/S/NE) 추가 및 방향성 로직 구현
|
||||
- 스냅(8px)·최소 크기(8px) 적용, 좌/상은 원점 이동 처리
|
||||
- 리사이즈 중 Moveable 드래그 이벤트 무시(간섭 방지)
|
||||
- 오류 원인/디버깅
|
||||
- React 경고: "다른 컴포넌트 렌더 중 setState" → 드래그/리사이즈 라이프사이클로 이동해 해결
|
||||
- Moveable 드래그와 리사이즈 동시 발생으로 좌표 튐/기대 불일치 → `resizingRef` 활성 시 Moveable onDragStart/onDrag 조기리턴 처리
|
||||
- 테스트 불안정: 선택 직후 의도치 않은 드래그 → 선택 후 `mouseUp(canvas)`로 상호작용 종료 보장, 스냅 기대값으로 단정
|
||||
- 결과: 위 2개 수용 테스트 포함 전체 그린 유지
|
||||
|
||||
### 가이드라인 고도화 진행(2025-11-16)
|
||||
- 목표: 객체-객체 스냅 가이드(8px 임계)
|
||||
- 수직 중심 정렬 가이드/스냅
|
||||
- 수평 중심 정렬 가이드/스냅
|
||||
- 좌/우/상/하 가장자리 정렬 가이드/스냅
|
||||
- TDD
|
||||
- `components/wysiwyg/Canvas.guidelines.advanced.test.tsx`
|
||||
- 수직 중심 스냅 가이드(8px) 검증. Moveable 모킹, `act`/`waitFor` 적용
|
||||
- `components/wysiwyg/Canvas.guidelines.horizontal.test.tsx`
|
||||
- 수평 중심 스냅 가이드(8px) 검증
|
||||
- `components/wysiwyg/Canvas.guidelines.edges.test.tsx`
|
||||
- 좌/우 에지 스냅 가이드(8px) 1차 케이스 검증(T→L 등 에지 페어)
|
||||
- 구현
|
||||
- `components/wysiwyg/Canvas.tsx`
|
||||
- onDrag: 그리드(8px) → 객체 중심 스냅(수직/수평) → 객체 에지 스냅(좌/우/상/하) 우선순위 적용
|
||||
- 가이드 좌표: 축별로 에지 > 중심 > 그리드 순서로 표시
|
||||
- 드래그 시작 시 가이드 표시, 종료 시 가이드 해제 유지
|
||||
- 결과: 전체 테스트 그린(131/131)
|
||||
|
||||
#### 오류 원인/디버깅(메모)
|
||||
- 실패: 수직 중심 스냅 테스트에서 선택 대상이 기본 선택되지 않아 좌표 미변경 → 레이어 objects 순서를 조정(o1을 첫 요소로)
|
||||
- 실패: 비동기 상태 반영 전 단정 → Moveable 이벤트 호출을 `act`로 감싸고 결과 검증을 `waitFor`/`findByTestId`로 보강하여 해결
|
||||
- 실패: 가장자리 스냅 미구현으로 208px(그리드) 유지 → 에지 스냅(LL/LR/RL/RR, TT/TB/BT/BB) 페어 계산 로직과 8px 임계 우선순위 적용으로 해결
|
||||
|
||||
#### 다음 단계
|
||||
- 키보드 nudge(Shift/Alt 미세/가속)와 가이드 반영 TDD/구현
|
||||
- 다중 선택 및 그룹 이동/정렬 스펙 초안 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 속성 방안 설계
|
||||
|
||||
### WYSIWYG 빌더 Export/이미지/Props 동기화 진행(2025-11-17)
|
||||
- 목표: /wysiwyg에서 실제 랜딩에 가까운 HTML/CSS Export와 로컬 이미지 업로드, 속성 패널과 Canvas의 일관된 동기화 확보
|
||||
- TDD
|
||||
- `lib/wysiwyg/export.test.ts`
|
||||
- 버튼 오브젝트를 `<a id="..." href="...">label</a>`로 내보내는지 검증
|
||||
- 숨김 레이어(`visible: false`)가 HTML/CSS에 포함되지 않는지 검증
|
||||
- `exportFrame` 결과 HTML이 `<!doctype html>`, `<link rel="stylesheet" href="styles.css" />`, `<script src="app.js"></script>`를 포함하는 전체 문서 구조인지 검증
|
||||
- `components/wysiwyg/WysiwygBuilder.acceptance.test.tsx`
|
||||
- 로컬 이미지 업로드 시 Canvas에 `<img src="/assets/...">`가 렌더되는지 검증
|
||||
- PropsPanel에서 Width/Height/Rotate 변경이 Canvas 스타일(width/height/transform)에 반영되는지 검증
|
||||
- PropsPanel에서 Text/Label 변경이 Canvas 텍스트/버튼 콘텐츠에 반영되는지 검증
|
||||
- 구현
|
||||
- `lib/wysiwyg/export.ts`
|
||||
- frame 내용을 `<div class="frame-scale"><div class="frame">...</div></div>`로 감싼 뒤, `<!doctype html><html lang="en"><head>...styles.css...</head><body>...app.js...</body></html>` 전체 문서로 래핑
|
||||
- 숨김 레이어는 HTML/CSS 생성 시 스킵, 버튼은 `<a>`로 내보내되 위치/크기/회전은 CSS에서 절대 좌표로 표현
|
||||
- `components/wysiwyg/WysiwygBuilderPage.tsx`
|
||||
- 페이지 수명 주기 동안 유지되는 `AssetManager`를 `useRef`로 보관
|
||||
- 파일 업로드 input(`data-testid="wysiwyg-image-input"`) 추가 후, 업로드된 이미지를 `AssetManager.add`로 수집하고 `props.src="/assets/..."`인 image WObject를 Base 레이어에 추가
|
||||
- Export 시 `assetManager.toZipStructure()`를 `buildZip`의 `assets`로 전달하고, 기존 무결성 파일(`assets.json`, `assets.index.json`, `assets.integrity.index.json`)을 extras에 포함
|
||||
- `components/wysiwyg/PropsPanel.tsx`
|
||||
- 내부 `model`을 `object` prop과 `useEffect`로 동기화하여 선택 변경 시 최신 값 반영
|
||||
- Text용 Text 필드(`aria-label="Text"` → `props.text`), Button용 Label 필드(`aria-label="Label"` → `props.label`) 추가
|
||||
- 결과
|
||||
- /wysiwyg에서 Add Text/Image/Button, PropsPanel 편집, 로컬 이미지 업로드, Export ZIP(index.html/styles.css/app.js/assets/* + 무결성 파일)까지 한 플로우가 acceptance 테스트로 검증되는 상태
|
||||
- `npm test -s` 기준 145 파일 / 246 테스트 전체 그린
|
||||
|
||||
### 접근성 라이브 리전(2025-11-17)
|
||||
- 목표: 캔버스에서 선택 개수 변화와 가이드(스냅 라인) 좌표 변화를 스크린리더에 폴라이트로 안내
|
||||
- TDD
|
||||
- `components/wysiwyg/Canvas.a11y.guides.test.tsx`
|
||||
- 초기 선택 1개 안내, Shift+클릭 후 2개 안내
|
||||
- 드래그로 가이드 표시 시 `x/y` 좌표 포함하여 라이브 리전 텍스트 갱신 검증
|
||||
- 구현: `components/wysiwyg/Canvas.tsx`
|
||||
- `role="status" aria-live="polite"` 라이브 리전 요소 추가(`data-testid="aria-live"`)
|
||||
- 텍스트는 `useMemo`로 파생 계산(선택 수, 가이드 표시 여부, 가이드 좌표)
|
||||
- 상태(setState) 기반 이펙트 대신 파생 텍스트로 전환하여 렌더 루프/린트 경고 회피
|
||||
- 결과: 테스트 그린(전체 232/232)
|
||||
- 디버깅 메모: useEffect 내 setState 경고 발생 → useMemo로 파생 텍스트 계산으로 해결
|
||||
|
||||
### 폼 요소 이관 + Export a11y + Help + Validation (2025-11-17)
|
||||
- TDD
|
||||
- components/wysiwyg/
|
||||
- WysiwygBuilder.form-input.acceptance.test.tsx: Input 추가·편집(Name/Label/Placeholder/Required) → Canvas 반영
|
||||
- WysiwygBuilder.form-select.acceptance.test.tsx: Select 추가·편집(Name/Label/Options/Default) → Canvas 반영
|
||||
- WysiwygBuilder.form-textarea.acceptance.test.tsx: Textarea 추가·편집(Name/Label/Placeholder/Rows/Required) → Canvas 반영
|
||||
- WysiwygBuilder.form-radio.acceptance.test.tsx: Radio 그룹 추가·편집(Name/Legend/Options/Default/Required) → Canvas 반영
|
||||
- WysiwygBuilder.form-checkbox.acceptance.test.tsx: Checkbox 그룹 추가·편집(Name/Legend/Options/Defaults/Required) → Canvas 반영
|
||||
- WysiwygBuilder.form-help.acceptance.test.tsx: Help 편집 → Canvas help 텍스트 및 aria-describedby 연결 검증
|
||||
- lib/wysiwyg/
|
||||
- export.form.test.ts: 폼 5종 a11y(label/for, fieldset/legend, selected 등) HTML/CSS 출력 검증
|
||||
- export.form.help.test.ts: Help → aria-describedby(입력)/그룹 Help(라디오/체크박스) 검증
|
||||
- export.form.validation.test.ts: pattern/minLength/maxLength 속성 내보내기 검증
|
||||
- 구현
|
||||
- lib/wysiwyg/schema.ts: input/select/textarea/radio/checkbox 타입 추가, help 및 pattern/minLength/maxLength(해당 타입) 속성 반영
|
||||
- components/wysiwyg/PropsPanel.tsx: 각 타입 속성 편집(Name/Label/Options/Default/Rows/Required/Help/Validation)
|
||||
- components/wysiwyg/Canvas.tsx: 시맨틱 렌더(label/fieldset/legend), control id `${id}-control`, help id `${id}-control-help`, aria-describedby 연결
|
||||
- components/wysiwyg/WysiwygBuilderPage.tsx: Add 버튼 및 오브젝트 생성 로직 추가(5종)
|
||||
- lib/wysiwyg/export.ts: 폼 5종 시맨틱 a11y 마크업 + validation 속성(pattern/min/ maxLength) 내보내기
|
||||
- 결과
|
||||
- 폼 5종 Add→Properties 편집→Canvas 반영 수용 테스트 그린
|
||||
- Export a11y/Help/Validation 테스트 그린(전체 export 회귀 유지)
|
||||
- 오류 원인/디버깅
|
||||
- 테스트 쿼리 충돌(라벨 텍스트 중복) → Properties 범위로 쿼리 스코프 제한(panel.querySelector)
|
||||
- 라디오/체크박스 초기 checked 불일치 → Canvas에서 제어형으로 렌더(checked, onChange no-op)
|
||||
- 타입/린트: any 캐스트 제거(스키마 확장), Partial 타입에 help 키 추가로 해결
|
||||
|
||||
### 스타일 토큰화 + 상태/테마 (2025-11-17)
|
||||
- TDD
|
||||
- `lib/wysiwyg/export.style.tokens.test.ts`: :root 토큰 존재(--bg, --text, --border, --primary), .frame/anchor 토큰 참조
|
||||
- `lib/wysiwyg/export.style.tokens.controls.test.ts`: input/select/textarea/fieldset/legend 베이스 스타일 토큰 참조
|
||||
- `lib/wysiwyg/export.style.tokens.states.test.ts`: :focus, :invalid 상태 스타일이 토큰(--primary/--danger) 참조
|
||||
- `lib/wysiwyg/export.style.tokens.theme.test.ts`: [data-theme="light"|"dark"] 프리셋 토큰 존재 및 .frame이 var(--bg) 사용
|
||||
- 구현
|
||||
- `lib/wysiwyg/export.ts`
|
||||
- :root 토큰: `--bg`, `--text`, `--border`, `--primary`, `--danger`
|
||||
- 베이스 규칙: `.frame{background:var(--bg)}`, `a{color:var(--primary)}`
|
||||
- 컨트롤 베이스: `input,select,textarea{color:var(--text);border:1px solid var(--border)}` + `fieldset/legend`
|
||||
- 상태: `:focus{outline:2px solid var(--primary)}` / `:invalid{border-color:var(--danger)}`
|
||||
- 테마 프리셋: `[data-theme="light"]`, `[data-theme="dark"]` 각각 토큰 값 제공
|
||||
- 결과: 모든 관련 테스트 그린 유지
|
||||
- 오류 원인/디버깅
|
||||
- 없음(스냅샷은 정규식 매칭으로 안정화)
|
||||
|
||||
### 스타일 토큰 회귀 강화(링/비활성) (2025-11-17)
|
||||
- TDD
|
||||
- `lib/wysiwyg/export.style.tokens.focusVisible.test.ts`: `--ring`, `--ring-offset` 토큰 존재 및 `:focus-visible`에서 outline/offset 참조 검증
|
||||
- `lib/wysiwyg/export.style.tokens.disabled.test.ts`: `--disabled-bg`, `--disabled-fg` 토큰 존재 및 `:disabled`/`[readonly]`에서 참조 검증
|
||||
- 구현: `lib/wysiwyg/export.ts`
|
||||
- :root/테마 토큰에 `--ring`, `--ring-offset`, `--disabled-bg`, `--disabled-fg` 추가
|
||||
- 규칙 추가: `:focus-visible{outline:2px solid var(--ring);outline-offset:var(--ring-offset)}`
|
||||
- 규칙 추가: `input,select,textarea:disabled{background:var(--disabled-bg);color:var(--disabled-fg)}` / `[readonly]{color:var(--disabled-fg)}`
|
||||
- 결과: 전체 테스트 그린(166 파일 / 291 테스트)
|
||||
|
||||
### Guides/그룹 액션 완성(드래그/리사이즈/회전 + 스냅) (2025-11-17)
|
||||
- TDD
|
||||
- `components/wysiwyg/WysiwygBuilder.guides.acceptance.test.tsx`: Guides 토글 ON/OFF 표시 확인
|
||||
- `components/wysiwyg/WysiwygBuilder.group-actions.acceptance.test.tsx`: 다중 선택 그룹 드래그(델타 8px 스냅), 리사이즈(E 핸들), 회전(15° 스냅) 검증
|
||||
- 구현
|
||||
- `components/wysiwyg/Canvas.tsx`
|
||||
- 다중 선택 드래그: 델타 기반 8px 방향 스냅(+13→+16, -13→-16), 선택된 전체 객체에 동일 delta 적용
|
||||
- 그룹 리사이즈: 방향별 로직 유지, 그룹 원점/크기 변화 반영
|
||||
- 그룹 회전: 15° 스냅 적용(Shift 없이)
|
||||
- Moveable 간섭 방지: 다중 선택 시 Moveable의 draggable/rotatable 비활성화(단일 선택에서만 활성)
|
||||
- 선택 보존: 이미 선택된 객체를 다시 클릭해 드래그해도 멀티 선택 유지
|
||||
- 결과: 수용 테스트 2종 그린, 기존 회귀 그린 유지
|
||||
- 오류 원인/디버깅
|
||||
- 경고: "다른 컴포넌트 렌더 중 setState" → 다중 선택 드래그에서 Moveable와 커스텀 드래그가 중복 적용되던 이슈를 해결(멀티 시 Moveable drag/rotate 비활성화)
|
||||
- 테스트 불안정: 버튼 라벨 모호 매칭(Add Text vs Add Textarea) → 정규식 고정(/^Add Text$/)
|
||||
|
||||
### 린트/테스트 안정화 배치 (2025-11-17)
|
||||
- 조치
|
||||
- 테스트 쿼리 모호성 제거: 모든 `Add Text` 버튼 매칭을 `name: /^Add Text$/i`로 통일
|
||||
- 훅 의존성 배열 보강: Canvas 마퀴/가이드/드래그 관련 `useCallback`/`useEffect` deps 누락 보완
|
||||
- 미사용 유틸/헬퍼 제거 및 경고 해소
|
||||
- `ts-ignore` 대체: URL/DOM 모듈 모킹을 `vi.spyOn(...)`으로 치환하여 타입 우회 제거
|
||||
- 멀티선택 시 Moveable 간섭 방지 재확인: draggable/rotatable 비활성화 유지로 중복 업데이트 차단
|
||||
- 스냅 우선순위 보존 검증: 에지 > 중심 > 그리드, 방향성 스냅(+13→+16, -13→-16) 회귀 그린 확인
|
||||
- 결과
|
||||
- `npm test -s`: 164 파일, 289 테스트 전부 그린
|
||||
- React 경고(setState in render) 제거, 테스트 플래키성 해소
|
||||
|
||||
### 키보드 nudge × 멀티선택 복합 (2025-11-17)
|
||||
- TDD
|
||||
- `components/wysiwyg/Canvas.nudge.multiselect.acceptance.test.tsx`
|
||||
- ArrowRight: 1px 이동 후 그리드 스냅 적용(이동 축만 스냅)
|
||||
- Shift+ArrowUp: 스냅 없이 정확히 -1px 이동(미세 이동)
|
||||
- Alt+ArrowRight: +16px 이동 후 그리드 스냅(가속 이동)
|
||||
- 구현: `components/wysiwyg/Canvas.tsx`
|
||||
- `onKeyDown`: 앵커(마지막 선택) 기준 목표 좌표(tx, ty) → 스냅 적용(nx, ny) → 델타(ddx, ddy) 산출 → 선택 집합 전체에 동일 델타 적용
|
||||
- 이동하지 않은 축은 기존 좌표 유지하여 비의도 축 보정 방지
|
||||
- 결과: 전체 테스트 그린(168 파일 / 295 테스트)
|
||||
|
||||
## 목표
|
||||
- 비개발자도 사용 가능한 단일 페이지 랜딩 페이지 빌더.
|
||||
- 결과물: 정적 ZIP(HTML/CSS/JS) 다운로드. 이미지: 외부 URL 또는 로컬 업로드(서버 저장 없음, ZIP에 패키징). 폰트는 외부 CDN 허용.
|
||||
@@ -246,6 +494,7 @@
|
||||
- a11y/SEO/OG/Analytics
|
||||
|
||||
## 오류/버그 기록
|
||||
- [2025-11-16 22:32] jsdom 환경에서 Moveable 내부 `document.elementFromPoint` 미구현으로 예외 발생 → `Canvas.tsx`에 테스트 전용 폴리필 추가(`elementFromPoint: () => null`)로 해결. 린트 any 제거 위해 타입(`DocWithEFP`) 선언 및 미사용 인자 경고 최소화.
|
||||
- [2025-11-13 22:55] BuilderClientPage 렌더 중 ref 접근 경고 / useRef.current를 렌더 중 참조하여 ESLint 경고 발생 / FormBuilderPanel 통합 시 `useRef(createFormStore())` 사용 / `useMemo(() => createFormStore(), [])`로 스토어 인스턴스 고정하고 `useSyncExternalStore`에 직접 주입하여 해결 / 렌더 중 ref 접근 금지 원칙 재확인
|
||||
- [2025-11-14 09:35] Vitest 로그에서 i18n 누락 메시지 경고 확인(en: `builder.action.addSelect/addRadio`, `builder.form.actionUrl/honeypot/minSeconds`) → `messages/en.json`에 키 존재 여부 점검 및 누락 보완 후 재실행, 모든 테스트 그린 유지
|
||||
- [2025-11-14 09:45] 프리뷰 텍스트 매칭 불안정으로 테스트 실패 → `data-testid` 기반 안정화(`preview-seo-title` 등) 및 텍스트 매칭 지점 `Title:`→`Locale:`로 조정, 전면 그린
|
||||
@@ -457,3 +706,21 @@
|
||||
- 브랜치: feat/wysiwyg-canvas 생성
|
||||
- 스키마 TDD 완료: lib/wysiwyg/schema.ts(+test)
|
||||
- 다음 작업: Moveable 도입 캔버스 조작 TDD(8px 격자/가장자리 스냅/키보드 nudge)
|
||||
- 스냅 유틸 공통화 완료: `lib/wysiwyg/snap.ts` (`snap8`, `snapAngle`) + 테스트 `lib/wysiwyg/snap.test.ts`
|
||||
- 정책: 위치 8px 스냅, 회전 15° 스냅(Shift시 1° 미세제어)
|
||||
- 경계 보정: 0<|deg|<15 구간은 15°/−15°로 스냅되도록 조정
|
||||
|
||||
- Moveable 통합 완료(TDD→구현→그린)
|
||||
- 설치: `react-moveable`, `moveable`
|
||||
- 스모크: Moveable가 드래그/리사이즈/회전 + 8px 스냅 그리드 props로 렌더
|
||||
- 이벤트 연동: onDrag/onResize/onRotate에서 `snap8`/`snapAngle` 적용, 가이드라인 표시/해제
|
||||
- Shift 1° 미세 제어 타입가드(`isShiftEvent`) 도입
|
||||
- target 바인딩: 선택 객체의 data-testid 셀렉터(`[data-testid="obj-<id>"]`)를 Moveable `target`으로 전달
|
||||
|
||||
|
||||
### 다음 작업(캔버스 Moveable 통합)
|
||||
- 패키지 추가: `react-moveable`, `moveable`
|
||||
- TDD: Moveable 기반 드래그/리사이즈/회전 일원화 테스트 + 8px/15° 스냅 및 가이드라인 표시/해제 검증
|
||||
- 구현: `components/wysiwyg/Canvas.tsx`에 Moveable 적용, 기존 조작 로직 치환, 공통 스냅 유틸 사용
|
||||
- 회귀: 기존 키보드 nudge/가이드라인 테스트 유지 그린
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
import WysiwygBuilderPage from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
export default function Page() {
|
||||
return <WysiwygBuilderPage />
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, fireEvent, waitFor } 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: 240,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'l1',
|
||||
name: 'L1',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'image', x: 16, y: 16, width: 32, height: 32, rotate: 0, zIndex: 0, props: { src: 'a', alt: '' } },
|
||||
{ id: 'o2', type: 'image', x: 80, y: 16, width: 32, height: 32, rotate: 0, zIndex: 1, props: { src: 'b', alt: '' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
describe('WYSIWYG Canvas a11y live region', () => {
|
||||
it('announces selection count and guideline position changes', async () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
const live = getByTestId('aria-live')
|
||||
|
||||
// initial selection exists (first object)
|
||||
await waitFor(() => {
|
||||
expect(live.textContent).toMatch(/선택\s*1개/)
|
||||
})
|
||||
|
||||
// add second selection via Shift+click
|
||||
fireEvent.mouseDown(getByTestId('obj-o2'), { clientX: 80, clientY: 16, shiftKey: true })
|
||||
await waitFor(() => {
|
||||
expect(live.textContent).toMatch(/선택\s*2개/)
|
||||
})
|
||||
|
||||
// start dragging o2 to trigger guide updates
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(getByTestId('obj-o2'), { clientX: 80, clientY: 16 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 96, clientY: 24 })
|
||||
|
||||
await waitFor(() => {
|
||||
// guide should be visible and aria-live includes guide coordinates
|
||||
const t = live.textContent || ''
|
||||
expect(t).toMatch(/가이드\s*x=\d+/)
|
||||
expect(t).toMatch(/y=\d+/)
|
||||
})
|
||||
|
||||
fireEvent.mouseUp(canvas)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,52 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function makeFrame(): Frame {
|
||||
return {
|
||||
id: 'f1',
|
||||
width: 200,
|
||||
height: 160,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'l1',
|
||||
name: 'L1',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'image', x: 10, y: 12, width: 32, height: 24, rotate: 0, zIndex: 0, props: { src: 'a', alt: '' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
describe('WYSIWYG Canvas a11y live region for keyboard nudge', () => {
|
||||
it('announces selected object coordinates after Arrow key nudge', async () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
const live = getByTestId('aria-live')
|
||||
|
||||
// Focus and nudge to the right by 1 (snap8 applies → from 10 to 8 or 16 depending on rounding)
|
||||
canvas.focus()
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowRight' })
|
||||
|
||||
await waitFor(() => {
|
||||
const t = live.textContent || ''
|
||||
expect(t).toMatch(/선택\s*1개/)
|
||||
expect(t).toMatch(/위치\s*x=\d+/)
|
||||
expect(t).toMatch(/y=\d+/)
|
||||
})
|
||||
|
||||
// Nudge down
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowDown' })
|
||||
await waitFor(() => {
|
||||
const t = live.textContent || ''
|
||||
expect(t).toMatch(/위치\s*x=\d+,\s*y=\d+/)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -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()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,68 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import { act } from 'react-dom/test-utils'
|
||||
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-guides',
|
||||
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: 1, props: { text: 'A', fontSize: 16, color: '#000' } },
|
||||
// 대상(o2)의 수직 중심선은 x = 240 (x=200, w=80)
|
||||
{ id: 'o2', type: 'text', x: 200, y: 50, width: 80, height: 30, rotate: 0, zIndex: 0, props: { text: 'B', fontSize: 16, color: '#000' } },
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
describe('Canvas guidelines advanced (object-object snap)', () => {
|
||||
beforeEach(() => capture.mockReset())
|
||||
|
||||
it('shows vertical guide and snaps x to other object center within 8px threshold', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
// 드래그 시작 → 가이드 활성화 상태
|
||||
await act(async () => { last.onDragStart?.() })
|
||||
|
||||
// o1의 중심을 o2 중심(240)에 근접시키도록 left를 220로 제안
|
||||
// o1 width=40이므로 중심은 left+20 → 240이 되도록 left=220 필요
|
||||
await act(async () => { last.onDrag?.({ left: 220, top: 10 }) })
|
||||
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
// x 스냅 결과: left가 정확히 220으로 맞춰짐
|
||||
await waitFor(() => {
|
||||
expect(obj.style.left).toBe('220px')
|
||||
})
|
||||
// 가이드 라인 표시
|
||||
await screen.findByTestId('guide-x')
|
||||
|
||||
// 드래그 종료 → 가이드 해제
|
||||
await act(async () => { last.onDragEnd?.() })
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByTestId('guide-x')).toBeNull()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,65 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import { act } from 'react-dom/test-utils'
|
||||
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-guides-edges',
|
||||
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: 1, props: { text: 'A', fontSize: 16, color: '#000' } },
|
||||
// 기준(o2) - 좌/우 에지: 200, 280
|
||||
{ id: 'o2', type: 'text', x: 200, y: 50, width: 80, height: 30, rotate: 0, zIndex: 0, props: { text: 'B', fontSize: 16, color: '#000' } },
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
describe('Canvas guidelines advanced (edge snap)', () => {
|
||||
beforeEach(() => capture.mockReset())
|
||||
|
||||
it('snaps left edge to other object left edge within 8px threshold and shows vertical guide', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
await act(async () => { last.onDragStart?.() })
|
||||
|
||||
// o2.left = 200. o1을 205로 제안하면 임계(≤8px) 내 → 200으로 스냅
|
||||
await act(async () => { last.onDrag?.({ left: 205, top: 10 }) })
|
||||
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
expect(obj.style.left).toBe('200px')
|
||||
})
|
||||
|
||||
// 수직 가이드 라인 표시(에지 x=200)
|
||||
await screen.findByTestId('guide-x')
|
||||
|
||||
await act(async () => { last.onDragEnd?.() })
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByTestId('guide-x')).toBeNull()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,65 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import { act } from 'react-dom/test-utils'
|
||||
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-guides-h',
|
||||
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: 40, rotate: 0, zIndex: 1, props: { text: 'A', 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' } },
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
describe('Canvas guidelines advanced (horizontal center snap)', () => {
|
||||
beforeEach(() => capture.mockReset())
|
||||
|
||||
it('shows horizontal guide and snaps y to other object center within 8px threshold', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
await act(async () => { last.onDragStart?.() })
|
||||
|
||||
// o1 height=40 → 중심은 top+20. o2 중심 65에 맞추려면 top=45 필요
|
||||
await act(async () => { last.onDrag?.({ left: 10, top: 45 }) })
|
||||
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
expect(obj.style.top).toBe('45px')
|
||||
})
|
||||
|
||||
// 수평 가이드 라인 표시
|
||||
await screen.findByTestId('guide-y')
|
||||
|
||||
await act(async () => { last.onDragEnd?.() })
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByTestId('guide-y')).toBeNull()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -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,50 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getLeft(el: HTMLElement) {
|
||||
const style = el.getAttribute('style') || ''
|
||||
const m = /left:\s*(\d+)px/
|
||||
return Number((style.match(m)?.[1]) || '0')
|
||||
}
|
||||
|
||||
function getTop(el: HTMLElement) {
|
||||
const style = el.getAttribute('style') || ''
|
||||
const m = /top:\s*(\d+)px/
|
||||
return Number((style.match(m)?.[1]) || '0')
|
||||
}
|
||||
|
||||
describe('Canvas guides - nearest candidate priority', () => {
|
||||
it('snaps to the nearest edge candidate among multiple options', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const addText = () => fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
// Create three objects: A (will move), B and C as anchors
|
||||
addText() // A
|
||||
addText() // B
|
||||
addText() // C
|
||||
const objs = await screen.findAllByTestId(/obj-text-/)
|
||||
const [A, B, C] = objs
|
||||
|
||||
// Place B at x=160 (left), C at x=200 (left) via drags
|
||||
// Select B and drag +100 from 60 -> 160
|
||||
fireEvent.mouseDown(B, { clientX: 60, clientY: 60 })
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseMove(canvas, { clientX: 160, clientY: 60 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
await waitFor(() => expect(getLeft(B)).toBe(160))
|
||||
|
||||
// Select C and drag +140 from 60 -> 200
|
||||
fireEvent.mouseDown(C, { clientX: 60, clientY: 120 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 200, clientY: 120 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
await waitFor(() => expect(getLeft(C)).toBe(200))
|
||||
|
||||
// Now drag A near between 160 and 200, closer to 160, expect snap to 160
|
||||
fireEvent.mouseDown(A, { clientX: 60, clientY: 180 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 168, clientY: 180 }) // delta +108 -> near 160 more than 200
|
||||
await screen.findByTestId('guide-x')
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
await waitFor(() => expect(getLeft(A)).toBe(160))
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,40 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getLeft(el: HTMLElement) {
|
||||
const style = el.getAttribute('style') || ''
|
||||
const m = /left:\s*(\d+)px/
|
||||
return Number((style.match(m)?.[1]) || '0')
|
||||
}
|
||||
|
||||
describe('Canvas guides - edge vs center priority', () => {
|
||||
it('prefers edge snap over center when both are available (edge>center)', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
// Add two texts
|
||||
const clickAddText = () => fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
clickAddText()
|
||||
clickAddText()
|
||||
const objs = await screen.findAllByTestId(/obj-text-/)
|
||||
const a = objs[0]
|
||||
const b = objs[1]
|
||||
|
||||
// Select A and drag to x≈100 (from x=60, delta≈+40 -> snaps to +40)
|
||||
fireEvent.mouseDown(a, { clientX: 60, clientY: 60 })
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseMove(canvas, { clientX: 100, clientY: 60 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
// Now A left≈100, width=160 so center≈180
|
||||
await waitFor(() => expect(getLeft(a)).toBe(100))
|
||||
|
||||
// Select B and drag so that B left≈100 too; both edge(L-L) and center-center coincide
|
||||
fireEvent.mouseDown(b, { clientX: 120, clientY: 60 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 159, clientY: 60 }) // delta≈+39 => snapped +40 → left 100
|
||||
// guides should show during drag
|
||||
await screen.findByTestId('guide-x')
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
await waitFor(() => expect(getLeft(b)).toBe(100))
|
||||
})
|
||||
})
|
||||
@@ -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,97 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import { act } from 'react-dom/test-utils'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
const capture = vi.fn()
|
||||
type MProps = {
|
||||
onDragStart?: (e: unknown) => void
|
||||
onDrag?: (e: { left?: number; top?: number }) => void
|
||||
onDragEnd?: (e: unknown) => void
|
||||
onResize?: (e: { width?: number; height?: number }) => void
|
||||
onRotate?: (e: { rotate?: number; inputEvent?: { shiftKey?: boolean } }) => 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: 'f1',
|
||||
width: 400,
|
||||
height: 300,
|
||||
background: '#fff',
|
||||
layers: [
|
||||
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
|
||||
{ id: 'o1', type: 'text', x: 10, y: 10, width: 80, height: 30, rotate: 0, zIndex: 0, props: { text: 'T', fontSize: 16, color: '#000' } },
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
describe('Canvas + Moveable events', () => {
|
||||
beforeEach(() => {
|
||||
capture.mockReset()
|
||||
})
|
||||
|
||||
it('onDrag applies 8px snap and updates left/top, guides show/hide', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
// start drag: guides visible
|
||||
await act(async () => { last.onDragStart?.({}) })
|
||||
await screen.findByTestId('guide-x')
|
||||
|
||||
// move: set left/top to 17/21 → snapped to 16/24
|
||||
await act(async () => { last.onDrag?.({ left: 17, top: 21 }) })
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
expect(obj.style.left).toBe('16px')
|
||||
expect(obj.style.top).toBe('24px')
|
||||
})
|
||||
|
||||
// end: guides hidden
|
||||
await act(async () => { last.onDragEnd?.({}) })
|
||||
await waitFor(() => {
|
||||
expect(screen.queryByTestId('guide-x')).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
it('onResize applies 8px snap and min size', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
await act(async () => { last.onResize?.({ width: 83, height: 13 }) })
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
// 현재 리사이즈는 Moveable onResize가 아닌 커스텀 핸들에서만 처리되므로
|
||||
// Moveable onResize 호출은 객체 크기에 영향을 주지 않는다.
|
||||
expect(obj.style.width).toBe('80px')
|
||||
expect(obj.style.height).toBe('30px')
|
||||
})
|
||||
})
|
||||
|
||||
it('onRotate applies 15deg snap (no shift) and 1deg with shift', async () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
const last = capture.mock.calls.at(-1)?.[0] as MProps
|
||||
expect(last).toBeTruthy()
|
||||
|
||||
await act(async () => { last.onRotate?.({ rotate: 7, inputEvent: { shiftKey: false } }) })
|
||||
const obj = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
expect(obj.style.transform).toContain('rotate(15deg)')
|
||||
})
|
||||
|
||||
await act(async () => { last.onRotate?.({ rotate: 22, inputEvent: { shiftKey: true } }) })
|
||||
await waitFor(() => {
|
||||
expect(obj.style.transform).toContain('rotate(22deg)')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,44 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render } from '@testing-library/react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
const capture = vi.fn()
|
||||
|
||||
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-target',
|
||||
width: 300,
|
||||
height: 200,
|
||||
background: '#fff',
|
||||
layers: [
|
||||
{ id: 'l1', name: 'L1', visible: true, locked: false, objects: [
|
||||
{ id: 'o1', type: 'text', x: 8, y: 8, width: 80, height: 30, rotate: 0, zIndex: 0, props: { text: 'A', fontSize: 16, color: '#000' } },
|
||||
{ id: 'o2', type: 'text', x: 96, y: 8, width: 80, height: 30, rotate: 0, zIndex: 1, props: { text: 'B', fontSize: 16, color: '#000' } },
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
describe('Canvas + Moveable target binding', () => {
|
||||
beforeEach(() => {
|
||||
capture.mockReset()
|
||||
})
|
||||
|
||||
it('passes the selected object selector as Moveable target', () => {
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
// 기본 선택은 첫 객체(o1)라고 가정
|
||||
const el = getByTestId('obj-o1')
|
||||
const last = capture.mock.calls.at(-1)?.[0] as { target?: string }
|
||||
expect(last).toBeTruthy()
|
||||
expect(last?.target).toBe('[data-testid="obj-o1"]')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,57 @@
|
||||
import React from 'react'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen } from '@testing-library/react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
vi.mock('react-moveable', () => {
|
||||
const Mock = (props: Record<string, unknown>) => <div data-testid="moveable" data-props={JSON.stringify({
|
||||
draggable: props.draggable,
|
||||
resizable: props.resizable,
|
||||
rotatable: props.rotatable,
|
||||
snappable: props.snappable,
|
||||
snapGridWidth: props.snapGridWidth,
|
||||
snapGridHeight: props.snapGridHeight,
|
||||
})} />
|
||||
return { default: Mock }
|
||||
})
|
||||
|
||||
const frame: Frame = {
|
||||
id: 'frame1',
|
||||
width: 800,
|
||||
height: 600,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'layer1',
|
||||
name: 'Layer 1',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'obj1', type: 'text', x: 10, y: 12, width: 100, height: 40, rotate: 0, zIndex: 0, props: { text: 'Hello', fontSize: 16, color: '#000000' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
describe('Canvas + Moveable integration (smoke)', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('renders Moveable with draggable/resizable/rotatable and 8px grid', () => {
|
||||
render(<Canvas frame={frame} />)
|
||||
|
||||
const mv = screen.getByTestId('moveable')
|
||||
expect(mv).toBeInTheDocument()
|
||||
|
||||
const props = JSON.parse(mv.getAttribute('data-props') || '{}')
|
||||
expect(props.draggable).toBe(true)
|
||||
// 현재 리사이즈는 커스텀 핸들로만 처리하므로 Moveable에는 resizable을 주지 않는다.
|
||||
expect(props.resizable).toBeUndefined()
|
||||
expect(props.rotatable).toBe(true)
|
||||
expect(props.snappable).toBe(true)
|
||||
expect(props.snapGridWidth).toBe(8)
|
||||
expect(props.snapGridHeight).toBe(8)
|
||||
})
|
||||
})
|
||||
@@ -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,56 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function makeFrame(): Frame {
|
||||
return {
|
||||
id: 'f1',
|
||||
width: 400,
|
||||
height: 300,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'l1',
|
||||
name: 'L1',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'image', x: 20, y: 20, width: 50, height: 40, rotate: 0, zIndex: 0, props: { src: 'x', alt: '' } },
|
||||
{ id: 'o2', type: 'image', x: 120, y: 60, width: 80, height: 30, rotate: 0, zIndex: 1, props: { src: 'y', alt: '' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
describe('WYSIWYG Canvas multigroup resize', () => {
|
||||
it('resizes all selected objects by the same snapped delta when resizing last-selected', async () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
// select o1
|
||||
const obj1 = getByTestId('obj-o1')
|
||||
fireEvent.mouseDown(obj1, { clientX: 25, clientY: 25 })
|
||||
// shift+select o2
|
||||
const obj2 = getByTestId('obj-o2')
|
||||
fireEvent.mouseDown(obj2, { clientX: 125, clientY: 65, shiftKey: true })
|
||||
|
||||
// resize using last-selected (o2) handle
|
||||
const handle2 = getByTestId('resize-handle-o2')
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
|
||||
// Start at bottom-right corner; move by +7,+9 (snap8 => +8, +8)
|
||||
fireEvent.mouseDown(handle2, { clientX: 200, clientY: 90 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 207, clientY: 99 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const o1 = getByTestId('obj-o1')
|
||||
const o2 = getByTestId('obj-o2')
|
||||
|
||||
await waitFor(() => {
|
||||
expect(o2).toHaveStyle({ width: '88px', height: '40px' })
|
||||
expect(o1).toHaveStyle({ width: '58px', height: '50px' })
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,77 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function makeFrame(): Frame {
|
||||
return {
|
||||
id: 'f1',
|
||||
width: 400,
|
||||
height: 300,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'l1',
|
||||
name: 'L1',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'image', x: 60, y: 60, width: 50, height: 40, rotate: 0, zIndex: 0, props: { src: 'x', alt: '' } },
|
||||
{ id: 'o2', type: 'image', x: 160, y: 60, width: 80, height: 30, rotate: 0, zIndex: 1, props: { src: 'y', alt: '' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
describe('WYSIWYG Canvas multigroup rotate', () => {
|
||||
it('rotates all selected objects by same snapped angle when rotating last-selected', async () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
// select o1 then shift+select o2 (last-selected o2)
|
||||
fireEvent.mouseDown(getByTestId('obj-o1'), { clientX: 60, clientY: 60 })
|
||||
fireEvent.mouseDown(getByTestId('obj-o2'), { clientX: 160, clientY: 60, shiftKey: true })
|
||||
|
||||
const handle2 = getByTestId('rotate-handle-o2')
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
|
||||
// start rotate at 0deg and move +16px -> snap to 15deg by default
|
||||
fireEvent.mouseDown(handle2, { clientX: 100, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 116, clientY: 50 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const o1 = getByTestId('obj-o1')
|
||||
const o2 = getByTestId('obj-o2')
|
||||
|
||||
await waitFor(() => {
|
||||
expect(o2).toHaveStyle({ transform: 'rotate(15deg)' })
|
||||
expect(o1).toHaveStyle({ transform: 'rotate(15deg)' })
|
||||
})
|
||||
})
|
||||
|
||||
it('applies fine rotation delta to all when holding Shift', async () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
|
||||
// select o1 then shift+select o2 (last-selected o2)
|
||||
fireEvent.mouseDown(getByTestId('obj-o1'), { clientX: 60, clientY: 60 })
|
||||
fireEvent.mouseDown(getByTestId('obj-o2'), { clientX: 160, clientY: 60, shiftKey: true })
|
||||
|
||||
const handle2 = getByTestId('rotate-handle-o2')
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
|
||||
// start rotate at 0deg, move +7px with Shift -> 7deg (no snap)
|
||||
fireEvent.mouseDown(handle2, { clientX: 100, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 107, clientY: 50, shiftKey: true })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const o1 = getByTestId('obj-o1')
|
||||
const o2 = getByTestId('obj-o2')
|
||||
|
||||
await waitFor(() => {
|
||||
expect(o2).toHaveStyle({ transform: 'rotate(7deg)' })
|
||||
expect(o1).toHaveStyle({ transform: 'rotate(7deg)' })
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,111 @@
|
||||
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 }
|
||||
})
|
||||
|
||||
// Base frame
|
||||
function makeFrame(): Frame {
|
||||
return {
|
||||
id: 'f-expand',
|
||||
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 snap expanded', () => {
|
||||
beforeEach(() => capture.mockReset())
|
||||
|
||||
it('axis independence: x-axis edge snapping does not alter y-axis center decision', async () => {
|
||||
const frame = makeFrame()
|
||||
render(<Canvas frame={frame} />)
|
||||
|
||||
// Multi select o1 + o2
|
||||
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?.() })
|
||||
// Propose left so that group right edge aligns to o3 left edge (x-edge snap),
|
||||
// while y stays near group original top to avoid y snapping.
|
||||
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)
|
||||
// x should snap near 90 (200 - groupWidth 110) with 8px grid tolerance
|
||||
expect([88, 90, 96]).toContain(l1)
|
||||
// y should remain aligned equally without forcing to o3 center (remain ~10 + dy)
|
||||
const t1 = parseInt(o1.style.top)
|
||||
const t2 = parseInt(o2.style.top)
|
||||
expect(t1 - 10).toBe(t2 - 10)
|
||||
})
|
||||
|
||||
await act(async () => { last.onDragEnd?.() })
|
||||
})
|
||||
|
||||
it('threshold boundary: snaps when within 8px, does not snap when beyond 8px', async () => {
|
||||
const frame = makeFrame()
|
||||
render(<Canvas frame={frame} />)
|
||||
|
||||
// Multi select
|
||||
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?.() })
|
||||
|
||||
// Case A: within 8px → should snap to o3 center X
|
||||
// group centerX=65. To reach o3 centerX=240, propose o2.left ~ 80 + (240-65) = 255
|
||||
await act(async () => { last.onDrag?.({ left: 255, top: 10 }) })
|
||||
const o1a = screen.getByTestId('obj-o1') as HTMLElement
|
||||
// group centerX should be ~240 (allow grid tolerance)
|
||||
await waitFor(() => {
|
||||
const l1 = parseInt(o1a.style.left)
|
||||
const groupCenter = l1 + 110 / 2 // groupWidth=110
|
||||
expect(Math.abs(groupCenter - 240)).toBeLessThanOrEqual(8)
|
||||
})
|
||||
|
||||
// Case B: beyond 8px → move slightly more than threshold on X so not snapping to center
|
||||
// propose further by +16 (two grid steps) from the previous left
|
||||
await act(async () => { last.onDrag?.({ left: 271, top: 10 }) })
|
||||
const o1b = screen.getByTestId('obj-o1') as HTMLElement
|
||||
await waitFor(() => {
|
||||
const l1b = parseInt(o1b.style.left)
|
||||
const groupCenterB = l1b + 110 / 2
|
||||
// should no longer be within 8px of 240 (no snap)
|
||||
expect(Math.abs(groupCenterB - 240)).toBeGreaterThan(8)
|
||||
})
|
||||
|
||||
await act(async () => { last.onDragEnd?.() })
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,95 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getBoxes(ids: string[]) {
|
||||
return ids.map((id) => {
|
||||
const el = screen.getByTestId(`obj-${id}`) as HTMLElement
|
||||
const s = el.style
|
||||
return {
|
||||
id,
|
||||
left: parseInt(s.left || '0', 10),
|
||||
top: parseInt(s.top || '0', 10),
|
||||
width: parseInt(s.width || '0', 10),
|
||||
height: parseInt(s.height || '0', 10),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function snap8(v: number) { return Math.round(v / 8) * 8 }
|
||||
|
||||
async function addTextAt(x: number, y: number) {
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const all = await screen.findAllByTestId(/obj-text-/)
|
||||
const obj = all[all.length - 1] as HTMLElement
|
||||
// select the newly added object
|
||||
fireEvent.mouseDown(obj, { clientX: x, clientY: y })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
// move via props inputs (X/Y) for the selected object
|
||||
const xInput = screen.getByLabelText('X') as HTMLInputElement
|
||||
const yInput = screen.getByLabelText('Y') as HTMLInputElement
|
||||
fireEvent.change(xInput, { target: { value: String(x) } })
|
||||
fireEvent.change(yInput, { target: { value: String(y) } })
|
||||
return obj.getAttribute('data-testid')!.replace('obj-', '')
|
||||
}
|
||||
|
||||
describe('Canvas multiselect directional resize', () => {
|
||||
it('east handle increases width of all selected without shifting their x', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const id1 = await addTextAt(60, 60)
|
||||
const id2 = await addTextAt(140, 60)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
// marquee select both
|
||||
fireEvent.mouseDown(canvas, { clientX: 50, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 240, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
// wait until aria-live announces 2 selections
|
||||
const live1 = await screen.findByTestId('aria-live')
|
||||
expect(live1.textContent || '').toMatch(/선택\s*2개/)
|
||||
const before = getBoxes([id1, id2])
|
||||
const hRight = await screen.findByTestId(`resize-handle-e-${id2}`)
|
||||
fireEvent.mouseDown(hRight, { clientX: before[1].left + before[1].width, clientY: before[1].top + 5 })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before[1].left + before[1].width + 16, clientY: before[1].top + 5 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBoxes([id1, id2])
|
||||
const dw = snap8(before[1].width + 16) - before[1].width
|
||||
after.forEach((b, i) => {
|
||||
expect(b.left).toBe(before[i].left)
|
||||
expect(b.width).toBe(before[i].width + dw)
|
||||
expect(b.top).toBe(before[i].top)
|
||||
expect(b.height).toBe(before[i].height)
|
||||
})
|
||||
})
|
||||
|
||||
it('west handle moves x of all selected left and increases their width equally', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const id1 = await addTextAt(60, 60)
|
||||
const id2 = await addTextAt(140, 60)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(canvas, { clientX: 50, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 240, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
const before = getBoxes([id1, id2])
|
||||
const hLeft = await screen.findByTestId(`resize-handle-w-${id1}`)
|
||||
fireEvent.mouseDown(hLeft, { clientX: before[0].left, clientY: before[0].top + 5 })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before[0].left - 16, clientY: before[0].top + 5 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBoxes([id1, id2])
|
||||
const right0 = before[0].left + before[0].width
|
||||
const expLeft0 = Math.min(snap8(before[0].left - 16), right0 - 8)
|
||||
const dx = expLeft0 - before[0].left
|
||||
const dw = (right0 - expLeft0) - before[0].width
|
||||
|
||||
after.forEach((b, i) => {
|
||||
expect(b.left).toBe(before[i].left + dx)
|
||||
expect(b.width).toBe(before[i].width + dw)
|
||||
expect(b.top).toBe(before[i].top)
|
||||
expect(b.height).toBe(before[i].height)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -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')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,98 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getBoxes(ids: string[]) {
|
||||
return ids.map((id) => {
|
||||
const el = screen.getByTestId(`obj-${id}`) as HTMLElement
|
||||
const s = el.style as CSSStyleDeclaration
|
||||
return {
|
||||
id,
|
||||
left: parseInt(s.left || '0', 10),
|
||||
top: parseInt(s.top || '0', 10),
|
||||
width: parseInt(s.width || '0', 10),
|
||||
height: parseInt(s.height || '0', 10),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function snap8(v: number) { return Math.round(v / 8) * 8 }
|
||||
|
||||
async function addTextAt(x: number, y: number) {
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const all = await screen.findAllByTestId(/obj-text-/)
|
||||
const obj = all[all.length - 1] as HTMLElement
|
||||
// select the newly added object
|
||||
fireEvent.mouseDown(obj, { clientX: x, clientY: y })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
// move via props inputs (X/Y) for the selected object
|
||||
const xInput = screen.getByLabelText('X') as HTMLInputElement
|
||||
const yInput = screen.getByLabelText('Y') as HTMLInputElement
|
||||
fireEvent.change(xInput, { target: { value: String(x) } })
|
||||
fireEvent.change(yInput, { target: { value: String(y) } })
|
||||
return obj.getAttribute('data-testid')!.replace('obj-', '')
|
||||
}
|
||||
|
||||
describe('Canvas multiselect keyboard nudge', () => {
|
||||
it('ArrowRight applies 1px then grid snap to both (no modifier)', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const id1 = await addTextAt(60, 60)
|
||||
const id2 = await addTextAt(140, 60)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
// marquee select both
|
||||
fireEvent.mouseDown(canvas, { clientX: 50, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 240, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const before = getBoxes([id1, id2])
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowRight' })
|
||||
const after = getBoxes([id1, id2])
|
||||
const expLeft0 = snap8(before[0].left + 1)
|
||||
const dx = expLeft0 - before[0].left
|
||||
after.forEach((b, i) => {
|
||||
expect(b.left).toBe(before[i].left + dx)
|
||||
expect(b.top).toBe(before[i].top)
|
||||
})
|
||||
})
|
||||
|
||||
it('Shift+ArrowUp moves exactly -1px on Y for both (no snap)', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const id1 = await addTextAt(60, 60)
|
||||
const id2 = await addTextAt(140, 60)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(canvas, { clientX: 50, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 240, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const before = getBoxes([id1, id2])
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowUp', shiftKey: true })
|
||||
const after = getBoxes([id1, id2])
|
||||
after.forEach((b, i) => {
|
||||
expect(b.top).toBe(before[i].top - 1)
|
||||
expect(b.left).toBe(before[i].left)
|
||||
})
|
||||
})
|
||||
|
||||
it('Alt+ArrowRight moves +16px then snaps to grid for both', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const id1 = await addTextAt(60, 60)
|
||||
const id2 = await addTextAt(140, 60)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(canvas, { clientX: 50, clientY: 50 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 240, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const before = getBoxes([id1, id2])
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowRight', altKey: true })
|
||||
const after = getBoxes([id1, id2])
|
||||
const expLeft0 = snap8(before[0].left + 16)
|
||||
const dx = expLeft0 - before[0].left
|
||||
after.forEach((b, i) => {
|
||||
expect(b.left).toBe(before[i].left + dx)
|
||||
expect(b.top).toBe(before[i].top)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -41,4 +41,31 @@ describe('WYSIWYG Canvas keyboard nudge with 8px snap', () => {
|
||||
const obj = getByTestId('obj-o1')
|
||||
expect(obj).toHaveStyle({ top: '96px' }) // 100 - 1 => 99 -> snap8 => 96
|
||||
})
|
||||
|
||||
it('Shift+ArrowRight nudges by 1px without grid snap', () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowRight', shiftKey: true })
|
||||
const obj = getByTestId('obj-o1')
|
||||
expect(obj).toHaveStyle({ left: '102px' }) // 101 + 1 => 102 (no snap)
|
||||
})
|
||||
|
||||
it('Shift+ArrowUp nudges by 1px without grid snap', () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowUp', shiftKey: true })
|
||||
const obj = getByTestId('obj-o1')
|
||||
expect(obj).toHaveStyle({ top: '99px' }) // 100 - 1 => 99 (no snap)
|
||||
})
|
||||
|
||||
it('Alt+ArrowRight nudges by 16px and snaps to grid', () => {
|
||||
const frame = makeFrame()
|
||||
const { getByTestId } = render(<Canvas frame={frame} />)
|
||||
const canvas = getByTestId('wysiwyg-canvas')
|
||||
fireEvent.keyDown(canvas, { key: 'ArrowRight', altKey: true })
|
||||
const obj = getByTestId('obj-o1')
|
||||
expect(obj).toHaveStyle({ left: '120px' }) // 101 + 16 = 117 -> snap8 => 120
|
||||
})
|
||||
})
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
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'
|
||||
|
||||
function makeFrame(): Frame {
|
||||
return {
|
||||
id: 'f',
|
||||
width: 400,
|
||||
height: 300,
|
||||
background: '#111111',
|
||||
layers: [
|
||||
{
|
||||
id: 'base',
|
||||
name: 'Base',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'text', x: 40, y: 40, width: 80, height: 40, rotate: 0, zIndex: 0, props: { text: 'A', fontSize: 16, color: '#fff' } },
|
||||
{ id: 'o2', type: 'text', x: 200, y: 40, width: 80, height: 40, rotate: 0, zIndex: 1, props: { text: 'B', fontSize: 16, color: '#fff' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
describe('Canvas resize behavior (단일 선택 UX)', () => {
|
||||
it('단일 선택일 때 우하단 핸들 드래그로만 크기가 변하고, 다른 객체는 그대로 유지된다', () => {
|
||||
const frame = makeFrame()
|
||||
render(<Canvas frame={frame} />)
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
const obj1 = screen.getByTestId('obj-o1') as HTMLDivElement
|
||||
const obj2 = screen.getByTestId('obj-o2') as HTMLDivElement
|
||||
|
||||
// o1만 선택
|
||||
fireEvent.mouseDown(obj1, { clientX: 50, clientY: 50 })
|
||||
|
||||
const handle = screen.getByTestId('resize-handle-o1')
|
||||
// 우하단 방향으로 드래그 → width/height 증가
|
||||
fireEvent.mouseDown(handle, { clientX: 120, clientY: 80 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 180, clientY: 140 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const w1 = parseInt(obj1.style.width, 10)
|
||||
const h1 = parseInt(obj1.style.height, 10)
|
||||
expect(w1).toBeGreaterThan(80)
|
||||
expect(h1).toBeGreaterThan(40)
|
||||
|
||||
// o2는 변하지 않는다
|
||||
const w2 = parseInt(obj2.style.width, 10)
|
||||
const h2 = parseInt(obj2.style.height, 10)
|
||||
expect(w2).toBe(80)
|
||||
expect(h2).toBe(40)
|
||||
|
||||
// 반대 방향으로 드래그하면 줄어든다
|
||||
const handle2 = screen.getByTestId('resize-handle-o1')
|
||||
fireEvent.mouseDown(handle2, { clientX: 180, clientY: 140 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 130, clientY: 100 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
const w1b = parseInt(obj1.style.width, 10)
|
||||
const h1b = parseInt(obj1.style.height, 10)
|
||||
expect(w1b).toBeLessThan(w1)
|
||||
expect(h1b).toBeLessThan(h1)
|
||||
})
|
||||
})
|
||||
+698
-32
@@ -1,21 +1,54 @@
|
||||
import React, { useCallback, useMemo, useRef, useState } from 'react'
|
||||
"use client"
|
||||
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||
import Moveable from 'react-moveable'
|
||||
import type { Frame, WObject } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function snap8(v: number) {
|
||||
return Math.round(v / 8) * 8
|
||||
}
|
||||
|
||||
// (removed unused type guard)
|
||||
|
||||
// 테스트 환경(jsdom)에서 react-moveable이 사용하는 elementFromPoint가 없을 수 있어 안전한 폴리필을 추가
|
||||
type DocWithEFP = Document & { elementFromPoint?: (x: number, y: number) => Element | null }
|
||||
if (typeof document !== 'undefined') {
|
||||
const d = document as DocWithEFP
|
||||
if (typeof d.elementFromPoint !== 'function') {
|
||||
d.elementFromPoint = (_x: number, _y: number) => { void _x; void _y; return null }
|
||||
}
|
||||
}
|
||||
|
||||
export type CanvasProps = {
|
||||
frame: Frame
|
||||
onChange?: (next: Frame) => void
|
||||
onSelectIds?: (ids: string[]) => void
|
||||
enableGuides?: boolean
|
||||
}
|
||||
|
||||
export function Canvas({ frame, onChange }: CanvasProps) {
|
||||
export function Canvas({ frame, onChange, onSelectIds, enableGuides = true }: CanvasProps) {
|
||||
const [model, setModel] = useState<Frame>(frame)
|
||||
const [selectedId, setSelectedId] = useState<string | null>(model.layers[0]?.objects[0]?.id ?? null)
|
||||
// 외부 프레임 변경(예: 빌더에서 PropsPanel 수정/객체 추가)이 들어오면 동기화
|
||||
useEffect(() => { setModel(frame) }, [frame])
|
||||
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 [isDragging, setIsDragging] = useState(false)
|
||||
const resizingRef = useRef<{ id: string; dir: 'w' | 'n' | 'e' | 's' | 'ne' | 'se' | 'nw' | 'sw'; startX: number; startY: number; origX: number; origY: number; origW: number; origH: number } | null>(null)
|
||||
const resizeGroupRef = useRef<{ ids: string[]; orig: Record<string, { x: number; y: number; w: number; h: number }> } | null>(null)
|
||||
const rotatingRef = useRef<{ id: string; startX: number; startY: number; origDeg: number } | null>(null)
|
||||
const rotateGroupRef = useRef<{ ids: string[]; orig: Record<string, { d: 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)
|
||||
|
||||
const selected = useMemo(() => {
|
||||
for (const layer of model.layers) {
|
||||
@@ -25,6 +58,21 @@ export function Canvas({ frame, onChange }: CanvasProps) {
|
||||
return null
|
||||
}, [model, selectedId])
|
||||
|
||||
// enableGuides가 꺼지면 즉시 가이드를 숨긴다
|
||||
useEffect(() => {
|
||||
if (!enableGuides && showGuides) setShowGuides(false)
|
||||
if (!enableGuides && isDragging) setIsDragging(false)
|
||||
}, [enableGuides, showGuides, isDragging])
|
||||
|
||||
// a11y 라이브 리전 텍스트: 선택 개수 및 가이드 좌표를 폴라이트로 알림
|
||||
const ariaLiveText = useMemo(() => {
|
||||
const count = selectedIds.length
|
||||
const base = `선택 ${count}개`
|
||||
const pos = selected ? `, 위치 x=${selected.x}, y=${selected.y}` : ''
|
||||
const guide = (enableGuides && (showGuides || isDragging)) ? `, 가이드 x=${guidePos.x}, y=${guidePos.y}` : ''
|
||||
return `${base}${pos}${guide}`
|
||||
}, [selectedIds.length, showGuides, isDragging, enableGuides, guidePos.x, guidePos.y, selected])
|
||||
|
||||
const updateObject = useCallback((id: string, updater: (o: WObject) => WObject) => {
|
||||
setModel((prev) => {
|
||||
const next: Frame = { ...prev, layers: prev.layers.map((ly) => ({ ...ly, objects: ly.objects.map((o) => (o.id === id ? updater(o) : o)) })) }
|
||||
@@ -33,28 +81,110 @@ 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
|
||||
if (e.key === 'ArrowLeft') dx = -1
|
||||
else if (e.key === 'ArrowRight') dx = 1
|
||||
else if (e.key === 'ArrowUp') dy = -1
|
||||
else if (e.key === 'ArrowDown') dy = 1
|
||||
let step = 1
|
||||
let useSnap = true
|
||||
// Shift: 미세 이동(1px, 스냅 없음), Alt: 가속 이동(16px, 스냅 적용)
|
||||
if (e.shiftKey) { step = 1; useSnap = false }
|
||||
else if (e.altKey) { step = 16; useSnap = true }
|
||||
|
||||
if (e.key === 'ArrowLeft') dx = -step
|
||||
else if (e.key === 'ArrowRight') dx = step
|
||||
else if (e.key === 'ArrowUp') dy = -step
|
||||
else if (e.key === 'ArrowDown') dy = step
|
||||
else return
|
||||
e.preventDefault()
|
||||
updateObject(selected.id, (o) => {
|
||||
const nx = snap8(o.x + dx)
|
||||
const ny = snap8(o.y + dy)
|
||||
return { ...o, x: nx, y: ny }
|
||||
})
|
||||
}, [selected, updateObject])
|
||||
|
||||
// 기준 객체(선택 anchor)에 대해 목표 좌표 계산 후 델타를 산출하여 멀티선택 전체에 동일 적용
|
||||
const tx = selected.x + dx
|
||||
const ty = selected.y + dy
|
||||
// 스냅은 이동한 축에만 적용, 이동이 없는 축은 값 유지
|
||||
const nx = dx !== 0 ? (useSnap ? snap8(tx) : tx) : selected.x
|
||||
const ny = dy !== 0 ? (useSnap ? snap8(ty) : ty) : selected.y
|
||||
const ddx = nx - selected.x
|
||||
const ddy = ny - selected.y
|
||||
|
||||
if (selectedIds.length > 1) {
|
||||
updateObjects(selectedIds, (o) => ({ ...o, x: o.x + ddx, y: o.y + ddy }))
|
||||
} else {
|
||||
updateObject(selected.id, (o) => ({ ...o, x: o.x + ddx, y: o.y + ddy }))
|
||||
}
|
||||
}, [selected, selectedIds, updateObject, updateObjects])
|
||||
|
||||
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)
|
||||
const next = [...prev, o.id]
|
||||
try { onSelectIds?.(next) } catch {}
|
||||
return next
|
||||
})
|
||||
} else {
|
||||
setSelectedIds((prev) => {
|
||||
// if already selected, preserve current multi-selection
|
||||
if (prev.includes(o.id)) {
|
||||
try { onSelectIds?.(prev) } catch {}
|
||||
return prev
|
||||
}
|
||||
const next = [o.id]
|
||||
try { onSelectIds?.(next) } catch {}
|
||||
return next
|
||||
})
|
||||
}
|
||||
draggingRef.current = { id: o.id, startX: e.clientX, startY: e.clientY, origX: o.x, origY: o.y }
|
||||
}, [])
|
||||
setIsDragging(true)
|
||||
if (enableGuides) {
|
||||
setShowGuides(true)
|
||||
setGuidePos({ x: snap8(o.x), y: snap8(o.y) })
|
||||
}
|
||||
}, [selectedIds, model.layers, onSelectIds, enableGuides])
|
||||
|
||||
const onMouseMoveCanvas = useCallback((e: React.MouseEvent) => {
|
||||
// guides 비활성화 상태에서 남아있다면 즉시 숨김
|
||||
if (!enableGuides && showGuides) setShowGuides(false)
|
||||
// 마퀴 선택 처리 우선
|
||||
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)
|
||||
try { onSelectIds?.(hits) } catch {}
|
||||
return
|
||||
}
|
||||
const rot = rotatingRef.current
|
||||
if (rot) {
|
||||
const dx = e.clientX - rot.startX
|
||||
@@ -62,43 +192,240 @@ export function Canvas({ frame, onChange }: CanvasProps) {
|
||||
if (!e.shiftKey) {
|
||||
next = Math.round(next / 15) * 15
|
||||
}
|
||||
if (selectedIds.length > 1 && rotateGroupRef.current) {
|
||||
const { ids, orig } = rotateGroupRef.current
|
||||
const base = orig[rot.id]
|
||||
const dd = next - base.d
|
||||
updateObjects(ids, (o) => {
|
||||
const o0 = orig[o.id]
|
||||
if (!o0) return o
|
||||
return { ...o, rotate: o0.d + dd }
|
||||
})
|
||||
} else {
|
||||
updateObject(rot.id, (o) => ({ ...o, rotate: next }))
|
||||
}
|
||||
return
|
||||
}
|
||||
const r = resizingRef.current
|
||||
if (r) {
|
||||
const dx = e.clientX - r.startX
|
||||
const dy = e.clientY - r.startY
|
||||
const nw = Math.max(8, snap8(r.origW + dx))
|
||||
const nh = Math.max(8, snap8(r.origH + dy))
|
||||
updateObject(r.id, (o) => ({ ...o, width: nw, height: nh }))
|
||||
let nx = r.origX
|
||||
let ny = r.origY
|
||||
let nw = r.origW
|
||||
let nh = r.origH
|
||||
|
||||
if (r.dir === 'e') {
|
||||
nw = Math.max(8, snap8(r.origW + dx))
|
||||
} else if (r.dir === 's') {
|
||||
nh = Math.max(8, snap8(r.origH + dy))
|
||||
} else if (r.dir === 'w') {
|
||||
// left edge moves, right edge fixed
|
||||
const tentativeLeft = snap8(r.origX + dx)
|
||||
const right = r.origX + r.origW
|
||||
nx = Math.min(tentativeLeft, right - 8)
|
||||
nw = Math.max(8, right - nx)
|
||||
} else if (r.dir === 'n') {
|
||||
// top edge moves, bottom fixed
|
||||
const tentativeTop = snap8(r.origY + dy)
|
||||
const bottom = r.origY + r.origH
|
||||
ny = Math.min(tentativeTop, bottom - 8)
|
||||
nh = Math.max(8, bottom - ny)
|
||||
} else if (r.dir === 'ne') {
|
||||
// top moves like 'n', right like 'e'
|
||||
const tentativeTop = snap8(r.origY + dy)
|
||||
const bottom = r.origY + r.origH
|
||||
ny = Math.min(tentativeTop, bottom - 8)
|
||||
nh = Math.max(8, bottom - ny)
|
||||
nw = Math.max(8, snap8(r.origW + dx))
|
||||
} else if (r.dir === 'se') {
|
||||
// bottom-right: origin stays, width/height increase
|
||||
nw = Math.max(8, snap8(r.origW + dx))
|
||||
nh = Math.max(8, snap8(r.origH + dy))
|
||||
} else if (r.dir === 'nw') {
|
||||
// top-left: move origin up/left, keep bottom-right fixed
|
||||
const right = r.origX + r.origW
|
||||
const bottom = r.origY + r.origH
|
||||
const tentativeLeft = snap8(r.origX + dx)
|
||||
const tentativeTop = snap8(r.origY + dy)
|
||||
nx = Math.min(tentativeLeft, right - 8)
|
||||
ny = Math.min(tentativeTop, bottom - 8)
|
||||
nw = Math.max(8, right - nx)
|
||||
nh = Math.max(8, bottom - ny)
|
||||
} else if (r.dir === 'sw') {
|
||||
// bottom-left: move left edge, increase height
|
||||
const right = r.origX + r.origW
|
||||
const tentativeLeft = snap8(r.origX + dx)
|
||||
nx = Math.min(tentativeLeft, right - 8)
|
||||
nw = Math.max(8, right - nx)
|
||||
nh = Math.max(8, snap8(r.origH + dy))
|
||||
}
|
||||
|
||||
// single selection vs multi-selection 적용
|
||||
if (selectedIds.length > 1 && resizeGroupRef.current) {
|
||||
const { ids, orig } = resizeGroupRef.current
|
||||
const base = orig[r.id]
|
||||
const dw = nw - base.w
|
||||
const dh = nh - base.h
|
||||
// 서/북 방향 포함 시 원점 이동량을 그룹 전체에 동일 적용
|
||||
const dxShift = nx - r.origX
|
||||
const dyShift = ny - r.origY
|
||||
updateObjects(ids, (o) => {
|
||||
const o0 = orig[o.id]
|
||||
if (!o0) return o
|
||||
const next: typeof o = {
|
||||
...o,
|
||||
width: Math.max(8, o0.w + dw),
|
||||
height: Math.max(8, o0.h + dh),
|
||||
}
|
||||
// 좌측/상단 이동이 있는 경우에만 좌표 이동 적용
|
||||
if (dxShift !== 0) next.x = o0.x + dxShift
|
||||
if (dyShift !== 0) next.y = o0.y + dyShift
|
||||
return next
|
||||
})
|
||||
} else {
|
||||
updateObject(r.id, (o) => ({ ...o, x: nx, y: ny, width: nw, height: nh }))
|
||||
}
|
||||
return
|
||||
}
|
||||
const d = draggingRef.current
|
||||
if (d) {
|
||||
if (enableGuides && !showGuides) setShowGuides(true)
|
||||
const dx = e.clientX - d.startX
|
||||
const dy = e.clientY - d.startY
|
||||
const nx = snap8(d.origX + dx)
|
||||
const ny = snap8(d.origY + dy)
|
||||
// compute raw target
|
||||
const rawLeft = d.origX + dx
|
||||
const rawTop = d.origY + dy
|
||||
// if raw lands exactly on 8px grid, keep it; else apply directional delta snap
|
||||
const onGrid = (v: number) => v % 8 === 0
|
||||
const snapDelta = (delta: number) => (delta >= 0 ? Math.ceil(delta / 8) : Math.floor(delta / 8)) * 8
|
||||
let nx = onGrid(rawLeft) ? rawLeft : d.origX + snapDelta(dx)
|
||||
let ny = onGrid(rawTop) ? rawTop : d.origY + snapDelta(dy)
|
||||
|
||||
// object-to-object snapping (edge > center > grid) with threshold 8px
|
||||
const threshold = 8
|
||||
// find current selected object dimensions
|
||||
let selW = 0, selH = 0
|
||||
for (const ly of model.layers) {
|
||||
const ob = ly.objects.find((o) => o.id === d.id)
|
||||
if (ob) { selW = ob.width; selH = ob.height; break }
|
||||
}
|
||||
let snappedCenterX: number | undefined
|
||||
let snappedCenterY: number | undefined
|
||||
let centerDistX = Number.POSITIVE_INFINITY
|
||||
let centerDistY = Number.POSITIVE_INFINITY
|
||||
let edgeNx: number | undefined
|
||||
let edgeNy: number | undefined
|
||||
let minDistX = Number.POSITIVE_INFINITY
|
||||
let minDistY = Number.POSITIVE_INFINITY
|
||||
for (const layer of model.layers) {
|
||||
for (const obj of layer.objects) {
|
||||
if (obj.id === d.id) continue
|
||||
// center snap
|
||||
const otherCenterX = obj.x + obj.width / 2
|
||||
const selCenterX = rawLeft + selW / 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 + selH / 2
|
||||
const dyCenter = Math.abs(selCenterY - otherCenterY)
|
||||
if (dyCenter <= threshold && dyCenter < centerDistY) {
|
||||
centerDistY = dyCenter
|
||||
snappedCenterY = otherCenterY
|
||||
}
|
||||
// edge snap X
|
||||
const selLeft = rawLeft
|
||||
const selRight = rawLeft + selW
|
||||
const otherLeft = obj.x
|
||||
const otherRight = obj.x + obj.width
|
||||
const xPairs: Array<{ dist: number; nx: number }> = [
|
||||
{ dist: Math.abs(selLeft - otherLeft), nx: otherLeft },
|
||||
{ dist: Math.abs(selLeft - otherRight), nx: otherRight },
|
||||
{ dist: Math.abs(selRight - otherLeft), nx: otherLeft - selW },
|
||||
{ dist: Math.abs(selRight - otherRight), nx: otherRight - selW },
|
||||
]
|
||||
for (const p of xPairs) {
|
||||
if (p.dist <= threshold && p.dist < minDistX) {
|
||||
minDistX = p.dist
|
||||
edgeNx = p.nx
|
||||
}
|
||||
}
|
||||
// edge snap Y
|
||||
const selTop = rawTop
|
||||
const selBottom = rawTop + selH
|
||||
const otherTop = obj.y
|
||||
const otherBottom = obj.y + obj.height
|
||||
const yPairs: Array<{ dist: number; ny: number }> = [
|
||||
{ dist: Math.abs(selTop - otherTop), ny: otherTop },
|
||||
{ dist: Math.abs(selTop - otherBottom), ny: otherBottom },
|
||||
{ dist: Math.abs(selBottom - otherTop), ny: otherTop - selH },
|
||||
{ dist: Math.abs(selBottom - otherBottom), ny: otherBottom - selH },
|
||||
]
|
||||
for (const p of yPairs) {
|
||||
if (p.dist <= threshold && p.dist < minDistY) {
|
||||
minDistY = p.dist
|
||||
edgeNy = p.ny
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (typeof edgeNx === 'number') nx = edgeNx
|
||||
else if (typeof snappedCenterX === 'number') nx = snappedCenterX - selW / 2
|
||||
if (typeof edgeNy === 'number') ny = edgeNy
|
||||
else if (typeof snappedCenterY === 'number') ny = snappedCenterY - selH / 2
|
||||
setGuidePos({ x: nx, y: ny })
|
||||
if (selectedIds.length > 1) {
|
||||
const ddx = nx - d.origX
|
||||
const ddy = ny - d.origY
|
||||
updateObjects(selectedIds, (o) => ({ ...o, x: o.x + ddx, y: o.y + ddy }))
|
||||
} else {
|
||||
updateObject(d.id, (o) => ({ ...o, x: nx, y: ny }))
|
||||
}
|
||||
}, [updateObject])
|
||||
}
|
||||
}, [updateObject, updateObjects, marquee.active, marquee.x0, marquee.y0, model.layers, selectedIds, selectedIds.length, enableGuides, onSelectIds, showGuides])
|
||||
|
||||
const onMouseUpCanvas = useCallback(() => {
|
||||
if (marquee.active) {
|
||||
setMarquee((m) => ({ ...m, active: false }))
|
||||
}
|
||||
// 상호작용 종료 시 가이드 숨김
|
||||
if (showGuides) setShowGuides(false)
|
||||
setIsDragging(false)
|
||||
draggingRef.current = null
|
||||
resizingRef.current = null
|
||||
resizeGroupRef.current = null
|
||||
rotatingRef.current = null
|
||||
}, [])
|
||||
}, [marquee.active, showGuides])
|
||||
|
||||
const onMouseDownResize = useCallback((e: React.MouseEvent, o: WObject) => {
|
||||
const onMouseDownResize = useCallback((e: React.MouseEvent, o: WObject, dir: 'w' | 'n' | 'e' | 's' | 'ne' | 'se' | 'nw' | 'sw') => {
|
||||
e.stopPropagation()
|
||||
resizingRef.current = { id: o.id, startX: e.clientX, startY: e.clientY, origW: o.width, origH: o.height }
|
||||
}, [])
|
||||
resizingRef.current = { id: o.id, dir, startX: e.clientX, startY: e.clientY, origX: o.x, origY: o.y, origW: o.width, origH: o.height }
|
||||
// capture originals for group resize
|
||||
const ids = Array.from(new Set([...selectedIds, o.id]))
|
||||
const orig: Record<string, { x: number; y: number; w: number; h: number }> = {}
|
||||
for (const ly of model.layers) {
|
||||
for (const ob of ly.objects) {
|
||||
if (ids.includes(ob.id)) orig[ob.id] = { x: ob.x, y: ob.y, w: ob.width, h: ob.height }
|
||||
}
|
||||
}
|
||||
resizeGroupRef.current = { ids, orig }
|
||||
}, [selectedIds, model.layers])
|
||||
|
||||
const onMouseDownRotate = useCallback((e: React.MouseEvent, o: WObject) => {
|
||||
e.stopPropagation()
|
||||
rotatingRef.current = { id: o.id, startX: e.clientX, startY: e.clientY, origDeg: o.rotate }
|
||||
}, [])
|
||||
const ids = Array.from(new Set([...selectedIds, o.id]))
|
||||
const orig: Record<string, { d: number }> = {}
|
||||
for (const ly of model.layers) {
|
||||
for (const ob of ly.objects) {
|
||||
if (ids.includes(ob.id)) orig[ob.id] = { d: ob.rotate }
|
||||
}
|
||||
}
|
||||
rotateGroupRef.current = { ids, orig }
|
||||
}, [selectedIds, model.layers])
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -106,27 +433,199 @@ 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 })
|
||||
try { onSelectIds?.([]) } catch {}
|
||||
}
|
||||
}}
|
||||
onMouseMove={onMouseMoveCanvas}
|
||||
onMouseUp={onMouseUpCanvas}
|
||||
style={{ position: 'relative', width: model.width, height: model.height, outline: '0' }}
|
||||
data-testid="wysiwyg-canvas"
|
||||
>
|
||||
{enableGuides && (showGuides || isDragging) && (
|
||||
<>
|
||||
<div data-testid="guide-x" style={{ position: 'absolute', left: guidePos.x, top: 0, bottom: 0, width: 1, background: '#0ea5e9' }} />
|
||||
<div data-testid="guide-y" style={{ position: 'absolute', top: guidePos.y, left: 0, right: 0, height: 1, background: '#0ea5e9' }} />
|
||||
</>
|
||||
)}
|
||||
<div role="status" aria-live="polite" data-testid="aria-live" style={{ position: 'absolute', left: -9999, top: 'auto', width: 1, height: 1, overflow: 'hidden' }}>{ariaLiveText}</div>
|
||||
{model.layers.map((layer) => layer.visible !== false && layer.objects.map((o) => (
|
||||
<div
|
||||
key={o.id}
|
||||
data-testid={`obj-${o.id}`}
|
||||
aria-label={`object ${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownObj(e, o)}
|
||||
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' }}
|
||||
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: selectedIds.includes(o.id)? '2px solid #0ea5e9':'none', border: '1px solid rgba(148,163,184,0.6)', background: 'rgba(15,23,42,0.8)', color: '#f9fafb', overflow: 'hidden', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 4, boxSizing: 'border-box' }}
|
||||
>
|
||||
{selectedId === o.id && (
|
||||
{/* 실제 오브젝트 콘텐츠 렌더링 */}
|
||||
{o.type === 'text' && (
|
||||
<p style={{ margin: 0, fontSize: o.props.fontSize, color: o.props.color }}>{o.props.text}</p>
|
||||
)}
|
||||
{o.type === 'image' && (
|
||||
<img src={o.props.src} alt={o.props.alt || ''} style={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'cover' }} />
|
||||
)}
|
||||
{o.type === 'button' && (
|
||||
<button
|
||||
type="button"
|
||||
style={{
|
||||
borderRadius: 9999,
|
||||
border: 'none',
|
||||
padding: '4px 12px',
|
||||
fontSize: 12,
|
||||
cursor: 'pointer',
|
||||
background: o.props.background ?? '#2563eb',
|
||||
color: o.props.color ?? '#ffffff',
|
||||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{o.props.label}
|
||||
</button>
|
||||
)}
|
||||
{o.type === 'input' && (() => {
|
||||
const cid = `${o.id}-control`
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
return (
|
||||
<label style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
|
||||
<span style={{ color: '#e5e7eb', fontSize: 12 }}>{o.props.label}</span>
|
||||
<input
|
||||
id={cid}
|
||||
name={o.props.name}
|
||||
placeholder={o.props.placeholder ?? ''}
|
||||
required={!!o.props.required}
|
||||
aria-describedby={helpId || undefined}
|
||||
style={{ width: '100%', height: 28, padding: '4px 8px', border: '1px solid #94a3b8', background: '#0f172a', color: '#f9fafb' }}
|
||||
/>
|
||||
{o.props.help ? <small id={helpId} style={{ color: '#94a3b8', fontSize: 11 }}>{o.props.help}</small> : null}
|
||||
</label>
|
||||
)
|
||||
})()}
|
||||
{o.type === 'select' && (() => {
|
||||
const cid = `${o.id}-control`
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
return (
|
||||
<label style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
|
||||
<span style={{ color: '#e5e7eb', fontSize: 12 }}>{o.props.label}</span>
|
||||
<select
|
||||
id={cid}
|
||||
name={o.props.name}
|
||||
value={o.props.defaultValue ?? ''}
|
||||
aria-describedby={helpId || undefined}
|
||||
style={{ width: '100%', height: 28, padding: '4px 8px', border: '1px solid #94a3b8', background: '#0f172a', color: '#f9fafb' }}
|
||||
onChange={() => { /* no-op in canvas preview */ }}
|
||||
>
|
||||
{(o.props.options ?? []).map((opt: string) => (
|
||||
<option key={opt} value={opt}>{opt}</option>
|
||||
))}
|
||||
</select>
|
||||
{o.props.help ? <small id={helpId} style={{ color: '#94a3b8', fontSize: 11 }}>{o.props.help}</small> : null}
|
||||
</label>
|
||||
)
|
||||
})()}
|
||||
{o.type === 'textarea' && (() => {
|
||||
const cid = `${o.id}-control`
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
return (
|
||||
<label style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
|
||||
<span style={{ color: '#e5e7eb', fontSize: 12 }}>{o.props.label}</span>
|
||||
<textarea
|
||||
id={cid}
|
||||
name={o.props.name}
|
||||
placeholder={o.props.placeholder ?? ''}
|
||||
required={!!o.props.required}
|
||||
rows={o.props.rows ?? 3}
|
||||
aria-describedby={helpId || undefined}
|
||||
style={{ width: '100%', padding: '4px 8px', border: '1px solid #94a3b8', background: '#0f172a', color: '#f9fafb', resize: 'none' }}
|
||||
/>
|
||||
{o.props.help ? <small id={helpId} style={{ color: '#94a3b8', fontSize: 11 }}>{o.props.help}</small> : null}
|
||||
</label>
|
||||
)
|
||||
})()}
|
||||
{o.type === 'radio' && (
|
||||
<fieldset style={{ display: 'flex', flexDirection: 'column', gap: 4, border: '1px solid transparent' }}>
|
||||
<legend style={{ color: '#e5e7eb', fontSize: 12 }}>{o.props.legend}</legend>
|
||||
{(o.props.options ?? []).map((opt: string) => (
|
||||
<label key={opt} style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||
<input type="radio" name={o.props.name} value={opt} checked={(o.props.defaultValue ?? '') === opt} onChange={() => {}} required={!!o.props.required} />
|
||||
<span>{opt}</span>
|
||||
</label>
|
||||
))}
|
||||
</fieldset>
|
||||
)}
|
||||
{o.type === 'checkbox' && (
|
||||
<fieldset style={{ display: 'flex', flexDirection: 'column', gap: 4, border: '1px solid transparent' }}>
|
||||
<legend style={{ color: '#e5e7eb', fontSize: 12 }}>{o.props.legend}</legend>
|
||||
{(o.props.options ?? []).map((opt: string) => (
|
||||
<label key={opt} style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||
<input type="checkbox" name={o.props.name} value={opt} checked={(o.props.defaultValues ?? []).includes(opt)} onChange={() => {}} required={!!o.props.required} />
|
||||
<span>{opt}</span>
|
||||
</label>
|
||||
))}
|
||||
</fieldset>
|
||||
)}
|
||||
{selectedIds.includes(o.id) && (
|
||||
<>
|
||||
{/* West (left-middle) */}
|
||||
<div
|
||||
data-testid={`resize-handle-w-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'w')}
|
||||
style={{ position: 'absolute', left: -5, top: '50%', marginTop: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'ew-resize' }}
|
||||
/>
|
||||
{/* North (top-middle) */}
|
||||
<div
|
||||
data-testid={`resize-handle-n-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'n')}
|
||||
style={{ position: 'absolute', left: '50%', top: -5, marginLeft: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'ns-resize' }}
|
||||
/>
|
||||
{/* East (right-middle) */}
|
||||
<div
|
||||
data-testid={`resize-handle-e-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'e')}
|
||||
style={{ position: 'absolute', right: -5, top: '50%', marginTop: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'ew-resize' }}
|
||||
/>
|
||||
{/* South (bottom-middle) */}
|
||||
<div
|
||||
data-testid={`resize-handle-s-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 's')}
|
||||
style={{ position: 'absolute', left: '50%', bottom: -5, marginLeft: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'ns-resize' }}
|
||||
/>
|
||||
{/* North-East (top-right corner) */}
|
||||
<div
|
||||
data-testid={`resize-handle-ne-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'ne')}
|
||||
style={{ position: 'absolute', right: -5, top: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'nesw-resize' }}
|
||||
/>
|
||||
{/* North-West (top-left corner) */}
|
||||
<div
|
||||
data-testid={`resize-handle-nw-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'nw')}
|
||||
style={{ position: 'absolute', left: -5, top: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'nwse-resize' }}
|
||||
/>
|
||||
{/* South-East (bottom-right corner) - legacy testid alias */}
|
||||
<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' }}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'se')}
|
||||
style={{ position: 'absolute', right: -5, bottom: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'nwse-resize' }}
|
||||
/>
|
||||
<div
|
||||
data-testid={`resize-handle-se-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'se')}
|
||||
style={{ position: 'absolute', right: -5, bottom: -5, width: 10, height: 10, background: 'transparent', cursor: 'nwse-resize' }}
|
||||
/>
|
||||
{/* South-West (bottom-left corner) */}
|
||||
<div
|
||||
data-testid={`resize-handle-sw-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownResize(e, o, 'sw')}
|
||||
style={{ position: 'absolute', left: -5, bottom: -5, width: 10, height: 10, background: '#0ea5e9', cursor: 'nesw-resize' }}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
{selectedId === o.id && (
|
||||
{selectedIds.includes(o.id) && (
|
||||
<div
|
||||
data-testid={`rotate-handle-${o.id}`}
|
||||
onMouseDown={(e) => onMouseDownRotate(e, o)}
|
||||
@@ -135,6 +634,173 @@ export function Canvas({ frame, onChange }: CanvasProps) {
|
||||
)}
|
||||
</div>
|
||||
)))}
|
||||
{/* Moveable 최소 통합: 드래그/리사이즈/회전 + 8px 스냅 그리드 활성화 */}
|
||||
<Moveable
|
||||
target={selectedId ? `[data-testid="obj-${selectedId}"]` : undefined}
|
||||
draggable={selectedIds.length === 1}
|
||||
rotatable={selectedIds.length === 1}
|
||||
snappable
|
||||
snapGridWidth={8}
|
||||
snapGridHeight={8}
|
||||
onDragStart={() => {
|
||||
if (resizingRef.current) return
|
||||
setIsDragging(true)
|
||||
if (enableGuides) setShowGuides(true)
|
||||
}}
|
||||
onDrag={({ left, top }) => {
|
||||
if (resizingRef.current) return
|
||||
if (!selected) return
|
||||
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)
|
||||
|
||||
// 객체-객체 스냅(수직/수평 중심 + 에지): 임계 8px
|
||||
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
|
||||
let guideEdgeX: number | undefined
|
||||
let guideEdgeY: number | undefined
|
||||
let minDistX = Number.POSITIVE_INFINITY
|
||||
let minDistY = Number.POSITIVE_INFINITY
|
||||
for (const layer of model.layers) {
|
||||
for (const obj of layer.objects) {
|
||||
if (selectedIds.includes(obj.id)) continue
|
||||
const otherCenterX = obj.x + obj.width / 2
|
||||
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 otherCenterY2 = obj.y + obj.height / 2
|
||||
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축)
|
||||
const selLeft = rawLeft
|
||||
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 - (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) {
|
||||
minDistX = p.dist
|
||||
edgeNx = p.nx
|
||||
guideEdgeX = p.guideX
|
||||
}
|
||||
}
|
||||
|
||||
// 에지 스냅 후보 계산 (Y축)
|
||||
const selTop = rawTop
|
||||
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 - (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) {
|
||||
minDistY = p.dist
|
||||
edgeNy = p.ny
|
||||
guideEdgeY = p.guideY
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 우선순위: 에지 스냅 > 중심 스냅 > 그리드
|
||||
if (typeof edgeNx === 'number') {
|
||||
nx = edgeNx
|
||||
} else if (typeof snappedCenterX === 'number') {
|
||||
nx = snappedCenterX - (selectedIds.length > 1 ? groupWidth : selected.width) / 2
|
||||
}
|
||||
if (typeof edgeNy === 'number') {
|
||||
ny = edgeNy
|
||||
} else if (typeof snappedCenterY === 'number') {
|
||||
ny = snappedCenterY - (selectedIds.length > 1 ? groupHeight : selected.height) / 2
|
||||
}
|
||||
|
||||
// 가이드 좌표 업데이트(에지 가이드 우선, 없으면 중심, 최후에는 nx/ny)
|
||||
const gx = typeof guideEdgeX === 'number' ? guideEdgeX : (typeof snappedCenterX === 'number' ? snappedCenterX : nx)
|
||||
const gy = typeof guideEdgeY === 'number' ? guideEdgeY : (typeof snappedCenterY === 'number' ? snappedCenterY : ny)
|
||||
if (enableGuides) setShowGuides(true)
|
||||
setGuidePos({ x: gx, y: gy })
|
||||
|
||||
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={() => {
|
||||
setIsDragging(false)
|
||||
setShowGuides(false)
|
||||
}}
|
||||
onRotate={({ rotate, inputEvent }) => {
|
||||
if (!selected) return
|
||||
const raw = typeof rotate === 'number' ? rotate : 0
|
||||
const shift = !!(inputEvent && (inputEvent as { shiftKey?: boolean }).shiftKey)
|
||||
const step = shift ? 1 : 15
|
||||
const snapped = Math.sign(raw) * Math.ceil(Math.abs(raw) / step) * step
|
||||
if (selectedIds.length > 1 && rotateGroupRef.current) {
|
||||
const { ids } = rotateGroupRef.current
|
||||
updateObjects(ids, (o) => ({ ...o, rotate: snapped }))
|
||||
} else {
|
||||
updateObject(selected.id, (o) => ({ ...o, rotate: snapped }))
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useCallback, useState } from 'react'
|
||||
import React, { useCallback, useEffect, useState } from 'react'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
export type LayersPanelProps = {
|
||||
@@ -9,6 +9,10 @@ export type LayersPanelProps = {
|
||||
export function LayersPanel({ frame, onChange }: LayersPanelProps) {
|
||||
const [model, setModel] = useState<Frame>(frame)
|
||||
|
||||
useEffect(() => {
|
||||
setModel(frame)
|
||||
}, [frame])
|
||||
|
||||
const move = useCallback((id: string, dir: 1 | -1) => {
|
||||
const idx = model.layers.findIndex((l) => l.id === id)
|
||||
if (idx < 0) return
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useState } from 'react'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import type { WObject } from '@/lib/wysiwyg/schema'
|
||||
|
||||
export type PropsPanelProps = {
|
||||
@@ -15,9 +15,41 @@ function isImage(o: WObject): o is Extract<WObject, { type: 'image' }> {
|
||||
return o.type === 'image'
|
||||
}
|
||||
|
||||
function isText(o: WObject): o is Extract<WObject, { type: 'text' }> {
|
||||
return o.type === 'text'
|
||||
}
|
||||
|
||||
function isButton(o: WObject): o is Extract<WObject, { type: 'button' }> {
|
||||
return o.type === 'button'
|
||||
}
|
||||
|
||||
function isInput(o: WObject): o is Extract<WObject, { type: 'input' }> {
|
||||
return o.type === 'input'
|
||||
}
|
||||
|
||||
function isSelect(o: WObject): o is Extract<WObject, { type: 'select' }> {
|
||||
return o.type === 'select'
|
||||
}
|
||||
|
||||
function isRadio(o: WObject): o is Extract<WObject, { type: 'radio' }> {
|
||||
return o.type === 'radio'
|
||||
}
|
||||
|
||||
function isCheckbox(o: WObject): o is Extract<WObject, { type: 'checkbox' }> {
|
||||
return o.type === 'checkbox'
|
||||
}
|
||||
|
||||
function isTextarea(o: WObject): o is Extract<WObject, { type: 'textarea' }> {
|
||||
return o.type === 'textarea'
|
||||
}
|
||||
|
||||
export function PropsPanel({ object, onChange }: PropsPanelProps) {
|
||||
const [model, setModel] = useState<WObject>(object)
|
||||
|
||||
useEffect(() => {
|
||||
setModel(object)
|
||||
}, [object])
|
||||
|
||||
const emit = (next: WObject) => {
|
||||
setModel(next)
|
||||
onChange?.(next)
|
||||
@@ -32,6 +64,46 @@ export function PropsPanel({ object, onChange }: PropsPanelProps) {
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
const updateTextProps = (patch: Partial<{ text: string }>): void => {
|
||||
if (!isText(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
const updateButtonProps = (patch: Partial<{ label: string }>): void => {
|
||||
if (!isButton(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
const updateInputProps = (patch: Partial<{ name: string; label: string; placeholder: string; required: boolean; help: string }>): void => {
|
||||
if (!isInput(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
const updateSelectProps = (patch: Partial<{ name: string; label: string; options: string[]; defaultValue: string; help: string }>): void => {
|
||||
if (!isSelect(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
const updateRadioProps = (patch: Partial<{ name: string; legend: string; options: string[]; defaultValue: string; required: boolean; help: string }>): void => {
|
||||
if (!isRadio(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
const updateCheckboxProps = (patch: Partial<{ name: string; legend: string; options: string[]; defaultValues: string[]; required: boolean; help: string }>): void => {
|
||||
if (!isCheckbox(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
const updateTextareaProps = (patch: Partial<{ name: string; label: string; placeholder: string; rows: number; required: boolean; help: string }>): void => {
|
||||
if (!isTextarea(model)) return
|
||||
const next: WObject = { ...model, props: { ...model.props, ...patch } }
|
||||
emit(next)
|
||||
}
|
||||
|
||||
return (
|
||||
<div aria-label="Properties Panel">
|
||||
@@ -58,6 +130,136 @@ export function PropsPanel({ object, onChange }: PropsPanelProps) {
|
||||
</label>
|
||||
</div>
|
||||
|
||||
{isText(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Text
|
||||
<input aria-label="Text" type="text" value={model.props.text} onChange={(e) => updateTextProps({ text: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isTextarea(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Name
|
||||
<input aria-label="Name" type="text" value={model.props.name} onChange={(e) => updateTextareaProps({ name: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Label
|
||||
<input aria-label="Label" type="text" value={model.props.label} onChange={(e) => updateTextareaProps({ label: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Placeholder
|
||||
<input aria-label="Placeholder" type="text" value={model.props.placeholder || ''} onChange={(e) => updateTextareaProps({ placeholder: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Rows
|
||||
<input aria-label="Rows" type="number" value={model.props.rows ?? 3} onChange={(e) => updateTextareaProps({ rows: Number(e.target.value) || model.props.rows })} />
|
||||
</label>
|
||||
<label>
|
||||
Required
|
||||
<input aria-label="Required" type="checkbox" checked={!!model.props.required} onChange={(e) => updateTextareaProps({ required: e.target.checked })} />
|
||||
</label>
|
||||
<label>
|
||||
Help
|
||||
<input aria-label="Help" type="text" value={model.props.help || ''} onChange={(e) => updateTextareaProps({ help: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isRadio(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Name
|
||||
<input aria-label="Name" type="text" value={model.props.name} onChange={(e) => updateRadioProps({ name: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Legend
|
||||
<input aria-label="Legend" type="text" value={model.props.legend} onChange={(e) => updateRadioProps({ legend: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Options
|
||||
<input aria-label="Options" type="text" value={(model.props.options || []).join(',')} onChange={(e) => updateRadioProps({ options: e.target.value.split(',').map(s => s.trim()).filter(Boolean) })} />
|
||||
</label>
|
||||
<label>
|
||||
Default
|
||||
<input aria-label="Default" type="text" value={model.props.defaultValue || ''} onChange={(e) => updateRadioProps({ defaultValue: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Required
|
||||
<input aria-label="Required" type="checkbox" checked={!!model.props.required} onChange={(e) => updateRadioProps({ required: e.target.checked })} />
|
||||
</label>
|
||||
<label>
|
||||
Help
|
||||
<input aria-label="Help" type="text" value={model.props.help || ''} onChange={(e) => updateRadioProps({ help: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isCheckbox(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Name
|
||||
<input aria-label="Name" type="text" value={model.props.name} onChange={(e) => updateCheckboxProps({ name: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Legend
|
||||
<input aria-label="Legend" type="text" value={model.props.legend} onChange={(e) => updateCheckboxProps({ legend: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Options
|
||||
<input aria-label="Options" type="text" value={(model.props.options || []).join(',')} onChange={(e) => updateCheckboxProps({ options: e.target.value.split(',').map(s => s.trim()).filter(Boolean) })} />
|
||||
</label>
|
||||
<label>
|
||||
Defaults
|
||||
<input aria-label="Defaults" type="text" value={(model.props.defaultValues || []).join(',')} onChange={(e) => updateCheckboxProps({ defaultValues: e.target.value.split(',').map(s => s.trim()).filter(Boolean) })} />
|
||||
</label>
|
||||
<label>
|
||||
Required
|
||||
<input aria-label="Required" type="checkbox" checked={!!model.props.required} onChange={(e) => updateCheckboxProps({ required: e.target.checked })} />
|
||||
</label>
|
||||
<label>
|
||||
Help
|
||||
<input aria-label="Help" type="text" value={model.props.help || ''} onChange={(e) => updateCheckboxProps({ help: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isSelect(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Name
|
||||
<input aria-label="Name" type="text" value={model.props.name} onChange={(e) => updateSelectProps({ name: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Label
|
||||
<input aria-label="Label" type="text" value={model.props.label} onChange={(e) => updateSelectProps({ label: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Options
|
||||
<input aria-label="Options" type="text" value={(model.props.options || []).join(',')} onChange={(e) => updateSelectProps({ options: e.target.value.split(',').map(s => s.trim()).filter(Boolean) })} />
|
||||
</label>
|
||||
<label>
|
||||
Default
|
||||
<input aria-label="Default" type="text" value={model.props.defaultValue || ''} onChange={(e) => updateSelectProps({ defaultValue: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Help
|
||||
<input aria-label="Help" type="text" value={model.props.help || ''} onChange={(e) => updateSelectProps({ help: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isButton(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Label
|
||||
<input aria-label="Label" type="text" value={model.props.label} onChange={(e) => updateButtonProps({ label: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isImage(model) && (
|
||||
<div>
|
||||
<label>
|
||||
@@ -70,6 +272,31 @@ export function PropsPanel({ object, onChange }: PropsPanelProps) {
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isInput(model) && (
|
||||
<div>
|
||||
<label>
|
||||
Name
|
||||
<input aria-label="Name" type="text" value={model.props.name} onChange={(e) => updateInputProps({ name: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Label
|
||||
<input aria-label="Label" type="text" value={model.props.label} onChange={(e) => updateInputProps({ label: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Placeholder
|
||||
<input aria-label="Placeholder" type="text" value={model.props.placeholder || ''} onChange={(e) => updateInputProps({ placeholder: e.target.value })} />
|
||||
</label>
|
||||
<label>
|
||||
Required
|
||||
<input aria-label="Required" type="checkbox" checked={!!model.props.required} onChange={(e) => updateInputProps({ required: e.target.checked })} />
|
||||
</label>
|
||||
<label>
|
||||
Help
|
||||
<input aria-label="Help" type="text" value={model.props.help || ''} onChange={(e) => updateInputProps({ help: e.target.value })} />
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
let spyCreate: ReturnType<typeof vi.spyOn> | null = null
|
||||
let spyRevoke: ReturnType<typeof vi.spyOn> | null = null
|
||||
|
||||
describe('WYSIWYG Builder acceptance', () => {
|
||||
beforeEach(() => {
|
||||
spyCreate = vi.spyOn(global.URL, 'createObjectURL').mockReturnValue('blob:mock')
|
||||
spyRevoke = vi.spyOn(global.URL, 'revokeObjectURL').mockImplementation(() => {})
|
||||
})
|
||||
afterEach(() => {
|
||||
spyCreate?.mockRestore()
|
||||
spyRevoke?.mockRestore()
|
||||
spyCreate = null
|
||||
spyRevoke = null
|
||||
})
|
||||
|
||||
it('Add → Edit → Export smoke', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Text
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId('obj-text-1')
|
||||
|
||||
// Select and edit via Properties panel
|
||||
fireEvent.mouseDown(obj)
|
||||
const inputX = await screen.findByLabelText('X')
|
||||
fireEvent.change(inputX, { target: { value: '80' } })
|
||||
|
||||
await waitFor(() => {
|
||||
// style left updated on canvas object (snap may apply, accept near 80)
|
||||
const left = parseInt((obj as HTMLElement).style.left || '0', 10)
|
||||
expect(Math.abs(left - 80)).toBeLessThanOrEqual(8)
|
||||
})
|
||||
|
||||
// Export exists and triggers download
|
||||
const exportBtn = screen.getByRole('button', { name: /Export/i })
|
||||
fireEvent.click(exportBtn)
|
||||
// No throw means success; optionally wait a tick
|
||||
await new Promise((r) => setTimeout(r, 0))
|
||||
})
|
||||
|
||||
it('uploads a local image and renders it via AssetManager path', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
const input = screen.getByTestId('wysiwyg-image-input') as HTMLInputElement
|
||||
const file = new File([new Uint8Array([1, 2, 3])], 'hero.png', { type: 'image/png' })
|
||||
|
||||
fireEvent.change(input, { target: { files: [file] } })
|
||||
|
||||
const img = await screen.findByRole('img')
|
||||
const src = (img as HTMLImageElement).src
|
||||
expect(src).toContain('/assets/')
|
||||
})
|
||||
|
||||
it('syncs width/height/rotate from Properties panel to Canvas for a text object', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Text and select
|
||||
const addTextBtn = screen.getByRole('button', { name: /^Add Text$/i })
|
||||
fireEvent.click(addTextBtn)
|
||||
const [obj] = await screen.findAllByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj)
|
||||
|
||||
// Edit width/height/rotate via Properties
|
||||
const inputW = await screen.findByLabelText('Width')
|
||||
const inputH = await screen.findByLabelText('Height')
|
||||
const inputR = await screen.findByLabelText('Rotate')
|
||||
|
||||
fireEvent.change(inputW, { target: { value: '200' } })
|
||||
fireEvent.change(inputH, { target: { value: '60' } })
|
||||
fireEvent.change(inputR, { target: { value: '30' } })
|
||||
|
||||
await waitFor(() => {
|
||||
const style = (obj as HTMLElement).style
|
||||
expect(style.width).toBe('200px')
|
||||
expect(style.height).toBe('60px')
|
||||
expect(style.transform).toContain('30deg')
|
||||
})
|
||||
})
|
||||
|
||||
it('syncs text/button specific props from Properties to Canvas content', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Text
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const [textObj] = await screen.findAllByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(textObj)
|
||||
const textInput = await screen.findByLabelText('Text')
|
||||
fireEvent.change(textInput, { target: { value: 'Hello World' } })
|
||||
|
||||
await waitFor(() => {
|
||||
expect(textObj).toHaveTextContent('Hello World')
|
||||
})
|
||||
|
||||
// Button
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Button/i }))
|
||||
const [buttonObj] = await screen.findAllByTestId(/obj-button-/)
|
||||
fireEvent.mouseDown(buttonObj)
|
||||
const labelInput = await screen.findByLabelText('Label')
|
||||
fireEvent.change(labelInput, { target: { value: 'CTA' } })
|
||||
|
||||
await waitFor(() => {
|
||||
expect(buttonObj).toHaveTextContent('CTA')
|
||||
})
|
||||
})
|
||||
|
||||
it('supports Shift+click multiselect and group drag on the builder canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// 두 텍스트 추가
|
||||
const addTextBtn = screen.getByRole('button', { name: /^Add Text$/i })
|
||||
fireEvent.click(addTextBtn)
|
||||
fireEvent.click(addTextBtn)
|
||||
|
||||
const [obj1, obj2] = await screen.findAllByTestId(/obj-text-/)
|
||||
|
||||
// 첫 번째 선택
|
||||
fireEvent.mouseDown(obj1, { clientX: 70, clientY: 70 })
|
||||
// Shift+클릭으로 두 번째 추가 선택
|
||||
fireEvent.mouseDown(obj2, { clientX: 80, clientY: 120, shiftKey: true })
|
||||
|
||||
// 멀티선택 상태에서 두 객체 모두 outline 스타일을 갖는지만 확인
|
||||
expect((obj1 as HTMLElement).style.outline).toContain('2px solid')
|
||||
expect((obj2 as HTMLElement).style.outline).toContain('2px solid')
|
||||
})
|
||||
|
||||
it('supports marquee selection on the builder canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// 텍스트 두 개 배치
|
||||
const addTextBtn = screen.getByRole('button', { name: /^Add Text$/i })
|
||||
fireEvent.click(addTextBtn)
|
||||
fireEvent.click(addTextBtn)
|
||||
const [obj1, obj2] = await screen.findAllByTestId(/obj-text-/)
|
||||
|
||||
// 마퀴 드래그 박스로 두 객체 모두 포함되도록 드래그
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(canvas, { clientX: 40, clientY: 40 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 300, clientY: 300 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
// 선택된 두 객체가 모두 outline 스타일을 갖는지 확인
|
||||
expect((obj1 as HTMLElement).style.outline).toContain('2px solid')
|
||||
expect((obj2 as HTMLElement).style.outline).toContain('2px solid')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,36 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Checkbox', () => {
|
||||
it('adds a Checkbox group, edits props, and reflects on Canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Checkbox
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Checkbox/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-checkbox-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const nameInput = panel.querySelector('input[aria-label="Name"]') as HTMLInputElement
|
||||
const legendInput = panel.querySelector('input[aria-label="Legend"]') as HTMLInputElement
|
||||
const optionsInput = panel.querySelector('input[aria-label="Options"]') as HTMLInputElement
|
||||
const defaultsInput = panel.querySelector('input[aria-label="Defaults"]') as HTMLInputElement
|
||||
const requiredCheckbox = panel.querySelector('input[aria-label="Required"]') as HTMLInputElement
|
||||
|
||||
fireEvent.change(nameInput, { target: { value: 'agree' } })
|
||||
fireEvent.change(legendInput, { target: { value: 'Agreements' } })
|
||||
fireEvent.change(optionsInput, { target: { value: 'One,Two,Three' } })
|
||||
fireEvent.change(defaultsInput, { target: { value: 'Two,Three' } })
|
||||
fireEvent.click(requiredCheckbox)
|
||||
|
||||
const rendered = await screen.findByTestId(/obj-checkbox-/)
|
||||
expect(rendered).toHaveTextContent('Agreements')
|
||||
const inputs = Array.from(rendered.querySelectorAll('input[type="checkbox"]')) as HTMLInputElement[]
|
||||
expect(inputs.map(i => i.value)).toEqual(['One','Two','Three'])
|
||||
const checkedValues = inputs.filter(i => i.checked).map(i => i.value)
|
||||
expect(checkedValues).toEqual(['Two','Three'])
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,29 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Help (aria-describedby)', () => {
|
||||
it('Input: edits Help in Properties and Canvas reflects help + aria-describedby', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Input
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Input/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-input-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const helpInput = panel.querySelector('input[aria-label="Help"]') as HTMLInputElement
|
||||
fireEvent.change(helpInput, { target: { value: 'We will not spam you.' } })
|
||||
|
||||
const rendered = await screen.findByTestId(/obj-input-/)
|
||||
expect(rendered).toHaveTextContent('We will not spam you.')
|
||||
const inputEl = rendered.querySelector('input') as HTMLInputElement
|
||||
expect(inputEl).toBeTruthy()
|
||||
const describedby = inputEl.getAttribute('aria-describedby')
|
||||
expect(describedby).toMatch(/-help$/)
|
||||
const helpEl = rendered.querySelector(`#${describedby}`)
|
||||
expect(helpEl?.textContent).toContain('We will not spam you.')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,37 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Input(Text)', () => {
|
||||
it('adds an Input, edits props in Properties, and reflects on Canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Input
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Input/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-input-/)
|
||||
// select to expose props
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
// edit props in Properties panel
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const nameInput = panel.querySelector('input[aria-label="Name"]') as HTMLInputElement
|
||||
const labelInput = panel.querySelector('input[aria-label="Label"]') as HTMLInputElement
|
||||
const placeholderInput = panel.querySelector('input[aria-label="Placeholder"]') as HTMLInputElement
|
||||
const requiredCheckbox = panel.querySelector('input[aria-label="Required"]') as HTMLInputElement
|
||||
|
||||
fireEvent.change(nameInput, { target: { value: 'email' } })
|
||||
fireEvent.change(labelInput, { target: { value: 'Email Address' } })
|
||||
fireEvent.change(placeholderInput, { target: { value: 'you@example.com' } })
|
||||
fireEvent.click(requiredCheckbox)
|
||||
|
||||
// Canvas should reflect label and placeholder
|
||||
const rendered = await screen.findByTestId(/obj-input-/)
|
||||
expect(rendered).toHaveTextContent('Email Address')
|
||||
const inputEl = rendered.querySelector('input') as HTMLInputElement
|
||||
expect(inputEl).toBeTruthy()
|
||||
expect(inputEl.placeholder).toBe('you@example.com')
|
||||
expect(inputEl.required).toBe(true)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,36 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Radio', () => {
|
||||
it('adds a Radio group, edits props, and reflects on Canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Radio
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Radio/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-radio-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const nameInput = panel.querySelector('input[aria-label="Name"]') as HTMLInputElement
|
||||
const legendInput = panel.querySelector('input[aria-label="Legend"]') as HTMLInputElement
|
||||
const optionsInput = panel.querySelector('input[aria-label="Options"]') as HTMLInputElement
|
||||
const defaultInput = panel.querySelector('input[aria-label="Default"]') as HTMLInputElement
|
||||
const requiredCheckbox = panel.querySelector('input[aria-label="Required"]') as HTMLInputElement
|
||||
|
||||
fireEvent.change(nameInput, { target: { value: 'color' } })
|
||||
fireEvent.change(legendInput, { target: { value: 'Color' } })
|
||||
fireEvent.change(optionsInput, { target: { value: 'Red,Green,Blue' } })
|
||||
fireEvent.change(defaultInput, { target: { value: 'Green' } })
|
||||
fireEvent.click(requiredCheckbox)
|
||||
|
||||
const rendered = await screen.findByTestId(/obj-radio-/)
|
||||
expect(rendered).toHaveTextContent('Color')
|
||||
const inputs = Array.from(rendered.querySelectorAll('input[type="radio"]')) as HTMLInputElement[]
|
||||
expect(inputs.map(i => i.value)).toEqual(['Red','Green','Blue'])
|
||||
const checked = inputs.find(i => i.checked)
|
||||
expect(checked?.value).toBe('Green')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,38 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Select', () => {
|
||||
it('adds a Select, edits props, and reflects on Canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Select
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Select/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-select-/)
|
||||
// select to expose props
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
// edit props in Properties panel
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const nameInput = panel.querySelector('input[aria-label="Name"]') as HTMLInputElement
|
||||
const labelInput = panel.querySelector('input[aria-label="Label"]') as HTMLInputElement
|
||||
const optionsInput = panel.querySelector('input[aria-label="Options"]') as HTMLInputElement
|
||||
const defaultInput = panel.querySelector('input[aria-label="Default"]') as HTMLInputElement
|
||||
|
||||
fireEvent.change(nameInput, { target: { value: 'size' } })
|
||||
fireEvent.change(labelInput, { target: { value: 'Size' } })
|
||||
fireEvent.change(optionsInput, { target: { value: 'S,M,L' } })
|
||||
fireEvent.change(defaultInput, { target: { value: 'M' } })
|
||||
|
||||
// Canvas should reflect label and select options/default
|
||||
const rendered = await screen.findByTestId(/obj-select-/)
|
||||
expect(rendered).toHaveTextContent('Size')
|
||||
const selectEl = rendered.querySelector('select') as HTMLSelectElement
|
||||
expect(selectEl).toBeTruthy()
|
||||
const opts = Array.from(selectEl.querySelectorAll('option')).map(o => o.textContent)
|
||||
expect(opts).toEqual(['S','M','L'])
|
||||
expect(selectEl.value).toBe('M')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,37 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Form Textarea', () => {
|
||||
it('adds a Textarea, edits props, and reflects on Canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// Add Textarea
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Textarea/i }))
|
||||
|
||||
const obj = await screen.findByTestId(/obj-textarea-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const panel = await screen.findByLabelText('Properties Panel')
|
||||
const nameInput = panel.querySelector('input[aria-label="Name"]') as HTMLInputElement
|
||||
const labelInput = panel.querySelector('input[aria-label="Label"]') as HTMLInputElement
|
||||
const placeholderInput = panel.querySelector('input[aria-label="Placeholder"]') as HTMLInputElement
|
||||
const rowsInput = panel.querySelector('input[aria-label="Rows"]') as HTMLInputElement
|
||||
const requiredCheckbox = panel.querySelector('input[aria-label="Required"]') as HTMLInputElement
|
||||
|
||||
fireEvent.change(nameInput, { target: { value: 'message' } })
|
||||
fireEvent.change(labelInput, { target: { value: 'Message' } })
|
||||
fireEvent.change(placeholderInput, { target: { value: 'Type here...' } })
|
||||
fireEvent.change(rowsInput, { target: { value: '5' } })
|
||||
fireEvent.click(requiredCheckbox)
|
||||
|
||||
const rendered = await screen.findByTestId(/obj-textarea-/)
|
||||
expect(rendered).toHaveTextContent('Message')
|
||||
const ta = rendered.querySelector('textarea') as HTMLTextAreaElement
|
||||
expect(ta).toBeTruthy()
|
||||
expect(ta.placeholder).toBe('Type here...')
|
||||
expect(ta.required).toBe(true)
|
||||
expect(ta.rows).toBe(5)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,112 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getXY(el: HTMLElement) {
|
||||
const style = el.getAttribute('style') || ''
|
||||
const m = { left: /left:\s*(\d+)px/, top: /top:\s*(\d+)px/ }
|
||||
const left = Number((style.match(m.left)?.[1]) || '0')
|
||||
const top = Number((style.match(m.top)?.[1]) || '0')
|
||||
return { left, top }
|
||||
}
|
||||
|
||||
function getRotate(el: HTMLElement) {
|
||||
const style = el.getAttribute('style') || ''
|
||||
const m = /rotate\(([-\d.]+)deg\)/
|
||||
const v = Number((style.match(m)?.[1]) || '0')
|
||||
return v
|
||||
}
|
||||
|
||||
describe('WYSIWYG - group actions drag/resize/rotate with snapping', () => {
|
||||
it('drags two selected objects together with 8px snapping', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
// add two texts
|
||||
const addText = () => fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
addText()
|
||||
addText()
|
||||
const objs = await screen.findAllByTestId(/obj-text-/)
|
||||
const a = objs[0]
|
||||
const b = objs[1]
|
||||
|
||||
// select both (click first then shift-click second)
|
||||
fireEvent.mouseDown(a, { clientX: 60, clientY: 60 })
|
||||
fireEvent.mouseUp(a)
|
||||
fireEvent.mouseDown(b, { clientX: 80, clientY: 80, shiftKey: true })
|
||||
// wait until selection reflects two items
|
||||
await screen.findByText(/선택 2개/)
|
||||
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
// drag second (selected) by ~13, expect snap to +16
|
||||
fireEvent.mouseDown(b, { clientX: 120, clientY: 120 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 133, clientY: 133 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
await waitFor(() => {
|
||||
const xyA = getXY(a)
|
||||
const xyB = getXY(b)
|
||||
expect(xyA.left).toBe(76)
|
||||
expect(xyA.top).toBe(76)
|
||||
expect(xyB.left).toBe(76)
|
||||
expect(xyB.top).toBe(76)
|
||||
})
|
||||
})
|
||||
|
||||
it('resizes group from east handle; both widths increase with snapping', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const addText = () => fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
addText()
|
||||
addText()
|
||||
const objs = await screen.findAllByTestId(/obj-text-/)
|
||||
const a = objs[0]
|
||||
const b = objs[1]
|
||||
|
||||
// select both
|
||||
fireEvent.mouseDown(a, { clientX: 60, clientY: 60 })
|
||||
fireEvent.mouseUp(a)
|
||||
fireEvent.mouseDown(b, { clientX: 80, clientY: 80, shiftKey: true })
|
||||
|
||||
// drag east handle of second by ~13 -> snap width +16
|
||||
const idB = (b.getAttribute('data-testid') || '').replace('obj-', '')
|
||||
const handleE = await screen.findByTestId(`resize-handle-e-${idB}`)
|
||||
fireEvent.mouseDown(handleE, { clientX: 180, clientY: 80 })
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseMove(canvas, { clientX: 193, clientY: 80 })
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
// widths reflected in inline style
|
||||
const styleA = a.getAttribute('style') || ''
|
||||
const styleB = b.getAttribute('style') || ''
|
||||
const wA = Number((styleA.match(/width:\s*(\d+)px/)?.[1]) || '0')
|
||||
const wB = Number((styleB.match(/width:\s*(\d+)px/)?.[1]) || '0')
|
||||
expect(wA).toBeGreaterThanOrEqual(176) // initial 160 -> +16
|
||||
expect(wB).toBeGreaterThanOrEqual(176)
|
||||
})
|
||||
|
||||
it('rotates group with 15deg snapping (no shift)', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const addText = () => fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
addText()
|
||||
addText()
|
||||
const objs = await screen.findAllByTestId(/obj-text-/)
|
||||
const a = objs[0]
|
||||
const b = objs[1]
|
||||
|
||||
// select both
|
||||
fireEvent.mouseDown(a)
|
||||
fireEvent.mouseUp(a)
|
||||
fireEvent.mouseDown(b, { shiftKey: true })
|
||||
fireEvent.mouseUp(b)
|
||||
|
||||
const idB2 = (b.getAttribute('data-testid') || '').replace('obj-', '')
|
||||
const rotateHandle = await screen.findByTestId(`rotate-handle-${idB2}`)
|
||||
fireEvent.mouseDown(rotateHandle, { clientX: 100, clientY: 10 })
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseMove(canvas, { clientX: 130, clientY: 10 }) // +30 -> snap 30 (15 step)
|
||||
fireEvent.mouseUp(canvas)
|
||||
|
||||
const rA = getRotate(a)
|
||||
const rB = getRotate(b)
|
||||
expect(rA).toBe(30)
|
||||
expect(rB).toBe(30)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,27 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Guides UI toggle', () => {
|
||||
it('shows guides by default, and hides when toggle is off', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
|
||||
// add a text and select it (exact match to avoid matching 'Add Textarea')
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
|
||||
// default ON: start drag -> guides should appear
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
fireEvent.mouseDown(obj, { clientX: 120, clientY: 120 })
|
||||
fireEvent.mouseMove(canvas, { clientX: 124, clientY: 124 })
|
||||
expect(await screen.findByTestId('guide-x')).toBeInTheDocument()
|
||||
|
||||
// end drag, then turn OFF and verify guides disappear on further movement
|
||||
const btn = screen.getByRole('button', { name: /Guides/i })
|
||||
fireEvent.mouseUp(canvas)
|
||||
fireEvent.click(btn)
|
||||
fireEvent.mouseMove(canvas, { clientX: 132, clientY: 132 })
|
||||
expect(screen.queryByTestId('guide-x')).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,47 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
describe('WYSIWYG Builder - Layers acceptance', () => {
|
||||
it('visible toggle reflects on layer button state', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
// add two texts
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
|
||||
// 레이어 패널에서 visible 토글 버튼 상태만 검증
|
||||
const hideBtn = screen.getByTestId('layer-hide-base')
|
||||
expect(hideBtn).toHaveAttribute('aria-pressed', 'false')
|
||||
fireEvent.click(hideBtn)
|
||||
expect(hideBtn).toHaveAttribute('aria-pressed', 'true')
|
||||
// 다시 클릭하면 보이도록 토글
|
||||
fireEvent.click(hideBtn)
|
||||
expect(hideBtn).toHaveAttribute('aria-pressed', 'false')
|
||||
})
|
||||
|
||||
it('layer order changes reflect in Canvas DOM stacking order', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
// Add two layers, each with one text object labeled L1, L2
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Layer/i }))
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Layer/i }))
|
||||
|
||||
const t1 = await screen.findByText('L1')
|
||||
const t2 = await screen.findByText('L2')
|
||||
|
||||
// Initially, later layer (L2) should be on top, thus follow L1 in DOM order
|
||||
const pos1 = t1.compareDocumentPosition(t2)
|
||||
expect(pos1 & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
|
||||
|
||||
// Move L2 up (towards front doesn't change since it's already last), then move L2 down to go below L1
|
||||
const up2 = screen.getByTestId('layer-up-layer-2')
|
||||
const down2 = screen.getByTestId('layer-down-layer-2')
|
||||
// up no-op when at top boundary (safe click)
|
||||
fireEvent.click(up2)
|
||||
// now move it down once (below)
|
||||
fireEvent.click(down2)
|
||||
|
||||
// After moving L2 down, L1 should now come after L2 in DOM order (L1 on top)
|
||||
const pos2 = t2.compareDocumentPosition(t1)
|
||||
expect(pos2 & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,156 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen, fireEvent } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
function getBox() {
|
||||
const el = screen.getByTestId(/obj-text-/) as HTMLElement
|
||||
const style = el.style
|
||||
const left = parseInt(style.left || '0', 10)
|
||||
const top = parseInt(style.top || '0', 10)
|
||||
const width = parseInt(style.width || '0', 10)
|
||||
const height = parseInt(style.height || '0', 10)
|
||||
return { left, top, width, height }
|
||||
|
||||
}
|
||||
|
||||
function snap8(v: number) {
|
||||
return Math.round(v / 8) * 8
|
||||
}
|
||||
|
||||
describe('WYSIWYG Builder - Resize directional handles', () => {
|
||||
it('left handle resizes by moving left edge and shifts x', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
// select
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
// end any potential drag
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const before = getBox()
|
||||
const hLeft = await screen.findByTestId(/resize-handle-w-/)
|
||||
// drag left handle to the left by 16px (two 8px snaps)
|
||||
fireEvent.mouseDown(hLeft, { clientX: before.left, clientY: before.top + 5 })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left - 16, clientY: before.top + 5 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
const expectedLeft = Math.min(snap8(before.left - 16), before.left + before.width - 8)
|
||||
const expectedWidth = (before.left + before.width) - expectedLeft
|
||||
expect(after.left).toBe(expectedLeft)
|
||||
expect(after.width).toBe(expectedWidth)
|
||||
// orthogonal axis may adjust minimally due to snapping/rounding; primary check is x/width
|
||||
})
|
||||
|
||||
it('corner NW handle moves left/top and expands width/height', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const before = getBox()
|
||||
const hNW = await screen.findByTestId(/resize-handle-nw-/)
|
||||
fireEvent.mouseDown(hNW, { clientX: before.left, clientY: before.top })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left - 16, clientY: before.top - 16 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
const expLeft = Math.min(snap8(before.left - 16), before.left + before.width - 8)
|
||||
const expTop = Math.min(snap8(before.top - 16), before.top + before.height - 8)
|
||||
expect(after.left).toBe(expLeft)
|
||||
expect(after.top).toBe(expTop)
|
||||
expect(after.width).toBe((before.left + before.width) - expLeft)
|
||||
expect(after.height).toBe((before.top + before.height) - expTop)
|
||||
})
|
||||
|
||||
it('corner SW handle moves left and expands height with bottom drag', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const before = getBox()
|
||||
const hSW = await screen.findByTestId(/resize-handle-sw-/)
|
||||
fireEvent.mouseDown(hSW, { clientX: before.left, clientY: before.top + before.height })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left - 16, clientY: before.top + before.height + 16 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
const expLeft2 = Math.min(snap8(before.left - 16), before.left + before.width - 8)
|
||||
expect(after.left).toBe(expLeft2)
|
||||
expect(after.width).toBe((before.left + before.width) - expLeft2)
|
||||
// bottom 증가, top은 유지
|
||||
expect(after.top).toBe(before.top)
|
||||
expect(after.height).toBe(snap8(before.height + 16))
|
||||
})
|
||||
|
||||
it('top handle resizes by moving top edge and shifts y', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const before = getBox()
|
||||
const hTop = await screen.findByTestId(/resize-handle-n-/)
|
||||
fireEvent.mouseDown(hTop, { clientX: before.left + 5, clientY: before.top })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left + 5, clientY: before.top - 16 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
const expectedTop = Math.min(snap8(before.top - 16), before.top + before.height - 8)
|
||||
const expectedHeight = (before.top + before.height) - expectedTop
|
||||
expect(after.top).toBe(expectedTop)
|
||||
expect(after.height).toBe(expectedHeight)
|
||||
// orthogonal axis may adjust minimally due to snapping; primary check is y/height
|
||||
})
|
||||
|
||||
it('right and bottom handles increase width/height without shifting origin', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
|
||||
const before = getBox()
|
||||
const hRight = await screen.findByTestId(/resize-handle-e-/)
|
||||
fireEvent.mouseDown(hRight, { clientX: before.left + before.width, clientY: before.top + 5 })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left + before.width + 16, clientY: before.top + 5 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const mid = getBox()
|
||||
// primary check: width increased by snapped delta
|
||||
expect(mid.width).toBe(snap8(before.width + 16))
|
||||
|
||||
const hBottom = await screen.findByTestId(/resize-handle-s-/)
|
||||
fireEvent.mouseDown(hBottom, { clientX: mid.left + 5, clientY: mid.top + mid.height })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: mid.left + 5, clientY: mid.top + mid.height + 16 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
// origin should remain same on y for bottom handle
|
||||
expect(after.top).toBe(mid.top)
|
||||
expect(after.height).toBe(snap8(mid.height + 16))
|
||||
})
|
||||
|
||||
it('corner NE handle adjusts width and height with appropriate origin shift on Y', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /^Add Text$/i }))
|
||||
const obj = await screen.findByTestId(/obj-text-/)
|
||||
fireEvent.mouseDown(obj, { clientX: 80, clientY: 80 })
|
||||
|
||||
const before = getBox()
|
||||
const hNE = await screen.findByTestId(/resize-handle-ne-/)
|
||||
fireEvent.mouseDown(hNE, { clientX: before.left + before.width, clientY: before.top })
|
||||
fireEvent.mouseMove(screen.getByTestId('wysiwyg-canvas'), { clientX: before.left + before.width + 16, clientY: before.top - 16 })
|
||||
fireEvent.mouseUp(screen.getByTestId('wysiwyg-canvas'))
|
||||
|
||||
const after = getBox()
|
||||
// NE: primary checks are top shifted up and width increased; left origin may adjust under snapping
|
||||
const expectedTop2 = Math.min(snap8(before.top - 16), before.top + before.height - 8)
|
||||
expect(after.top).toBe(expectedTop2)
|
||||
expect(after.width).toBe(snap8(before.width + 16))
|
||||
expect(after.height).toBe((before.top + before.height) - expectedTop2)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,34 @@
|
||||
import { describe, it, expect, vi } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { WysiwygBuilderPage } from '@/components/wysiwyg/WysiwygBuilderPage'
|
||||
|
||||
// minimal mock for URL.createObjectURL used by download
|
||||
let spyCreate: ReturnType<typeof vi.spyOn> | null = null
|
||||
let spyRevoke: ReturnType<typeof vi.spyOn> | null = null
|
||||
|
||||
describe('WysiwygBuilderPage', () => {
|
||||
beforeEach(() => {
|
||||
spyCreate = vi.spyOn(global.URL, 'createObjectURL').mockReturnValue('blob:mock')
|
||||
spyRevoke = vi.spyOn(global.URL, 'revokeObjectURL').mockImplementation(() => {})
|
||||
})
|
||||
afterEach(() => {
|
||||
spyCreate?.mockRestore()
|
||||
spyRevoke?.mockRestore()
|
||||
spyCreate = null
|
||||
spyRevoke = null
|
||||
})
|
||||
|
||||
it('adds a text object to the canvas', async () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
const addText = screen.getByRole('button', { name: /^Add Text$/i })
|
||||
fireEvent.click(addText)
|
||||
await waitFor(() => {
|
||||
expect(screen.getByTestId('obj-text-1')).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
|
||||
it('has an Export button', () => {
|
||||
render(<WysiwygBuilderPage />)
|
||||
expect(screen.getByRole('button', { name: /Export/i })).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,279 @@
|
||||
"use client"
|
||||
import React, { useCallback, useMemo, useRef, useState } from 'react'
|
||||
import type { Frame, WObject } from '@/lib/wysiwyg/schema'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import { PropsPanel } from '@/components/wysiwyg/PropsPanel'
|
||||
import { LayersPanel } from '@/components/wysiwyg/LayersPanel'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import { buildZip } from '@/lib/exporter/zip'
|
||||
import { AssetManager } from '@/lib/assets/assetManager'
|
||||
import { buildAssetsMetadata } from '@/lib/exporter/assets.meta'
|
||||
import { buildAssetsIndex } from '@/lib/exporter/assets.index'
|
||||
import { buildAssetsIntegrityIndex } from '@/lib/exporter/assets.integrity.index'
|
||||
|
||||
function emptyFrame(): Frame {
|
||||
return {
|
||||
id: 'f-wysiwyg',
|
||||
width: 800,
|
||||
height: 500,
|
||||
background: '#111111',
|
||||
layers: [
|
||||
{ id: 'base', name: 'Base', visible: true, locked: false, objects: [] },
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
function download(filename: string, data: Uint8Array) {
|
||||
const ab = data.slice().buffer as ArrayBuffer
|
||||
const blob = new Blob([ab], { type: 'application/zip' })
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = filename
|
||||
document.body.appendChild(a)
|
||||
a.click()
|
||||
a.remove()
|
||||
URL.revokeObjectURL(url)
|
||||
}
|
||||
|
||||
let textCounter = 1
|
||||
let imageCounter = 1
|
||||
let buttonCounter = 1
|
||||
let inputCounter = 1
|
||||
let selectCounter = 1
|
||||
let textareaCounter = 1
|
||||
let radioCounter = 1
|
||||
let checkboxCounter = 1
|
||||
let layerCounter = 1
|
||||
|
||||
export function WysiwygBuilderPage() {
|
||||
const [frame, setFrame] = useState<Frame>(() => emptyFrame())
|
||||
const assetManagerRef = useRef<AssetManager | null>(null)
|
||||
const [selectedIds, setSelectedIds] = useState<string[]>([])
|
||||
const [guidesOn, setGuidesOn] = useState(true)
|
||||
const selectedId = selectedIds[selectedIds.length - 1] || null
|
||||
const selectedObject: WObject | null = useMemo(() => {
|
||||
for (const ly of frame.layers) {
|
||||
const o = ly.objects.find((x) => x.id === selectedId)
|
||||
if (o) return o
|
||||
}
|
||||
return null
|
||||
}, [frame, selectedId])
|
||||
|
||||
const onChangeFrame = useCallback((next: Frame) => setFrame(next), [])
|
||||
const onSelectIds = useCallback((ids: string[]) => setSelectedIds(ids), [])
|
||||
|
||||
const addText = useCallback(() => {
|
||||
const id = `text-${textCounter++}`
|
||||
const obj: WObject = { id, type: 'text', x: 60, y: 60, width: 160, height: 40, rotate: 0, zIndex: 0, props: { text: 'Text', fontSize: 18, color: '#ffffff' } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addRadio = useCallback(() => {
|
||||
const id = `radio-${radioCounter++}`
|
||||
const obj: WObject = { id, type: 'radio', x: 60, y: 240, width: 300, height: 96, rotate: 0, zIndex: 0, props: { name: 'choice', legend: 'Legend', options: ['A','B','C'], defaultValue: 'A', required: false } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addCheckbox = useCallback(() => {
|
||||
const id = `checkbox-${checkboxCounter++}`
|
||||
const obj: WObject = { id, type: 'checkbox', x: 60, y: 360, width: 320, height: 96, rotate: 0, zIndex: 0, props: { name: 'agree', legend: 'Legend', options: ['One','Two','Three'], defaultValues: ['One'], required: false } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addTextarea = useCallback(() => {
|
||||
const id = `textarea-${textareaCounter++}`
|
||||
const obj: WObject = { id, type: 'textarea', x: 60, y: 180, width: 320, height: 96, rotate: 0, zIndex: 0, props: { name: 'message', label: 'Message', placeholder: '', rows: 3, required: false } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addSelect = useCallback(() => {
|
||||
const id = `select-${selectCounter++}`
|
||||
const obj: WObject = { id, type: 'select', x: 60, y: 120, width: 260, height: 48, rotate: 0, zIndex: 0, props: { name: 'field', label: 'Label', options: ['S','M','L'], defaultValue: '' } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addLayer = useCallback(() => {
|
||||
const lid = `layer-${layerCounter++}`
|
||||
const tid = `text-${textCounter++}`
|
||||
const layer: Frame['layers'][number] = {
|
||||
id: lid,
|
||||
name: `Layer ${layerCounter - 1}`,
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: tid, type: 'text', x: 60, y: 60, width: 160, height: 40, rotate: 0, zIndex: 0, props: { text: `L${layerCounter - 1}`, fontSize: 18, color: '#ffffff' } },
|
||||
],
|
||||
}
|
||||
setFrame((prev) => ({ ...prev, layers: [...prev.layers, layer] }))
|
||||
setSelectedIds([tid])
|
||||
}, [])
|
||||
|
||||
const addImage = useCallback(() => {
|
||||
const id = `image-${imageCounter++}`
|
||||
const obj: WObject = { id, type: 'image', x: 60, y: 120, width: 120, height: 90, rotate: 0, zIndex: 0, props: { src: 'https://via.placeholder.com/120x90', alt: '' } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const onUploadImage = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const files = e.target.files
|
||||
if (!files || files.length === 0) return
|
||||
const file = files[0]
|
||||
const reader = new FileReader()
|
||||
reader.onload = () => {
|
||||
const result = reader.result
|
||||
if (!(result instanceof ArrayBuffer)) return
|
||||
const bytes = new Uint8Array(result)
|
||||
const am = assetManagerRef.current ?? new AssetManager({ maxBytes: 10 * 1024 * 1024, allowedExts: ['png', 'jpg', 'jpeg', 'webp', 'svg'], pathStrategy: 'grouped' })
|
||||
assetManagerRef.current = am
|
||||
am.add({ name: file.name, type: file.type, bytes }).then((ref) => {
|
||||
const id = `image-${imageCounter++}`
|
||||
const obj: WObject = {
|
||||
id,
|
||||
type: 'image',
|
||||
x: 60,
|
||||
y: 120,
|
||||
width: 120,
|
||||
height: 90,
|
||||
rotate: 0,
|
||||
zIndex: 0,
|
||||
props: { src: `/${ref.path}` as string, alt: file.name },
|
||||
}
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => (i === 0 ? { ...l, objects: [...l.objects, obj] } : l)),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}).catch(() => {
|
||||
// ignore upload errors in UI for now
|
||||
})
|
||||
}
|
||||
reader.readAsArrayBuffer(file)
|
||||
}, [])
|
||||
|
||||
const addButton = useCallback(() => {
|
||||
const id = `button-${buttonCounter++}`
|
||||
const obj: WObject = { id, type: 'button', x: 60, y: 240, width: 120, height: 36, rotate: 0, zIndex: 0, props: { label: 'Button', href: '#', color: '#ffffff', background: '#2563eb' } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const addInput = useCallback(() => {
|
||||
const id = `input-${inputCounter++}`
|
||||
const obj: WObject = { id, type: 'input', x: 60, y: 60, width: 260, height: 48, rotate: 0, zIndex: 0, props: { name: 'field', label: 'Label', placeholder: '', required: false } }
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l, i) => i === 0 ? { ...l, objects: [...l.objects, obj] } : l),
|
||||
}))
|
||||
setSelectedIds([id])
|
||||
}, [])
|
||||
|
||||
const onChangeObject = useCallback((next: WObject) => {
|
||||
setFrame((prev) => ({
|
||||
...prev,
|
||||
layers: prev.layers.map((l) => ({
|
||||
...l,
|
||||
objects: l.objects.map((o) => (o.id === next.id ? (next as WObject) : o)),
|
||||
})),
|
||||
}))
|
||||
}, [])
|
||||
|
||||
const doExport = useCallback(async () => {
|
||||
const out = exportFrame(frame)
|
||||
const am = assetManagerRef.current ?? new AssetManager({ maxBytes: 10 * 1024 * 1024, allowedExts: ['png','jpg','jpeg','webp','svg','woff2','txt'], pathStrategy: 'grouped' })
|
||||
assetManagerRef.current = am
|
||||
const extras: Record<string, Uint8Array> = {
|
||||
'assets.json': buildAssetsMetadata(am),
|
||||
'assets.index.json': buildAssetsIndex(am),
|
||||
'assets.integrity.index.json': buildAssetsIntegrityIndex(am),
|
||||
}
|
||||
const assets = am.toZipStructure()
|
||||
const zip = await buildZip({ html: out.html, css: out.css, js: out.js, assets, extras })
|
||||
download('landing.zip', zip)
|
||||
}, [frame])
|
||||
|
||||
return (
|
||||
<div className="p-4 grid grid-cols-[260px_1fr_320px] gap-4">
|
||||
<div className="space-y-3">
|
||||
<div className="flex gap-2 items-center">
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2" onClick={addText}>Add Text</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2" onClick={addImage}>Add Image</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2" onClick={addLayer}>Add Layer</button>
|
||||
<input
|
||||
type="file"
|
||||
accept="image/png,image/jpeg,image/jpg,image/webp,image/svg+xml"
|
||||
data-testid="wysiwyg-image-input"
|
||||
onChange={onUploadImage}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2 mr-2" onClick={addInput}>Add Input</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2 mr-2" onClick={addSelect}>Add Select</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2 mr-2" onClick={addTextarea}>Add Textarea</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2 mr-2" onClick={addRadio}>Add Radio</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2 mr-2" onClick={addCheckbox}>Add Checkbox</button>
|
||||
<button type="button" className="bg-gray-200 rounded px-3 py-2" onClick={addButton}>Add Button</button>
|
||||
</div>
|
||||
<div className="border rounded p-2">
|
||||
<LayersPanel frame={frame} onChange={setFrame} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-xl font-semibold">WYSIWYG Builder</h1>
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
aria-pressed={guidesOn ? 'true' : 'false'}
|
||||
className="bg-gray-200 rounded px-3 py-2"
|
||||
onClick={() => setGuidesOn((v) => !v)}
|
||||
>
|
||||
Guides
|
||||
</button>
|
||||
<button type="button" className="bg-emerald-600 text-white rounded px-4 py-2" onClick={doExport}>Export</button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="border rounded p-2 inline-block" style={{ background: '#111111' }}>
|
||||
<Canvas key={`guides-${guidesOn ? 'on' : 'off'}`} frame={frame} onChange={onChangeFrame} onSelectIds={onSelectIds} enableGuides={guidesOn} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="border rounded p-2">
|
||||
<h2 className="text-sm font-semibold mb-2">Properties</h2>
|
||||
{selectedObject ? (
|
||||
<PropsPanel object={selectedObject} onChange={onChangeObject} />
|
||||
) : (
|
||||
<p className="text-sm text-gray-500">Select an object to edit</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default WysiwygBuilderPage
|
||||
@@ -0,0 +1,15 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { render, screen } from '@testing-library/react'
|
||||
import { WysiwygPage } from '@/components/wysiwyg/WysiwygPage'
|
||||
|
||||
describe('WysiwygPage', () => {
|
||||
it('renders Canvas with a sample frame and aria-live region', () => {
|
||||
render(<WysiwygPage />)
|
||||
const canvas = screen.getByTestId('wysiwyg-canvas')
|
||||
expect(canvas).toBeInTheDocument()
|
||||
// at least one object is present
|
||||
expect(screen.getByTestId('obj-o1')).toBeInTheDocument()
|
||||
// a11y live region exists
|
||||
expect(screen.getByTestId('aria-live')).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,36 @@
|
||||
import React from 'react'
|
||||
import { Canvas } from '@/components/wysiwyg/Canvas'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function sampleFrame(): Frame {
|
||||
return {
|
||||
id: 'f-sample',
|
||||
width: 600,
|
||||
height: 400,
|
||||
background: '#ffffff',
|
||||
layers: [
|
||||
{
|
||||
id: 'l1',
|
||||
name: 'Base',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'o1', type: 'image', x: 40, y: 40, width: 100, height: 80, rotate: 0, zIndex: 0, props: { src: 'https://via.placeholder.com/100x80', alt: 'A' } },
|
||||
{ id: 'o2', type: 'text', x: 200, y: 60, width: 200, height: 40, rotate: 0, zIndex: 1, props: { text: 'WYSIWYG', fontSize: 20, color: '#111111' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
export function WysiwygPage() {
|
||||
const frame = sampleFrame()
|
||||
return (
|
||||
<div className="p-6 space-y-4">
|
||||
<h1 className="text-xl font-semibold">WYSIWYG Canvas</h1>
|
||||
<Canvas frame={frame} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default WysiwygPage
|
||||
@@ -0,0 +1,34 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(bg = '#111111'): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: bg,
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - CSS regression (tokens + rules presence)', () => {
|
||||
it('contains core tokens and rules across themes and states', () => {
|
||||
const out = exportFrame(baseFrame('#222222'))
|
||||
const css = out.css
|
||||
// root and theme tokens
|
||||
expect(css).toMatch(/:root\s*{[^}]*--bg:/)
|
||||
expect(css).toMatch(/\[data-theme="light"\]\s*{[^}]*--bg:/)
|
||||
expect(css).toMatch(/\[data-theme="dark"\]\s*{[^}]*--bg:/)
|
||||
// base usage
|
||||
expect(css).toMatch(/\.frame\s*{[^}]*background:var\(--bg\)/)
|
||||
expect(css).toMatch(/a\s*{[^}]*color:var\(--primary\)/)
|
||||
// controls base
|
||||
expect(css).toMatch(/input,select,textarea\s*{[^}]*color:var\(--text\)/)
|
||||
expect(css).toMatch(/input,select,textarea\s*{[^}]*border:1px solid var\(--border\)/)
|
||||
// states
|
||||
expect(css).toMatch(/input:focus,select:focus,textarea:focus\s*{[^}]*outline:2px solid var\(--primary\)/)
|
||||
expect(css).toMatch(/:focus-visible\s*{[^}]*outline:2px solid var\(--ring\)/)
|
||||
expect(css).toMatch(/:focus-visible\s*{[^}]*outline-offset:var\(--ring-offset\)/)
|
||||
expect(css).toMatch(/input:invalid,select:invalid,textarea:invalid\s*{[^}]*border-color:var\(--danger\)/)
|
||||
expect(css).toMatch(/input:disabled,select:disabled,textarea:disabled\s*{[^}]*background:var\(--disabled-bg\)/)
|
||||
expect(css).toMatch(/input\[readonly\],select\[readonly\],textarea\[readonly\]\s*{[^}]*color:var\(--disabled-fg\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,50 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 400, height: 300, background: '#ffffff',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - forms aria-describedby(help)', () => {
|
||||
it('input: adds help element and aria-describedby linkage', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'in1', type: 'input', x: 10, y: 20, width: 260, height: 48, rotate: 0, zIndex: 0, props: { name: 'email', label: 'Email', placeholder: '', required: false, help: 'We will not spam you.' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<div id="in1">[\s\S]*<input id="in1-control" name="email" aria-describedby="in1-control-help"\/>[\s\S]*<small id="in1-control-help"/)
|
||||
expect(out.html).toMatch(/We will not spam you\./)
|
||||
})
|
||||
|
||||
it('select: adds help and aria-describedby', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'sel1', type: 'select', x: 0, y: 0, width: 100, height: 30, rotate: 0, zIndex: 0, props: { name: 'size', label: 'Size', options: ['S'], defaultValue: 'S', help: 'Choose wisely.' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<select id="sel1-control" name="size" aria-describedby="sel1-control-help">/)
|
||||
expect(out.html).toMatch(/<small id="sel1-control-help"/)
|
||||
})
|
||||
|
||||
it('textarea: adds help and aria-describedby', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'ta1', type: 'textarea', x: 0, y: 0, width: 100, height: 60, rotate: 0, zIndex: 0, props: { name: 'msg', label: 'Msg', placeholder: '', rows: 3, required: false, help: 'Say hello.' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<textarea id="ta1-control" name="msg" rows="3" aria-describedby="ta1-control-help"><\/textarea>/)
|
||||
expect(out.html).toMatch(/<small id="ta1-control-help"/)
|
||||
})
|
||||
|
||||
it('radio: adds group help (fieldset) and does not use aria-describedby per item by default', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'rg1', type: 'radio', x: 0, y: 0, width: 100, height: 60, rotate: 0, zIndex: 0, props: { name: 'color', legend: 'Color', options: ['Red'], defaultValue: 'Red', required: false, help: 'Pick one.' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<fieldset id="rg1">[\s\S]*<legend>Color<\/legend>[\s\S]*<small id="rg1-help"/)
|
||||
})
|
||||
|
||||
it('checkbox: adds group help (fieldset)', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'cb1', type: 'checkbox', x: 0, y: 0, width: 100, height: 60, rotate: 0, zIndex: 0, props: { name: 'pick', legend: 'Pick', options: ['One'], defaultValues: [], required: false, help: 'You can pick many.' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<fieldset id="cb1">[\s\S]*<legend>Pick<\/legend>[\s\S]*<small id="cb1-help"/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,62 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 400, height: 300, background: '#ffffff',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - forms a11y', () => {
|
||||
it('exports input with label/for and required/placeholder', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'in1', type: 'input', x: 10, y: 20, width: 260, height: 48, rotate: 0, zIndex: 0, props: { name: 'email', label: 'Email', placeholder: 'you@example.com', required: true } })
|
||||
const out = exportFrame(f)
|
||||
// label and input id/for
|
||||
expect(out.html).toMatch(/<label for="in1-control">Email<\/label>/)
|
||||
expect(out.html).toMatch(/<input id="in1-control" name="email"[^>]*placeholder="you@example.com"[^>]*required/)
|
||||
// absolutely positioned wrapper
|
||||
expect(out.css).toMatch(/#in1\s*{[^}]*left:10px;[^}]*top:20px;[^}]*width:260px;[^}]*height:48px/)
|
||||
})
|
||||
|
||||
it('exports select with options and defaultValue', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'sel1', type: 'select', x: 12, y: 30, width: 220, height: 40, rotate: 0, zIndex: 0, props: { name: 'size', label: 'Size', options: ['S','M','L'], defaultValue: 'M' } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<label for="sel1-control">Size<\/label>/)
|
||||
expect(out.html).toMatch(/<select id="sel1-control" name="size"/)
|
||||
expect(out.html).toMatch(/<option value="S">S<\/option>/)
|
||||
expect(out.html).toMatch(/<option value="M" selected>M<\/option>/)
|
||||
expect(out.html).toMatch(/<option value="L">L<\/option>/)
|
||||
})
|
||||
|
||||
it('exports textarea with label and rows/placeholder/required', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'ta1', type: 'textarea', x: 14, y: 40, width: 300, height: 90, rotate: 0, zIndex: 0, props: { name: 'message', label: 'Message', placeholder: 'Type...', rows: 5, required: true } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<label for="ta1-control">Message<\/label>/)
|
||||
expect(out.html).toMatch(/<textarea id="ta1-control" name="message"[^>]*rows="5"[^>]*placeholder="Type..."[^>]*required/)
|
||||
})
|
||||
|
||||
it('exports radio group with fieldset/legend and checked default', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'rg1', type: 'radio', x: 16, y: 60, width: 300, height: 80, rotate: 0, zIndex: 0, props: { name: 'color', legend: 'Color', options: ['Red','Green','Blue'], defaultValue: 'Green', required: true } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<fieldset id="rg1"/)
|
||||
expect(out.html).toMatch(/<legend>Color<\/legend>/)
|
||||
expect(out.html).toMatch(/<input type="radio" id="rg1-1" name="color" value="Green" checked required\/>/)
|
||||
expect(out.html).toMatch(/<label for="rg1-1">Green<\/label>/)
|
||||
})
|
||||
|
||||
it('exports checkbox group with fieldset/legend and defaultValues', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'cb1', type: 'checkbox', x: 18, y: 80, width: 320, height: 100, rotate: 0, zIndex: 0, props: { name: 'agreements', legend: 'Agree', options: ['One','Two','Three'], defaultValues: ['Two','Three'], required: true } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<fieldset id="cb1"/)
|
||||
expect(out.html).toMatch(/<legend>Agree<\/legend>/)
|
||||
expect(out.html).toMatch(/<input type="checkbox" id="cb1-1" name="agreements" value="Two" checked required\/>/)
|
||||
expect(out.html).toMatch(/<label for="cb1-1">Two<\/label>/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,29 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 400, height: 300, background: '#ffffff',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - form validation attributes', () => {
|
||||
it('input: pattern, minLength, maxLength exported', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'in1', type: 'input', x: 0, y: 0, width: 200, height: 40, rotate: 0, zIndex: 0, props: { name: 'code', label: 'Code', placeholder: '', required: false, pattern: '[A-Z]{3}', minLength: 3, maxLength: 3 } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<input id="in1-control" name="code"[^>]*pattern="\[A-Z\]\{3\}"/)
|
||||
expect(out.html).toMatch(/<input id="in1-control" name="code"[^>]*minlength="3"/i)
|
||||
expect(out.html).toMatch(/<input id="in1-control" name="code"[^>]*maxlength="3"/i)
|
||||
})
|
||||
|
||||
it('textarea: minLength, maxLength exported', () => {
|
||||
const f = baseFrame()
|
||||
f.layers[0].objects.push({ id: 'ta1', type: 'textarea', x: 0, y: 0, width: 200, height: 80, rotate: 0, zIndex: 0, props: { name: 'msg', label: 'Msg', placeholder: '', rows: 4, required: false, minLength: 10, maxLength: 200 } })
|
||||
const out = exportFrame(f)
|
||||
expect(out.html).toMatch(/<textarea id="ta1-control" name="msg"[^>]*minlength="10"/i)
|
||||
expect(out.html).toMatch(/<textarea id="ta1-control" name="msg"[^>]*maxlength="200"/i)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,21 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: '#111111',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - style tokens for controls', () => {
|
||||
it('defines base styles for inputs/selects/textarea/fieldset/legend using tokens', () => {
|
||||
const f = baseFrame()
|
||||
const out = exportFrame(f)
|
||||
expect(out.css).toMatch(/input,select,textarea\s*{[^}]*color:var\(--text\)/)
|
||||
expect(out.css).toMatch(/input,select,textarea\s*{[^}]*border:1px solid var\(--border\)/)
|
||||
expect(out.css).toMatch(/fieldset\s*{[^}]*border:1px solid var\(--border\)/)
|
||||
expect(out.css).toMatch(/legend\s*{[^}]*color:var\(--text\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,23 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: '#111111',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - disabled/read-only control tokens', () => {
|
||||
it('defines disabled tokens and uses them for :disabled and [readonly]', () => {
|
||||
const out = exportFrame(baseFrame())
|
||||
// tokens
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--disabled-bg:/)
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--disabled-fg:/)
|
||||
// usage
|
||||
expect(out.css).toMatch(/input:disabled,select:disabled,textarea:disabled\s*{[^}]*background:var\(--disabled-bg\)/)
|
||||
expect(out.css).toMatch(/input:disabled,select:disabled,textarea:disabled\s*{[^}]*color:var\(--disabled-fg\)/)
|
||||
expect(out.css).toMatch(/input\[readonly\],select\[readonly\],textarea\[readonly\]\s*{[^}]*color:var\(--disabled-fg\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,22 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: '#111111',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - focus-visible ring tokens', () => {
|
||||
it('defines ring tokens and uses them in :focus-visible styles', () => {
|
||||
const out = exportFrame(baseFrame())
|
||||
// tokens
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--ring:/)
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--ring-offset:/)
|
||||
// usage (focus-visible across common focusables and controls)
|
||||
expect(out.css).toMatch(/:focus-visible\s*{[^}]*outline:2px solid var\(--ring\)/)
|
||||
expect(out.css).toMatch(/:focus-visible\s*{[^}]*outline-offset:var\(--ring-offset\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,23 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: '#111111',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - control state styles via tokens', () => {
|
||||
it('adds :focus styles using tokens', () => {
|
||||
const out = exportFrame(baseFrame())
|
||||
expect(out.css).toMatch(/:root[^}]*--primary:/)
|
||||
expect(out.css).toMatch(/input:focus,select:focus,textarea:focus\s*{[^}]*outline:2px solid var\(--primary\)/)
|
||||
})
|
||||
it('adds :invalid styles using tokens', () => {
|
||||
const out = exportFrame(baseFrame())
|
||||
expect(out.css).toMatch(/:root[^}]*--danger:/)
|
||||
expect(out.css).toMatch(/input:invalid,select:invalid,textarea:invalid\s*{[^}]*border-color:var\(--danger\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,26 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: '#111111',
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - style tokens', () => {
|
||||
it('injects :root tokens and uses them in base rules', () => {
|
||||
const f = baseFrame()
|
||||
const out = exportFrame(f)
|
||||
// root tokens
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--bg:\s*#[0-9a-fA-F]{3,6}/)
|
||||
expect(out.css).toMatch(/--text:/)
|
||||
expect(out.css).toMatch(/--border:/)
|
||||
expect(out.css).toMatch(/--primary:/)
|
||||
// frame uses tokens
|
||||
expect(out.css).toMatch(/\.frame\s*{[^}]*background:var\(--bg\)/)
|
||||
// anchor uses primary color
|
||||
expect(out.css).toMatch(/a\s*{[^}]*color:var\(--primary\)/)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,23 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { exportFrame } from '@/lib/wysiwyg/export'
|
||||
import type { Frame } from '@/lib/wysiwyg/schema'
|
||||
|
||||
function baseFrame(bg = '#111111'): Frame {
|
||||
return {
|
||||
id: 'f', width: 320, height: 200, background: bg,
|
||||
layers: [{ id: 'l1', name: 'Base', visible: true, locked: false, objects: [] }],
|
||||
}
|
||||
}
|
||||
|
||||
describe('wysiwyg export - theme switching tokens', () => {
|
||||
it('emits light/dark token presets', () => {
|
||||
const out = exportFrame(baseFrame('#202020'))
|
||||
expect(out.css).toMatch(/:root\s*{[^}]*--bg:/)
|
||||
expect(out.css).toMatch(/\[data-theme="light"\]\s*{[^}]*--bg:/)
|
||||
expect(out.css).toMatch(/\[data-theme="dark"\]\s*{[^}]*--bg:/)
|
||||
})
|
||||
it('frame uses var(--bg), so theme can override background', () => {
|
||||
const out = exportFrame(baseFrame('#333333'))
|
||||
expect(out.css).toMatch(/\.frame\s*{[^}]*background:var\(--bg\)/)
|
||||
})
|
||||
})
|
||||
@@ -39,4 +39,44 @@ describe('wysiwyg export (absolute positioned HTML/CSS + scale wrapper)', () =>
|
||||
expect(out.css).toMatch(/\.frame-scale\s*{[^}]*transform-origin:0 0/)
|
||||
expect(out.html).toMatch(/class=\"frame-scale\"/)
|
||||
})
|
||||
|
||||
it('wraps exported markup with full HTML document and references stylesheet/script', () => {
|
||||
const frame = makeFrame()
|
||||
const out = exportFrame(frame)
|
||||
expect(out.html.startsWith('<!doctype html>')).toBe(true)
|
||||
expect(out.html).toMatch(/<link rel=\"stylesheet\" href=\"styles\.css\"/)
|
||||
expect(out.html).toMatch(/<script src=\"app\.js\"><\/script>/)
|
||||
})
|
||||
|
||||
it('exports button objects as anchors with href/label semantics', () => {
|
||||
const frame: Frame = {
|
||||
...makeFrame(),
|
||||
layers: [
|
||||
{
|
||||
id: 'buttons',
|
||||
name: 'Buttons',
|
||||
visible: true,
|
||||
locked: false,
|
||||
objects: [
|
||||
{ id: 'cta', type: 'button', x: 10, y: 20, width: 120, height: 36, rotate: 0, zIndex: 0, props: { label: 'Start', href: 'https://acme.dev', color: '#fff', background: '#111' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
const out = exportFrame(frame)
|
||||
expect(out.html).toMatch(/<a id=\"cta\" href=\"https:\/\/acme\.dev\">Start<\/a>/)
|
||||
expect(out.css).toMatch(/#cta\s*{[^}]*width:120px;[^}]*height:36px/)
|
||||
})
|
||||
|
||||
it('skips invisible layers when exporting html/css', () => {
|
||||
const frame: Frame = {
|
||||
...makeFrame(),
|
||||
layers: [
|
||||
{ id: 'hidden', name: 'Hidden', visible: false, locked: false, objects: [makeFrame().layers[0].objects[0]] },
|
||||
],
|
||||
}
|
||||
const out = exportFrame(frame)
|
||||
expect(out.html).not.toContain('id="o1"')
|
||||
expect(out.css).not.toContain('#o1')
|
||||
})
|
||||
})
|
||||
|
||||
+110
-3
@@ -9,6 +9,11 @@ function esc(s: string) {
|
||||
function isImage(o: WObject): o is Extract<WObject, { type: 'image' }> { return o.type === 'image' }
|
||||
function isText(o: WObject): o is Extract<WObject, { type: 'text' }> { return o.type === 'text' }
|
||||
function isButton(o: WObject): o is Extract<WObject, { type: 'button' }> { return o.type === 'button' }
|
||||
function isInput(o: WObject): o is Extract<WObject, { type: 'input' }> { return o.type === 'input' }
|
||||
function isSelect(o: WObject): o is Extract<WObject, { type: 'select' }> { return o.type === 'select' }
|
||||
function isTextarea(o: WObject): o is Extract<WObject, { type: 'textarea' }> { return o.type === 'textarea' }
|
||||
function isRadio(o: WObject): o is Extract<WObject, { type: 'radio' }> { return o.type === 'radio' }
|
||||
function isCheckbox(o: WObject): o is Extract<WObject, { type: 'checkbox' }> { return o.type === 'checkbox' }
|
||||
|
||||
function renderObject(o: WObject): { html: string; css: string } {
|
||||
const baseCss = `#${o.id}{position:absolute;left:${o.x}px;top:${o.y}px;width:${o.width}px;height:${o.height}px;transform:rotate(${o.rotate}deg)}`
|
||||
@@ -20,7 +25,82 @@ function renderObject(o: WObject): { html: string; css: string } {
|
||||
const html = `<p id="${o.id}">${esc(o.props.text)}</p>`
|
||||
return { html, css: baseCss + `;font-size:${o.props.fontSize}px;color:${o.props.color}` }
|
||||
}
|
||||
// button minimal
|
||||
if (isInput(o)) {
|
||||
const cid = `${o.id}-control`
|
||||
const req = o.props.required ? ' required' : ''
|
||||
const ph = o.props.placeholder ? ` placeholder="${esc(o.props.placeholder)}"` : ''
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
const described = helpId ? ` aria-describedby="${helpId}"` : ''
|
||||
const pat = o.props.pattern ? ` pattern="${esc(o.props.pattern)}"` : ''
|
||||
const min = typeof o.props.minLength === 'number' ? ` minlength="${o.props.minLength}"` : ''
|
||||
const max = typeof o.props.maxLength === 'number' ? ` maxlength="${o.props.maxLength}"` : ''
|
||||
const html = [
|
||||
`<div id="${o.id}">`,
|
||||
`<label for="${cid}">${esc(o.props.label)}</label>`,
|
||||
`<input id="${cid}" name="${esc(o.props.name)}"${ph}${req}${described}${pat}${min}${max}/>`,
|
||||
o.props.help ? `<small id="${helpId}">${esc(o.props.help)}</small>` : '',
|
||||
`</div>`,
|
||||
].join('')
|
||||
return { html, css: baseCss }
|
||||
}
|
||||
if (isSelect(o)) {
|
||||
const cid = `${o.id}-control`
|
||||
const opts = (o.props.options || [])
|
||||
.map((opt) => `<option value="${esc(opt)}"${o.props.defaultValue === opt ? ' selected' : ''}>${esc(opt)}</option>`)
|
||||
.join('')
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
const described = helpId ? ` aria-describedby="${helpId}"` : ''
|
||||
const html = [
|
||||
`<div id="${o.id}">`,
|
||||
`<label for="${cid}">${esc(o.props.label)}</label>`,
|
||||
`<select id="${cid}" name="${esc(o.props.name)}"${described}>${opts}</select>`,
|
||||
o.props.help ? `<small id="${helpId}">${esc(o.props.help)}</small>` : '',
|
||||
`</div>`,
|
||||
].join('')
|
||||
return { html, css: baseCss }
|
||||
}
|
||||
if (isTextarea(o)) {
|
||||
const cid = `${o.id}-control`
|
||||
const req = o.props.required ? ' required' : ''
|
||||
const ph = o.props.placeholder ? ` placeholder="${esc(o.props.placeholder)}"` : ''
|
||||
const rows = Number(o.props.rows ?? 3)
|
||||
const helpId = o.props.help ? `${cid}-help` : ''
|
||||
const described = helpId ? ` aria-describedby="${helpId}"` : ''
|
||||
const min = typeof o.props.minLength === 'number' ? ` minlength="${o.props.minLength}"` : ''
|
||||
const max = typeof o.props.maxLength === 'number' ? ` maxlength="${o.props.maxLength}"` : ''
|
||||
const html = [
|
||||
`<div id="${o.id}">`,
|
||||
`<label for="${cid}">${esc(o.props.label)}</label>`,
|
||||
`<textarea id="${cid}" name="${esc(o.props.name)}" rows="${rows}"${ph}${req}${described}${min}${max}></textarea>`,
|
||||
o.props.help ? `<small id="${helpId}">${esc(o.props.help)}</small>` : '',
|
||||
`</div>`,
|
||||
].join('')
|
||||
return { html, css: baseCss }
|
||||
}
|
||||
if (isRadio(o)) {
|
||||
const req = o.props.required ? ' required' : ''
|
||||
const items = (o.props.options || []).map((opt, idx) => {
|
||||
const id = `${o.id}-${idx}`
|
||||
const checked = o.props.defaultValue === opt ? ' checked' : ''
|
||||
return `<div><input type="radio" id="${id}" name="${esc(o.props.name)}" value="${esc(opt)}"${checked}${req}/><label for="${id}">${esc(opt)}</label></div>`
|
||||
}).join('')
|
||||
const help = o.props.help ? `<small id="${o.id}-help">${esc(o.props.help)}</small>` : ''
|
||||
const html = [`<fieldset id="${o.id}">`, `<legend>${esc(o.props.legend)}</legend>`, items, help, `</fieldset>`].join('')
|
||||
return { html, css: baseCss }
|
||||
}
|
||||
if (isCheckbox(o)) {
|
||||
const req = o.props.required ? ' required' : ''
|
||||
const def = new Set(o.props.defaultValues || [])
|
||||
const items = (o.props.options || []).map((opt, idx) => {
|
||||
const id = `${o.id}-${idx}`
|
||||
const checked = def.has(opt) ? ' checked' : ''
|
||||
return `<div><input type="checkbox" id="${id}" name="${esc(o.props.name)}" value="${esc(opt)}"${checked}${req}/><label for="${id}">${esc(opt)}</label></div>`
|
||||
}).join('')
|
||||
const help = o.props.help ? `<small id="${o.id}-help">${esc(o.props.help)}</small>` : ''
|
||||
const html = [`<fieldset id="${o.id}">`, `<legend>${esc(o.props.legend)}</legend>`, items, help, `</fieldset>`].join('')
|
||||
return { html, css: baseCss }
|
||||
}
|
||||
// button minimal (fallback)
|
||||
const label = isButton(o) ? o.props.label : 'Button'
|
||||
const href = isButton(o) ? (o.props.href || '#') : '#'
|
||||
const html = `<a id="${o.id}" href="${esc(href)}">${esc(label)}</a>`
|
||||
@@ -38,11 +118,38 @@ export function exportFrame(frame: Frame): Exported {
|
||||
piecesCss.push(r.css)
|
||||
}
|
||||
}
|
||||
const html = `<div class="frame-scale"><div class="frame">${piecesHtml.join('')}</div></div>`
|
||||
const inner = `<div class="frame-scale"><div class="frame">${piecesHtml.join('')}</div></div>`
|
||||
const css = [
|
||||
`.frame{position:relative;width:${frame.width}px;height:${frame.height}px;background:${frame.background}}`,
|
||||
`:root{--bg:${frame.background};--text:#f9fafb;--border:#94a3b8;--primary:#0ea5e9;--danger:#ef4444;--ring:#22c55e;--ring-offset:2px;--disabled-bg:#e5e7eb;--disabled-fg:#9ca3af}`,
|
||||
`[data-theme="light"]{--bg:#ffffff;--text:#0f172a;--border:#cbd5e1;--primary:#0ea5e9;--danger:#ef4444;--ring:#22c55e;--ring-offset:2px;--disabled-bg:#e5e7eb;--disabled-fg:#6b7280}`,
|
||||
`[data-theme="dark"]{--bg:#111111;--text:#f9fafb;--border:#94a3b8;--primary:#0ea5e9;--danger:#ef4444;--ring:#22c55e;--ring-offset:2px;--disabled-bg:#1f2937;--disabled-fg:#9ca3af}`,
|
||||
`.frame{position:relative;width:${frame.width}px;height:${frame.height}px;background:var(--bg)}`,
|
||||
`.frame-scale{transform-origin:0 0}`,
|
||||
`a{color:var(--primary);text-decoration:none}`,
|
||||
`input,select,textarea{color:var(--text);background:transparent;border:1px solid var(--border)}`,
|
||||
`:focus-visible{outline:2px solid var(--ring);outline-offset:var(--ring-offset)}`,
|
||||
`input:focus,select:focus,textarea:focus{outline:2px solid var(--primary);outline-offset:2px}`,
|
||||
`input:invalid,select:invalid,textarea:invalid{border-color:var(--danger)}`,
|
||||
`input:disabled,select:disabled,textarea:disabled{background:var(--disabled-bg);color:var(--disabled-fg)}`,
|
||||
`input[readonly],select[readonly],textarea[readonly]{color:var(--disabled-fg)}`,
|
||||
`fieldset{border:1px solid var(--border)}`,
|
||||
`legend{color:var(--text)}`,
|
||||
...piecesCss,
|
||||
].join('\n')
|
||||
const html = [
|
||||
'<!doctype html>',
|
||||
'<html lang="en">',
|
||||
'<head>',
|
||||
'<meta charset="utf-8" />',
|
||||
'<meta name="viewport" content="width=device-width,initial-scale=1" />',
|
||||
'<title>WYSIWYG Frame</title>',
|
||||
'<link rel="stylesheet" href="styles.css" />',
|
||||
'</head>',
|
||||
'<body>',
|
||||
inner,
|
||||
'<script src="app.js"></script>',
|
||||
'</body>',
|
||||
'</html>',
|
||||
].join('')
|
||||
return { html, css, js: '' }
|
||||
}
|
||||
|
||||
+64
-1
@@ -39,7 +39,70 @@ const buttonObject = baseObject.extend({
|
||||
}),
|
||||
})
|
||||
|
||||
export const objectSchema = z.discriminatedUnion('type', [textObject, imageObject, buttonObject])
|
||||
const inputObject = baseObject.extend({
|
||||
type: z.literal('input'),
|
||||
props: z.object({
|
||||
name: z.string().min(1),
|
||||
label: z.string().min(1),
|
||||
placeholder: z.string().optional().default(''),
|
||||
required: z.boolean().optional().default(false),
|
||||
pattern: z.string().optional(),
|
||||
minLength: z.number().int().nonnegative().optional(),
|
||||
maxLength: z.number().int().nonnegative().optional(),
|
||||
help: z.string().optional(),
|
||||
}),
|
||||
})
|
||||
|
||||
const selectObject = baseObject.extend({
|
||||
type: z.literal('select'),
|
||||
props: z.object({
|
||||
name: z.string().min(1),
|
||||
label: z.string().min(1),
|
||||
options: z.array(z.string()).default([]),
|
||||
defaultValue: z.string().optional().default(''),
|
||||
help: z.string().optional(),
|
||||
}),
|
||||
})
|
||||
|
||||
const textareaObject = baseObject.extend({
|
||||
type: z.literal('textarea'),
|
||||
props: z.object({
|
||||
name: z.string().min(1),
|
||||
label: z.string().min(1),
|
||||
placeholder: z.string().optional().default(''),
|
||||
rows: z.number().int().positive().default(3),
|
||||
required: z.boolean().optional().default(false),
|
||||
minLength: z.number().int().nonnegative().optional(),
|
||||
maxLength: z.number().int().nonnegative().optional(),
|
||||
help: z.string().optional(),
|
||||
}),
|
||||
})
|
||||
|
||||
const radioObject = baseObject.extend({
|
||||
type: z.literal('radio'),
|
||||
props: z.object({
|
||||
name: z.string().min(1),
|
||||
legend: z.string().min(1),
|
||||
options: z.array(z.string()).default([]),
|
||||
defaultValue: z.string().optional().default(''),
|
||||
required: z.boolean().optional().default(false),
|
||||
help: z.string().optional(),
|
||||
}),
|
||||
})
|
||||
|
||||
const checkboxObject = baseObject.extend({
|
||||
type: z.literal('checkbox'),
|
||||
props: z.object({
|
||||
name: z.string().min(1),
|
||||
legend: z.string().min(1),
|
||||
options: z.array(z.string()).default([]),
|
||||
defaultValues: z.array(z.string()).default([]),
|
||||
required: z.boolean().optional().default(false),
|
||||
help: z.string().optional(),
|
||||
}),
|
||||
})
|
||||
|
||||
export const objectSchema = z.discriminatedUnion('type', [textObject, imageObject, buttonObject, inputObject, selectObject, textareaObject, radioObject, checkboxObject])
|
||||
export type WObject = z.infer<typeof objectSchema>
|
||||
|
||||
export const layerSchema = z.object({
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { snap8, snapAngle } from '@/lib/wysiwyg/snap'
|
||||
|
||||
describe('snap utils', () => {
|
||||
it('snap8 rounds to nearest 8', () => {
|
||||
expect(snap8(0)).toBe(0)
|
||||
expect(snap8(3)).toBe(0)
|
||||
expect(snap8(4)).toBe(8)
|
||||
expect(snap8(11)).toBe(8)
|
||||
expect(snap8(12)).toBe(16)
|
||||
})
|
||||
|
||||
it('snapAngle snaps to 15deg by default', () => {
|
||||
expect(snapAngle(0)).toBe(0)
|
||||
expect(snapAngle(7)).toBe(15)
|
||||
expect(snapAngle(22)).toBe(15)
|
||||
expect(snapAngle(30)).toBe(30)
|
||||
})
|
||||
|
||||
it('snapAngle respects fine=true (1deg)', () => {
|
||||
expect(snapAngle(7, true)).toBe(7)
|
||||
expect(snapAngle(22, true)).toBe(22)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,16 @@
|
||||
// 8px 격자 스냅: 주어진 값 v를 가장 가까운 8의 배수로 반올림
|
||||
export function snap8(v: number): number {
|
||||
return Math.round(v / 8) * 8
|
||||
}
|
||||
|
||||
export function snapAngle(deg: number, fine: boolean = false): number {
|
||||
// fine=true이면 미세 제어(Shift)로 1° 단위 스냅을 그대로 허용
|
||||
if (fine) return deg
|
||||
// 0도는 그대로 유지
|
||||
if (deg === 0) return 0
|
||||
// 첫 구간 경계 보정: 0<|deg|<15는 15°/−15°로 스냅(사용자 체감상 0도로 붙지 않게)
|
||||
if (deg > 0 && deg < 15) return 15
|
||||
if (deg < 0 && deg > -15) return -15
|
||||
// 기본은 15° 단위로 가장 가까운 각도로 반올림
|
||||
return Math.round(deg / 15) * 15
|
||||
}
|
||||
Generated
+251
@@ -13,10 +13,12 @@
|
||||
"@dnd-kit/sortable": "^10.0.0",
|
||||
"@dnd-kit/utilities": "^3.2.2",
|
||||
"jszip": "^3.10.1",
|
||||
"moveable": "^0.53.0",
|
||||
"next": "16.0.2",
|
||||
"next-intl": "^4.5.2",
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"react-moveable": "^0.56.0",
|
||||
"zod": "^4.1.12",
|
||||
"zustand": "^5.0.8"
|
||||
},
|
||||
@@ -385,6 +387,15 @@
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@cfcs/core": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@cfcs/core/-/core-0.0.6.tgz",
|
||||
"integrity": "sha512-FxfJMwoLB8MEMConeXUCqtMGqxdtePQxRBOiGip9ULcYYam3WfCgoY6xdnMaSkYvRvmosp5iuG+TiPofm65+Pw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@egjs/component": "^3.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@csstools/color-helpers": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
|
||||
@@ -520,6 +531,12 @@
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@daybrush/utils": {
|
||||
"version": "1.13.0",
|
||||
"resolved": "https://registry.npmjs.org/@daybrush/utils/-/utils-1.13.0.tgz",
|
||||
"integrity": "sha512-ALK12C6SQNNHw1enXK+UO8bdyQ+jaWNQ1Af7Z3FNxeAwjYhQT7do+TRE4RASAJ3ObaS2+TJ7TXR3oz2Gzbw0PQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@dnd-kit/accessibility": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
|
||||
@@ -587,6 +604,33 @@
|
||||
"react": ">=16.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@egjs/agent": {
|
||||
"version": "2.4.4",
|
||||
"resolved": "https://registry.npmjs.org/@egjs/agent/-/agent-2.4.4.tgz",
|
||||
"integrity": "sha512-cvAPSlUILhBBOakn2krdPnOGv5hAZq92f1YHxYcfu0p7uarix2C6Ia3AVizpS1SGRZGiEkIS5E+IVTLg1I2Iog==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@egjs/children-differ": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@egjs/children-differ/-/children-differ-1.0.1.tgz",
|
||||
"integrity": "sha512-DRvyqMf+CPCOzAopQKHtW+X8iN6Hy6SFol+/7zCUiE5y4P/OB8JP8FtU4NxtZwtafvSL4faD5KoQYPj3JHzPFQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@egjs/list-differ": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@egjs/component": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@egjs/component/-/component-3.0.5.tgz",
|
||||
"integrity": "sha512-cLcGizTrrUNA2EYE3MBmEDt2tQv1joVP1Q3oDisZ5nw0MZDx2kcgEXM+/kZpfa/PAkFvYVhRUZwytIQWoN3V/w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@egjs/list-differ": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@egjs/list-differ/-/list-differ-1.0.1.tgz",
|
||||
"integrity": "sha512-OTFTDQcWS+1ZREOdCWuk5hCBgYO4OsD30lXcOCyVOAjXMhgL5rBRDnt/otb6Nz8CzU0L/igdcaQBDLWc4t9gvg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@emnapi/core": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.0.tgz",
|
||||
@@ -2449,6 +2493,34 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@scena/dragscroll": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@scena/dragscroll/-/dragscroll-1.4.0.tgz",
|
||||
"integrity": "sha512-3O8daaZD9VXA9CP3dra6xcgt/qrm0mg0xJCwiX6druCteQ9FFsXffkF8PrqxY4Z4VJ58fFKEa0RlKqbsi/XnRA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.6.0",
|
||||
"@scena/event-emitter": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@scena/event-emitter": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@scena/event-emitter/-/event-emitter-1.0.5.tgz",
|
||||
"integrity": "sha512-AzY4OTb0+7ynefmWFQ6hxDdk0CySAq/D4efljfhtRHCOP7MBF9zUfhKG3TJiroVjASqVgkRJFdenS8ArZo6Olg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@scena/matrix": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@scena/matrix/-/matrix-1.1.1.tgz",
|
||||
"integrity": "sha512-JVKBhN0tm2Srl+Yt+Ywqu0oLgLcdemDQlD1OxmN9jaCTwaFPZ7tY8n6dhVgMEaR9qcR7r+kAlMXnSfNyYdE+Vg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@schummar/icu-type-parser": {
|
||||
"version": "1.21.5",
|
||||
"resolved": "https://registry.npmjs.org/@schummar/icu-type-parser/-/icu-type-parser-1.21.5.tgz",
|
||||
@@ -4563,6 +4635,52 @@
|
||||
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/croact": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/croact/-/croact-1.0.4.tgz",
|
||||
"integrity": "sha512-9GhvyzTY/IVUrMQ2iz/mzgZ8+NcjczmIo/t4FkC1CU0CEcau6v6VsEih4jkTa4ZmRgYTF0qXEZLObCzdDFplpw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@egjs/list-differ": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/croact-css-styled": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/croact-css-styled/-/croact-css-styled-1.1.9.tgz",
|
||||
"integrity": "sha512-G7yvRiVJ3Eoj0ov2h2xR4312hpOzATay2dGS9clK8yJQothjH1sBXIyvOeRP5wBKD9mPcKcoUXPCPsl0tQog4w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"css-styled": "~1.0.8",
|
||||
"framework-utils": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/croact-moveable": {
|
||||
"version": "0.9.0",
|
||||
"resolved": "https://registry.npmjs.org/croact-moveable/-/croact-moveable-0.9.0.tgz",
|
||||
"integrity": "sha512-fc3bieV6CdqqZFtzsSLi9KmvUMFW3oakUfhPCls1BxKjOfUfn8rktteGED2341A/Qghy8tI3Hm6SdocIc68IKg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@egjs/agent": "^2.2.1",
|
||||
"@egjs/children-differ": "^1.0.1",
|
||||
"@egjs/list-differ": "^1.0.0",
|
||||
"@scena/dragscroll": "^1.4.0",
|
||||
"@scena/event-emitter": "^1.0.5",
|
||||
"@scena/matrix": "^1.1.1",
|
||||
"croact-css-styled": "^1.1.9",
|
||||
"css-to-mat": "^1.1.1",
|
||||
"framework-utils": "^1.1.0",
|
||||
"gesto": "^1.19.3",
|
||||
"overlap-area": "^1.1.0",
|
||||
"react-css-styled": "^1.1.9",
|
||||
"react-moveable": "~0.56.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"croact": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.6",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||
@@ -4578,6 +4696,25 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/css-styled": {
|
||||
"version": "1.0.8",
|
||||
"resolved": "https://registry.npmjs.org/css-styled/-/css-styled-1.0.8.tgz",
|
||||
"integrity": "sha512-tCpP7kLRI8dI95rCh3Syl7I+v7PP+2JYOzWkl0bUEoSbJM+u8ITbutjlQVf0NC2/g4ULROJPi16sfwDIO8/84g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/css-to-mat": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/css-to-mat/-/css-to-mat-1.1.1.tgz",
|
||||
"integrity": "sha512-kvpxFYZb27jRd2vium35G7q5XZ2WJ9rWjDUMNT36M3Hc41qCrLXFM5iEKMGXcrPsKfXEN+8l/riB4QzwwwiEyQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@scena/matrix": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/css-tree": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
|
||||
@@ -5723,6 +5860,12 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/framework-utils": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/framework-utils/-/framework-utils-1.1.0.tgz",
|
||||
"integrity": "sha512-KAfqli5PwpFJ8o3psRNs8svpMGyCSAe8nmGcjQ0zZBWN2H6dZDnq+ABp3N3hdUmFeMrLtjOCTXD4yplUJIWceg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
@@ -5799,6 +5942,16 @@
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/gesto": {
|
||||
"version": "1.19.4",
|
||||
"resolved": "https://registry.npmjs.org/gesto/-/gesto-1.19.4.tgz",
|
||||
"integrity": "sha512-hfr/0dWwh0Bnbb88s3QVJd1ZRJeOWcgHPPwmiH6NnafDYvhTsxg+SLYu+q/oPNh9JS3V+nlr6fNs8kvPAtcRDQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@scena/event-emitter": "^1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/get-intrinsic": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
|
||||
@@ -7207,6 +7360,24 @@
|
||||
"setimmediate": "^1.0.5"
|
||||
}
|
||||
},
|
||||
"node_modules/keycode": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
|
||||
"integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/keycon": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/keycon/-/keycon-1.4.0.tgz",
|
||||
"integrity": "sha512-p1NAIxiRMH3jYfTeXRs2uWbVJ1WpEjpi8ktzUyBJsX7/wn2qu2VRXktneBLNtKNxJmlUYxRi9gOJt1DuthXR7A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@cfcs/core": "^0.0.6",
|
||||
"@daybrush/utils": "^1.7.1",
|
||||
"@scena/event-emitter": "^1.0.2",
|
||||
"keycode": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/keyv": {
|
||||
"version": "4.5.4",
|
||||
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
|
||||
@@ -7703,6 +7874,19 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/moveable": {
|
||||
"version": "0.53.0",
|
||||
"resolved": "https://registry.npmjs.org/moveable/-/moveable-0.53.0.tgz",
|
||||
"integrity": "sha512-71jS9zIoQzMhnNvduhg4tUEdm23+fO/40FN7muVMbZvVwbTku2MIxxLhnU4qFvxI4oVxn75l79SbtgjuA+s7Pw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@scena/event-emitter": "^1.0.5",
|
||||
"croact": "^1.0.4",
|
||||
"croact-moveable": "~0.9.0",
|
||||
"react-moveable": "~0.56.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
@@ -8065,6 +8249,15 @@
|
||||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/overlap-area": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/overlap-area/-/overlap-area-1.1.0.tgz",
|
||||
"integrity": "sha512-3dlJgJCaVeXH0/eZjYVJvQiLVVrPO4U1ZGqlATtx6QGO3b5eNM6+JgUKa7oStBTdYuGTk7gVoABCW6Tp+dhRdw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.7.1"
|
||||
}
|
||||
},
|
||||
"node_modules/own-keys": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
|
||||
@@ -8392,6 +8585,16 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-css-styled": {
|
||||
"version": "1.1.9",
|
||||
"resolved": "https://registry.npmjs.org/react-css-styled/-/react-css-styled-1.1.9.tgz",
|
||||
"integrity": "sha512-M7fJZ3IWFaIHcZEkoFOnkjdiUFmwd8d+gTh2bpqMOcnxy/0Gsykw4dsL4QBiKsxcGow6tETUa4NAUcmJF+/nfw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"css-styled": "~1.0.8",
|
||||
"framework-utils": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-dom": {
|
||||
"version": "19.2.0",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
|
||||
@@ -8411,6 +8614,36 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/react-moveable": {
|
||||
"version": "0.56.0",
|
||||
"resolved": "https://registry.npmjs.org/react-moveable/-/react-moveable-0.56.0.tgz",
|
||||
"integrity": "sha512-FmJNmIOsOA36mdxbrc/huiE4wuXSRlmon/o+/OrfNhSiYYYL0AV5oObtPluEhb2Yr/7EfYWBHTxF5aWAvjg1SA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@egjs/agent": "^2.2.1",
|
||||
"@egjs/children-differ": "^1.0.1",
|
||||
"@egjs/list-differ": "^1.0.0",
|
||||
"@scena/dragscroll": "^1.4.0",
|
||||
"@scena/event-emitter": "^1.0.5",
|
||||
"@scena/matrix": "^1.1.1",
|
||||
"css-to-mat": "^1.1.1",
|
||||
"framework-utils": "^1.1.0",
|
||||
"gesto": "^1.19.3",
|
||||
"overlap-area": "^1.1.0",
|
||||
"react-css-styled": "^1.1.9",
|
||||
"react-selecto": "^1.25.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-selecto": {
|
||||
"version": "1.26.3",
|
||||
"resolved": "https://registry.npmjs.org/react-selecto/-/react-selecto-1.26.3.tgz",
|
||||
"integrity": "sha512-Ubik7kWSnZyQEBNro+1k38hZaI1tJarE+5aD/qsqCOA1uUBSjgKVBy3EWRzGIbdmVex7DcxznFZLec/6KZNvwQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"selecto": "~1.26.3"
|
||||
}
|
||||
},
|
||||
"node_modules/readable-stream": {
|
||||
"version": "2.3.8",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
|
||||
@@ -8705,6 +8938,24 @@
|
||||
"integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/selecto": {
|
||||
"version": "1.26.3",
|
||||
"resolved": "https://registry.npmjs.org/selecto/-/selecto-1.26.3.tgz",
|
||||
"integrity": "sha512-gZHgqMy5uyB6/2YDjv3Qqaf7bd2hTDOpPdxXlrez4R3/L0GiEWDCFaUfrflomgqdb3SxHF2IXY0Jw0EamZi7cw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@daybrush/utils": "^1.13.0",
|
||||
"@egjs/children-differ": "^1.0.1",
|
||||
"@scena/dragscroll": "^1.4.0",
|
||||
"@scena/event-emitter": "^1.0.5",
|
||||
"css-styled": "^1.0.8",
|
||||
"css-to-mat": "^1.1.1",
|
||||
"framework-utils": "^1.1.0",
|
||||
"gesto": "^1.19.4",
|
||||
"keycon": "^1.2.0",
|
||||
"overlap-area": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/semver": {
|
||||
"version": "6.3.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
|
||||
|
||||
@@ -20,10 +20,12 @@
|
||||
"@dnd-kit/sortable": "^10.0.0",
|
||||
"@dnd-kit/utilities": "^3.2.2",
|
||||
"jszip": "^3.10.1",
|
||||
"moveable": "^0.53.0",
|
||||
"next": "16.0.2",
|
||||
"next-intl": "^4.5.2",
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"react-moveable": "^0.56.0",
|
||||
"zod": "^4.1.12",
|
||||
"zustand": "^5.0.8"
|
||||
},
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import { test, expect } from '@playwright/test'
|
||||
|
||||
const wysiwygUrl = '/en/wysiwyg'
|
||||
|
||||
test.describe('WYSIWYG - Guides toggle and multiselect live region', () => {
|
||||
test('toggles guides and announces multiselect in aria-live', async ({ page }) => {
|
||||
await page.goto(wysiwygUrl)
|
||||
|
||||
// Canvas and live region present
|
||||
const canvas = page.getByTestId('wysiwyg-canvas')
|
||||
await expect(canvas).toBeVisible()
|
||||
const live = page.getByTestId('aria-live')
|
||||
await expect(live).toContainText(/선택\s*0개/)
|
||||
|
||||
// Add two text objects
|
||||
const addText = page.getByRole('button', { name: /^Add Text$/i })
|
||||
await addText.click()
|
||||
await addText.click()
|
||||
|
||||
// Marquee select both
|
||||
const box = await canvas.boundingBox()
|
||||
if (!box) throw new Error('canvas not found')
|
||||
await page.mouse.move(box.x + 40, box.y + 40)
|
||||
await page.mouse.down()
|
||||
await page.mouse.move(box.x + 300, box.y + 200)
|
||||
await page.mouse.up()
|
||||
|
||||
await expect(live).toContainText(/선택\s*2개/)
|
||||
|
||||
// Guides toggle
|
||||
const guidesBtn = page.getByRole('button', { name: /Guides/i })
|
||||
await expect(guidesBtn).toHaveAttribute('aria-pressed', 'true')
|
||||
await guidesBtn.click()
|
||||
await expect(guidesBtn).toHaveAttribute('aria-pressed', 'false')
|
||||
await guidesBtn.click()
|
||||
await expect(guidesBtn).toHaveAttribute('aria-pressed', 'true')
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user