Skip to content

Commit 170f78e

Browse files
committed
fix(export): Fix export error.
(cherry picked from commit e89b295)
1 parent d64b009 commit 170f78e

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

src/html-generation/markdown-renderer.ts

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export namespace MarkdownRenderer
2525

2626
try
2727
{
28-
await renderLeaf.openFile(file.markdownFile, { active: false});
28+
await renderLeaf.openFile(file.markdownFile, { active: false });
2929
}
3030
catch (e)
3131
{
@@ -65,19 +65,18 @@ export namespace MarkdownRenderer
6565

6666
await Utils.changeViewMode(renderLeaf.view, "preview");
6767
if (cancelled) throw new Error("Markdown rendering cancelled");
68-
69-
7068
// @ts-ignore
7169
preview.renderer.showAll = true;
7270
// @ts-ignore
71+
preview.renderer.renderExtraMinPx = 50000; // Contents longer than 50000px would be cut
72+
// @ts-ignore
7373
await preview.renderer.unfoldAllHeadings();
7474
if (cancelled) throw new Error("Markdown rendering cancelled");
7575

7676
// @ts-ignore
7777
const lastRender = preview.renderer.lastRender;
7878
// @ts-ignore
7979
preview.renderer.rerender(true);
80-
8180
let isRendered = false;
8281
// @ts-ignore
8382
preview.renderer.onRendered(() =>
@@ -86,7 +85,7 @@ export namespace MarkdownRenderer
8685
});
8786

8887
// @ts-ignore
89-
const renderfinished = await Utils.waitUntil(() => (preview.renderer.lastRender != lastRender && isRendered) || cancelled, 30000, 50);
88+
const renderfinished = await Utils.waitUntil(() => ((preview.renderer.lastRender != lastRender) && isRendered) || cancelled, 30000, 300);
9089

9190
if (cancelled) throw new Error("Markdown rendering cancelled");
9291

@@ -98,7 +97,7 @@ export namespace MarkdownRenderer
9897
view?.update(file.markdownFile.path, { syncStatus: 'fail' })
9998
return generateFailDocument();
10099
}
101-
100+
102101
// wait for dataview blocks to render
103102
const text = renderLeaf.view.data;
104103
const dataviews = text.matchAll(/```(dataview|dataviewjs)/g);
@@ -155,21 +154,16 @@ export namespace MarkdownRenderer
155154
});
156155
}
157156

158-
function newTab(app: App, navType: PaneType | boolean, splitDirection: SplitDirection = 'vertical'): WorkspaceLeaf {
159-
let leaf = navType === 'split' ? app.workspace.getLeaf(navType, splitDirection) : app.workspace.getLeaf(navType);
160-
return leaf;
161-
}
162-
163157
export async function beginBatch(plugin: InvioPlugin)
164158
{
165159
problemLog = "";
166160
errorInBatch = false;
167161
cancelled = false;
168162

169-
renderLeaf = newTab(plugin.app, "window", "vertical");
163+
renderLeaf = app.workspace.getLeaf('window');
170164
// @ts-ignore
171-
const parentFound = await Utils.waitUntil(() => renderLeaf && renderLeaf.parent, 2000, 10);
172-
if (!parentFound)
165+
const parentFound = await Utils.waitUntil(() => renderLeaf && renderLeaf.parent, 2000, 50);
166+
if (!parentFound)
173167
{
174168
try
175169
{
@@ -186,24 +180,26 @@ export namespace MarkdownRenderer
186180

187181
// hide the leaf so we can render without intruding on the user
188182
// @ts-ignore
189-
renderLeaf.parent.containerEl.style.height = "0";
183+
renderLeaf.parent.containerEl.style.height = "100%";
190184
// @ts-ignore
191185
renderLeaf.parent.parent.containerEl.querySelector(".clickable-icon, .workspace-tab-header-container-inner").style.display = "none";
192186
// @ts-ignore
193-
renderLeaf.parent.containerEl.style.maxHeight = "var(--header-height)";
187+
// renderLeaf.parent.containerEl.style.maxHeight = "var(--header-height)";
194188
// @ts-ignore
195189
renderLeaf.parent.parent.containerEl.classList.remove("mod-vertical");
196190
// @ts-ignore
197191
renderLeaf.parent.parent.containerEl.classList.add("mod-horizontal");
192+
198193
// @ts-ignore
199-
renderLeaf.view.containerEl.win.resizeTo(1, 1);
194+
// renderLeaf.view.containerEl.win.resizeTo(1, 1);
200195
// @ts-ignore
201-
renderLeaf.view.containerEl.win.moveTo(window.screen.width + 450, window.screen.height + 450);
196+
// renderLeaf.view.containerEl.win.moveTo(window.screen.width + 450, window.screen.height + 450);
202197

203198
// @ts-ignore
204199
const renderBrowserWindow = window.electron.remote.BrowserWindow.getFocusedWindow();
205200
if (renderBrowserWindow) {
206-
// renderBrowserWindow.setAlwaysOnTop(true, "floating", 1);
201+
renderBrowserWindow.hide();
202+
// renderBrowserWindow.setAlwaysOnTop(false, "floating", 1);
207203
renderBrowserWindow.webContents.setFrameRate(120);
208204
renderBrowserWindow.on("close", () =>
209205
{

0 commit comments

Comments
 (0)