Skip to content

armgit / pdfcn

Public Imported from GitHub
0

Beautiful pdf components, built on Takumi and Forme. 100% Free, Zero config, one command setup.

Upgrade takumi-pdf to 0.11 and build PdfPageNumber on its primitives

Kane Wang51aaef30e0a9
diff --git a/package.json b/package.json
index 489c2ea..9b1214e 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"@formepdf/core": "^0.10.5",
"@formepdf/react": "^0.10.5",
"@tailwindcss/postcss": "^4.2.4",
- "@takumi-rs/helpers": "^2.9.0",
+ "@takumi-rs/helpers": "^2.10.0",
"@vercel/analytics": "^2.0.1",
"@web-kits/audio": "^0.1.0",
"class-variance-authority": "^0.7.1",
@@ -45,7 +45,7 @@
"sonner": "^2.0.7",
"sucrase": "^3.35.1",
"tailwind-merge": "^3.5.0",
- "takumi-pdf": "^0.10.0",
+ "takumi-pdf": "^0.11.0",
"ts-morph": "^26.0.0",
"vaul": "^1.1.2",
"web-haptics": "^0.0.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0041df4..3df0307 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
specifier: ^4.2.4
version: 4.2.4
'@takumi-rs/helpers':
- specifier: ^2.9.0
- version: 2.9.0([email protected])
+ specifier: ^2.10.0
+ version: 2.10.0([email protected])
'@vercel/analytics':
specifier: ^2.0.1
@@ -102,8 +102,8 @@ importers:
specifier: ^3.5.0
version: 3.5.0
takumi-pdf:
- specifier: ^0.10.0
- version: 0.10.0([email protected])
+ specifier: ^0.11.0
+ version: 0.11.0([email protected])
ts-morph:
specifier: ^26.0.0
version: 26.0.0
@@ -2161,20 +2161,8 @@ packages:
'@tailwindcss/[email protected]':
resolution: {integrity: sha512-wgAVj6nUWAolAu8YFvzT2cTBIElWHkjZwFYovF+xsqKsW2ADxM/X2opxj5NsF/qVccAOjRNe8X2IdPzMsWyHTg==}
- '@takumi-rs/[email protected]':
- resolution: {integrity: sha512-hlt0W0nILorfAnLA3HtsaFHR2L7IFHpZBeVc3TE6W991f1E/TozvCMj6gLxcmR4pBTYAaFypvlaRDvBYRiMpaQ==}
- engines: {node: '>=18'}
- peerDependencies:
- preact: ^10.0.0
- react: ^18.0.0 || ^19.0.0
- peerDependenciesMeta:
- preact:
- optional: true
- react:
- optional: true
-
- '@takumi-rs/[email protected]':
- resolution: {integrity: sha512-U/im0o1s0dyzWcy+ukP6JVOaQsoHkRcKE6WWVPLIVvbip3p2URUGVCdnKqkJdyEgWdRVVVGti7JUFErgWHkV0w==}
+ '@takumi-rs/[email protected]':
+ resolution: {integrity: sha512-cPQNj/16DASgMaIA07ZrjNQ14Z+7lWiVPZQVz5S1kLAhVlCf9qg2D2vge/+yglHrdaL556U22wDWNUyFId5a+A==}
engines: {node: '>=18'}
peerDependencies:
preact: ^10.0.0
@@ -4299,8 +4287,8 @@ packages:
resolution: {integrity: sha512-HhKppgO81FQof5m6TEnuBWCZGgfRAWbaeOaGT00KOy/Pf/j6oUihdvBpA7ltCeAvZpFhW3j0PTclkxsd4IXYDA==}
- resolution: {integrity: sha512-23IWa+YQqY+IaIFJdqfB+uG9J8GLeQeNMxf2X0Pjk2JpMlEDCGTDY8wBd40bXZ/J04uXEQpFdu9i+bYH1Fjm3Q==}
+ resolution: {integrity: sha512-cWE4SNk2x6QQkP4HdCMOrQ1Qu5UudayqtIpI3WHbMOFPVcIr0IaQNkJxkrUUkU1Tdqs6WBKHg/wvM1xWHDwAkg==}
engines: {node: '>=18'}
peerDependencies:
react: ^18.0.0 || ^19.0.0
@@ -6381,11 +6369,7 @@ snapshots:
postcss: 8.5.10
tailwindcss: 4.2.4
- optionalDependencies:
- react: 19.2.5
-
optionalDependencies:
react: 19.2.5
@@ -8896,9 +8880,9 @@ snapshots:
dependencies:
- '@takumi-rs/helpers': 2.9.1([email protected])
+ '@takumi-rs/helpers': 2.10.0([email protected])
optionalDependencies:
react: 19.2.5
transitivePeerDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 0000000..5dd3504
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+minimumReleaseAgeExclude:
+ - '@takumi-rs/[email protected]'
diff --git a/registry/bases/takumi/components/page-number/page-number.tsx b/registry/bases/takumi/components/page-number/page-number.tsx
index 5373d7c..6c5b1f2 100644
--- a/registry/bases/takumi/components/page-number/page-number.tsx
+++ b/registry/bases/takumi/components/page-number/page-number.tsx
@@ -2,10 +2,13 @@ import {
usePdfcnTheme,
useSafeMemo,
} from "@/registry/bases/takumi/components/theme-provider";
+import { PageNumber, TotalPages } from "takumi-pdf";
+
import {
View,
Text as PDFText,
StyleSheet,
+ flatten,
} from "@/registry/bases/takumi/lib/pdf-primitives";
import type { Style } from "@/registry/bases/takumi/lib/pdf-primitives";
import type { PDFComponentProps } from "@/registry/types/pdf-components";
@@ -116,22 +119,10 @@ export const PdfPageNumber = ({
<View style={[styles.container, justifyMap[align]]}>
{format.split(/({page}|{total})/).map((part, index) => {
if (part === "{page}") {
- return (
- <PDFText
- key={`page-${index}`}
- className="pageNumber"
- style={textStyles}
- />
- );
+ return <PageNumber key={`page-${index}`} style={flatten(textStyles)} />;
}
if (part === "{total}") {
- return (
- <PDFText
- key={`total-${index}`}
- className="totalPages"
- style={textStyles}
- />
- );
+ return <TotalPages key={`total-${index}`} style={flatten(textStyles)} />;
}
return (
<PDFText key={`text-${index}`} style={textStyles}>
diff --git a/registry/bases/takumi/lib/pdf-primitives.tsx b/registry/bases/takumi/lib/pdf-primitives.tsx
index 6742bce..97d2cb0 100644
--- a/registry/bases/takumi/lib/pdf-primitives.tsx
+++ b/registry/bases/takumi/lib/pdf-primitives.tsx
@@ -155,7 +155,7 @@ export const normalizeTakumiStyle = (style: Style): Style => {
);
};
-const flatten = (style?: StyleInput): Record<string, unknown> | undefined => {
+export const flatten = (style?: StyleInput): Record<string, unknown> | undefined => {
if (!style) {
return undefined;
}