Skip to content

Handled non-hex color strings for area opacity #25

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

Open
hmonika23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handled non-hex color strings for area opacity #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions components/chart/area/area-chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
TooltipComponent
} from 'echarts/components';
import * as echarts from 'echarts/core';
import { parse, stringify } from 'zrender/lib/tool/color';
import React, { useEffect, useMemo, useRef } from 'react';
import { View } from 'react-native';
import { getAxis, valueAxisBoundsFromProps, categoryAxisBoundsFromProps } from '../axis';
Expand All @@ -38,6 +39,12 @@ echarts.use([
LineChart,
]);

const applyOpacity = (colorStr: string, opacity: number) => {
const rgba = parse(colorStr);
if (!rgba) return colorStr;
return stringify([rgba[0], rgba[1], rgba[2], opacity], 'rgba');
};

const ChartComponent = ({
data,
width = 220,
Expand Down Expand Up @@ -308,11 +315,9 @@ const ChartComponent = ({
const seriesColor = theme.series[index % theme.series.length].color;
const seriesLineWidth = theme.series[index]?.lineWidth ?? theme.series[0].lineWidth ?? 2;

// Convert opacity (0-1) to hex (00-FF)
const opacityHex = Math.round(areaOpacity * 255).toString(16).padStart(2, '0');
const colorWithOpacity = seriesColor + opacityHex;
const transparentColor = seriesColor + '00';
const solidColor = seriesColor + 'ff';
const colorWithOpacity = applyOpacity(seriesColor, areaOpacity);
const transparentColor = applyOpacity(seriesColor, 0);
const solidColor = applyOpacity(seriesColor, 1);

const areaStyleConfig =
areaFill === 'gradient'
Expand Down