@ecomcx/ecomweb-editor 1.27.0 → 1.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/locales/en/background.ts +22 -0
- package/src/locales/en/block-desc.ts +30 -1
- package/src/locales/en/index.ts +2 -1
- package/src/locales/en/v2.ts +5 -0
- package/src/locales/vi/background.ts +22 -0
- package/src/locales/vi/block-desc.ts +30 -1
- package/src/locales/vi/index.ts +2 -1
- package/src/locales/vi/v2.ts +5 -0
- package/src/shared/block-defs.ts +5 -0
- package/src/shared/panel-store.ts +65 -7
- package/src/v2/blocks/compat.tsx +1 -0
- package/src/v2/blocks/index.ts +2 -1
- package/src/v2/canvas/block-list.tsx +3 -1
- package/src/v2/canvas/canvas.tsx +80 -7
- package/src/v2/canvas/dnd.ts +15 -2
- package/src/v2/context.tsx +6 -0
- package/src/v2/core/registry.ts +2 -1
- package/src/v2/editor.css +21 -0
- package/src/v2/editor.tsx +20 -6
- package/src/v2/index.ts +3 -3
- package/src/v2/ui/background-panel.tsx +83 -0
- package/src/v2/ui/block-menu.ts +19 -0
- package/src/v2/ui/inserter.tsx +21 -6
- package/src/v2/ui/inspector.tsx +45 -8
- package/src/v2/ui/layout-panel.tsx +5 -5
- package/src/v2/ui/section-adder.tsx +58 -0
- package/src/v2/ui/style-supports.ts +29 -0
- package/src/v2/ui/style-tab.tsx +24 -15
- package/src/v2/ui/toolbar.tsx +123 -34
- package/src/v2/ui/unit-controls.tsx +2 -2
package/src/v2/ui/toolbar.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { WIDE_BLOCKS } from "@ecomcx/ecomweb-content";
|
|
2
2
|
import { clearCells, mergeRange, selectedCellRect } from "../core/tables";
|
|
3
3
|
import { AiTools } from "./ai";
|
|
4
|
-
import { Eraser, TableCellsMerge, StickyNote, Keyboard, MoveHorizontal, Maximize2, RectangleHorizontal, AlignCenter, AlignLeft, AlignRight, ArrowUpLeft, Bold, ChevronDown, ChevronUp, Code, Copy, CopyPlus, GripVertical, IndentDecrease, IndentIncrease, Italic, Link2, Link2Off, MoreVertical, PanelTop, Strikethrough, Trash2, Underline, Ungroup, Group as GroupIcon, Blocks, ArrowUpToLine, ArrowDownToLine, Shapes, Lock, Subscript, Superscript, Highlighter } from "lucide-react";
|
|
4
|
+
import { Eraser, TableCellsMerge, StickyNote, Keyboard, MoveHorizontal, Maximize2, RectangleHorizontal, AlignCenter, AlignLeft, AlignRight, ArrowUpLeft, Bold, ChevronDown, ChevronUp, Code, Copy, CopyPlus, GripVertical, IndentDecrease, IndentIncrease, Italic, Link2, Link2Off, MoreVertical, PanelTop, Strikethrough, Trash2, Underline, Ungroup, Group as GroupIcon, Blocks, ArrowUpToLine, ArrowDownToLine, Shapes, Lock, Subscript, Superscript, Highlighter, Paintbrush, ClipboardPaste } from "lucide-react";
|
|
5
5
|
import { TextSelection } from "prosemirror-state";
|
|
6
6
|
import type { EditorView } from "prosemirror-view";
|
|
7
7
|
import { useEffect, useLayoutEffect, useRef, useState, type ComponentType, type KeyboardEvent as ReactKeyboardEvent, type ReactNode } from "react";
|
|
@@ -18,6 +18,8 @@ import { topLevelOrdered } from "../core/ops";
|
|
|
18
18
|
import type { BlockTransform } from "../core/registry";
|
|
19
19
|
import { insertSibling, richViews } from "../text/rich-text";
|
|
20
20
|
import { canContain } from "../core/structure";
|
|
21
|
+
import { blockActionsFor } from "../../shared/panel-store";
|
|
22
|
+
import { copyStyle, hasCopiedStyle, menuPosition, pastedStyle } from "./block-menu";
|
|
21
23
|
|
|
22
24
|
const cx = (...c: unknown[]) => c.filter((x): x is string => typeof x === "string" && x !== "").join(" ");
|
|
23
25
|
|
|
@@ -150,12 +152,6 @@ export function BlockToolbar({ placement = "floating" }: { placement?: "floating
|
|
|
150
152
|
const text = firstText(res[0]);
|
|
151
153
|
if (text) store.focusText(text, -1);
|
|
152
154
|
};
|
|
153
|
-
const copy = async () => {
|
|
154
|
-
const s = serializeBlocks(ordered.map((id) => store.block(id)!));
|
|
155
|
-
try {
|
|
156
|
-
await navigator.clipboard.write([new ClipboardItem({ "text/plain": new Blob([s.text], { type: "text/plain" }), "text/html": new Blob([s.html], { type: "text/html" }) })]);
|
|
157
|
-
} catch { /* trình duyệt chặn ghi clipboard: người dùng vẫn chép được bằng Ctrl+C */ }
|
|
158
|
-
};
|
|
159
155
|
/** Công cụ của các khối bao ngoài (bảng, bộ cột, nhóm nút) — mỗi loại một lần, gần nhất trước. */
|
|
160
156
|
const contextTools = (ancestors: string[], currentId: string) => {
|
|
161
157
|
const seen = new Set<string>();
|
|
@@ -167,24 +163,12 @@ export function BlockToolbar({ placement = "floating" }: { placement?: "floating
|
|
|
167
163
|
return <div className="ecx-tool-group" key={`ctx-${id}`}><T ancestor={anc} currentId={currentId} /></div>;
|
|
168
164
|
});
|
|
169
165
|
};
|
|
170
|
-
/** Tạo mẫu từ các khối đang chọn; mẫu đồng bộ → thay khối bằng tham chiếu tới mẫu. */
|
|
171
|
-
const createPattern = async () => {
|
|
172
|
-
const picked = ordered.map((id) => store.block(id)!).filter(Boolean);
|
|
173
|
-
const res = await ctx.host.createPattern!(contentFromBlocks(picked));
|
|
174
|
-
if (!res?.synced) return;
|
|
175
|
-
const ref = makeBlock("syncedPattern", { ref: res.ref });
|
|
176
|
-
store.batch(() => {
|
|
177
|
-
store.replace(ordered[0], [ref], { select: { ids: [ref.id], editing: null }, caret: null });
|
|
178
|
-
if (ordered.length > 1) store.remove(ordered.slice(1), { focusNeighbor: false });
|
|
179
|
-
});
|
|
180
|
-
};
|
|
181
166
|
// Khoá khối: ẩn thao tác không được phép
|
|
182
167
|
const movable = ordered.every((id) => store.canMove(id));
|
|
183
168
|
const removable = ordered.every((id) => store.canRemove(id));
|
|
184
169
|
const insertable = store.canInsertInto(parent?.id ?? null);
|
|
185
170
|
const isLocked = nodes.length === 1 && !!(first.attrs.lock || first.attrs.templateLock);
|
|
186
171
|
const nested = first.type === "templatePart" || first.type === "syncedPattern" ? ui.blockEl(first.id)?.dataset.ecxNested : undefined;
|
|
187
|
-
const canGroup = canContain(parent?.type ?? null, "group");
|
|
188
172
|
|
|
189
173
|
return (
|
|
190
174
|
<>
|
|
@@ -264,21 +248,7 @@ export function BlockToolbar({ placement = "floating" }: { placement?: "floating
|
|
|
264
248
|
{nested && <div className="ecx-tool-group"><ToolButton label={labels.editOriginal} className="ecx-tool-wide" onClick={() => store.enterFocus(nested)}><PanelTop className="ecx-icon" /><span className="ecx-tool-text">{labels.editOriginal}</span></ToolButton></div>}
|
|
265
249
|
<div className="ecx-tool-group">
|
|
266
250
|
<Dropdown label={labels.more} trigger={<MoreVertical className="ecx-icon" />}>
|
|
267
|
-
{(close) => (
|
|
268
|
-
<>
|
|
269
|
-
{insertable && <>
|
|
270
|
-
<MenuItem icon={CopyPlus} label={labels.duplicate} shortcut={`${mod}⇧D`} onClick={() => { close(); store.duplicate(ordered); }} />
|
|
271
|
-
<MenuItem icon={ArrowUpToLine} label={labels.insertBefore} shortcut={`${mod}⌥T`} onClick={() => { close(); insertSibling(store, ordered[0], 0); }} />
|
|
272
|
-
<MenuItem icon={ArrowDownToLine} label={labels.insertAfter} shortcut={`${mod}⌥Y`} onClick={() => { close(); insertSibling(store, ordered[ordered.length - 1], 1); }} />
|
|
273
|
-
</>}
|
|
274
|
-
<MenuItem icon={Copy} label={labels.copy} onClick={() => { close(); void copy(); }} />
|
|
275
|
-
{ctx.host.createPattern && <MenuItem icon={Shapes} label={labels.createPattern} onClick={() => { close(); void createPattern(); }} />}
|
|
276
|
-
{canGroup && removable && movable && insertable && <MenuItem icon={GroupIcon} label={labels.group} onClick={() => { close(); store.wrap(ordered, "group"); }} />}
|
|
277
|
-
{nodes.length === 1 && first.content && first.type === "group" && removable && <MenuItem icon={Ungroup} label={labels.ungroup} onClick={() => { close(); store.unwrap(first.id); }} />}
|
|
278
|
-
{nodes.length === 1 && !store.isContentOnly(first.id) && <MenuItem icon={Lock} label={labels.lock} onClick={() => { close(); setLockOpen(true); }} />}
|
|
279
|
-
{removable && <MenuItem icon={Trash2} label={labels.remove} shortcut="⇧⌥Z" danger onClick={() => { close(); store.remove(ordered); }} />}
|
|
280
|
-
</>
|
|
281
|
-
)}
|
|
251
|
+
{(close) => <BlockMenuItems ids={ids} close={close} onLock={() => setLockOpen(true)} />}
|
|
282
252
|
</Dropdown>
|
|
283
253
|
</div>
|
|
284
254
|
</div>
|
|
@@ -333,6 +303,125 @@ function MarkTools({ view, onLink }: { view: EditorView; onLink(): void }) {
|
|
|
333
303
|
);
|
|
334
304
|
}
|
|
335
305
|
|
|
306
|
+
/** Mục của menu ⋮ trên thanh công cụ khối — dùng chung với menu chuột phải (BlockContextMenu). */
|
|
307
|
+
function BlockMenuItems({ ids, close, onLock }: { ids: string[]; close(): void; onLock(): void }) {
|
|
308
|
+
const ctx = useEditor();
|
|
309
|
+
const { store, ui, labels } = ctx;
|
|
310
|
+
const nodes = ids.map((id) => store.block(id)).filter(Boolean) as BNode[];
|
|
311
|
+
const loc = nodes[0] ? store.locate(nodes[0].id) : null;
|
|
312
|
+
if (!loc) return null;
|
|
313
|
+
const first = nodes[0];
|
|
314
|
+
const parent = loc.parent;
|
|
315
|
+
const ordered = topLevelOrdered(store.getState().docs[loc.docId].blocks, ids);
|
|
316
|
+
const movable = ordered.every((id) => store.canMove(id));
|
|
317
|
+
const removable = ordered.every((id) => store.canRemove(id));
|
|
318
|
+
const insertable = store.canInsertInto(parent?.id ?? null);
|
|
319
|
+
const canGroup = canContain(parent?.type ?? null, "group");
|
|
320
|
+
const styleEditable = ordered.every((id) => !store.isContentOnly(id) && store.modeOf(id) !== "disabled");
|
|
321
|
+
const copy = async () => {
|
|
322
|
+
const s = serializeBlocks(ordered.map((id) => store.block(id)!));
|
|
323
|
+
try {
|
|
324
|
+
await navigator.clipboard.write([new ClipboardItem({ "text/plain": new Blob([s.text], { type: "text/plain" }), "text/html": new Blob([s.html], { type: "text/html" }) })]);
|
|
325
|
+
} catch { /* trình duyệt chặn ghi clipboard: người dùng vẫn chép được bằng Ctrl+C */ }
|
|
326
|
+
};
|
|
327
|
+
/** Tạo mẫu từ các khối đang chọn; mẫu đồng bộ → thay khối bằng tham chiếu tới mẫu. */
|
|
328
|
+
const createPattern = async () => {
|
|
329
|
+
const picked = ordered.map((id) => store.block(id)!).filter(Boolean);
|
|
330
|
+
const res = await ctx.host.createPattern!(contentFromBlocks(picked));
|
|
331
|
+
if (!res?.synced) return;
|
|
332
|
+
const ref = makeBlock("syncedPattern", { ref: res.ref });
|
|
333
|
+
store.batch(() => {
|
|
334
|
+
store.replace(ordered[0], [ref], { select: { ids: [ref.id], editing: null }, caret: null });
|
|
335
|
+
if (ordered.length > 1) store.remove(ordered.slice(1), { focusNeighbor: false });
|
|
336
|
+
});
|
|
337
|
+
};
|
|
338
|
+
return (
|
|
339
|
+
<>
|
|
340
|
+
{insertable && <>
|
|
341
|
+
<MenuItem icon={CopyPlus} label={labels.duplicate} shortcut={`${mod}⇧D`} onClick={() => { close(); store.duplicate(ordered); }} />
|
|
342
|
+
<MenuItem icon={ArrowUpToLine} label={labels.insertBefore} shortcut={`${mod}⌥T`} onClick={() => { close(); insertSibling(store, ordered[0], 0); }} />
|
|
343
|
+
<MenuItem icon={ArrowDownToLine} label={labels.insertAfter} shortcut={`${mod}⌥Y`} onClick={() => { close(); insertSibling(store, ordered[ordered.length - 1], 1); }} />
|
|
344
|
+
</>}
|
|
345
|
+
<MenuItem icon={Copy} label={labels.copy} onClick={() => { close(); void copy(); }} />
|
|
346
|
+
<MenuItem icon={Paintbrush} label={labels.copyStyle} onClick={() => { close(); copyStyle(first.attrs); ui.announce(labels.styleCopied); }} />
|
|
347
|
+
{hasCopiedStyle() && styleEditable && <MenuItem icon={ClipboardPaste} label={labels.pasteStyle} onClick={() => { close(); store.setAttrs(ordered, pastedStyle()!); }} />}
|
|
348
|
+
{ctx.host.createPattern && <MenuItem icon={Shapes} label={labels.createPattern} onClick={() => { close(); void createPattern(); }} />}
|
|
349
|
+
{blockActionsFor(nodes.map((n) => n.type)).map((a) => (
|
|
350
|
+
<MenuItem key={a.id} icon={a.icon} label={ctx.host.translate ? ctx.host.translate(a.label) : a.label} onClick={() => {
|
|
351
|
+
close();
|
|
352
|
+
Promise.resolve(a.run({ blocks: nodes.map((b) => ({ id: b.id, type: b.type, attrs: b.attrs })), setAttrs: (x) => store.setAttrs(ordered, x) }))
|
|
353
|
+
.catch((e) => console.warn("[ecomweb-editor] block action", a.id, e));
|
|
354
|
+
}} />
|
|
355
|
+
))}
|
|
356
|
+
{canGroup && removable && movable && insertable && <MenuItem icon={GroupIcon} label={labels.group} onClick={() => { close(); store.wrap(ordered, "group"); }} />}
|
|
357
|
+
{nodes.length === 1 && first.content && first.type === "group" && removable && <MenuItem icon={Ungroup} label={labels.ungroup} onClick={() => { close(); store.unwrap(first.id); }} />}
|
|
358
|
+
{nodes.length === 1 && !store.isContentOnly(first.id) && <MenuItem icon={Lock} label={labels.lock} onClick={() => { close(); onLock(); }} />}
|
|
359
|
+
{removable && <MenuItem icon={Trash2} label={labels.remove} shortcut="⇧⌥Z" danger onClick={() => { close(); store.remove(ordered); }} />}
|
|
360
|
+
</>
|
|
361
|
+
);
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
/**
|
|
365
|
+
* Menu chuột phải trên khối: cùng mục với menu ⋮ (BlockMenuItems). Mở bằng chuột phải, Shift+F10 hoặc phím Menu (khung soạn gọi ui.openContextMenu);
|
|
366
|
+
* ↑/↓/Home/End đi giữa các mục, Esc / Tab / bấm ra ngoài / cuộn thì đóng.
|
|
367
|
+
*/
|
|
368
|
+
export function BlockContextMenu() {
|
|
369
|
+
const { ui, store, labels } = useEditor();
|
|
370
|
+
useUiTick();
|
|
371
|
+
const at = ui.contextMenu;
|
|
372
|
+
const ref = useRef<HTMLDivElement>(null);
|
|
373
|
+
const [pos, setPos] = useState<{ top: number; left: number } | null>(null);
|
|
374
|
+
const [lock, setLock] = useState<BNode | null>(null);
|
|
375
|
+
// refocus: bàn phím quay về khối (Esc / Tab) hoặc khung soạn (chọn mục xong — khối có thể đã bị xoá / thay)
|
|
376
|
+
const close = (refocus?: "block" | "canvas") => {
|
|
377
|
+
const id = ui.contextMenu?.ids[0];
|
|
378
|
+
ui.openContextMenu(null);
|
|
379
|
+
const root = ui.canvasDoc?.querySelector<HTMLElement>(".ecx-canvas-root");
|
|
380
|
+
if (refocus) ((refocus === "block" && id && ui.blockEl(id)) || root)?.focus({ preventScroll: true });
|
|
381
|
+
};
|
|
382
|
+
useLayoutEffect(() => {
|
|
383
|
+
const m = ref.current;
|
|
384
|
+
if (!at || !m) { setPos(null); return; }
|
|
385
|
+
// Gốc toạ độ của "fixed" có thể là khối cha có transform (như Dropdown): đo rồi trừ ra
|
|
386
|
+
const origin = m.getBoundingClientRect();
|
|
387
|
+
const p = menuPosition(at.x, at.y, m.offsetWidth, m.offsetHeight, window.innerWidth, window.innerHeight);
|
|
388
|
+
setPos({ top: p.top - Math.round(origin.top), left: p.left - Math.round(origin.left) });
|
|
389
|
+
}, [at]);
|
|
390
|
+
useEffect(() => { if (pos) ref.current?.querySelector<HTMLElement>("[role=menuitem]")?.focus(); }, [pos]);
|
|
391
|
+
useEffect(() => {
|
|
392
|
+
if (!at) return;
|
|
393
|
+
const docs = [document, ui.canvasDoc].filter(Boolean) as Document[];
|
|
394
|
+
const outside = (e: Event) => { if (!ref.current?.contains(e.target as Node)) close(); };
|
|
395
|
+
const resize = () => close();
|
|
396
|
+
for (const d of docs) { d.addEventListener("mousedown", outside, true); d.addEventListener("scroll", outside, true); }
|
|
397
|
+
window.addEventListener("resize", resize);
|
|
398
|
+
return () => { for (const d of docs) { d.removeEventListener("mousedown", outside, true); d.removeEventListener("scroll", outside, true); } window.removeEventListener("resize", resize); };
|
|
399
|
+
}, [at, ui]);
|
|
400
|
+
return (
|
|
401
|
+
<>
|
|
402
|
+
{at && (
|
|
403
|
+
<div ref={ref} className="ecx-menu is-floating ecx-context-menu" role="menu" aria-label={labels.blockMenu}
|
|
404
|
+
style={pos ? { top: pos.top, left: pos.left } : { visibility: "hidden", top: 0, left: 0 }}
|
|
405
|
+
onContextMenu={(e) => e.preventDefault()}
|
|
406
|
+
onKeyDown={(e) => {
|
|
407
|
+
const items = Array.from(e.currentTarget.querySelectorAll<HTMLElement>("[role=menuitem]"));
|
|
408
|
+
const i = items.indexOf(document.activeElement as HTMLElement);
|
|
409
|
+
const go = (n: number) => { e.preventDefault(); items[(n + items.length) % items.length]?.focus(); };
|
|
410
|
+
if (e.key === "ArrowDown") go(i + 1);
|
|
411
|
+
else if (e.key === "ArrowUp") go(i < 0 ? -1 : i - 1);
|
|
412
|
+
else if (e.key === "Home") go(0);
|
|
413
|
+
else if (e.key === "End") go(-1);
|
|
414
|
+
else if (e.key === "Escape") { e.preventDefault(); e.stopPropagation(); close("block"); }
|
|
415
|
+
else if (e.key === "Tab") { e.preventDefault(); close("block"); }
|
|
416
|
+
}}>
|
|
417
|
+
<BlockMenuItems ids={at.ids} close={() => close("canvas")} onLock={() => setLock(store.block(at.ids[0]) ?? null)} />
|
|
418
|
+
</div>
|
|
419
|
+
)}
|
|
420
|
+
{lock && <LockDialog block={lock} onClose={() => setLock(null)} />}
|
|
421
|
+
</>
|
|
422
|
+
);
|
|
423
|
+
}
|
|
424
|
+
|
|
336
425
|
/** Hộp sửa liên kết của chữ đang chọn (con trỏ trong liên kết → sửa cả liên kết). */
|
|
337
426
|
function LinkPopover({ viewKey, top, left, onClose }: { viewKey: string; top: number; left: number; onClose(): void }) {
|
|
338
427
|
const { labels } = useEditor();
|
|
@@ -16,7 +16,7 @@ const parse = (v: unknown): { n: string; unit: string } | null => {
|
|
|
16
16
|
return m ? { n: m[1], unit: m[2] ?? "px" } : null;
|
|
17
17
|
};
|
|
18
18
|
|
|
19
|
-
export function UnitInput({ value, onChange, label, max = 100, units = UNITS, slider = true }: { value?: string; onChange(v: string | undefined): void; label: string; max?: number; units?: string[]; slider?: boolean }) {
|
|
19
|
+
export function UnitInput({ value, onChange, label, max = 100, units = UNITS, slider = true, placeholder }: { value?: string; onChange(v: string | undefined): void; label: string; max?: number; units?: string[]; slider?: boolean; placeholder?: string }) {
|
|
20
20
|
const t = useMsgs("controls");
|
|
21
21
|
const p = parse(value);
|
|
22
22
|
const [n, setN] = useState(p?.n ?? "");
|
|
@@ -27,7 +27,7 @@ export function UnitInput({ value, onChange, label, max = 100, units = UNITS, sl
|
|
|
27
27
|
return (
|
|
28
28
|
<div className="ecx-unit-row">
|
|
29
29
|
<div className="ecx-unit-input">
|
|
30
|
-
<input type="number" inputMode="decimal" aria-label={label} value={n} placeholder={p ? undefined : value ?? ""} step={unit === "px" || unit === "%" ? 1 : 0.1}
|
|
30
|
+
<input type="number" inputMode="decimal" aria-label={label} value={n} placeholder={p ? undefined : value ?? placeholder ?? ""} step={unit === "px" || unit === "%" ? 1 : 0.1}
|
|
31
31
|
onChange={(e) => { setN(e.target.value); emit(e.target.value, unit); }} />
|
|
32
32
|
<select aria-label={`${label}: ${t.unit}`} value={unit} onChange={(e) => { setUnit(e.target.value); if (n !== "") emit(n, e.target.value); }}>
|
|
33
33
|
{units.map((u) => <option key={u} value={u}>{u}</option>)}
|