fix: 修复品牌预览渲染循环与区域点选
This commit is contained in:
1 parent
bb0709b8cc
commit
18ddf125be
4 files changed
+107
-72
No files matched your search
@@ -107,7 +107,7 @@
|
||||
.component-template-preview__composite-select {
|
||||
position: absolute;
|
||||
z-index: 7;
|
||||
width: auto !important;
|
||||
width: max-content !important;
|
||||
padding: 2px 8px !important;
|
||||
border: 1px solid #1677ff !important;
|
||||
border-radius: 4px !important;
|
||||
@@ -142,3 +142,18 @@
|
||||
.component-template-preview {
|
||||
height: 100%;
|
||||
}
|
||||
.component-template-preview__overlay-host {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
z-index: 5;
|
||||
pointer-events: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.component-template-preview__overlay-host.is-visible {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.component-template-preview__overlay-host > * {
|
||||
pointer-events: auto;
|
||||
}
|
||||
@@ -15,6 +15,7 @@ type PreviewProps = {
|
||||
};
|
||||
|
||||
type Outline = { top: number; left: number; width: number; height: number; label: string };
|
||||
type CompositeOutline = Outline & { key: string };
|
||||
|
||||
export function ComponentTemplatePreview({
|
||||
workspace,
|
||||
@@ -26,11 +27,10 @@ export function ComponentTemplatePreview({
|
||||
}: PreviewProps) {
|
||||
const Renderer = resolveTemplateRenderer(workspace);
|
||||
const root = useRef<HTMLDivElement>(null);
|
||||
const canvas = useRef<HTMLDivElement>(null);
|
||||
const [mode, setMode] = useState<"edit" | "browse">("edit");
|
||||
const [hovered, setHovered] = useState<HTMLElement | null>(null);
|
||||
const [hoverOutline, setHoverOutline] = useState<Outline | null>(null);
|
||||
const [selectedOutline, setSelectedOutline] = useState<Outline | null>(null);
|
||||
const [compositeOutlines, setCompositeOutlines] = useState<Array<Outline & { key: string }>>([]);
|
||||
const overlay = useRef<HTMLDivElement>(null);
|
||||
const targetFor = useCallback(
|
||||
(element: Element | null): HTMLElement | null => {
|
||||
let candidate = element?.closest<HTMLElement>("[data-editor-target]");
|
||||
@@ -56,17 +56,64 @@ export function ComponentTemplatePreview({
|
||||
) ?? null
|
||||
);
|
||||
}, [selection]);
|
||||
const renderOutlines = useCallback(
|
||||
(
|
||||
host: HTMLDivElement,
|
||||
outlines: {
|
||||
hover: Outline | null;
|
||||
selected: Outline | null;
|
||||
composite: CompositeOutline[];
|
||||
},
|
||||
) => {
|
||||
host.replaceChildren();
|
||||
const position = (node: HTMLElement, outline: Outline) => {
|
||||
node.style.top = `${outline.top}px`;
|
||||
node.style.left = `${outline.left}px`;
|
||||
node.style.width = `${outline.width}px`;
|
||||
node.style.height = `${outline.height}px`;
|
||||
};
|
||||
if (outlines.hover) {
|
||||
const node = document.createElement("div");
|
||||
node.className = "component-template-preview__outline is-hovered";
|
||||
position(node, outlines.hover);
|
||||
host.append(node);
|
||||
}
|
||||
if (outlines.selected) {
|
||||
const node = document.createElement("div");
|
||||
node.className = "component-template-preview__outline is-selected";
|
||||
node.dataset.selectedTarget = selection?.targetKey ?? "";
|
||||
node.dataset.selectedRecordId = selection?.recordId ?? "";
|
||||
const label = document.createElement("span");
|
||||
label.textContent = outlines.selected.label;
|
||||
node.append(label);
|
||||
position(node, outlines.selected);
|
||||
host.append(node);
|
||||
}
|
||||
for (const outline of outlines.composite) {
|
||||
const node = document.createElement("button");
|
||||
node.type = "button";
|
||||
node.className = "component-template-preview__composite-select";
|
||||
node.textContent = `选择${outline.label}`;
|
||||
node.setAttribute("aria-label", node.textContent);
|
||||
node.onclick = () => onTargetSelected({ targetKey: outline.key });
|
||||
node.style.top = `${outline.top + 4}px`;
|
||||
node.style.left = `${outline.left + 4}px`;
|
||||
host.append(node);
|
||||
}
|
||||
},
|
||||
[onTargetSelected, selection?.recordId, selection?.targetKey],
|
||||
);
|
||||
const measure = useCallback(
|
||||
(element: HTMLElement | null): Outline | null => {
|
||||
const viewport = root.current;
|
||||
if (!element || !viewport || !viewport.contains(element)) return null;
|
||||
const host = canvas.current;
|
||||
if (!element || !host || !host.contains(element)) return null;
|
||||
const box = element.getBoundingClientRect();
|
||||
const parent = viewport.getBoundingClientRect();
|
||||
const parent = host.getBoundingClientRect();
|
||||
const target = targets.find((item) => item.key === element.dataset.editorTarget);
|
||||
if (!target || !box.width || !box.height) return null;
|
||||
return {
|
||||
top: box.top - parent.top + viewport.scrollTop,
|
||||
left: box.left - parent.left + viewport.scrollLeft,
|
||||
top: box.top - parent.top,
|
||||
left: box.left - parent.left,
|
||||
width: box.width,
|
||||
height: box.height,
|
||||
label: target.label,
|
||||
@@ -76,30 +123,35 @@ export function ComponentTemplatePreview({
|
||||
);
|
||||
useLayoutEffect(() => {
|
||||
const viewport = root.current;
|
||||
if (!viewport) return;
|
||||
const outlineHost = overlay.current;
|
||||
const host = canvas.current;
|
||||
if (!viewport || !outlineHost || !host) return;
|
||||
let frame = 0;
|
||||
const update = () => {
|
||||
cancelAnimationFrame(frame);
|
||||
frame = requestAnimationFrame(() => {
|
||||
setSelectedOutline(measure(selectedElement()));
|
||||
setHoverOutline(measure(hovered));
|
||||
setCompositeOutlines(
|
||||
targets
|
||||
.filter((target) => target.composite)
|
||||
.flatMap((target) => {
|
||||
const element = viewport.querySelector<HTMLElement>(
|
||||
`[data-editor-target="${CSS.escape(target.key)}"]`,
|
||||
);
|
||||
const outline = measure(element);
|
||||
return outline ? [{ ...outline, key: target.key }] : [];
|
||||
}),
|
||||
);
|
||||
const nextHover = measure(hovered);
|
||||
const nextSelected = measure(selectedElement());
|
||||
const nextComposite = targets
|
||||
.filter((target) => target.composite)
|
||||
.flatMap((target) => {
|
||||
const element = host.querySelector<HTMLElement>(
|
||||
`[data-editor-target="${CSS.escape(target.key)}"]`,
|
||||
);
|
||||
const outline = measure(element);
|
||||
return outline ? [{ ...outline, key: target.key }] : [];
|
||||
});
|
||||
renderOutlines(outlineHost, {
|
||||
hover: nextHover,
|
||||
selected: nextSelected,
|
||||
composite: nextComposite,
|
||||
});
|
||||
});
|
||||
};
|
||||
update();
|
||||
const resize = new ResizeObserver(update);
|
||||
resize.observe(viewport);
|
||||
viewport
|
||||
host
|
||||
.querySelectorAll<HTMLElement>("[data-editor-target]")
|
||||
.forEach((node) => resize.observe(node));
|
||||
window.addEventListener("resize", update);
|
||||
@@ -174,50 +226,16 @@ export function ComponentTemplatePreview({
|
||||
);
|
||||
}}
|
||||
>
|
||||
<div className="component-template-preview__canvas">
|
||||
<div ref={canvas} className="component-template-preview__canvas">
|
||||
<Renderer workspace={workspace} page={page} {...(offeringId ? { offeringId } : {})} />
|
||||
</div>
|
||||
{mode === "edit"
|
||||
? compositeOutlines.map((outline) => (
|
||||
<button
|
||||
key={outline.key}
|
||||
type="button"
|
||||
className="component-template-preview__composite-select"
|
||||
style={{ top: outline.top + 4, left: outline.left + 4 }}
|
||||
aria-label={`选择${targets.find((target) => target.key === outline.key)?.label ?? outline.label}`}
|
||||
onClick={() => onTargetSelected({ targetKey: outline.key })}
|
||||
>
|
||||
选择{targets.find((target) => target.key === outline.key)?.label ?? outline.label}
|
||||
</button>
|
||||
))
|
||||
: null}
|
||||
{mode === "edit" && hoverOutline ? (
|
||||
<div
|
||||
className="component-template-preview__outline is-hovered"
|
||||
style={{
|
||||
top: hoverOutline.top,
|
||||
left: hoverOutline.left,
|
||||
width: hoverOutline.width,
|
||||
height: hoverOutline.height,
|
||||
}}
|
||||
aria-hidden="true"
|
||||
ref={overlay}
|
||||
className={`component-template-preview__overlay-host ${
|
||||
mode === "edit" ? "is-visible" : ""
|
||||
}`}
|
||||
data-editor-overlay=""
|
||||
/>
|
||||
) : null}
|
||||
{mode === "edit" && selectedOutline ? (
|
||||
<div
|
||||
className="component-template-preview__outline is-selected"
|
||||
style={{
|
||||
top: selectedOutline.top,
|
||||
left: selectedOutline.left,
|
||||
width: selectedOutline.width,
|
||||
height: selectedOutline.height,
|
||||
}}
|
||||
data-selected-target={selection?.targetKey}
|
||||
data-selected-record-id={selection?.recordId}
|
||||
>
|
||||
<span>{selectedOutline.label}</span>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Form, message } from "antd";
|
||||
import { useMutation, useQuery } from "@tanstack/react-query";
|
||||
import type { QueryClient } from "@tanstack/react-query";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import type { FormInstance } from "antd";
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
@@ -191,13 +191,15 @@ export function useBrandPreviewDraft({
|
||||
[brand, previewBrandValues, previewConfig],
|
||||
);
|
||||
|
||||
const resetPreview = useCallback(() => {
|
||||
setPreviewConfig(config ?? {});
|
||||
setPreviewBrandValues({});
|
||||
}, [config]);
|
||||
|
||||
return {
|
||||
previewBrand,
|
||||
handleValuesChange,
|
||||
resetPreview: () => {
|
||||
setPreviewConfig(config ?? {});
|
||||
setPreviewBrandValues({});
|
||||
},
|
||||
resetPreview,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user