-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #666 from hisptz/bugfix/issue-#658
Bugfix: Scorecard table cell styling
- Loading branch information
Showing
8 changed files
with
115 additions
and
95 deletions.
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
83 changes: 41 additions & 42 deletions
83
shared/components/src/ScorecardCell/Components/SingleCellSvg.js
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 |
|---|---|---|
| @@ -1,50 +1,49 @@ | ||
| import PropTypes from "prop-types"; | ||
| import React from "react"; | ||
| import { DecreasingArrows, IncreasingArrows } from "./Arrows"; | ||
| import {DecreasingArrows, IncreasingArrows} from "./Arrows"; | ||
|
|
||
| export default function SingleCellSvg({ color, value, status, bold }) { | ||
| const width = 100; | ||
| const height = 47; | ||
| const fontSize = 12; | ||
| const arrowFontSize = 10; | ||
| export default function SingleCellSvg({cellRef, color, value, status, bold}) { | ||
| const width = cellRef?.offsetWidth - 1 || 100; //1px for the border | ||
| const height = cellRef?.offsetHeight - 1 || 47; //1px for the border | ||
| const fontSize = 12; | ||
| const arrowFontSize = 10; | ||
|
|
||
| return ( | ||
| <svg width={width} height={height} style={{ display: "block" }}> | ||
| <polygon | ||
| points={`0 0 0 ${height} ${width} ${height} ${width} 0`} | ||
| style={{ fill: color ?? "#FFFFFF" }} | ||
| /> | ||
| {status && | ||
| (status === "increasing" ? ( | ||
| <IncreasingArrows | ||
| fontSize={arrowFontSize} | ||
| y={height - arrowFontSize * 2} | ||
| x={width / 2 - fontSize * 2} | ||
| /> | ||
| ) : ( | ||
| <DecreasingArrows | ||
| fontSize={arrowFontSize} | ||
| y={height - fontSize} | ||
| x={width / 2 - fontSize * 2} | ||
| /> | ||
| ))} | ||
| <text | ||
| id={"test-average-column"} | ||
| style={{ fontWeight: bold && "bold" }} | ||
| lengthAdjust="spacingAndGlyphs" | ||
| fontSize={fontSize} | ||
| x={width / 2 - fontSize} | ||
| y={height - fontSize} | ||
| > | ||
| {value} | ||
| </text> | ||
| </svg> | ||
| ); | ||
| const decreasing = status === "decreasing"; | ||
|
|
||
| return ( | ||
| <svg width={width} height={height} style={{display: "block"}}> | ||
| <polygon | ||
| points={`0 0 0 ${height} ${width} ${height} ${width} 0`} | ||
| style={{fill: color ?? "#FFFFFF"}} | ||
| /> | ||
| {status && | ||
| ( | ||
| decreasing ? | ||
| <DecreasingArrows x={width / 2 - fontSize * 2} y={(height - arrowFontSize) / 2 + arrowFontSize} | ||
| fontSize={arrowFontSize}/> : | ||
| <IncreasingArrows | ||
| fontSize={arrowFontSize} | ||
| y={(height - arrowFontSize) / 2} | ||
| x={width / 2 - fontSize * 2} | ||
| /> | ||
| )} | ||
| <text | ||
| id={"test-average-column"} | ||
| style={{fontWeight: bold && "bold"}} | ||
| lengthAdjust="spacingAndGlyphs" | ||
| fontSize={fontSize} | ||
| x={width / 2 - fontSize} | ||
| y={(height - fontSize) / 2 + fontSize} | ||
| > | ||
| {value} | ||
| </text> | ||
| </svg> | ||
| ); | ||
| } | ||
|
|
||
| SingleCellSvg.propTypes = { | ||
| value: PropTypes.string.isRequired, | ||
| bold: PropTypes.bool, | ||
| color: PropTypes.string, | ||
| status: PropTypes.oneOf(["increasing", "decreasing"]), | ||
| value: PropTypes.string.isRequired, | ||
| bold: PropTypes.bool, | ||
| color: PropTypes.string, | ||
| status: PropTypes.oneOf(["increasing", "decreasing"]), | ||
| }; |
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