fix: 修复品牌预览渲染循环与区域点选
This commit is contained in:
1 parent
bb0709b8cc
commit
18ddf125be
4 files changed
+107
-72
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons";
|
import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons";
|
||||||
import { Alert, Button, Image, Popconfirm, Space, Spin, Upload, message } from "antd";
|
import { Alert, Button, Image, Popconfirm, Space, Spin, Upload, message } from "antd";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useMemo, useState } from "react";
|
||||||
import { createApiClient } from "../lib/api.js";
|
import { createApiClient } from "../lib/api.js";
|
||||||
|
|
||||||
interface ImageUrlFieldProps {
|
interface ImageUrlFieldProps {
|
||||||
@@ -17,7 +17,7 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image
|
|||||||
const [storageStatus, setStorageStatus] = useState<
|
const [storageStatus, setStorageStatus] = useState<
|
||||||
"loading" | "ok" | "unavailable" | "unconfigured"
|
"loading" | "ok" | "unavailable" | "unconfigured"
|
||||||
>("loading");
|
>("loading");
|
||||||
const client = createApiClient();
|
const client = useMemo(() => createApiClient(), []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
|
|||||||
@@ -107,7 +107,7 @@
|
|||||||
.component-template-preview__composite-select {
|
.component-template-preview__composite-select {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 7;
|
z-index: 7;
|
||||||
width: auto !important;
|
width: max-content !important;
|
||||||
padding: 2px 8px !important;
|
padding: 2px 8px !important;
|
||||||
border: 1px solid #1677ff !important;
|
border: 1px solid #1677ff !important;
|
||||||
border-radius: 4px !important;
|
border-radius: 4px !important;
|
||||||
@@ -142,3 +142,18 @@
|
|||||||
.component-template-preview {
|
.component-template-preview {
|
||||||
height: 100%;
|
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 Outline = { top: number; left: number; width: number; height: number; label: string };
|
||||||
|
type CompositeOutline = Outline & { key: string };
|
||||||
|
|
||||||
export function ComponentTemplatePreview({
|
export function ComponentTemplatePreview({
|
||||||
workspace,
|
workspace,
|
||||||
@@ -26,11 +27,10 @@ export function ComponentTemplatePreview({
|
|||||||
}: PreviewProps) {
|
}: PreviewProps) {
|
||||||
const Renderer = resolveTemplateRenderer(workspace);
|
const Renderer = resolveTemplateRenderer(workspace);
|
||||||
const root = useRef<HTMLDivElement>(null);
|
const root = useRef<HTMLDivElement>(null);
|
||||||
|
const canvas = useRef<HTMLDivElement>(null);
|
||||||
const [mode, setMode] = useState<"edit" | "browse">("edit");
|
const [mode, setMode] = useState<"edit" | "browse">("edit");
|
||||||
const [hovered, setHovered] = useState<HTMLElement | null>(null);
|
const [hovered, setHovered] = useState<HTMLElement | null>(null);
|
||||||
const [hoverOutline, setHoverOutline] = useState<Outline | null>(null);
|
const overlay = useRef<HTMLDivElement>(null);
|
||||||
const [selectedOutline, setSelectedOutline] = useState<Outline | null>(null);
|
|
||||||
const [compositeOutlines, setCompositeOutlines] = useState<Array<Outline & { key: string }>>([]);
|
|
||||||
const targetFor = useCallback(
|
const targetFor = useCallback(
|
||||||
(element: Element | null): HTMLElement | null => {
|
(element: Element | null): HTMLElement | null => {
|
||||||
let candidate = element?.closest<HTMLElement>("[data-editor-target]");
|
let candidate = element?.closest<HTMLElement>("[data-editor-target]");
|
||||||
@@ -56,17 +56,64 @@ export function ComponentTemplatePreview({
|
|||||||
) ?? null
|
) ?? null
|
||||||
);
|
);
|
||||||
}, [selection]);
|
}, [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(
|
const measure = useCallback(
|
||||||
(element: HTMLElement | null): Outline | null => {
|
(element: HTMLElement | null): Outline | null => {
|
||||||
const viewport = root.current;
|
const host = canvas.current;
|
||||||
if (!element || !viewport || !viewport.contains(element)) return null;
|
if (!element || !host || !host.contains(element)) return null;
|
||||||
const box = element.getBoundingClientRect();
|
const box = element.getBoundingClientRect();
|
||||||
const parent = viewport.getBoundingClientRect();
|
const parent = host.getBoundingClientRect();
|
||||||
const target = targets.find((item) => item.key === element.dataset.editorTarget);
|
const target = targets.find((item) => item.key === element.dataset.editorTarget);
|
||||||
if (!target || !box.width || !box.height) return null;
|
if (!target || !box.width || !box.height) return null;
|
||||||
return {
|
return {
|
||||||
top: box.top - parent.top + viewport.scrollTop,
|
top: box.top - parent.top,
|
||||||
left: box.left - parent.left + viewport.scrollLeft,
|
left: box.left - parent.left,
|
||||||
width: box.width,
|
width: box.width,
|
||||||
height: box.height,
|
height: box.height,
|
||||||
label: target.label,
|
label: target.label,
|
||||||
@@ -76,30 +123,35 @@ export function ComponentTemplatePreview({
|
|||||||
);
|
);
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
const viewport = root.current;
|
const viewport = root.current;
|
||||||
if (!viewport) return;
|
const outlineHost = overlay.current;
|
||||||
|
const host = canvas.current;
|
||||||
|
if (!viewport || !outlineHost || !host) return;
|
||||||
let frame = 0;
|
let frame = 0;
|
||||||
const update = () => {
|
const update = () => {
|
||||||
cancelAnimationFrame(frame);
|
cancelAnimationFrame(frame);
|
||||||
frame = requestAnimationFrame(() => {
|
frame = requestAnimationFrame(() => {
|
||||||
setSelectedOutline(measure(selectedElement()));
|
const nextHover = measure(hovered);
|
||||||
setHoverOutline(measure(hovered));
|
const nextSelected = measure(selectedElement());
|
||||||
setCompositeOutlines(
|
const nextComposite = targets
|
||||||
targets
|
.filter((target) => target.composite)
|
||||||
.filter((target) => target.composite)
|
.flatMap((target) => {
|
||||||
.flatMap((target) => {
|
const element = host.querySelector<HTMLElement>(
|
||||||
const element = viewport.querySelector<HTMLElement>(
|
`[data-editor-target="${CSS.escape(target.key)}"]`,
|
||||||
`[data-editor-target="${CSS.escape(target.key)}"]`,
|
);
|
||||||
);
|
const outline = measure(element);
|
||||||
const outline = measure(element);
|
return outline ? [{ ...outline, key: target.key }] : [];
|
||||||
return outline ? [{ ...outline, key: target.key }] : [];
|
});
|
||||||
}),
|
renderOutlines(outlineHost, {
|
||||||
);
|
hover: nextHover,
|
||||||
|
selected: nextSelected,
|
||||||
|
composite: nextComposite,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
update();
|
update();
|
||||||
const resize = new ResizeObserver(update);
|
const resize = new ResizeObserver(update);
|
||||||
resize.observe(viewport);
|
resize.observe(viewport);
|
||||||
viewport
|
host
|
||||||
.querySelectorAll<HTMLElement>("[data-editor-target]")
|
.querySelectorAll<HTMLElement>("[data-editor-target]")
|
||||||
.forEach((node) => resize.observe(node));
|
.forEach((node) => resize.observe(node));
|
||||||
window.addEventListener("resize", update);
|
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 } : {})} />
|
<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
|
<div
|
||||||
className="component-template-preview__outline is-hovered"
|
ref={overlay}
|
||||||
style={{
|
className={`component-template-preview__overlay-host ${
|
||||||
top: hoverOutline.top,
|
mode === "edit" ? "is-visible" : ""
|
||||||
left: hoverOutline.left,
|
}`}
|
||||||
width: hoverOutline.width,
|
data-editor-overlay=""
|
||||||
height: hoverOutline.height,
|
|
||||||
}}
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
/>
|
||||||
) : null}
|
</div>
|
||||||
{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>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Form, message } from "antd";
|
import { Form, message } from "antd";
|
||||||
import { useMutation, useQuery } from "@tanstack/react-query";
|
import { useMutation, useQuery } from "@tanstack/react-query";
|
||||||
import type { QueryClient } 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 { FormInstance } from "antd";
|
||||||
import type {
|
import type {
|
||||||
AdminTemplateContent,
|
AdminTemplateContent,
|
||||||
@@ -191,13 +191,15 @@ export function useBrandPreviewDraft({
|
|||||||
[brand, previewBrandValues, previewConfig],
|
[brand, previewBrandValues, previewConfig],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const resetPreview = useCallback(() => {
|
||||||
|
setPreviewConfig(config ?? {});
|
||||||
|
setPreviewBrandValues({});
|
||||||
|
}, [config]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
previewBrand,
|
previewBrand,
|
||||||
handleValuesChange,
|
handleValuesChange,
|
||||||
resetPreview: () => {
|
resetPreview,
|
||||||
setPreviewConfig(config ?? {});
|
|
||||||
setPreviewBrandValues({});
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user