Skip to content

2.x #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Oct 15, 2024
Merged

2.x #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3b7eeff
feat: dep up
zhiqingchen Aug 2, 2024
a1e8eff
feat: move code
zhiqingchen Aug 2, 2024
c656dde
feat: init skia render
zhiqingchen Aug 6, 2024
5d34b7e
feat: support event
zhiqingchen Aug 6, 2024
a5237dd
feat: add line dash effect
zhiqingchen Aug 6, 2024
e397927
feat: add stroke & fill
zhiqingchen Aug 6, 2024
bde3277
feat: add shadow
zhiqingchen Aug 6, 2024
3b30bac
chore: lint fix
zhiqingchen Aug 6, 2024
44beba1
feat: support Gradient
zhiqingchen Aug 8, 2024
0109ce1
feat: support clip path
zhiqingchen Aug 12, 2024
eef446d
feat: support background
zhiqingchen Aug 12, 2024
c8c69bf
feat: up dep
zhiqingchen Aug 13, 2024
fc019f2
fix: matrix transform error
zhiqingchen Aug 13, 2024
594c70a
fix: remove compress
zhiqingchen Aug 13, 2024
f782762
feat: own path builder
zhiqingchen Aug 20, 2024
ce3b461
fix: update test
zhiqingchen Aug 22, 2024
c154ebe
fix: v2 image bugfix
Sep 4, 2024
c2dc6c5
feat: add fontFamily set
zhiqingchen Oct 10, 2024
6a00760
fix: export
zhiqingchen Oct 11, 2024
497ac31
feat: use Paragraph
zhiqingchen Oct 11, 2024
c7af08d
fix: web support
zhiqingchen Oct 12, 2024
988e575
feat: update test
zhiqingchen Oct 14, 2024
c420035
feat: rename
zhiqingchen Oct 15, 2024
d5579b8
feat: 2.0
zhiqingchen Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ import SvgChart, { SVGRenderer } from '@wuba/react-native-echarts/svgChart';
```
or
```js
import SkiaChart, { SVGRenderer } from '@wuba/react-native-echarts/skiaChart';
import SkiaChart, { SkiaRenderer } from '@wuba/react-native-echarts/skiaChart';
```

## Contributing
Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ import SvgChart, { SVGRenderer } from '@wuba/react-native-echarts/svgChart';
```
或
```js
import SkiaChart, { SVGRenderer } from '@wuba/react-native-echarts/skiaChart';
import SkiaChart, { SkiaRenderer } from '@wuba/react-native-echarts/skiaChart';
```

## 贡献
Expand Down
4 changes: 2 additions & 2 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"@expo/webpack-config": "~19.0.1",
"@shopify/react-native-skia": "1.2.3",
"echarts": "^5.5.0",
"expo": "~51.0.0",
"expo": "~51.0.37",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.1",
"react-native": "0.74.5",
"react-native-gesture-handler": "~2.16.1",
"react-native-svg": "15.2.0",
"react-native-web": "~0.19.6",
Expand Down
25 changes: 18 additions & 7 deletions example/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
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, SkiaChart, SvgChart } from '@wuba/react-native-echarts';
import {
SVGRenderer,
SvgChart,
SkiaRenderer,
SkiaChart,
} from '@wuba/react-native-echarts';
import * as echarts from 'echarts/core';
import { BarChart, LineChart } from 'echarts/charts';
import {
Expand All @@ -17,6 +22,7 @@ echarts.use([
TooltipComponent,
GridComponent,
SVGRenderer,
SkiaRenderer,
// ...
BarChart,
LineChart,
Expand All @@ -31,9 +37,9 @@ function SkiaComponent({ option }: any) {
useEffect(() => {
let chart: any;
if (skiaRef.current) {
// @ts-ignore
chart = echarts.init(skiaRef.current, 'light', {
renderer: 'svg',
// @ts-ignore
renderer: 'skia',
width: E_WIDTH,
height: E_HEIGHT,
});
Expand All @@ -51,7 +57,6 @@ function SvgComponent({ option }: any) {
useEffect(() => {
let chart: any;
if (svgRef.current) {
// @ts-ignore
chart = echarts.init(svgRef.current, 'light', {
renderer: 'svg',
width: E_WIDTH,
Expand All @@ -64,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',
Expand All @@ -86,6 +94,9 @@ const option = {
type: 'line',
},
],
textStyle: {
fontFamily,
},
};
function App() {
return (
Expand Down
2,147 changes: 1,215 additions & 932 deletions example/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wuba/react-native-echarts",
"version": "1.3.1",
"version": "2.0.0",
"description": "Echarts for react native.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down Expand Up @@ -74,13 +74,13 @@
"pod-install": "^0.2.2",
"prettier": "^3.2.5",
"react": "18.3.1",
"react-native": "0.74.1",
"react-native": "0.74.5",
"react-native-builder-bob": "^0.23.2",
"react-native-gesture-handler": "~2.16.1",
"react-native-svg": "15.2.0",
"react-test-renderer": "^18.3.1",
"release-it": "^17.2.1",
"sharp": "^0.33.3",
"sharp": "^0.33.5",
"typescript": "^5.0.4",
"zrender": "^5.5.0"
},
Expand Down
4 changes: 2 additions & 2 deletions skiaChart.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './lib/typescript/skiaChart';
export { default } from './lib/typescript/skiaChart';
export * from './lib/typescript/skia/skiaChart';
export { default } from './lib/typescript/skia/skiaChart';
4 changes: 2 additions & 2 deletions skiaChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './lib/module/skiaChart';
export { default } from './lib/module/skiaChart';
export * from './lib/module/skia/skiaChart';
export { default } from './lib/module/skia/skiaChart';
54 changes: 27 additions & 27 deletions src/__tests__/__snapshots__/chart.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ exports[`SvgChart Chart fire PanResponder tap & drag & pinch event correctly 5`]
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -429,7 +429,7 @@ exports[`SvgChart Chart fire PanResponder tap & drag & pinch event correctly 5`]
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -495,7 +495,7 @@ exports[`SvgChart Chart fire PanResponder tap & drag & pinch event correctly 5`]
fillOpacity={0.5}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "20px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -775,7 +775,7 @@ exports[`SvgChart Chart fire RNGH tap & drag & pinch event correctly 5`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -830,7 +830,7 @@ exports[`SvgChart Chart fire RNGH tap & drag & pinch event correctly 5`] = `
fillOpacity={0.5}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "20px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -926,7 +926,7 @@ exports[`SvgChart Chart fire RNGH tap & drag & pinch event correctly 5`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -1260,7 +1260,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -1315,7 +1315,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -1370,7 +1370,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -1425,7 +1425,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -1480,7 +1480,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -1535,7 +1535,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -1594,7 +1594,7 @@ exports[`SvgChart Chart fire dispatchEventsToZRender correctly 3`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -1959,7 +1959,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2014,7 +2014,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2069,7 +2069,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2124,7 +2124,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2179,7 +2179,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2234,7 +2234,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -2293,7 +2293,7 @@ exports[`SvgChart Chart renders correctly 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -2753,7 +2753,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2808,7 +2808,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2863,7 +2863,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2918,7 +2918,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -2973,7 +2973,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "end",
}
Expand Down Expand Up @@ -3028,7 +3028,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down Expand Up @@ -3087,7 +3087,7 @@ exports[`SvgChart Chart renders correctly when handleGesture false 2`] = `
fillOpacity={1}
font={
{
"fontFamily": "Helvetica Neue",
"fontFamily": "sans-serif",
"fontSize": "12px",
"textAnchor": "middle",
}
Expand Down
Loading
Loading