tweak(tupaiaWeb): RN-249: getting x-Name in viz export #5886
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Tupaia | ||
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import styled from 'styled-components'; | ||
| import MuiButton from '@material-ui/core/Button'; | ||
|
|
||
| const getLegendTextColor = (theme: any, isExporting: boolean) => { | ||
| if (isExporting) { | ||
| return '#2c3236'; | ||
| } | ||
|
|
||
| if (theme.palette.type === 'light') { | ||
| return theme.palette.text.primary; | ||
| } | ||
| return 'white'; | ||
| }; | ||
|
|
||
| export const LegendItem = styled(({ isExporting, ...props }) => <MuiButton {...props} />)` | ||
| text-align: left; | ||
| font-size: 0.75rem; | ||
| padding-bottom: 0; | ||
| padding-top: 0; | ||
| margin-right: 1.2rem; | ||
|
|
||
| .MuiButton-label { | ||
| display: flex; | ||
| white-space: nowrap; | ||
| align-items: center; | ||
| color: ${({ theme, isExporting }) => getLegendTextColor(theme, isExporting)}; | ||
| > div { | ||
| width: ${isExporting => (isExporting ? '100%' : '')}; | ||
| } | ||
| } | ||
|
|
||
| &.Mui-disabled { | ||
| color: ${({ theme, isExporting }) => getLegendTextColor(theme, isExporting)}; | ||
| } | ||
|
|
||
| // small styles | ||
| &.small { | ||
| font-size: 0.5rem; | ||
| padding-bottom: 0; | ||
| padding-top: 0; | ||
| margin-right: 0; | ||
| } | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Tupaia | ||
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { CartesianChartConfig } from '@tupaia/types'; | ||
| import styled from 'styled-components'; | ||
| import { TooltipPayload } from 'recharts'; | ||
| import Tooltip from '@material-ui/core/Tooltip'; | ||
| import { LegendPosition } from '../../types'; | ||
| import { isMobile } from '../../utils'; | ||
| import { LegendItem } from './LegendItem'; | ||
|
|
||
| const LegendContainer = styled.div<{ | ||
| $position?: LegendPosition; | ||
| }>` | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| justify-content: center; | ||
| flex-direction: row; | ||
| // Add more padding at the bottom for exports | ||
| padding: ${props => (props.$position === 'bottom' ? '1em 0 0 3.5em' : '0 0 3em 0')}; | ||
| `; | ||
|
|
||
| const TooltipContainer = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
| padding-bottom: 0.3rem; | ||
| padding-top: 0.3rem; | ||
| `; | ||
|
|
||
| const Box = styled.span` | ||
| display: block; | ||
| width: 1.25rem; | ||
| height: 1.25rem; | ||
| margin-right: 0.625rem; | ||
| border-radius: 3px; | ||
|
|
||
| // small styles | ||
| &.small { | ||
| width: 0.8rem; | ||
| min-width: 0.8rem; | ||
| height: 0.8rem; | ||
| margin-right: 0.4rem; | ||
| } | ||
| `; | ||
|
|
||
| const Text = styled.span` | ||
| line-height: 1.4; | ||
| `; | ||
|
|
||
| interface CartesianLegendProps { | ||
| chartConfig: CartesianChartConfig['chartConfig']; | ||
| onClick: Function; | ||
| getIsActiveKey: Function; | ||
| isExporting?: boolean; | ||
| legendPosition?: LegendPosition; | ||
| } | ||
|
|
||
| export const getCartesianChartLegend = | ||
| ({ chartConfig, onClick, getIsActiveKey, isExporting, legendPosition }: CartesianLegendProps) => | ||
| ({ payload }: any) => { | ||
| const isMobileSize = isMobile(isExporting); | ||
| return ( | ||
| <LegendContainer $position={isExporting ? 'top' : legendPosition}> | ||
| {payload.map(({ color, value, dataKey }: TooltipPayload) => { | ||
| // check the type here because according to TooltipPayload, value can be a number or a readonly string | number array | ||
| const displayValue = (typeof value === 'string' && chartConfig?.[value]?.label) || value; | ||
|
|
||
| return ( | ||
| <LegendItem | ||
| // parse to a string because the key can't be an array | ||
| key={String(value)} | ||
| onClick={() => onClick(dataKey)} | ||
| isExporting={isExporting} | ||
| className={isMobileSize ? 'small' : 'enlarged'} | ||
| style={{ textDecoration: getIsActiveKey(value) ? '' : 'line-through' }} | ||
| > | ||
| <Tooltip title="Click to filter data" placement="top" arrow> | ||
| <TooltipContainer> | ||
| <Box | ||
| className={isMobileSize ? 'small' : 'enlarged'} | ||
| style={{ background: color }} | ||
| /> | ||
| <Text>{displayValue}</Text> | ||
| </TooltipContainer> | ||
| </Tooltip> | ||
| </LegendItem> | ||
| ); | ||
| })} | ||
| </LegendContainer> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Tupaia | ||
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { PieChartConfig } from '@tupaia/types'; | ||
| import { TooltipPayload } from 'recharts'; | ||
| import { formatDataValueByType } from '@tupaia/utils'; | ||
| import { LegendPosition } from '../../types'; | ||
| import { isMobile } from '../../utils'; | ||
| import { LegendItem } from './LegendItem'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| const PieLegendContainer = styled.div<{ | ||
| $position?: LegendPosition; | ||
| $isExporting?: boolean; | ||
| }>` | ||
| display: flex; | ||
| flex-wrap: ${props => (props.$isExporting ? 'nowrap' : 'wrap')}; | ||
| justify-content: ${props => (props.$position === 'bottom' ? 'center' : 'flex-start')}; | ||
| flex-direction: ${props => (props.$isExporting ? 'column' : 'row')}; | ||
| padding: 0; | ||
| `; | ||
|
|
||
| const TooltipContainer = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
| padding-bottom: 0.3rem; | ||
| padding-top: 0.3rem; | ||
| `; | ||
|
|
||
| const Box = styled.span` | ||
| display: block; | ||
| width: 1.25rem; | ||
| height: 1.25rem; | ||
| margin-right: 0.625rem; | ||
| border-radius: 3px; | ||
|
|
||
| // small styles | ||
| &.small { | ||
| width: 0.8rem; | ||
| min-width: 0.8rem; | ||
| height: 0.8rem; | ||
| margin-right: 0.4rem; | ||
| } | ||
| `; | ||
|
|
||
| const Text = styled.span` | ||
| line-height: 1.4; | ||
| `; | ||
|
|
||
| interface PieLegendProps { | ||
| isEnlarged?: boolean; | ||
| isExporting?: boolean; | ||
| legendPosition?: LegendPosition; | ||
| config: PieChartConfig; | ||
| } | ||
|
|
||
| const getPieLegendDisplayValue = ( | ||
| value: TooltipPayload['value'], | ||
| item: any, | ||
| config: PieLegendProps['config'], | ||
| isEnlarged?: PieLegendProps['isEnlarged'], | ||
| isMobileSize?: boolean, | ||
| ) => { | ||
| const metadata = item[`${value}_metadata`]; | ||
| const labelSuffix = formatDataValueByType({ value: item.value, metadata }, config.valueType); | ||
|
|
||
| // on mobile the legend will show the actual formatDataValueByType after the label value | ||
| return isMobileSize && isEnlarged ? `${value} ${labelSuffix}` : value; | ||
| }; | ||
|
|
||
| export const getPieChartLegend = | ||
| ({ isEnlarged, isExporting, legendPosition, config }: PieLegendProps) => | ||
| ({ payload }: any) => { | ||
| const isMobileSize = isMobile(isExporting); | ||
| return ( | ||
| <PieLegendContainer $position={legendPosition} $isExporting={isExporting}> | ||
| {payload.map(({ color, value, payload: item }: TooltipPayload) => { | ||
| const displayValue = getPieLegendDisplayValue( | ||
| value, | ||
| item, | ||
| config, | ||
| isEnlarged, | ||
| isMobileSize, | ||
| ); | ||
|
|
||
| return ( | ||
| <LegendItem | ||
| key={String(value)} | ||
| isExporting={isExporting} | ||
| className={isEnlarged && !isMobileSize ? 'enlarged' : 'small'} | ||
| disabled | ||
| > | ||
| <TooltipContainer> | ||
| <Box | ||
| className={isEnlarged && !isMobileSize ? 'enlarged' : 'small'} | ||
| style={{ background: color }} | ||
| /> | ||
| <Text>{displayValue}</Text> | ||
| </TooltipContainer> | ||
| </LegendItem> | ||
| ); | ||
| })} | ||
| </PieLegendContainer> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* | ||
| * Tupaia | ||
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ | ||
|
|
||
| export { getCartesianChartLegend } from './getCartesianChartLegend'; | ||
| export { getPieChartLegend } from './getPieChartLegend'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is intended to prevent overlapping between tick labels and the x-axis. Given the tick labels are restricted to a maximum number of characters (using ellipses for longer text) this approach should resolve the issue.