revert styleprop generic

williamsjokvist · williamsjokvist · commit 1d7424a26c54 · 2026-03-04T21:19:18.000+01:00
diff --git a/packages/layout/src/types/canvas.ts b/packages/layout/src/types/canvas.ts
@@ -16,7 +16,7 @@ interface CanvasProps extends NodeProps {
 export type CanvasNode = {
   type: typeof P.Canvas;
   props: CanvasProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/checkbox.ts b/packages/layout/src/types/checkbox.ts
@@ -16,7 +16,7 @@ interface CheckboxProps extends FormCommonProps {
 export type CheckboxNode = {
   type: typeof P.Checkbox;
   props: CheckboxProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/circle.ts b/packages/layout/src/types/circle.ts
@@ -24,7 +24,7 @@ interface SafeCircleProps extends SafeSVGPresentationAttributes {
 export type CircleNode = {
   type: typeof P.Circle;
   props: CircleProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: Origin;
   yogaNode?: never;
diff --git a/packages/layout/src/types/document.ts b/packages/layout/src/types/document.ts
@@ -48,7 +48,7 @@ export type DocumentNode = {
   props: DocumentProps;
   box?: never;
   origin?: never;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   yoga?: YogaInstance;
   yogaNode?: never;
   children: PageNode[];
diff --git a/packages/layout/src/types/ellipse.ts b/packages/layout/src/types/ellipse.ts
@@ -25,7 +25,7 @@ interface SafeEllipseProps extends SafeSVGPresentationAttributes {
 export type EllipseNode = {
   type: typeof P.Ellipse;
   props: EllipseProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/field-set.ts b/packages/layout/src/types/field-set.ts
@@ -14,7 +14,7 @@ interface FieldSetProps extends NodeProps {
 export type FieldSetNode = {
   type: typeof P.FieldSet;
   props: FieldSetProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/g.ts b/packages/layout/src/types/g.ts
@@ -17,7 +17,7 @@ import {
 } from './base';
 
 interface GProps extends SVGPresentationAttributes {
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
 }
 
 interface SafeGProps extends SafeSVGPresentationAttributes {
@@ -27,7 +27,7 @@ interface SafeGProps extends SafeSVGPresentationAttributes {
 export type GNode = {
   type: typeof P.G;
   props: GProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/image.ts b/packages/layout/src/types/image.ts
@@ -65,7 +65,7 @@ export type ImageNode = {
   type: typeof P.Image;
   props: ImageProps;
   image?: Image;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/line.ts b/packages/layout/src/types/line.ts
@@ -25,7 +25,7 @@ interface SafeLineProps extends SafeSVGPresentationAttributes {
 export type LineNode = {
   type: typeof P.Line;
   props: LineProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/link.ts b/packages/layout/src/types/link.ts
@@ -22,7 +22,7 @@ interface LinkProps extends NodeProps {
 export type LinkNode = {
   type: typeof P.Link;
   props: LinkProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/note.ts b/packages/layout/src/types/note.ts
@@ -7,7 +7,7 @@ import { SafeTextInstanceNode, TextInstanceNode } from './text-instance';
 export type NoteNode = {
   type: typeof P.Note;
   props: NodeProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/page.ts b/packages/layout/src/types/page.ts
@@ -92,7 +92,7 @@ interface PageProps extends NodeProps {
 export type PageNode = {
   type: typeof P.Page;
   props: PageProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/path.ts b/packages/layout/src/types/path.ts
@@ -19,7 +19,7 @@ interface SafePathProps extends SafeSVGPresentationAttributes {
 export type PathNode = {
   type: typeof P.Path;
   props: PathProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/polygon.ts b/packages/layout/src/types/polygon.ts
@@ -1,5 +1,5 @@
 import * as P from '@react-pdf/primitives';
-import { SafeStyle, Style, StyleProp } from '@react-pdf/stylesheet';
+import { SafeStyle, StyleProp } from '@react-pdf/stylesheet';
 
 import {
   SafeSVGPresentationAttributes,
@@ -19,7 +19,7 @@ interface SafePolygonProps extends SafeSVGPresentationAttributes {
 export type PolygonNode = {
   type: typeof P.Polygon;
   props: PolygonProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/polyline.ts b/packages/layout/src/types/polyline.ts
@@ -19,7 +19,7 @@ interface SafePolylineProps extends SafeSVGPresentationAttributes {
 export type PolylineNode = {
   type: typeof P.Polyline;
   props: PolylineProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/rect.ts b/packages/layout/src/types/rect.ts
@@ -29,7 +29,7 @@ interface SafeRectProps extends SafeSVGPresentationAttributes {
 export type RectNode = {
   type: typeof P.Rect;
   props: RectProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/select.ts b/packages/layout/src/types/select.ts
@@ -15,7 +15,7 @@ interface SelectAndListProps extends FormCommonProps {
 export type SelectNode = {
   type: typeof P.Select;
   props: SelectAndListProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: never;
@@ -29,7 +29,7 @@ export type SafeSelectNode = Omit<SelectNode, 'style'> & {
 export type ListNode = {
   type: typeof P.List;
   props: SelectAndListProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/svg.ts b/packages/layout/src/types/svg.ts
@@ -61,7 +61,7 @@ interface SvgSafeProps extends NodeProps, SafeSVGPresentationAttributes {
 export type SvgNode = {
   type: typeof P.Svg;
   props: SvgProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/text-input.ts b/packages/layout/src/types/text-input.ts
@@ -49,7 +49,7 @@ interface TextInputProps extends FormCommonProps {
 export type TextInputNode = {
   type: typeof P.TextInput;
   props: TextInputProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/text.ts b/packages/layout/src/types/text.ts
@@ -39,7 +39,7 @@ interface TextProps extends NodeProps {
 export type TextNode = {
   type: typeof P.Text;
   props: TextProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/layout/src/types/tspan.ts b/packages/layout/src/types/tspan.ts
@@ -1,5 +1,5 @@
 import * as P from '@react-pdf/primitives';
-import { SafeStyle, Style, StyleProp } from '@react-pdf/stylesheet';
+import { SafeStyle, StyleProp } from '@react-pdf/stylesheet';
 import { Paragraph } from '@react-pdf/textkit';
 
 import {
@@ -21,7 +21,7 @@ interface SafeTspanProps extends SafeSVGPresentationAttributes {
 export type TspanNode = {
   type: typeof P.Tspan;
   props: TspanProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: never;
   origin?: never;
   yogaNode?: never;
diff --git a/packages/layout/src/types/view.ts b/packages/layout/src/types/view.ts
@@ -1,5 +1,5 @@
 import * as P from '@react-pdf/primitives';
-import { SafeStyle, Style, StyleProp } from '@react-pdf/stylesheet';
+import { SafeStyle, StyleProp } from '@react-pdf/stylesheet';
 import { YogaNode } from 'yoga-layout/load';
 
 import { Box, NodeProps, Origin, RenderProp } from './base';
@@ -26,7 +26,7 @@ interface ViewProps extends NodeProps {
 export type ViewNode = {
   type: typeof P.View;
   props: ViewProps;
-  style?: StyleProp<Style | Style[]>;
+  style?: StyleProp;
   box?: Box;
   origin?: Origin;
   yogaNode?: YogaNode;
diff --git a/packages/renderer/index.d.ts b/packages/renderer/index.d.ts
@@ -31,7 +31,7 @@ declare namespace ReactPDF {
   }
 
   interface DocumentProps {
-    style?: StyleProp<Style | Style[]>;
+    style?: StyleProp;
     title?: string;
     author?: string;
     subject?: string;
@@ -59,7 +59,7 @@ declare namespace ReactPDF {
 
   interface NodeProps {
     id?: string;
-    style?: StyleProp<Style | Style[]>;
+    style?: StyleProp;
     /**
      * Render component in all wrapped pages.
      * @see https://react-pdf.org/advanced#fixed-components
@@ -585,7 +585,7 @@ declare namespace ReactPDF {
   interface PDFViewerProps {
     width?: number | string;
     height?: number | string;
-    style?: StyleProp<Style | Style[]>;
+    style?: StyleProp;
     className?: string;
     children?: React.ReactElement<DocumentProps>;
     innerRef?: React.Ref<HTMLIFrameElement>;
diff --git a/packages/stylesheet/src/types.ts b/packages/stylesheet/src/types.ts
@@ -451,10 +451,12 @@ type MediaQueryStyle = {
 
 export type Style = BaseStyle & MediaQueryStyle;
 
-interface RecursiveArray<T>
-  extends Array<T | ReadonlyArray<T> | RecursiveArray<T>> { };
+type RecursiveArray<T> = Array<T | ReadonlyArray<T> | RecursiveArray<T>>;
 
-export type StyleProp<T> = T | RecursiveArray<T | undefined>;
+export type StyleProp =
+  | Style
+  | Style[]
+  | RecursiveArray<Style | Style[] | undefined>;
 
 export type StyleKey = keyof BaseStyle;
 
