Merge branch 'dev'

Author: crimx

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.22.0](https://github.com/crimx/ext-saladict/compare/v7.21.0...v7.22.0) (2026-05-01)
+
+
+### Features
+
+* add utility functions for DOM manipulation ([6340484](https://github.com/crimx/ext-saladict/commit/63404840427eef6181af07717c22c7803f28d6b3))
+* update theme mode ([8af665f](https://github.com/crimx/ext-saladict/commit/8af665f4f1cbc3be6b34620b4deb654a84e906ed))
+* update zip script ([94d8d2c](https://github.com/crimx/ext-saladict/commit/94d8d2c3c0f4500ec9756aeac57607b13c69b2ce))
+
+
+### Bug Fixes
+
+* pdf sniffing ([62653e5](https://github.com/crimx/ext-saladict/commit/62653e58eb1590e7dc5e702a258b84e5c28a2f85))
+* update Firefox strict_min_version ([45cc47d](https://github.com/crimx/ext-saladict/commit/45cc47dfcc6f10b5e62e06b118de4956d974a085))
+
 ## [7.21.0](https://github.com/crimx/ext-saladict/compare/v7.20.0...v7.21.0) (2026-04-25)
 
 

assets/pdf-viewer-bridge.js

@@ -1,6 +1,7 @@
 ;(function() {
   var AUTO_MARKER = 'saladict-pdf'
   var MAX_ATTEMPTS = 20
+  var VIEWER_APP_MAX_ATTEMPTS = 80
 
   function sleep(ms) {
     return new Promise(function(resolve) {
@@ -15,18 +16,49 @@
     return viewerUrl.toString()
   }
 
-  async function fetchPendingPdfOpen() {
+  async function waitForPDFViewerApplication() {
+    for (var attempt = 0; attempt < VIEWER_APP_MAX_ATTEMPTS; attempt++) {
+      if (
+        window.PDFViewerApplication &&
+        window.PDFViewerApplication.initializedPromise
+      ) {
+        return window.PDFViewerApplication
+      }
+
+      await sleep(50)
+    }
+
+    return null
+  }
+
+  async function getViewerTabContext() {
+    var context = {}
+
+    try {
+      if (browser.tabs && browser.tabs.getCurrent) {
+        var tab = await browser.tabs.getCurrent()
+        if (tab && typeof tab.id === 'number') {
+          context.tabId = tab.id
+        }
+      }
+    } catch (error) {
+      /* fall back to the message sender metadata */
+    }
+
+    return context
+  }
+
+  async function fetchPendingPdfOpen(context) {
     return browser.runtime.sendMessage({
-      type: 'GET_PDF_SNIFF_PENDING'
+      type: 'GET_PDF_SNIFF_PENDING',
+      payload: context
     })
   }
 
-  async function openStandaloneIfNeeded(url) {
+  async function openStandaloneIfNeeded(url, context) {
     return browser.runtime.sendMessage({
       type: 'OPEN_PDF_VIEWER_STANDALONE_IF_NEEDED',
-      payload: {
-        url: url
-      }
+      payload: Object.assign({ url: url }, context)
     })
   }
 
@@ -36,20 +68,19 @@
       return
     }
 
-    if (
-      !window.PDFViewerApplication ||
-      !window.PDFViewerApplication.initializedPromise
-    ) {
+    var pdfViewerApplication = await waitForPDFViewerApplication()
+    if (!pdfViewerApplication) {
       return
     }
 
-    await window.PDFViewerApplication.initializedPromise
+    await pdfViewerApplication.initializedPromise
+    var viewerTabContext = await getViewerTabContext()
 
     for (var attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
       var pending = null
 
       try {
-        pending = await fetchPendingPdfOpen()
+        pending = await fetchPendingPdfOpen(viewerTabContext)
       } catch (error) {
         pending = null
       }
@@ -65,7 +96,11 @@
       }
 
       try {
-        if (await openStandaloneIfNeeded(pending.url)) {
+        var openedStandalone = await openStandaloneIfNeeded(
+          pending.url,
+          viewerTabContext
+        )
+        if (openedStandalone) {
           return
         }
       } catch (error) {
@@ -77,7 +112,7 @@
         '',
         buildViewerUrl(pending.url)
       )
-      await window.PDFViewerApplication.open(pending.url)
+      await pdfViewerApplication.open({ url: pending.url })
       return
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "saladict",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "description": "Chrome extension and Firefox WebExtension; inline translator powered by multiple online dictionaries",
   "private": true,
   "scripts": {
@@ -14,7 +14,7 @@
     "type-check": "tsc --noEmit",
     "test": "jest --testTimeout 20000",
     "test:watch": "jest --watch",
-    "zip": "yarn neutrino-webextension-zip '!test' '!.git' '.env' 'assets/pdf' 'deps'",
+    "zip": "node scripts/zip.js '!test' '!.git' '.env' 'assets/pdf' 'deps'",
     "postinstall": "node scripts/setup-env.js",
     "commit": "git-cz",
     "release": "standard-version",
@@ -68,7 +68,6 @@
     "@types/react": "^16.8.23",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-dom": "^16.8.4",
-    "@types/react-helmet": "^5.0.15",
     "@types/react-redux": "^7.1.2",
     "@types/react-resize-detector": "^4.0.2",
     "@types/react-textarea-autosize": "^4.3.4",
@@ -93,7 +92,6 @@
     "react": "^16.10.0",
     "react-beautiful-dnd": "^13.0.0",
     "react-dom": "^16.10.0",
-    "react-helmet": "^6.0.0-beta.2",
     "react-hot-loader": "^4",
     "react-number-editor": "^4.0.3",
     "react-redux": "^7.1.0",
@@ -135,6 +133,7 @@
     "@types/storybook__react": "4.0.2",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",
+    "archiver": "^3.0.0",
     "autoprefixer": "^9.6.1",
     "axios-mock-adapter": "^1.17.0",
     "babel-plugin-import": "^1.12.1",
@@ -153,10 +152,12 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.18.3",
     "eslint-plugin-standard": "^4.0.1",
+    "extract-zip": "^2.0.1",
     "faker": "^4.1.0",
     "fast-glob": "^3.1.1",
     "form-data": "^2.5.1",
     "franc-min": "^4.1.1",
+    "globby": "^10.0.1",
     "husky": "^4.3.0",
     "jest": "^26.1.0",
     "jest-fetch-mock": "^2.1.2",