@d-i-t-a/reader 2.0.3 → 2.0.4

package/dist/esm/index.js

@@ -47367,7 +47367,6 @@ var TextHighlighter = class {
   }
   bindEvents(el, _scope, hasEventListener) {
     let doc = el.ownerDocument;
-    doc.addEventListener("keyup", this.toolboxShowDelayed.bind(this));
     el.addEventListener("mouseup", this.toolboxShowDelayed.bind(this));
     el.addEventListener("touchend", this.toolboxShowDelayed.bind(this));
     doc.addEventListener("selectstart", this.toolboxShowDelayed.bind(this));
@@ -47402,7 +47401,6 @@ var TextHighlighter = class {
   }
   unbindEvents(el, _scope) {
     let doc = el.ownerDocument;
-    doc.removeEventListener("keyup", this.toolboxShowDelayed.bind(this));
     el.removeEventListener("mouseup", this.toolboxShowDelayed.bind(this));
     el.removeEventListener("touchend", this.toolboxShowDelayed.bind(this));
     doc.removeEventListener("selectstart", this.toolboxShowDelayed.bind(this));
@@ -52943,7 +52941,7 @@ var import_debounce5 = __toModule(require_debounce());
 // src/utils/TouchEventHandler.ts
 init_polyfills();
 var _TouchEventHandler = class {
-  constructor() {
+  constructor(navigator2) {
     this.onBackwardSwipe = () => {
     };
     this.onForwardSwipe = () => {
@@ -53008,6 +53006,7 @@ var _TouchEventHandler = class {
         }, false);
       }
     };
+    this.navigator = navigator2;
   }
 };
 var TouchEventHandler = _TouchEventHandler;
@@ -53018,7 +53017,7 @@ TouchEventHandler.SLOW_SWIPE_MS = 500;
 // src/utils/KeyboardEventHandler.ts
 init_polyfills();
 var KeyboardEventHandler = class {
-  constructor() {
+  constructor(navigator2) {
     this.onBackwardSwipe = () => {
     };
     this.onForwardSwipe = () => {
@@ -53032,33 +53031,36 @@ var KeyboardEventHandler = class {
     this.focusin = (element) => {
       const self2 = this;
       element.addEventListener("focusin", function(event) {
-        self2.delegate.view?.snap(event.target);
+        self2.navigator.view?.snap(event.target);
       }, true);
     };
     this.keydown = (element) => {
       const self2 = this;
-      element.addEventListener("keydown", function(event) {
-        const eventTarget = event.target;
-        if (/input|select|option|textarea/i.test(eventTarget.tagName)) {
-          return;
-        }
-        const ownerDocument = eventTarget.ownerDocument || eventTarget;
-        const ownerWindow = ownerDocument.defaultView;
-        const selection = ownerWindow.getSelection();
-        if (!selection.isCollapsed) {
-          return;
-        }
-        const key = event.key;
-        switch (key) {
-          case "ArrowRight":
-            self2.onForwardSwipe(event);
-            break;
-          case "ArrowLeft":
-            self2.onBackwardSwipe(event);
-            break;
-        }
-      }, false);
+      if (!this.navigator.rights.customKeyboardEvents) {
+        element.addEventListener("keydown", function(event) {
+          const eventTarget = event.target;
+          if (/input|select|option|textarea/i.test(eventTarget.tagName)) {
+            return;
+          }
+          const ownerDocument = eventTarget.ownerDocument || eventTarget;
+          const ownerWindow = ownerDocument.defaultView;
+          const selection = ownerWindow.getSelection();
+          if (!selection.isCollapsed) {
+            return;
+          }
+          const key = event.key;
+          switch (key) {
+            case "ArrowRight":
+              self2.onForwardSwipe(event);
+              break;
+            case "ArrowLeft":
+              self2.onBackwardSwipe(event);
+              break;
+          }
+        }, false);
+      }
     };
+    this.navigator = navigator2;
   }
 };
 
@@ -53191,7 +53193,8 @@ var IFrameNavigator = class extends import_eventemitter3.default {
       enablePageBreaks: false,
       enableSearch: false,
       enableTTS: false,
-      enableTimeline: false
+      enableTimeline: false,
+      customKeyboardEvents: false
     };
     this.didInitKeyboardEventHandler = false;
     this.onResize = () => {
@@ -53239,8 +53242,8 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     this.view.attributes = attributes;
     this.view.delegate = this;
     this.eventHandler = new EventHandler(this);
-    this.touchEventHandler = new TouchEventHandler();
-    this.keyboardEventHandler = new KeyboardEventHandler();
+    this.touchEventHandler = new TouchEventHandler(this);
+    this.keyboardEventHandler = new KeyboardEventHandler(this);
     this.upLinkConfig = upLinkConfig;
     this.initialLastReadingPosition = initialLastReadingPosition;
     this.publication = publication;
@@ -53258,7 +53261,8 @@ var IFrameNavigator = class extends import_eventemitter3.default {
       enablePageBreaks: false,
       enableSearch: false,
       enableTTS: false,
-      enableTimeline: false
+      enableTimeline: false,
+      customKeyboardEvents: false
     };
     this.tts = tts;
     this.injectables = injectables;
@@ -53284,7 +53288,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     removeEventListenerOptional(this.nextPageAnchorElement, "click", this.handleNextPageClick.bind(this));
     removeEventListenerOptional(this.tryAgainButton, "click", this.tryAgain.bind(this));
     removeEventListenerOptional(this.goBackButton, "click", IFrameNavigator.goBack.bind(this));
-    removeEventListenerOptional(this.bookmarksControl, "keydown", this.hideBookmarksOnEscape.bind(this));
     removeEventListenerOptional(this.espandMenuIcon, "click", this.handleEditClick.bind(this));
     removeEventListenerOptional(window, "resize", this.onResize);
     this.iframes.forEach((iframe) => {
@@ -53557,38 +53560,12 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     addEventListenerOptional(this.nextPageAnchorElement, "click", this.handleNextPageClick.bind(this));
     addEventListenerOptional(this.tryAgainButton, "click", this.tryAgain.bind(this));
     addEventListenerOptional(this.goBackButton, "click", IFrameNavigator.goBack.bind(this));
-    addEventListenerOptional(this.bookmarksControl, "keydown", this.hideBookmarksOnEscape.bind(this));
     addEventListenerOptional(this.espandMenuIcon, "click", this.handleEditClick.bind(this));
     addEventListenerOptional(window, "resize", this.onResize);
     for (const iframe of this.iframes) {
       addEventListenerOptional(iframe, "resize", this.onResize);
     }
   }
-  setupModalFocusTrap(modal, closeButton, lastFocusableElement) {
-    const TAB_KEY = 9;
-    closeButton.addEventListener("keydown", (event) => {
-      if (IFrameNavigator.isDisplayed(modal)) {
-        const tab = event.keyCode === TAB_KEY;
-        const shift = event.shiftKey;
-        if (tab && shift) {
-          lastFocusableElement.focus();
-          event.preventDefault();
-          event.stopPropagation();
-        }
-      }
-    });
-    lastFocusableElement.addEventListener("keydown", (event) => {
-      if (IFrameNavigator.isDisplayed(modal)) {
-        const tab = event.keyCode === TAB_KEY;
-        const shift = event.shiftKey;
-        if (tab && !shift) {
-          closeButton.focus();
-          event.preventDefault();
-          event.stopPropagation();
-        }
-      }
-    });
-  }
   updateBookView() {
     if (this.view?.layout === "fixed") {
       if (this.nextPageAnchorElement)
@@ -53765,21 +53742,12 @@ var IFrameNavigator = class extends import_eventemitter3.default {
   }
   async loadManifest() {
     try {
-      const createSubmenu = (parentElement, links, control, ol = false) => {
-        let menuControl;
-        let mainElement;
-        if (control) {
-          menuControl = control;
-          if (parentElement instanceof HTMLDivElement) {
-            mainElement = parentElement;
-          }
-        }
+      const createSubmenu = (parentElement, links, ol = false) => {
         var listElement = document.createElement("ul");
         if (ol) {
           listElement = document.createElement("ol");
         }
         listElement.className = "sidenav-toc";
-        let lastLink = void 0;
         for (const link of links) {
           const listItemElement = document.createElement("li");
           const linkElement = document.createElement("a");
@@ -53798,13 +53766,9 @@ var IFrameNavigator = class extends import_eventemitter3.default {
             listItemElement.appendChild(spanElement);
           }
           if (link.Children && link.Children.length > 0) {
-            createSubmenu(listItemElement, link.Children, void 0, true);
+            createSubmenu(listItemElement, link.Children, true);
           }
           listElement.appendChild(listItemElement);
-          lastLink = linkElement;
-        }
-        if (lastLink && menuControl && mainElement) {
-          this.setupModalFocusTrap(mainElement, menuControl, lastLink);
         }
         addEventListenerOptional(listElement, "click", (event) => {
           event.preventDefault();
@@ -53814,7 +53778,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
             if (linkElement.className.indexOf("active") !== -1) {
               this.hideView();
             } else {
-              menuControl?.focus();
               let locations = {
                 progression: 0
               };
@@ -54028,7 +53991,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
         }
         this.touchEventHandler.setupEvents(this.errorMessage);
         if (!this.didInitKeyboardEventHandler) {
-          this.keyboardEventHandler.delegate = this;
           this.keyboardEventHandler.keydown(document);
           this.didInitKeyboardEventHandler = true;
         }
@@ -54505,89 +54467,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
   static goBack() {
     window.history.back();
   }
-  static isDisplayed(element) {
-    return element ? element.className.indexOf(" active") !== -1 : false;
-  }
-  static showElement(element, control) {
-    if (element) {
-      element.className = element.className.replace(" inactive", "");
-      if (element.className.indexOf(" active") === -1) {
-        element.className += " active";
-      }
-      element.setAttribute("aria-hidden", "false");
-      if (control) {
-        control.setAttribute("aria-expanded", "true");
-        const openIcon = control.querySelector(".icon.open");
-        if (openIcon && (openIcon.getAttribute("class") || "").indexOf(" inactive-icon") === -1) {
-          const newIconClass = (openIcon.getAttribute("class") || "") + " inactive-icon";
-          openIcon.setAttribute("class", newIconClass);
-        }
-        const closeIcon = control.querySelector(".icon.close");
-        if (closeIcon) {
-          const newIconClass = (closeIcon.getAttribute("class") || "").replace(" inactive-icon", "");
-          closeIcon.setAttribute("class", newIconClass);
-        }
-      }
-      const buttons = Array.prototype.slice.call(element.querySelectorAll("button"));
-      const links = Array.prototype.slice.call(element.querySelectorAll("a"));
-      for (const button of buttons) {
-        button.tabIndex = 0;
-      }
-      for (const link of links) {
-        link.tabIndex = 0;
-      }
-    }
-  }
-  static hideElement(element, control) {
-    if (element) {
-      element.className = element.className.replace(" active", "");
-      if (element.className.indexOf(" inactive") === -1) {
-        element.className += " inactive";
-      }
-      element.setAttribute("aria-hidden", "true");
-      if (control) {
-        control.setAttribute("aria-expanded", "false");
-        const openIcon = control.querySelector(".icon.open");
-        if (openIcon) {
-          const newIconClass = (openIcon.getAttribute("class") || "").replace(" inactive-icon", "");
-          openIcon.setAttribute("class", newIconClass);
-        }
-        const closeIcon = control.querySelector(".icon.close");
-        if (closeIcon && (closeIcon.getAttribute("class") || "").indexOf(" inactive-icon") === -1) {
-          const newIconClass = (closeIcon.getAttribute("class") || "") + " inactive-icon";
-          closeIcon.setAttribute("class", newIconClass);
-        }
-      }
-      const buttons = Array.prototype.slice.call(element.querySelectorAll("button"));
-      const links = Array.prototype.slice.call(element.querySelectorAll("a"));
-      for (const button of buttons) {
-        button.tabIndex = -1;
-      }
-      for (const link of links) {
-        link.tabIndex = -1;
-      }
-    }
-  }
-  hideModal(modal, control) {
-    for (const iframe of this.iframes) {
-      iframe.setAttribute("aria-hidden", "false");
-    }
-    if (this.upLink)
-      this.upLink.setAttribute("aria-hidden", "false");
-    if (this.linksBottom)
-      this.linksBottom.setAttribute("aria-hidden", "false");
-    if (this.linksMiddle)
-      this.linksMiddle.setAttribute("aria-hidden", "false");
-    if (this.loadingMessage)
-      this.loadingMessage.setAttribute("aria-hidden", "false");
-    if (this.errorMessage)
-      this.errorMessage.setAttribute("aria-hidden", "false");
-    if (this.infoTop)
-      this.infoTop.setAttribute("aria-hidden", "false");
-    if (this.infoBottom)
-      this.infoBottom.setAttribute("aria-hidden", "false");
-    IFrameNavigator.hideElement(modal, control);
-  }
   handleEditClick(event) {
     var element = event.target;
     if (this.headerMenu) {
@@ -55127,12 +55006,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
       event.stopPropagation();
     }
   }
-  hideBookmarksOnEscape(event) {
-    const ESCAPE_KEY = 27;
-    if (IFrameNavigator.isDisplayed(this.bookmarksView) && event.keyCode === ESCAPE_KEY) {
-      this.hideModal(this.bookmarksView, this.bookmarksControl);
-    }
-  }
   hideView() {
     if (this.view?.layout !== "fixed") {
       if (this.view?.isScrollMode()) {
@@ -58335,7 +58208,8 @@ var D2Reader = class {
       enablePageBreaks: false,
       enableSearch: false,
       enableTTS: false,
-      enableTimeline: false
+      enableTimeline: false,
+      customKeyboardEvents: false
     };
     if (rights.enableContentProtection && initialConfig.protection) {
       await ContentProtectionModule.setupPreloadProtection(initialConfig.protection);