Skip to content

Commit

Permalink
finished merge
Browse files Browse the repository at this point in the history
  • Loading branch information
bobular committed May 18, 2023
2 parents 59005c2 + a0c181e commit 5148ada
Show file tree
Hide file tree
Showing 20 changed files with 2,061 additions and 1,510 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function RadioButtonGroup({
containerStyles = {},
labelPlacement,
minWidth,
buttonColor,
buttonColor = 'primary',
margins,
itemMarginRight,
disabledList,
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/components/src/map/DonutMarker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ function donutMarkerSVGIcon(props: DonutMarkerStandaloneProps): {
.map((o) => o.value)
.reduce((a, c) => {
return a + c;
});
}, 0);

// for display, convert large value with k (e.g., 12345 -> 12k): return original value if less than a criterion
const sumLabel = props.markerLabel ?? String(fullPieValue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,14 @@ export default function HeaderCell({
return (
<th
{...headerGroup.getHeaderProps()}
{...(sortable && headerGroup.getSortByToggleProps({
title: 'Click to toggle sorting and Shift-Click to multi-sort'
}))}
{...(sortable &&
headerGroup.getSortByToggleProps({
title: 'Click to toggle sorting and Shift-Click to multi-sort',
}))}
css={{
padding: 0, verticalAlign: 'bottom', height: '100%', ...borderCSSOverrides
padding: 0,
verticalAlign: 'bottom',
...borderCSSOverrides,
}}
>
<div
Expand Down
Loading

0 comments on commit 5148ada

Please sign in to comment.