Merge branch 'main' into feat/repeating-linear-gradient

src/builder/shadow.ts

@@ -24,7 +24,14 @@ const SCALE = 1.1
 
 export function buildDropShadow(
   { id, width, height }: { id: string; width: number; height: number },
-  style: Record<string, any>
+  style: {
+    shadowColor: string[]
+    shadowOffset: {
+      width: number
+      height: number
+    }[]
+    shadowRadius: number[]
+  }
 ) {
   if (
     !style.shadowColor ||

src/font.ts

@@ -5,24 +5,39 @@ import opentype from '@shuding/opentype.js'
 import { Locale, locales, isValidLocale } from './language.js'
 
 export type Weight = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
-type WeightName = 'normal' | 'bold'
-export type Style = 'normal' | 'italic'
+export type WeightName = 'normal' | 'bold'
+export type FontWeight = Weight | WeightName
+export type FontStyle = 'normal' | 'italic'
 const SUFFIX_WHEN_LANG_NOT_SET = 'unknown'
 
 export interface FontOptions {
   data: Buffer | ArrayBuffer
   name: string
   weight?: Weight
-  style?: Style
+  style?: FontStyle
   lang?: string
 }
 
 export type FontEngine = {
   has: (s: string) => boolean
   baseline: (s?: string, resolvedFont?: any) => number
   height: (s?: string, resolvedFont?: any) => number
-  measure: (s: string, style: any) => number
-  getSVG: (s: string, style: any) => string
+  measure: (
+    s: string,
+    style: {
+      fontSize: number
+      letterSpacing: number
+    }
+  ) => number
+  getSVG: (
+    s: string,
+    style: {
+      fontSize: number
+      top: number
+      left: number
+      letterSpacing: number
+    }
+  ) => string
 }
 
 function compareFont(
@@ -74,7 +89,7 @@ function compareFont(
 
 export default class FontLoader {
   defaultFont: opentype.Font
-  fonts = new Map<string, [opentype.Font, Weight?, Style?][]>()
+  fonts = new Map<string, [opentype.Font, Weight?, FontStyle?][]>()
   constructor(fontOptions: FontOptions[]) {
     this.addFonts(fontOptions)
   }
@@ -87,7 +102,7 @@ export default class FontLoader {
   }: {
     name: string
     weight: Weight | WeightName
-    style: Style
+    style: FontStyle
   }) {
     if (!this.fonts.has(name)) {
       return null
@@ -175,8 +190,8 @@ export default class FontLoader {
       fontStyle = 'normal',
     }: {
       fontFamily?: string | string[]
-      fontWeight?: Weight | WeightName
-      fontStyle?: Style
+      fontWeight?: FontWeight
+      fontStyle?: FontStyle
     },
     locale: Locale | undefined
   ): FontEngine {
@@ -351,10 +366,24 @@ export default class FontLoader {
           (lineHeight / 1.2)
         )
       },
-      measure: (s: string, style: any) => {
+      measure: (
+        s: string,
+        style: {
+          fontSize: number
+          letterSpacing: number
+        }
+      ) => {
         return this.measure(resolveFont, s, style)
       },
-      getSVG: (s: string, style: any) => {
+      getSVG: (
+        s: string,
+        style: {
+          fontSize: number
+          top: number
+          left: number
+          letterSpacing: number
+        }
+      ) => {
         return this.getSVG(resolveFont, s, style)
       },
     }

src/handler/expand.ts

@@ -14,6 +14,7 @@ import parseTransformOrigin, {
 } from '../transform-origin.js'
 import { isString, lengthToNumber, v, splitEffects } from '../utils.js'
 import { MaskProperty, parseMask } from '../parser/mask.js'
+import { FontWeight, FontStyle } from '../font.js'
 
 // https://react-cn.github.io/react/tips/style-props-value-px.html
 const optOutPx = new Set([
@@ -172,21 +173,22 @@ function handleSpecialCase(
   if (name === 'textShadow') {
     // Handle multiple text shadows if provided.
     value = value.toString().trim()
-    if (value.includes(',')) {
-      const shadows = splitEffects(value)
-      const result = {}
-      for (const shadow of shadows) {
-        const styles = getStylesForProperty('textShadow', shadow, true)
-        for (const k in styles) {
-          if (!result[k]) {
-            result[k] = [styles[k]]
-          } else {
-            result[k].push(styles[k])
-          }
+    const result = {}
+
+    const shadows = splitEffects(value)
+
+    for (const shadow of shadows) {
+      const styles = getStylesForProperty('textShadow', shadow, true)
+      for (const k in styles) {
+        if (!result[k]) {
+          result[k] = [styles[k]]
+        } else {
+          result[k].push(styles[k])
         }
       }
-      return result
     }
+
+    return result
   }
 
   return
@@ -232,6 +234,11 @@ type MainStyle = {
   wordBreak: string
   textAlign: string
   lineHeight: number
+  letterSpacing: number
+
+  fontFamily: string | string[]
+  fontWeight: FontWeight
+  fontStyle: FontStyle
 
   borderTopWidth: number
   borderLeftWidth: number
@@ -249,6 +256,13 @@ type MainStyle = {
   gap: number
   rowGap: number
   columnGap: number
+
+  textShadowOffset: {
+    width: number
+    height: number
+  }[]
+  textShadowColor: string[]
+  textShadowRadius: number[]
 }
 
 type OtherStyle = Exclude<Record<PropertyKey, string | number>, keyof MainStyle>
@@ -391,6 +405,34 @@ export default function expand(
         transform[type] = len
       }
     }
+
+    if (prop === 'textShadowRadius') {
+      const textShadowRadius = value as unknown as Array<number | string>
+
+      serializedStyle.textShadowRadius = textShadowRadius.map((_v) =>
+        lengthToNumber(_v, baseFontSize, 0, inheritedStyle, false)
+      )
+    }
+
+    if (prop === 'textShadowOffset') {
+      const textShadowOffset = value as unknown as Array<{
+        width: number | string
+        height: number | string
+      }>
+
+      serializedStyle.textShadowOffset = textShadowOffset.map(
+        ({ height, width }) => ({
+          height: lengthToNumber(
+            height,
+            baseFontSize,
+            0,
+            inheritedStyle,
+            false
+          ),
+          width: lengthToNumber(width, baseFontSize, 0, inheritedStyle, false),
+        })
+      )
+    }
   }
 
   return serializedStyle

src/index.ts

@@ -1,7 +1,7 @@
 export type {
   FontOptions as Font,
   Weight as FontWeight,
-  Style as FontStyle,
+  FontStyle,
 } from './font.js'
 export type { Locale } from './language.js'
 

src/layout.ts

@@ -16,7 +16,7 @@ import {
 import { SVGNodeToImage } from './handler/preprocess.js'
 import computeStyle from './handler/compute.js'
 import FontLoader from './font.js'
-import buildTextNodes from './text.js'
+import buildTextNodes from './text/index.js'
 import rect from './builder/rect.js'
 import { Locale, normalizeLocale } from './language.js'
 import { SerializedStyle } from './handler/expand.js'