Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ats-form-react-pdf-layout",
"version": "4.4.2",
"version": "4.4.3",
"license": "MIT",
"description": "Resolve document component's layout",
"author": "Diego Muracciole <diegomuracciole@gmail.com>",
Expand All @@ -23,7 +23,7 @@
"@react-pdf/fns": "3.1.2",
"@react-pdf/image": "^3.0.3",
"@react-pdf/primitives": "^4.1.1",
"@react-pdf/stylesheet": "^6.1.1",
"ats-form-react-pdf-stylesheet": "^6.1.2",
"@react-pdf/textkit": "^6.0.0",
"@react-pdf/types": "^2.9.1",
"emoji-regex-xs": "^1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/renderer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ats-form-react-pdf-renderer",
"version": "4.3.2",
"version": "4.3.3",
"license": "MIT",
"description": "Create PDF files on the browser and server",
"author": "Diego Muracciole <diegomuracciole@gmail.com>",
Expand All @@ -26,7 +26,7 @@
"@babel/runtime": "^7.20.13",
"@react-pdf/fns": "3.1.2",
"@react-pdf/font": "^4.0.3",
"ats-form-react-pdf-layout": "^4.4.2",
"ats-form-react-pdf-layout": "^4.4.3",
"@react-pdf/pdfkit": "^4.0.4",
"@react-pdf/primitives": "^4.1.1",
"@react-pdf/reconciler": "^1.1.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/stylesheet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-pdf/stylesheet",
"version": "6.1.1",
"name": "ats-form-react-pdf-stylesheet",
"version": "6.1.2",
"license": "MIT",
"description": "A styles engine for Node and the browser",
"author": "Diego Muracciole <diegomuracciole@gmail.com>",
Expand Down
7 changes: 5 additions & 2 deletions packages/stylesheet/src/resolve/borders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ const resolveBorderShorthand = <K extends BorderKey>(

if (match) {
const widthMatch = match[1] || value;
const styleMatch = match[4] || value;
const styleMatch = match[4] || value || 'solid';
const colorMatch = match[5] || value;

const style = styleMatch as BorderStyleValue;
const color = colorMatch ? transformColor(colorMatch as string) : undefined;
const width = widthMatch ? transformUnit(container, widthMatch) : undefined;
const width =
typeof widthMatch !== 'undefined'
? transformUnit(container, widthMatch)
: undefined;

if (key.match(/(Top|Right|Bottom|Left)$/)) {
return {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"dependencies": {
"@react-pdf/font": "^4.0.3",
"@react-pdf/primitives": "^4.1.1",
"@react-pdf/stylesheet": "^6.1.1"
"ats-form-react-pdf-stylesheet": "^6.1.2"
}
}
12 changes: 12 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2220,6 +2220,18 @@
prop-types "^15.6.2"
queue "^6.0.1"

"@react-pdf/stylesheet@^6.1.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@react-pdf/stylesheet/-/stylesheet-6.1.1.tgz#ade1174e43ce8fc5fe3f8f6598a9426d853050ac"
integrity sha512-Iyw0A3wRIeQLN4EkaKf8yF9MvdMxiZ8JjoyzLzDHSxnKYoOA4UGu84veCb8dT9N8MxY5x7a0BUv/avTe586Plg==
dependencies:
"@react-pdf/fns" "3.1.2"
"@react-pdf/types" "^2.9.1"
color-string "^1.9.1"
hsl-to-hex "^1.0.0"
media-engine "^1.0.3"
postcss-value-parser "^4.1.0"

"@rollup/plugin-alias@^5.1.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
Expand Down