Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

预览页面渲染错误 #1475

Merged
merged 2 commits into from
Sep 25, 2023
Merged

预览页面渲染错误 #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0abce2a
:bug: Fix the issue of confusing preview element and actions element
Zuoqiu-Yingyi Sep 24, 2023
9906e3e
Update index.d.ts
Zuoqiu-Yingyi Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ts/outline/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class Outline {
public render(vditor: IVditor) {
let html = "";
if (vditor.preview.element.style.display === "block") {
html = outlineRender(vditor.preview.element.lastElementChild as HTMLElement,
html = outlineRender(vditor.preview.previewElement,
this.element.lastElementChild, vditor);
} else {
html = outlineRender(vditor[vditor.currentMode].element, this.element.lastElementChild, vditor);
Expand Down
78 changes: 40 additions & 38 deletions src/ts/preview/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@ import {previewImage} from "./image";

export class Preview {
public element: HTMLElement;
public actionElement?: HTMLElement;
public previewElement: HTMLElement;
private mdTimeoutId: number;

constructor(vditor: IVditor) {
this.element = document.createElement("div");
this.element.className = `vditor-preview`;
const previewElement = document.createElement("div");
previewElement.className = "vditor-reset";
this.previewElement = document.createElement("div");
this.previewElement.className = "vditor-reset";
if (vditor.options.classes.preview) {
previewElement.classList.add(vditor.options.classes.preview);
this.previewElement.classList.add(vditor.options.classes.preview);
}
previewElement.style.maxWidth = vditor.options.preview.maxWidth + "px";
previewElement.addEventListener("copy", (event: ClipboardEvent & { target: HTMLElement }) => {
this.previewElement.style.maxWidth = vditor.options.preview.maxWidth + "px";
this.previewElement.addEventListener("copy", (event: ClipboardEvent & { target: HTMLElement }) => {
if (event.target.tagName === "TEXTAREA") {
// /~https://github.com/Vanessa219/vditor/issues/901
return;
Expand All @@ -42,11 +44,11 @@ export class Preview {
this.copyToX(vditor, tempElement, "default");
event.preventDefault();
});
previewElement.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
this.previewElement.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
const spanElement = hasClosestByMatchTag(event.target, "SPAN");
if (spanElement && hasClosestByClassName(spanElement, "vditor-toc")) {
const headingElement =
previewElement.querySelector("#" + spanElement.getAttribute("data-target-id")) as HTMLElement;
this.previewElement.querySelector("#" + spanElement.getAttribute("data-target-id")) as HTMLElement;
if (headingElement) {
this.element.scrollTop = headingElement.offsetTop;
}
Expand All @@ -69,13 +71,13 @@ export class Preview {
}
}
});
this.element.appendChild(previewElement);
this.element.appendChild(this.previewElement);
const actions = vditor.options.preview.actions;
if (actions.length === 0) {
return;
}
const actionElement = document.createElement("div");
actionElement.className = "vditor-preview__action";
this.actionElement = document.createElement("div");
this.actionElement.className = "vditor-preview__action";
const actionHtml: string[] = [];
for (let i = 0; i < actions.length; i++) {
const action = actions[i];
Expand All @@ -101,9 +103,8 @@ export class Preview {
break;
}
}
actionElement.innerHTML = actionHtml.join("");
this.element.appendChild(actionElement);
actionElement.addEventListener(getEventName(), (event) => {
this.actionElement.innerHTML = actionHtml.join("");
this.actionElement.addEventListener(getEventName(), (event) => {
const btn = hasClosestByTag(event.target as HTMLElement, "BUTTON");
if (!btn) {
return;
Expand All @@ -116,26 +117,27 @@ export class Preview {
}

if (type === "mp-wechat" || type === "zhihu") {
this.copyToX(vditor, this.element.lastElementChild.cloneNode(true) as HTMLElement, type);
this.copyToX(vditor, this.previewElement.cloneNode(true) as HTMLElement, type);
return;
}

if (type === "desktop") {
previewElement.style.width = "auto";
this.previewElement.style.width = "auto";
} else if (type === "tablet") {
previewElement.style.width = "780px";
this.previewElement.style.width = "780px";
} else {
previewElement.style.width = "360px";
this.previewElement.style.width = "360px";
}
if (previewElement.scrollWidth > previewElement.parentElement.clientWidth) {
previewElement.style.width = "auto";
if (this.previewElement.scrollWidth > this.previewElement.parentElement.clientWidth) {
this.previewElement.style.width = "auto";
}
this.render(vditor);
actionElement.querySelectorAll("button").forEach((item) => {
this.actionElement.querySelectorAll("button").forEach((item) => {
item.classList.remove("vditor-preview__action--current");
});
btn.classList.add("vditor-preview__action--current");
});
this.element.insertBefore(this.actionElement, this.previewElement);
}

public render(vditor: IVditor, value?: string) {
Expand All @@ -149,13 +151,13 @@ export class Preview {
}

if (value) {
this.element.lastElementChild.innerHTML = value;
this.previewElement.innerHTML = value;
return;
}

if (getMarkdown(vditor)
.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "") === "") {
this.element.lastElementChild.innerHTML = "";
this.previewElement.innerHTML = "";
return;
}

Expand All @@ -177,14 +179,14 @@ export class Preview {
if (vditor.options.preview.transform) {
responseJSON.data = vditor.options.preview.transform(responseJSON.data);
}
this.element.lastElementChild.innerHTML = responseJSON.data;
this.previewElement.innerHTML = responseJSON.data;
this.afterRender(vditor, renderStartTime);
} else {
let html = vditor.lute.Md2HTML(markdownText);
if (vditor.options.preview.transform) {
html = vditor.options.preview.transform(html);
}
this.element.lastElementChild.innerHTML = html;
this.previewElement.innerHTML = html;
this.afterRender(vditor, renderStartTime);
}
}
Expand All @@ -196,7 +198,7 @@ export class Preview {
if (vditor.options.preview.transform) {
html = vditor.options.preview.transform(html);
}
this.element.lastElementChild.innerHTML = html;
this.previewElement.innerHTML = html;
this.afterRender(vditor, renderStartTime);
}
}, vditor.options.preview.delay);
Expand All @@ -219,18 +221,18 @@ export class Preview {
if (cmtFocusElement) {
cmtFocusElement.classList.remove("vditor-comment--focus");
}
codeRender(vditor.preview.element.lastElementChild as HTMLElement);
highlightRender(vditor.options.preview.hljs, vditor.preview.element.lastElementChild as HTMLElement,
codeRender(vditor.preview.previewElement);
highlightRender(vditor.options.preview.hljs, vditor.preview.previewElement,
vditor.options.cdn);
mermaidRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn, vditor.options.theme);
markmapRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn, vditor.options.theme);
flowchartRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn);
graphvizRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn);
chartRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn, vditor.options.theme);
mindmapRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn, vditor.options.theme);
plantumlRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn);
abcRender(vditor.preview.element.lastElementChild as HTMLElement, vditor.options.cdn);
mediaRender(vditor.preview.element.lastElementChild as HTMLElement);
mermaidRender(vditor.preview.previewElement, vditor.options.cdn, vditor.options.theme);
markmapRender(vditor.preview.previewElement, vditor.options.cdn, vditor.options.theme);
flowchartRender(vditor.preview.previewElement, vditor.options.cdn);
graphvizRender(vditor.preview.previewElement, vditor.options.cdn);
chartRender(vditor.preview.previewElement, vditor.options.cdn, vditor.options.theme);
mindmapRender(vditor.preview.previewElement, vditor.options.cdn, vditor.options.theme);
plantumlRender(vditor.preview.previewElement, vditor.options.cdn);
abcRender(vditor.preview.previewElement, vditor.options.cdn);
mediaRender(vditor.preview.previewElement);
// toc render
const editorElement = vditor.preview.element;
let tocHTML = vditor.outline.render(vditor);
Expand All @@ -244,7 +246,7 @@ export class Preview {
math: vditor.options.preview.math,
});
});
mathRender(vditor.preview.element.lastElementChild as HTMLElement, {
mathRender(vditor.preview.previewElement, {
cdn: vditor.options.cdn,
math: vditor.options.preview.math,
});
Expand Down Expand Up @@ -272,7 +274,7 @@ export class Preview {
range.selectNode(copyElement);
setSelectionFocus(range);
document.execCommand("copy");
this.element.lastElementChild.remove();
copyElement.remove();

vditor.tip.show(['zhihu', 'mp-wechat'].includes(type) ? `已复制，可到${type === "zhihu" ? "知乎" : "微信公众号平台"}进行粘贴` : `已复制到剪切板`);
}
Expand Down
4 changes: 3 additions & 1 deletion types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,9 @@ interface IVditor {
element?: HTMLElement,
};
preview?: {
element: HTMLElement
element: HTMLElement,
actionElement?: HTMLElement,
previewElement: HTMLElement,
render(vditor: IVditor, value?: string): void,
};
counter?: {
Expand Down