ats-form-react-pdf-renderer 4.3.8 → 4.3.10

package/lib/react-pdf.browser.js

@@ -4054,7 +4054,7 @@ const fromFragments = fragments => {
     runs
   };
 };
-
+const SOFT_HYPHEN$1 = '\u00ad';
 /**
  * Default word hyphenation engine used when no one provided.
  * Does not perform word hyphenation at all
@@ -4062,7 +4062,16 @@ const fromFragments = fragments => {
  * @param word
  * @returns Same word
  */
-const defaultHyphenationEngine = word => [word];
+const defaultHyphenate = word => [word];
+/**
+ * Remove soft hyphens from word
+ *
+ * @param word
+ * @returns Word without soft hyphens
+ */
+const removeSoftHyphens = word => {
+  return word.replaceAll(SOFT_HYPHEN$1, '');
+};
 /**
  * Wrap words of attribute string
  *
@@ -4084,21 +4093,30 @@ const wrapWords = function (engines, options) {
     var _engines$wordHyphenat, _engines;
     const syllables = [];
     const fragments = [];
-    const hyphenateWord = options.hyphenationCallback || ((_engines$wordHyphenat = (_engines = engines).wordHyphenation) === null || _engines$wordHyphenat === void 0 ? void 0 : _engines$wordHyphenat.call(_engines)) || defaultHyphenationEngine;
+    const builtinHyphenate = ((_engines$wordHyphenat = (_engines = engines).wordHyphenation) === null || _engines$wordHyphenat === void 0 ? void 0 : _engines$wordHyphenat.call(_engines)) || defaultHyphenate;
+    const hyphenate = options.hyphenationCallback || builtinHyphenate;
+    let offset = 0;
     for (let i = 0; i < attributedString.runs.length; i += 1) {
       let string = '';
       const run = attributedString.runs[i];
       const words = attributedString.string.slice(run.start, run.end).split(/([ ]+)/g).filter(Boolean);
       for (let j = 0; j < words.length; j += 1) {
         const word = words[j];
-        const parts = hyphenateWord(word);
+        const parts = hyphenate(word, builtinHyphenate).map(removeSoftHyphens);
         syllables.push(...parts);
         string += parts.join('');
       }
+      // Modify run start and end based on removed soft hyphens.
+      const runOffset = run.end - run.start - string.length;
+      const start = run.start - offset;
+      const end = run.end - offset - runOffset;
       fragments.push({
         ...run,
+        start,
+        end,
         string
       });
+      offset += runOffset;
     }
     const result = {
       ...fromFragments(fragments),
@@ -5776,7 +5794,7 @@ const layoutEngine = engines => {
     if (options === void 0) {
       options = {};
     }
-    const processParagraph = compose(resolveYOffset(), resolveAttachments(), verticalAlignment(), wrapWords(engines, options), generateGlyphs(), mirrorString(), preprocessRuns(engines));
+    const processParagraph = compose(resolveYOffset(), resolveAttachments(), verticalAlignment(), generateGlyphs(), wrapWords(engines, options), mirrorString(), preprocessRuns(engines));
     const processParagraphs = paragraphs => paragraphs.map(processParagraph);
     return compose(finalizeFragments(engines, options), bidiReordering(), typesetter(engines, options, container), processParagraphs, splitParagraphs(), applyDefaultStyles())(attributedString);
   };
@@ -5834,6 +5852,15 @@ const bidiEngine = () => {
   };
 };
 const INFINITY = 10000;
+const skipPastGlueAndPenalty = (nodes, start) => {
+  let j = start + 1;
+  for (; j < nodes.length; j++) {
+    if (nodes[j].type !== 'glue' && nodes[j].type !== 'penalty') {
+      break;
+    }
+  }
+  return nodes[j - 1];
+};
 const getNextBreakpoint = (subnodes, widths, lineNumber) => {
   let position = null;
   let minimumBadness = Infinity;
@@ -5856,6 +5883,7 @@ const getNextBreakpoint = (subnodes, widths, lineNumber) => {
     }
     return 0;
   };
+  let hyphenWidth = 0;
   for (let i = 0; i < subnodes.length; i += 1) {
     const node = subnodes[i];
     if (node.type === 'box') {
@@ -5866,7 +5894,9 @@ const getNextBreakpoint = (subnodes, widths, lineNumber) => {
       sum.stretch += node.stretch;
       sum.shrink += node.shrink;
     }
-    if (sum.width - sum.shrink > lineLength) {
+    const potentialEndOfLine = skipPastGlueAndPenalty(subnodes, i);
+    hyphenWidth = potentialEndOfLine.type === 'penalty' ? potentialEndOfLine.width : 0;
+    if (sum.width - sum.shrink + hyphenWidth > lineLength) {
       if (position === null) {
         let j = i === 0 ? i + 1 : i;
         while (j < subnodes.length && (subnodes[j].type === 'glue' || subnodes[j].type === 'penalty')) {
@@ -5886,7 +5916,7 @@ const getNextBreakpoint = (subnodes, widths, lineNumber) => {
       }
     }
   }
-  return sum.width - sum.shrink > lineLength ? position : null;
+  return sum.width - sum.shrink + hyphenWidth > lineLength ? position : null;
 };
 const applyBestFit = (nodes, widths) => {
   let count = 0;
@@ -6483,7 +6513,6 @@ const breakLines = (attributedString, nodes, breaks) => {
     start = end;
     return [...acc, line];
   }, []);
-  // Last line
   lines.push(slice(start, attributedString.string.length, attributedString));
   return lines;
 };
@@ -6915,10 +6944,11 @@ const wordHyphenation = () => {
 const IGNORED_CODE_POINTS = [173];
 const getFontSize = run => run.attributes.fontSize || 12;
 const pickFontFromFontStack = (codePoint, fontStack, lastFont) => {
+  if (IGNORED_CODE_POINTS.includes(codePoint)) return lastFont;
   const fontStackWithFallback = [...fontStack, lastFont];
   for (let i = 0; i < fontStackWithFallback.length; i += 1) {
     const font = fontStackWithFallback[i];
-    if (!IGNORED_CODE_POINTS.includes(codePoint) && font && font.hasGlyphForCodePoint && font.hasGlyphForCodePoint(codePoint)) {
+    if (font && font.hasGlyphForCodePoint && font.hasGlyphForCodePoint(codePoint)) {
       return font;
     }
   }
@@ -23506,11 +23536,7 @@ class PNG {
     this.format = 'png';
   }
   static isValid(data) {
-    try {
-      return !!new PNG(data);
-    } catch {
-      return false;
-    }
+    return data && Buffer$1.isBuffer(data) && data[0] === 137 && data[1] === 80 && data[2] === 78 && data[3] === 71 && data[4] === 13 && data[5] === 10 && data[6] === 26 && data[7] === 10;
   }
 }
 class JPEG {
@@ -23550,22 +23576,21 @@ const createCache = function (_temp) {
   let {
     limit = 100
   } = _temp === void 0 ? {} : _temp;
-  let cache = {};
-  let keys = [];
+  let cache = new Map();
   return {
-    get: key => key ? cache[key] : null,
+    get: key => key ? cache.get(key) ?? undefined : null,
     set: (key, value) => {
-      keys.push(key);
-      if (keys.length > limit) {
-        delete cache[keys.shift()];
+      cache.delete(key);
+      if (cache.size >= limit) {
+        const firstKey = cache.keys().next().value;
+        cache.delete(firstKey);
       }
-      cache[key] = value;
+      cache.set(key, value);
     },
     reset: () => {
-      cache = {};
-      keys = [];
+      cache = new Map();
     },
-    length: () => keys.length
+    length: () => cache.size
   };
 };
 const IMAGE_CACHE = createCache({
@@ -23578,7 +23603,7 @@ const isBlob = src => {
 const isDataImageSrc = src => {
   return 'data' in src;
 };
-const isBase64Src = imageSrc => 'uri' in imageSrc && /^data:image\/[a-zA-Z]*;base64,[^"]*/g.test(imageSrc.uri);
+const isDataUri = imageSrc => 'uri' in imageSrc && imageSrc.uri.startsWith('data:');
 const fetchRemoteFile = async src => {
   const {
     method = 'GET',
@@ -23599,7 +23624,7 @@ const isValidFormat = format => {
   const lower = format.toLowerCase();
   return lower === 'jpg' || lower === 'jpeg' || lower === 'png';
 };
-const guessFormat = buffer => {
+const getImageFormat = buffer => {
   let format;
   if (JPEG.isValid(buffer)) {
     format = 'jpg';
@@ -23637,7 +23662,7 @@ const resolveImageFromData = async src => {
   throw new Error(`Invalid data given for local file: ${JSON.stringify(src)}`);
 };
 const resolveBufferImage = async buffer => {
-  const format = guessFormat(buffer);
+  const format = getImageFormat(buffer);
   if (format) {
     return getImage(buffer, format);
   }
@@ -23662,27 +23687,18 @@ const resolveBlobImage = async blob => {
   const buffer = await blob.arrayBuffer();
   return getImage(Buffer$1.from(buffer), format);
 };
-const getImageFormat = body => {
-  const isPng = body[0] === 137 && body[1] === 80 && body[2] === 78 && body[3] === 71 && body[4] === 13 && body[5] === 10 && body[6] === 26 && body[7] === 10;
-  const isJpg = body[0] === 255 && body[1] === 216 && body[2] === 255;
-  let extension = '';
-  if (isPng) {
-    extension = 'png';
-  } else if (isJpg) {
-    extension = 'jpg';
-  } else {
-    throw new Error('Not valid image extension');
-  }
-  return extension;
-};
 const resolveImageFromUrl = async src => {
   const data = await fetchRemoteFile(src);
   const format = getImageFormat(data);
+  if (!format) {
+    throw new Error('Not valid image extension');
+  }
   return getImage(data, format);
 };
 const getCacheKey = src => {
+  var _src$data;
   if (isBlob(src) || isBuffer(src)) return null;
-  if (isDataImageSrc(src)) return src.data.toString();
+  if (isDataImageSrc(src)) return ((_src$data = src.data) === null || _src$data === void 0 ? void 0 : _src$data.toString('base64')) ?? null;
   return src.uri;
 };
 const resolveImage = function (src, _temp2) {
@@ -23697,16 +23713,13 @@ const resolveImage = function (src, _temp2) {
     image = resolveBufferImage(src);
   } else if (cache && IMAGE_CACHE.get(cacheKey)) {
     return IMAGE_CACHE.get(cacheKey);
-  } else if (isBase64Src(src)) {
+  } else if (isDataUri(src)) {
     image = resolveBase64Image(src);
   } else if (isDataImageSrc(src)) {
     image = resolveImageFromData(src);
   } else {
     image = resolveImageFromUrl(src);
   }
-  if (!image) {
-    throw new Error('Cannot resolve image');
-  }
   if (cache && cacheKey) {
     IMAGE_CACHE.set(cacheKey, image);
   }
@@ -24954,6 +24967,10 @@ const splitNode = (node, height) => {
       borderTopWidth: 0,
       borderTopLeftRadius: 0,
       borderTopRightRadius: 0
+    },
+    props: {
+      ...node.props,
+      bookmark: null
     }
   });
   if (nextHeight) {
@@ -26893,7 +26910,7 @@ const createRenderer = _ref2 => {
   });
 };
 
-var version$1 = "4.3.8";
+var version$1 = "4.3.10";
 var packageJson = {
 	version: version$1};