@inizioevoke/astro-core 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inizioevoke/astro-core",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "license": "ISC",
   "author": "",

package/src/components/PdfViewer/PdfViewer.astro

@@ -6,8 +6,9 @@ interface Props {
   id: string;
   class?: string;
   height?: number | string;
-  theme?: 'black' | 'dark';
+  theme?: 'light' | 'dark' | 'black';
   pdf: string;
+  zoom?: 50 | 60 | 70 | 80 | 90 | 100 | 110 | 120 | 130 | 140 | 150;
   page?: number;
   pages?: string;
   bookmarks?: Record<string, number>;
@@ -23,6 +24,7 @@ const {
   height,
   theme,
   pdf,
+  zoom,
   page = 1,
   bookmarks,
   bookmarkText = 'Jump to',
@@ -40,6 +42,7 @@ if (height) {
   class:list={['evo-pdf-viewer', cssClass, theme ? `evo-pdf-viewer-theme-${theme}` : null]} 
   data-pdf={pdf} 
   data-page={page}
+  data-zoom={zoom}
   {...attrs} 
 >
   <div class="evo-pdf-viewer-toolbar">

package/src/components/PdfViewer/PdfViewer.css

@@ -127,7 +127,7 @@
   }*/
   .evo-pdf-viewer-container {
     height: calc(var(--evo-pdf-viewer-height) - var(--evo-pdf-viewer-toolbar-height));
-    padding: 0 9px 9px 9px;
+    padding: 0 9px 9px var(--evo-scroll-container-content-padding-right);
     box-sizing: border-box;
 
     .evo-scroll-container {

package/src/components/PdfViewer/PdfViewer.ts

@@ -225,11 +225,11 @@ export async function createViewer(selector: string) {
     const toolbarHeight = parseFloat(getComputedStyle(toolbar).height);
     const pageSelect = toolbar.querySelector('.evo-pdf-viewer-nav-page select') as HTMLSelectElement;
     const scrollContainer = ScrollContainer.getScrollContainer(pdfViewer.querySelector('.evo-scroll-container') as HTMLElement) as ScrollContainer.IScrollContainer;
-
+    const defaultZoom = parseInt(pdfViewer.getAttribute('data-zoom') ?? '100', 10);
     const zoom = (z: number) => {
       const style = getComputedStyle(pdfViewer);
       const current = Math.floor(parseFloat(style.getPropertyValue('--evo-pdf-viewer-scale')) * 10);
-      const scale = z === 0 ? 10 : current + z;
+      const scale = z === 0 ? defaultZoom / 10 : current + z;
       if (scale >= 1) {
         const scroll = ScrollContainer.getScroll(scrollContainer);
         pdfViewer.style.setProperty('--evo-pdf-viewer-scale', (scale/10).toString());
@@ -237,6 +237,7 @@ export async function createViewer(selector: string) {
         ScrollContainer.refresh(scrollContainer);
       }
     };
+    zoom(0);
 
     const gotoPage = (page: number | string) => {
       if (typeof page == 'string') {
@@ -271,11 +272,13 @@ export async function createViewer(selector: string) {
 
     const pdf: PDFDocumentProxy = await pdfjs.getDocument(pdfViewer.getAttribute('data-pdf') as string).promise;
 
-    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 bookmarksSelect = toolbar.querySelector<HTMLSelectElement>('.evo-pdf-viewer-toolbar-bookmarks select');
+    if (bookmarksSelect) {
+      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; });
@@ -295,7 +298,6 @@ export async function createViewer(selector: string) {
       }
     }, { passive: true });
 
-
     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);

package/src/components/ScrollContainer/ScrollContainer.css

@@ -9,6 +9,7 @@
     --evo-scroll-container-thumb-color: #666666;
     --evo-scroll-container-thumb-border-width: 0px;
     --evo-scroll-container-thumb-border-color: var(--evo-scroll-container-track-color);
+    --evo-scroll-container-content-padding-right: calc(1rem + var(--evo-scroll-container-track-width));
   }
 
   evo-scroll-container,
@@ -27,7 +28,7 @@
     .evo-scroll-content {
       height: 100%;
       overflow-y: scroll;
-      padding-right: calc(1rem + var(--evo-scroll-container-track-width));
+      padding-right: var(--evo-scroll-container-content-padding-right);
       -ms-overflow-style: none;
       scrollbar-width: none;
       &::-webkit-scrollbar {