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.

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

RadialBar: Utilize defs/fill, modeled after Bar implementation #1957

Merged
merged 6 commits into from
May 10, 2022
Merged

RadialBar: Utilize defs/fill, modeled after Bar implementation #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef87fe8
working checkpoint of hard coded defs for a patterned render of a rad…
bdefore Mar 23, 2022
7620aa6
instead bind the fill to root datum
bdefore Mar 23, 2022
3817daf
remove disabled props for fill on datum.data
bdefore Mar 23, 2022
8bb1364
convert hard code to story
bdefore Mar 23, 2022
5d99f24
remove diagnostics
bdefore Mar 23, 2022
b6e9922
run make fmt
bdefore Mar 23, 2022
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
18 changes: 17 additions & 1 deletion packages/radial-bar/src/RadialBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import { createElement, Fragment, ReactNode } from 'react'
import { Container, useDimensions, SvgWrapper, clampArc } from '@nivo/core'
import {
Container,
useDimensions,
SvgWrapper,
clampArc,
// @ts-ignore
bindDefs,
} from '@nivo/core'

import { ArcLabelsLayer } from '@nivo/arcs'
import { BoxLegendSvg } from '@nivo/legends'
import { PolarGrid, RadialAxis, CircularAxis } from '@nivo/polar-axes'
Expand Down Expand Up @@ -37,6 +45,8 @@ const InnerRadialBar = <D extends RadialBarDatum>({
circularAxisInner = svgDefaultProps.circularAxisInner,
circularAxisOuter = svgDefaultProps.circularAxisOuter,
colors = svgDefaultProps.colors,
defs = svgDefaultProps.defs,
fill = svgDefaultProps.fill,
borderWidth = svgDefaultProps.borderWidth,
borderColor = svgDefaultProps.borderColor,
enableLabels = svgDefaultProps.enableLabels,
Expand Down Expand Up @@ -219,11 +229,17 @@ const InnerRadialBar = <D extends RadialBarDatum>({
)
}

const boundDefs = bindDefs(defs, bars, fill, {
dataKey: 'data',
targetKey: 'fill',
})

return (
<SvgWrapper
width={outerWidth}
height={outerHeight}
margin={margin}
defs={boundDefs}
role={role}
ariaLabel={ariaLabel}
ariaLabelledBy={ariaLabelledBy}
Expand Down
3 changes: 3 additions & 0 deletions packages/radial-bar/src/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ export const commonDefaultProps = {

legends: [],

defs: [],
fill: [],

animate: true,
motionConfig: 'gentle' as const,
transitionMode: 'centerRadius' as const,
Expand Down
4 changes: 3 additions & 1 deletion packages/radial-bar/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
ModernMotionProps,
PropertyAccessor,
ValueFormat,
SvgDefsAndFill,
} from '@nivo/core'
import { Arc, ArcGenerator, ArcLabelsProps, ArcTransitionMode } from '@nivo/arcs'
import { InheritedColorConfig, OrdinalColorScaleConfig } from '@nivo/colors'
Expand Down Expand Up @@ -123,4 +124,5 @@ export type RadialBarSvgProps<D extends RadialBarDatum = RadialBarDatum> = Parti
> &
RadialBarDataProps<D> &
Dimensions &
ModernMotionProps
ModernMotionProps &
SvgDefsAndFill<D>
26 changes: 26 additions & 0 deletions packages/radial-bar/stories/radialBar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,32 @@ const demoPhases: {
enableLabels: true,
},
},
{
description: 'Patterned Fill',
props: {
...commonProperties,
defs: [
{
id: 'lines',
type: 'patternLines',
background: 'rgba(0, 0, 0, 0)',
color: 'inherit',
rotation: -45,
lineWidth: 4,
spacing: 8,
},
],
fill: [
{
match: {
// id: 'Online.Fruits'
x: 'Fruits',
},
id: 'lines',
},
],
},
},
]

const demoTheme: Theme = {
Expand Down