@inizioevoke/astro-core 1.1.0 → 1.2.0

package/src/components/PdfViewer/PdfViewer.ts

@@ -1,4 +1,4 @@
-import * as pdfjs from './pdf.mjs';
+import * as pdfjs from './pdf.min.mjs';
 import type { PDFDocumentProxy } from 'pdfjs-dist';
 import * as ScrollContainer from '../ScrollContainer/ScrollContainer';
 
@@ -21,7 +21,7 @@ export function init(settings: PdfViewerSettings = {}) {
 export async function createViewer(selector: string) {
   const pdfViewer = document.querySelector<HTMLElement>(selector);
   if (pdfViewer) {
-    const ddlPage = pdfViewer.querySelector('select') as HTMLSelectElement;
+    // const ddlPage = pdfViewer.querySelector('select') as HTMLSelectElement;
     const toolbar = pdfViewer.querySelector('.evo-pdf-viewer-toolbar') as HTMLElement;
     const toolbarHeight = parseFloat(getComputedStyle(toolbar).height);
     const pageSelect = toolbar.querySelector('.evo-pdf-viewer-nav-page select') as HTMLSelectElement;
@@ -72,22 +72,11 @@ export async function createViewer(selector: string) {
 
     const pdf: PDFDocumentProxy = await pdfjs.getDocument(pdfViewer.getAttribute('data-pdf') as string).promise;
 
-    const bookmarks: Record<string, number> = JSON.parse(atob(pdfViewer.getAttribute('data-bookmarks') as string));
-    if (Object.keys(bookmarks).length > 0) {
-      const toolbarBookmarks = toolbar.querySelector('.evo-pdf-viewer-toolbar-bookmarks') as HTMLElement;
-      const bookmarksSelect = toolbarBookmarks.querySelector('select') as HTMLSelectElement;
-      Object.entries(bookmarks).forEach(([ key, value ]) => {
-        const option = document.createElement('option') as HTMLOptionElement;
-        option.value = value.toString();
-        option.innerText = key;
-        bookmarksSelect.options.add(option);
-      });
-      bookmarksSelect.addEventListener('change', () => {
-        gotoPage(bookmarksSelect.options[bookmarksSelect.selectedIndex].value);
-        bookmarksSelect.selectedIndex = 0;
-      });
-      toolbarBookmarks.classList.remove('hidden');
-    }
+    const bookmarksSelect = toolbar.querySelector('.evo-pdf-viewer-toolbar-bookmarks select') as HTMLSelectElement;
+    bookmarksSelect.addEventListener('change', () => {
+      gotoPage(bookmarksSelect.options[bookmarksSelect.selectedIndex].value);
+      bookmarksSelect.selectedIndex = 0;
+    });
 
     const outputScale = window.devicePixelRatio || 1;
     const pages = new Array(pdf.numPages).fill(1).map((v, i) => { return i + 1; });
@@ -110,11 +99,14 @@ export async function createViewer(selector: string) {
 
     const pdfContainer = pdfViewer.querySelector('.evo-scroll-content') as HTMLElement;
     pdfViewer.querySelector<HTMLElement>('.evo-pdf-viewer-nav-page-count')!.innerText = pages.length.toString();
+    pageSelect.options.remove(0);
     for (const pageNum of pages) {
       const option = document.createElement('option');
       option.value = pageNum.toString();
       option.innerText = `${pageNum}`;
-      ddlPage.options.add(option);
+      pageSelect.options.add(option);
+    }
+    for (const pageNum of pages) {
 
       const pdfPage = await pdf.getPage(pageNum);
       const pdfPageWidth = pdfPage.getViewport({ scale: 1}).width;