@pdfme/schemas 3.0.0-dev.1 → 3.0.1-dev.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/__tests__/barcode.test.js +6 -15
- package/dist/cjs/__tests__/barcode.test.js.map +1 -1
- package/dist/cjs/__tests__/renderUtils.test.js +0 -7
- package/dist/cjs/__tests__/renderUtils.test.js.map +1 -1
- package/dist/cjs/__tests__/text.test.js +49 -58
- package/dist/cjs/__tests__/text.test.js.map +1 -1
- package/dist/cjs/src/barcodes/helper.js +3 -12
- package/dist/cjs/src/barcodes/helper.js.map +1 -1
- package/dist/cjs/src/barcodes/pdfRender.js +8 -14
- package/dist/cjs/src/barcodes/pdfRender.js.map +1 -1
- package/dist/cjs/src/barcodes/propPanel.js +99 -15
- package/dist/cjs/src/barcodes/propPanel.js.map +1 -1
- package/dist/cjs/src/barcodes/uiRender.js +40 -23
- package/dist/cjs/src/barcodes/uiRender.js.map +1 -1
- package/dist/cjs/src/image/pdfRender.js +5 -13
- package/dist/cjs/src/image/pdfRender.js.map +1 -1
- package/dist/cjs/src/image/uiRender.js +17 -16
- package/dist/cjs/src/image/uiRender.js.map +1 -1
- package/dist/cjs/src/renderUtils.js +1 -3
- package/dist/cjs/src/renderUtils.js.map +1 -1
- package/dist/cjs/src/text/helper.js +8 -18
- package/dist/cjs/src/text/helper.js.map +1 -1
- package/dist/cjs/src/text/pdfRender.js +17 -27
- package/dist/cjs/src/text/pdfRender.js.map +1 -1
- package/dist/cjs/src/text/propPanel.js +2 -2
- package/dist/cjs/src/text/propPanel.js.map +1 -1
- package/dist/cjs/src/text/uiRender.js +16 -23
- package/dist/cjs/src/text/uiRender.js.map +1 -1
- package/dist/esm/__tests__/barcode.test.js +6 -15
- package/dist/esm/__tests__/barcode.test.js.map +1 -1
- package/dist/esm/__tests__/renderUtils.test.js +1 -8
- package/dist/esm/__tests__/renderUtils.test.js.map +1 -1
- package/dist/esm/__tests__/text.test.js +49 -58
- package/dist/esm/__tests__/text.test.js.map +1 -1
- package/dist/esm/src/barcodes/helper.js +3 -12
- package/dist/esm/src/barcodes/helper.js.map +1 -1
- package/dist/esm/src/barcodes/pdfRender.js +9 -15
- package/dist/esm/src/barcodes/pdfRender.js.map +1 -1
- package/dist/esm/src/barcodes/propPanel.js +99 -15
- package/dist/esm/src/barcodes/propPanel.js.map +1 -1
- package/dist/esm/src/barcodes/uiRender.js +40 -23
- package/dist/esm/src/barcodes/uiRender.js.map +1 -1
- package/dist/esm/src/image/pdfRender.js +5 -13
- package/dist/esm/src/image/pdfRender.js.map +1 -1
- package/dist/esm/src/image/uiRender.js +17 -16
- package/dist/esm/src/image/uiRender.js.map +1 -1
- package/dist/esm/src/renderUtils.js +0 -1
- package/dist/esm/src/renderUtils.js.map +1 -1
- package/dist/esm/src/text/helper.js +8 -18
- package/dist/esm/src/text/helper.js.map +1 -1
- package/dist/esm/src/text/pdfRender.js +17 -27
- package/dist/esm/src/text/pdfRender.js.map +1 -1
- package/dist/esm/src/text/propPanel.js +2 -2
- package/dist/esm/src/text/propPanel.js.map +1 -1
- package/dist/esm/src/text/uiRender.js +16 -23
- package/dist/esm/src/text/uiRender.js.map +1 -1
- package/dist/types/src/renderUtils.d.ts +0 -1
- package/package.json +2 -2
- package/src/barcodes/pdfRender.ts +6 -2
- package/src/image/pdfRender.ts +4 -2
- package/src/renderUtils.ts +0 -2
@@ -1,12 +1,3 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { getDefaultFont } from '@pdfme/common';
|
11
2
|
import { DEFAULT_FONT_SIZE, DEFAULT_ALIGNMENT, VERTICAL_ALIGN_TOP, VERTICAL_ALIGN_MIDDLE, VERTICAL_ALIGN_BOTTOM, DEFAULT_VERTICAL_ALIGNMENT, DEFAULT_LINE_HEIGHT, DEFAULT_CHARACTER_SPACING, DEFAULT_FONT_COLOR, } from './constants';
|
12
3
|
import { calculateDynamicFontSize, getFontKitFont, getBrowserVerticalFontAdjustments, } from './helper';
|
@@ -22,34 +13,32 @@ const mapVerticalAlignToFlex = (verticalAlignmentValue) => {
|
|
22
13
|
return 'flex-start';
|
23
14
|
};
|
24
15
|
const getBackgroundColor = (mode, value, schema) => {
|
25
|
-
var _a;
|
26
16
|
if ((mode === 'form' || mode === 'designer') && value && schema.backgroundColor) {
|
27
17
|
return schema.backgroundColor;
|
28
18
|
}
|
29
19
|
else if (mode === 'viewer') {
|
30
|
-
return
|
20
|
+
return schema.backgroundColor ?? 'transparent';
|
31
21
|
}
|
32
22
|
else {
|
33
23
|
return 'rgb(242 244 255 / 75%)';
|
34
24
|
}
|
35
25
|
};
|
36
|
-
export const uiRender = (arg) =>
|
37
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
26
|
+
export const uiRender = async (arg) => {
|
38
27
|
const { value, schema, rootElement, mode, onChange, stopEditing, tabIndex, placeholder, options, } = arg;
|
39
|
-
const font =
|
28
|
+
const font = options?.font || getDefaultFont();
|
40
29
|
let dynamicFontSize = undefined;
|
41
30
|
if (schema.dynamicFontSize && value) {
|
42
|
-
dynamicFontSize =
|
31
|
+
dynamicFontSize = await calculateDynamicFontSize({
|
43
32
|
textSchema: schema,
|
44
33
|
font,
|
45
34
|
value,
|
46
35
|
startingFontSize: dynamicFontSize,
|
47
36
|
});
|
48
37
|
}
|
49
|
-
const fontKitFont =
|
38
|
+
const fontKitFont = await getFontKitFont(schema, font);
|
50
39
|
// Depending on vertical alignment, we need to move the top or bottom of the font to keep
|
51
40
|
// it within it's defined box and align it with the generated pdf.
|
52
|
-
const { topAdj, bottomAdj } = getBrowserVerticalFontAdjustments(fontKitFont,
|
41
|
+
const { topAdj, bottomAdj } = getBrowserVerticalFontAdjustments(fontKitFont, dynamicFontSize ?? schema.fontSize ?? DEFAULT_FONT_SIZE, schema.lineHeight ?? DEFAULT_LINE_HEIGHT, schema.verticalAlignment ?? DEFAULT_VERTICAL_ALIGNMENT);
|
53
42
|
const topAdjustment = topAdj;
|
54
43
|
const bottomAdjustment = bottomAdj;
|
55
44
|
const container = document.createElement('div');
|
@@ -70,10 +59,10 @@ export const uiRender = (arg) => __awaiter(void 0, void 0, void 0, function* ()
|
|
70
59
|
const fontStyles = {
|
71
60
|
fontFamily: schema.fontName ? `'${schema.fontName}'` : 'inherit',
|
72
61
|
color: schema.fontColor ? schema.fontColor : DEFAULT_FONT_COLOR,
|
73
|
-
fontSize: `${
|
74
|
-
letterSpacing: `${
|
75
|
-
lineHeight: `${
|
76
|
-
textAlign:
|
62
|
+
fontSize: `${dynamicFontSize ?? schema.fontSize ?? DEFAULT_FONT_SIZE}pt`,
|
63
|
+
letterSpacing: `${schema.characterSpacing ?? DEFAULT_CHARACTER_SPACING}pt`,
|
64
|
+
lineHeight: `${schema.lineHeight ?? DEFAULT_LINE_HEIGHT}em`,
|
65
|
+
textAlign: schema.alignment ?? DEFAULT_ALIGNMENT,
|
77
66
|
whiteSpace: 'pre-wrap',
|
78
67
|
wordBreak: 'break-word',
|
79
68
|
};
|
@@ -104,7 +93,11 @@ export const uiRender = (arg) => __awaiter(void 0, void 0, void 0, function* ()
|
|
104
93
|
}
|
105
94
|
else {
|
106
95
|
const div = document.createElement('div');
|
107
|
-
const divStyle =
|
96
|
+
const divStyle = {
|
97
|
+
...fontStyles,
|
98
|
+
marginBottom: bottomAdjustment + 'px',
|
99
|
+
paddingTop: topAdjustment + 'px',
|
100
|
+
};
|
108
101
|
Object.assign(div.style, divStyle);
|
109
102
|
div.innerHTML = value
|
110
103
|
.split('')
|
@@ -112,5 +105,5 @@ export const uiRender = (arg) => __awaiter(void 0, void 0, void 0, function* ()
|
|
112
105
|
.join('');
|
113
106
|
container.appendChild(div);
|
114
107
|
}
|
115
|
-
}
|
108
|
+
};
|
116
109
|
//# sourceMappingURL=uiRender.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"uiRender.js","sourceRoot":"","sources":["../../../../src/text/uiRender.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"uiRender.js","sourceRoot":"","sources":["../../../../src/text/uiRender.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@pdfme/schemas",
|
3
|
-
"version": "3.0.
|
3
|
+
"version": "3.0.1-dev.10",
|
4
4
|
"sideEffects": false,
|
5
5
|
"author": "hand-dot",
|
6
6
|
"license": "MIT",
|
@@ -35,7 +35,7 @@
|
|
35
35
|
},
|
36
36
|
"scripts": {
|
37
37
|
"develop": "tsc -p tsconfig.esm.json -w",
|
38
|
-
"build": "npm
|
38
|
+
"build": "npm-run-all --parallel build:cjs build:esm",
|
39
39
|
"build:cjs": "tsc -p tsconfig.cjs.json",
|
40
40
|
"build:esm": "tsc -p tsconfig.esm.json",
|
41
41
|
"clean": "rimraf dist",
|
@@ -1,13 +1,17 @@
|
|
1
1
|
import { PDFRenderProps } from '@pdfme/common';
|
2
|
-
import {
|
2
|
+
import { convertForPdfLayoutProps } from '../renderUtils';
|
3
3
|
import type { BarcodeSchema } from './types';
|
4
4
|
import { createBarCode, validateBarcodeInput } from './helper';
|
5
5
|
|
6
|
+
const getBarcodeCacheKey = (schema: BarcodeSchema, value: string) => {
|
7
|
+
return `${schema.type}${schema.backgroundColor}${schema.barColor}${schema.textColor}${value}`;
|
8
|
+
};
|
9
|
+
|
6
10
|
export const pdfRender = async (arg: PDFRenderProps<BarcodeSchema>) => {
|
7
11
|
const { value, schema, pdfDoc, page, _cache } = arg;
|
8
12
|
if (!validateBarcodeInput(schema.type, value)) return;
|
9
13
|
|
10
|
-
const inputBarcodeCacheKey =
|
14
|
+
const inputBarcodeCacheKey = getBarcodeCacheKey(schema, value);
|
11
15
|
let image = _cache.get(inputBarcodeCacheKey);
|
12
16
|
if (!image) {
|
13
17
|
const imageBuf = await createBarCode(
|
package/src/image/pdfRender.ts
CHANGED
@@ -1,6 +1,8 @@
|
|
1
|
-
import type { PDFRenderProps } from '@pdfme/common';
|
1
|
+
import type { PDFRenderProps, Schema } from '@pdfme/common';
|
2
2
|
import type { ImageSchema } from './types';
|
3
|
-
import {
|
3
|
+
import { convertForPdfLayoutProps } from '../renderUtils';
|
4
|
+
|
5
|
+
const getCacheKey = (schema: Schema, input: string) => `${schema.type}${input}`;
|
4
6
|
|
5
7
|
export const pdfRender = async (arg: PDFRenderProps<ImageSchema>) => {
|
6
8
|
const { value, schema, pdfDoc, page, _cache } = arg;
|