Skip to content
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.

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

[gradient] add <RadialGradient />. fixes #83 #90

Merged
merged 2 commits into from
Jul 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions packages/vx-demo/components/tiles/gradients.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
GradientPurpleTeal,
GradientSteelPurple,
GradientTealBlue,
RadialGradient,
} from '@vx/gradient';

export default ({
Expand All @@ -34,7 +35,7 @@ export default ({
<GradientPinkRed id="PinkRed" vertical={false} />
<GradientPurpleOrange id="PurpleOrange" vertical={false} />
<GradientPurpleRed id="PurpleRed" vertical={false} />
<GradientPurpleTeal id="PurpleTeal" vertical={false} />
<RadialGradient from="#55bdd5" to="#4f3681" id="Radial" r={'80%'} />
<GradientSteelPurple id="SteelPurple" vertical={false} />
<GradientTealBlue id="TealBlue" vertical={false} />
<Bar
Expand Down Expand Up @@ -112,7 +113,7 @@ export default ({
y={h}
width={w}
height={h}
fill={`url(#PurpleTeal)`}
fill={`url(#Radial)`}
rx={14}
stroke="#ffffff"
strokeWidth={8}
Expand Down
20 changes: 13 additions & 7 deletions packages/vx-demo/components/tiles/lineradial.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import { LinearGradient } from '@vx/gradient';
const x = d => new Date(d.date);
const y = d => d.close;

const capPoints = [appleStock[0]].concat([appleStock[appleStock.length - 1]]);
const capPoints = [appleStock[0]].concat([
appleStock[appleStock.length - 1],
]);

export default function LineRadialTile({
width,
Expand All @@ -20,7 +22,7 @@ export default function LineRadialTile({
left: 10,
right: 10,
bottom: 120,
}
},
}) {
if (width < 10) return null;

Expand All @@ -36,7 +38,11 @@ export default function LineRadialTile({
});
return (
<svg width={width} height={height}>
<LinearGradient from="#e5fd3d" to="#aeeef8" id="line-gradient" />
<LinearGradient
from="#e5fd3d"
to="#aeeef8"
id="line-gradient"
/>
<rect
x={0}
y={0}
Expand All @@ -45,7 +51,7 @@ export default function LineRadialTile({
fill="#744cca"
rx={14}
/>
<Group top={height / 2 } left={width / 2}>
<Group top={height / 2} left={width / 2}>
{yScale.ticks().map((tick, i) => {
return (
<g key={`radial-grid-${i}`}>
Expand All @@ -54,7 +60,7 @@ export default function LineRadialTile({
stroke="#aeeef8"
strokeWidth={1}
fill="#aeeef8"
fillOpacity={(1 / (i + 1)) - ((1 / i) * .2)}
fillOpacity={1 / (i + 1) - 1 / i * 0.2}
strokeOpacity={0.2}
/>
<text
Expand All @@ -77,7 +83,7 @@ export default function LineRadialTile({
fill="none"
stroke={"url('#line-gradient')"}
strokeWidth={2}
strokeOpacity={.8}
strokeOpacity={0.8}
curve={curveBasisOpen}
strokeLinecap="round"
/>
Expand All @@ -95,4 +101,4 @@ export default function LineRadialTile({
</Group>
</svg>
);
}
}
52 changes: 30 additions & 22 deletions packages/vx-demo/pages/gradients.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,41 @@ import {
GradientPurpleRed,
GradientPurpleTeal,
GradientSteelPurple,
GradientTealBlue
GradientTealBlue,
RadialGradient,
} from '@vx/gradient';

export default ({
width,
height,
margin = {
top: 0,
left: 0,
right: 0,
bottom: 80,
},
}) => {
const w = width / 4;
const h = (height - 80) / 2;
const h = (height - margin.bottom) / 2;
return (
<svg width={width} height={height}>
<DarkgreenGreen id="DarkgreenGreen" />
<LightgreenGreen id="LightgreenGreen" />
<OrangeRed id="OrangeRed" />
<PinkBlue id="PinkBlue" />
<PinkRed id="PinkRed" vertical={false} />
<PurpleOrange id="PurpleOrange" vertical={false} />
<PurpleRed id="PurpleRed" vertical={false} />
<PurpleTeal id="PurpleTeal" vertical={false} />
<SteelPurple id="SteelPurple" vertical={false} />
<TealBlue id="TealBlue" vertical={false} />
<GradientDarkgreenGreen id="DarkgreenGreen" />
<GradientLightgreenGreen id="LightgreenGreen" />
<GradientOrangeRed id="OrangeRed" />
<GradientPinkBlue id="PinkBlue" />
<GradientPinkRed id="PinkRed" vertical={false} />
<GradientPurpleOrange id="PurpleOrange" vertical={false} />
<GradientPurpleRed id="PurpleRed" vertical={false} />
<RadialGradient from="#55bdd5" to="#4f3681" id="Radial" r={'80%'} />
<GradientSteelPurple id="SteelPurple" vertical={false} />
<GradientTealBlue id="TealBlue" vertical={false} />
<Bar
x={0}
y={0}
width={w}
height={h}
fill={\`url(#LightgreenGreen)\`}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
rx={14}
/>
Expand All @@ -62,7 +69,7 @@ export default ({
height={h}
fill={\`url(#OrangeRed)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
Expand All @@ -72,7 +79,7 @@ export default ({
height={h}
fill={\`url(#PinkBlue)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
Expand All @@ -82,7 +89,7 @@ export default ({
height={h}
fill={\`url(#DarkgreenGreen)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
Expand All @@ -92,7 +99,7 @@ export default ({
height={h}
fill={\`url(#PinkRed)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
Expand All @@ -102,7 +109,7 @@ export default ({
height={h}
fill={\`url(#TealBlue)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
Expand All @@ -112,22 +119,23 @@ export default ({
height={h}
fill={\`url(#PurpleOrange)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
<Bar
x={w * 3}
y={h}
width={w}
height={h}
fill={\`url(#PurpleTeal)\`}
fill={\`url(#Radial)\`}
rx={14}
stroke='#ffffff'
stroke="#ffffff"
strokeWidth={8}
/>
</svg>
);
}`}
};
`}
</Show>
);
};
52 changes: 52 additions & 0 deletions packages/vx-gradient/src/gradients/RadialGradient.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import React from 'react';
import PropTypes from 'prop-types';

RadialGradient.propTypes = {
id: PropTypes.string.isRequired,
from: PropTypes.string,
to: PropTypes.string,
fromOffset: PropTypes.string,
fromOpacity: PropTypes.number,
toOffset: PropTypes.string,
toOpacity: PropTypes.number,
rotate: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
transform: PropTypes.string,
};

export default function RadialGradient({
children,
id,
from,
to,
fromOffset = '0%',
fromOpacity = 1,
toOffset = '100%',
toOpacity = 1,
rotate,
transform,
...restProps
}) {
return (
<defs>
<radialGradient
id={id}
gradientTransform={rotate ? `rotate(${rotate})` : transform}
{...restProps}
>
{!!children && children}
{!children &&
<stop
offset={fromOffset}
stopColor={from}
stopOpacity={fromOpacity}
/>}
{!children &&
<stop
offset={toOffset}
stopColor={to}
stopOpacity={toOpacity}
/>}
</radialGradient>
</defs>
);
}
1 change: 1 addition & 0 deletions packages/vx-gradient/src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { default as LinearGradient } from './gradients/LinearGradient';
export { default as RadialGradient } from './gradients/RadialGradient';
export { default as GradientDarkgreenGreen } from './gradients/DarkgreenGreen';
export { default as GradientLightgreenGreen } from './gradients/LightgreenGreen';
export { default as GradientOrangeRed } from './gradients/OrangeRed';
Expand Down
7 changes: 7 additions & 0 deletions packages/vx-gradient/test/LinearGradient.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { LinearGradient } from '../src';

describe('<LinearGradient />', () => {
it('should be defined', () => {
expect(LinearGradient).toBeDefined();
});
});
7 changes: 7 additions & 0 deletions packages/vx-gradient/test/RadialGradient.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { RadialGradient } from '../src';

describe('<RadialGradient />', () => {
it('should be defined', () => {
expect(RadialGradient).toBeDefined();
});
});