hsu-utils 0.0.43 → 0.0.44

package/dist/hsu-utils.min.js.LICENSE.txt

@@ -1,6 +1,6 @@
 /*!
  * 
- * hsu-utils v0.0.42
+ * hsu-utils v0.0.43
  *
  * some front-end utils
  *

package/es/GetStrSize/index.d.ts

@@ -5,7 +5,7 @@ interface Font {
     size?: number;
     family?: string;
 }
-export default function get_string_size(str: string, font?: Font, letterSpacing?: number): {
+export default function get_string_size(str: string, font?: Font): {
     width: number;
     height: number;
 };

package/es/GetStrSize/index.js

@@ -1,12 +1,10 @@
-export default function get_string_size(str, font = {}, letterSpacing = 0) {
+export default function get_string_size(str, font = {}) {
     const { style = 'normal', variant = 'normal', weight = 'normal', size = 10, family: fontFamily = 'sans-serif' } = font;
     const canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     ctx.font = `${style} ${variant} ${weight} ${size}px ${fontFamily}`;
     const metrics = ctx.measureText(str);
-    let width = +(+metrics.width.toFixed(2) + 0.01).toFixed(2);
+    let width = +(+metrics.width.toFixed(2)).toFixed(2);
     const height = +(+metrics.actualBoundingBoxAscent.toFixed(2) + +metrics.actualBoundingBoxDescent.toFixed(2)).toFixed(2);
-    const _letterSpacing = (str.length > 0 ? str.length - 1 : 0) * letterSpacing;
-    width += _letterSpacing;
     return { width: +width.toFixed(2), height: +height.toFixed(2) };
 }

package/es/RenderPDF/index.d.ts

@@ -6,11 +6,12 @@ interface RenderOption {
     endPageNum?: number;
     pixelRatio?: number;
     scale?: number;
+    workerSrc?: string;
 }
-declare function load(pdfUrl: string): Promise<PDFDocumentProxy>;
-declare function getNumPages(pdfUrl: string): Promise<number>;
+declare function load(pdfUrl: string, workerSrc?: string): Promise<PDFDocumentProxy>;
+declare function getNumPages(pdfUrl: string, workerSrc?: string): Promise<number>;
 declare function clear(containerId: string): void;
-declare function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale }: RenderOption): Promise<void>;
+declare function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale, workerSrc }: RenderOption): Promise<void>;
 declare const RenderPDF: {
     load: typeof load;
     getNumPages: typeof getNumPages;

package/es/RenderPDF/index.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { GlobalWorkerOptions, getDocument } from 'pdfjs-dist/legacy/build/pdf.js';
-GlobalWorkerOptions.workerSrc = 'https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/pdf.js/2.13.216/pdf.worker.js';
+GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.13.216/pdf.worker.min.js';
 const PDFMap = new Map();
-function load(pdfUrl) {
+function load(pdfUrl, workerSrc) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (workerSrc) {
+            GlobalWorkerOptions.workerSrc = workerSrc;
+        }
         let pdf = PDFMap.get(pdfUrl);
         if (!pdf) {
             const loadingTask = getDocument({
@@ -25,9 +28,9 @@ function load(pdfUrl) {
         return yield pdf;
     });
 }
-function getNumPages(pdfUrl) {
+function getNumPages(pdfUrl, workerSrc) {
     return __awaiter(this, void 0, void 0, function* () {
-        const pdf = yield load(pdfUrl);
+        const pdf = yield load(pdfUrl, workerSrc);
         return pdf.numPages;
     });
 }
@@ -38,13 +41,13 @@ function clear(containerId) {
         container === null || container === void 0 ? void 0 : container.removeChild(item);
     });
 }
-function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale }) {
+function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale, workerSrc }) {
     return __awaiter(this, void 0, void 0, function* () {
         clear(containerId);
         const container = document.getElementById(containerId);
         if (!container)
             return;
-        const pdf = yield load(pdfUrl);
+        const pdf = yield load(pdfUrl, workerSrc);
         const start = startPageNum !== null && startPageNum !== void 0 ? startPageNum : 1;
         const end = endPageNum !== null && endPageNum !== void 0 ? endPageNum : pdf.numPages;
         for (let i = start; i <= end; i++) {

package/lib/GetStrSize/index.d.ts

@@ -5,7 +5,7 @@ interface Font {
     size?: number;
     family?: string;
 }
-export default function get_string_size(str: string, font?: Font, letterSpacing?: number): {
+export default function get_string_size(str: string, font?: Font): {
     width: number;
     height: number;
 };

package/lib/GetStrSize/index.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function get_string_size(str, font, letterSpacing) {
+function get_string_size(str, font) {
     if (font === void 0) { font = {}; }
-    if (letterSpacing === void 0) { letterSpacing = 0; }
     var _a = font.style, style = _a === void 0 ? 'normal' : _a, _b = font.variant, variant = _b === void 0 ? 'normal' : _b, _c = font.weight, weight = _c === void 0 ? 'normal' : _c, _d = font.size, size = _d === void 0 ? 10 : _d, _e = font.family, fontFamily = _e === void 0 ? 'sans-serif' : _e;
     var canvas = document.createElement('canvas');
     var ctx = canvas.getContext('2d');
     ctx.font = "".concat(style, " ").concat(variant, " ").concat(weight, " ").concat(size, "px ").concat(fontFamily);
     var metrics = ctx.measureText(str);
-    var width = +(+metrics.width.toFixed(2) + 0.01).toFixed(2);
+    var width = +(+metrics.width.toFixed(2)).toFixed(2);
     var height = +(+metrics.actualBoundingBoxAscent.toFixed(2) + +metrics.actualBoundingBoxDescent.toFixed(2)).toFixed(2);
-    var _letterSpacing = (str.length > 0 ? str.length - 1 : 0) * letterSpacing;
-    width += _letterSpacing;
     return { width: +width.toFixed(2), height: +height.toFixed(2) };
 }
 exports.default = get_string_size;

package/lib/RenderPDF/index.d.ts

@@ -6,11 +6,12 @@ interface RenderOption {
     endPageNum?: number;
     pixelRatio?: number;
     scale?: number;
+    workerSrc?: string;
 }
-declare function load(pdfUrl: string): Promise<PDFDocumentProxy>;
-declare function getNumPages(pdfUrl: string): Promise<number>;
+declare function load(pdfUrl: string, workerSrc?: string): Promise<PDFDocumentProxy>;
+declare function getNumPages(pdfUrl: string, workerSrc?: string): Promise<number>;
 declare function clear(containerId: string): void;
-declare function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale }: RenderOption): Promise<void>;
+declare function render({ pdfUrl, containerId, startPageNum, endPageNum, pixelRatio, scale, workerSrc }: RenderOption): Promise<void>;
 declare const RenderPDF: {
     load: typeof load;
     getNumPages: typeof getNumPages;

package/lib/RenderPDF/index.js

@@ -37,14 +37,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var pdf_js_1 = require("pdfjs-dist/legacy/build/pdf.js");
-pdf_js_1.GlobalWorkerOptions.workerSrc = 'https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/pdf.js/2.13.216/pdf.worker.js';
+pdf_js_1.GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.13.216/pdf.worker.min.js';
 var PDFMap = new Map();
-function load(pdfUrl) {
+function load(pdfUrl, workerSrc) {
     return __awaiter(this, void 0, void 0, function () {
         var pdf, loadingTask;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    if (workerSrc) {
+                        pdf_js_1.GlobalWorkerOptions.workerSrc = workerSrc;
+                    }
                     pdf = PDFMap.get(pdfUrl);
                     if (!pdf) {
                         loadingTask = (0, pdf_js_1.getDocument)({
@@ -61,12 +64,12 @@ function load(pdfUrl) {
         });
     });
 }
-function getNumPages(pdfUrl) {
+function getNumPages(pdfUrl, workerSrc) {
     return __awaiter(this, void 0, void 0, function () {
         var pdf;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4, load(pdfUrl)];
+                case 0: return [4, load(pdfUrl, workerSrc)];
                 case 1:
                     pdf = _a.sent();
                     return [2, pdf.numPages];
@@ -82,7 +85,7 @@ function clear(containerId) {
     });
 }
 function render(_a) {
-    var pdfUrl = _a.pdfUrl, containerId = _a.containerId, startPageNum = _a.startPageNum, endPageNum = _a.endPageNum, pixelRatio = _a.pixelRatio, scale = _a.scale;
+    var pdfUrl = _a.pdfUrl, containerId = _a.containerId, startPageNum = _a.startPageNum, endPageNum = _a.endPageNum, pixelRatio = _a.pixelRatio, scale = _a.scale, workerSrc = _a.workerSrc;
     return __awaiter(this, void 0, void 0, function () {
         var container, pdf, start, end, i;
         return __generator(this, function (_b) {
@@ -92,7 +95,7 @@ function render(_a) {
                     container = document.getElementById(containerId);
                     if (!container)
                         return [2];
-                    return [4, load(pdfUrl)];
+                    return [4, load(pdfUrl, workerSrc)];
                 case 1:
                     pdf = _b.sent();
                     start = startPageNum !== null && startPageNum !== void 0 ? startPageNum : 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsu-utils",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "some front-end utils",
   "repository": "git@github.com:VitaTsui/hsu-utils.git",
   "author": "VitaHsu <vitahsu7@gmail.com>",