From 97d7eb659c088328319bad1f03d827133f5cc3a7 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Wed, 11 Jun 2025 11:11:06 +0800 Subject: [PATCH] bump: sync with upstream foliate-js (#1381) --- .../readest-app/src/app/reader/components/FoliateViewer.tsx | 6 ++++++ apps/readest-app/src/libs/document.ts | 4 ++-- apps/readest-app/src/store/readerStore.ts | 4 +--- packages/foliate-js | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/readest-app/src/app/reader/components/FoliateViewer.tsx b/apps/readest-app/src/app/reader/components/FoliateViewer.tsx index d5653373..20a0b74d 100644 --- a/apps/readest-app/src/app/reader/components/FoliateViewer.tsx +++ b/apps/readest-app/src/app/reader/components/FoliateViewer.tsx @@ -203,6 +203,12 @@ const FoliateViewer: React.FC<{ const { book } = view; + book.transformTarget?.addEventListener('load', (event: Event) => { + const { detail } = event as CustomEvent; + if (detail.isScript) { + detail.allowScript = viewSettings.allowScript ?? false; + } + }); book.transformTarget?.addEventListener('data', getDocTransformHandler({ width, height })); view.renderer.setStyles?.(getStyles(viewSettings)); diff --git a/apps/readest-app/src/libs/document.ts b/apps/readest-app/src/libs/document.ts index f83c3aa6..d945659f 100644 --- a/apps/readest-app/src/libs/document.ts +++ b/apps/readest-app/src/libs/document.ts @@ -178,7 +178,7 @@ export class DocumentLoader { ); } - public async open({ allowScript = false } = {}): Promise<{ book: BookDoc; format: BookFormat }> { + public async open(): Promise<{ book: BookDoc; format: BookFormat }> { let book = null; let format: BookFormat = 'EPUB'; if (!this.file.size) { @@ -200,7 +200,7 @@ export class DocumentLoader { format = 'FBZ'; } else { const { EPUB } = await import('foliate-js/epub.js'); - book = await new EPUB(loader).init({ allowScript }); + book = await new EPUB(loader).init(); format = 'EPUB'; } } else if (await this.isPDF()) { diff --git a/apps/readest-app/src/store/readerStore.ts b/apps/readest-app/src/store/readerStore.ts index 50093e80..428371c1 100644 --- a/apps/readest-app/src/store/readerStore.ts +++ b/apps/readest-app/src/store/readerStore.ts @@ -130,9 +130,7 @@ export const useReaderStore = create((set, get) => ({ const content = (await appService.loadBookContent(book, settings)) as BookContent; const { file, config } = content; console.log('Loading book', key); - const { book: bookDoc } = await new DocumentLoader(file).open({ - allowScript: config.viewSettings?.allowScript, - }); + const { book: bookDoc } = await new DocumentLoader(file).open(); updateToc(bookDoc, config.viewSettings?.sortedTOC ?? false); // Set the book's language for formerly imported books, newly imported books have this field set book.primaryLanguage = diff --git a/packages/foliate-js b/packages/foliate-js index 8d86688f..30404a18 160000 --- a/packages/foliate-js +++ b/packages/foliate-js @@ -1 +1 @@ -Subproject commit 8d86688f6931fd0eb52836e7ef37877a36aa0dc5 +Subproject commit 30404a186502cd18cd3924958d5a2a59c27e6993