feat: add fontFamily set

wuba · Oct 10, 2024 · c2dc6c5 · c2dc6c5
1 parent c154ebe
commit c2dc6c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useEffect, useRef } from 'react';
-import { StyleSheet, View, Dimensions } from 'react-native';
+import { StyleSheet, View, Dimensions, Platform } from 'react-native';
 import { gestureHandlerRootHOC } from 'react-native-gesture-handler';
 import {
   SVGRenderer,
@@ -69,11 +69,14 @@ function SvgComponent({ option }: any) {
 
   return <SvgChart ref={svgRef} useRNGH />;
 }
-
+const fontFamily = Platform.select({
+  ios: 'PingFang SC',
+  android: 'sans-serif',
+});
 const option = {
   xAxis: {
     type: 'category',
-    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    data: ['周一', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
   },
   yAxis: {
     type: 'value',
@@ -91,6 +94,9 @@ const option = {
       type: 'line',
     },
   ],
+  textStyle: {
+    fontFamily,
+  },
 };
 function App() {
   return (

diff --git a/src/skia/skiaChart.tsx b/src/skia/skiaChart.tsx
@@ -12,21 +12,13 @@ import React, {
 import { Canvas, useCanvasRef } from '@shopify/react-native-skia';
 import { View } from 'react-native';
 
-import {
-  setPlatformAPI,
-  // DEFAULT_FONT_FAMILY as zrenderFontFamily,
-} from 'zrender/lib/core/platform';
-// import { DEFAULT_FONT_FAMILY } from './utils/font';
-import { measureText } from '../utils/platform';
 import { GestureHandler } from '../components/GestureHandler';
 import { dispatchEventsToZRender } from '../components/events';
 import type { ChartElement, DispatchEvents, SkiaChartProps } from '../types';
 
 export { SkiaRender } from './SkiaRender';
 export * from '../types';
 
-setPlatformAPI({ measureText });
-
 function SkiaComponent(
   props: SkiaChartProps,
   ref: ForwardedRef<(ChartElement & any) | null>

diff --git a/src/svg/svgChart.tsx b/src/svg/svgChart.tsx
@@ -149,14 +149,6 @@ function SvgEle(props: SVGVEleProps) {
           const key = parts[0]?.trim();
           let value = parts[1]?.trim();
           if (key) {
-            // echart里默认字体sans-serif，ios无法识别
-            if (
-              Platform.OS === 'ios' &&
-              key === 'font-family' &&
-              value === 'sans-serif'
-            ) {
-              value = 'Helvetica Neue';
-            }
             attrs[toCamelCase(key)] = value;
           }
         });