types and nitpicks

Author: MendyLanda

.changeset/six-paws-tie.md

@@ -4,4 +4,4 @@
 "@react-pdf/types": minor
 ---
 
-Add support for fontFeatureSettings to customise ligatures, tabular number display, and other font features
+Add support for fontFeatureSettings to customize ligatures, tabular number display, and other font features

.github/workflows/main.yml

@@ -111,7 +111,7 @@ jobs:
         run: REACT_VERSION=${{ matrix.react_version }} yarn test
 
   e2e-node:
-    name: Run E2E tests (Node.js ${{ matrix.node_version }}; ${{ matrix.cjs_or_esm == 'cjs' ? 'CJS' : 'ESM' }})
+    name: 'E2E tests (Node.js ${{ matrix.node_version }}, ${{ matrix.cjs_or_esm }})'
     runs-on: ubuntu-latest
     strategy:
       matrix:

packages/stylesheet/src/types.ts

@@ -321,13 +321,44 @@ export type TextTransform =
 
 export type VerticalAlign = 'sub' | 'super';
 
+export type FontFeatureSetting =
+  | 'liga'
+  | 'dlig'
+  | 'onum'
+  | 'lnum'
+  | 'tnum'
+  | 'zero'
+  | 'frac'
+  | 'sups'
+  | 'subs'
+  | 'smcp'
+  | 'c2sc'
+  | 'case'
+  | 'hlig'
+  | 'calt'
+  | 'swsh'
+  | 'hist'
+  | 'ss**'
+  | 'kern'
+  | 'locl'
+  | 'rlig'
+  | 'medi'
+  | 'init'
+  | 'isol'
+  | 'fina'
+  | 'mark'
+  | 'mkmk';
+export type FontFeatureSettings =
+  | FontFeatureSetting[]
+  | Record<FontFeatureSetting, number>;
+
 export type TextStyle = {
   direction?: 'ltr' | 'rtl';
   fontSize?: number | string;
   fontFamily?: string | string[];
   fontStyle?: FontStyle;
   fontWeight?: FontWeight;
-  fontFeatureSettings?: string[] | Record<string, boolean>;
+  fontFeatureSettings?: FontFeatureSettings;
   letterSpacing?: number | string;
   lineHeight?: number | string;
   maxLines?: number;
@@ -348,6 +379,7 @@ export type TextSafeStyle = TextExpandedStyle & {
   fontWeight?: number;
   letterSpacing?: number;
   lineHeight?: number;
+  fontFeatureSettings?: FontFeatureSettings;
 };
 
 // Margins

packages/textkit/src/types.ts

@@ -1,5 +1,6 @@
 import type { Glyph as FontkitGlyph } from 'fontkit';
 import type { Font } from '@rpdf/font';
+import type { FontFeatureSettings } from '@rpdf/stylesheet';
 import { Factor as JustificationFactor } from './engines/justification/types';
 
 export type Coordinate = {
@@ -51,7 +52,7 @@ export type Attributes = {
   characterSpacing?: number;
   color?: string;
   direction?: 'rtl' | 'ltr';
-  features?: string[] | Record<string, number>;
+  features?: FontFeatureSettings;
   fill?: boolean;
   font?: Font[];
   fontSize?: number;