@anaralabs/lector 3.15.0 → 3.15.1

package/dist/index.js

@@ -401,9 +401,19 @@ function normalizeUnicode(text, matchDiacritics = true) {
 }
 var segmenter;
 function* unicodeReplacements(text, matchDiacritics) {
-  segmenter ??= new Intl.Segmenter(void 0, { granularity: "grapheme" });
   for (const match of text.matchAll(/\p{ASCII}?\P{ASCII}+/gu)) {
     if (normalizeUnicode(match[0], matchDiacritics) === match[0]) continue;
+    const prefix = match[0].charCodeAt(0) < 128 ? 1 : 0;
+    const code = match[0].charCodeAt(prefix);
+    if (match[0].length === prefix + 1 && code >= 64256 && code <= 64262) {
+      yield {
+        index: match.index + prefix,
+        length: 1,
+        text: ligatures[code - 64256]
+      };
+      continue;
+    }
+    segmenter ??= new Intl.Segmenter(void 0, { granularity: "grapheme" });
     for (const { segment, index } of segmenter.segment(match[0])) {
       yield {
         index: match.index + index,
@@ -7799,6 +7809,10 @@ var useViewportContainer = ({
       if (!st.active) {
         return;
       }
+      if (Math.abs(event.deltaX) > abs) {
+        st.active = false;
+        return;
+      }
       if (now - st.lastTime > WHEEL_INERTIA_GAP_MS) {
         st.active = false;
         return;
@@ -7858,12 +7872,11 @@ var useViewportContainer = ({
             contentPosition,
             containerPosition,
             originZoom: currentZoom,
+            origin: [...origin],
             lastZoom: currentZoom
           };
         });
-        if (first) {
-          return newMemo;
-        }
+        if (first && ms === 1) return newMemo;
         const gestureValuesValid = Number.isFinite(ms) && ms > 0;
         let effectiveScale = ms;
         if (!gestureValuesValid) {
@@ -7882,9 +7895,18 @@ var useViewportContainer = ({
           minZoom,
           maxZoom
         );
+        if (event.type === "wheel") {
+          const previousScale = newMemo.lastZoom / newMemo.originZoom;
+          for (const axis of [0, 1]) {
+            const movement2 = origin[axis] - newMemo.origin[axis];
+            newMemo.contentPosition[axis] += movement2 / previousScale;
+            newMemo.containerPosition[axis] += movement2;
+            newMemo.origin[axis] = origin[axis];
+          }
+        }
         const realMs = newZoom / newMemo.originZoom;
-        const newTranslateX = newMemo.contentPosition[0] * realMs - newMemo.containerPosition[0];
-        const newTranslateY = newMemo.contentPosition[1] * realMs - newMemo.containerPosition[1];
+        const newTranslateX = newMemo.contentPosition[0] * realMs - newMemo.containerPosition[0] - (origin[0] - newMemo.origin[0]);
+        const newTranslateY = newMemo.contentPosition[1] * realMs - newMemo.containerPosition[1] - (origin[1] - newMemo.origin[1]);
         transformations.current = {
           zoom: newZoom,
           translateX: newTranslateX,
@@ -8066,7 +8088,14 @@ var Pages = ({
     };
   }, [isPinching, virtualizer?.measure, virtualizer?.getVirtualItems]);
   const virtualizerItems = virtualizer?.getVirtualItems() ?? [];
-  const items = tempItems.length ? tempItems : virtualizerItems;
+  const items = useMemo(() => {
+    if (!tempItems.length) return virtualizerItems;
+    const combined = new Map(
+      virtualizerItems.map((item) => [item.index, item])
+    );
+    for (const item of tempItems) combined.set(item.index, item);
+    return [...combined.values()].sort((a, b) => a.index - b.index);
+  }, [tempItems, virtualizerItems]);
   useVisiblePage({
     items,
     // Pass through nullish (pre-measure) rather than coercing to 0, so the
@@ -9284,6 +9313,10 @@ function* runSearch(pages, searchText, options = {}, cooperative = false, budget
   let steps = 0;
   let deadline = cooperative ? performance.now() + budget : 0;
   for (const page of pages) {
+    if (cooperative && performance.now() >= deadline) {
+      yield;
+      deadline = performance.now() + budget;
+    }
     const normalized = normalize(page, options);
     const lower = normalized.text;
     const exactStarts = [];
@@ -9308,6 +9341,9 @@ function* runSearch(pages, searchText, options = {}, cooperative = false, budget
       lastStart = span.start;
       lastEnd = span.end;
       exactCount++;
+      if (maxDistance === 0 && exactCount > limit) {
+        return { exactMatches, fuzzyMatches, hasMoreResults: true };
+      }
       if (exactMatches.length < limit) {
         exactMatches.push(
           createMatch(
@@ -9382,7 +9418,19 @@ async function searchDocumentAsync(pages, searchText, options = {}) {
       throw new DOMException("Search aborted", "AbortError");
     const result = iterator.next();
     if (result.done) return result.value;
-    await new Promise((resolve) => setTimeout(resolve, 0));
+    await new Promise((resolve) => {
+      if (typeof MessageChannel === "undefined") {
+        setTimeout(resolve, 0);
+        return;
+      }
+      const channel = new MessageChannel();
+      channel.port1.onmessage = () => {
+        channel.port1.close();
+        channel.port2.close();
+        resolve();
+      };
+      channel.port2.postMessage(null);
+    });
   }
 }
 
@@ -9480,10 +9528,16 @@ async function calculateHighlightRects(pageProxy, textMatch) {
         const start = Math.max(0, textMatch.matchIndex - offset3);
         const end = Math.min(length, matchEnd - offset3);
         if (end > start && item.str.slice(start, end).trim()) {
+          let style = styles[item.fontName];
+          if (style?.fontFamily && !style.vertical && (start > 0 || end < length)) {
+            const { TextLayer: TextLayer2 } = await loadPdfJs();
+            const fontFamily = TextLayer2.fontFamilyMap.get(style.fontFamily);
+            if (fontFamily) style = { ...style, fontFamily };
+          }
           matchRects.push(
             getItemRect(
               item,
-              styles[item.fontName],
+              style,
               viewport,
               start,
               end,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anaralabs/lector",
-	"version": "3.15.0",
+	"version": "3.15.1",
 	"description": "A headless PDF viewer for React",
 	"author": "andrewdr (https://github.com/andrewdoro)",
 	"license": "MIT",