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

fixes Histograms display without fills intermittently #292 #330

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fixes Histograms display without fills intermittently #292 #330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4c618
fixes Histograms display without fills intermittently #292
paddymul Nov 11, 2024
7516034
added an explanatory comment linking back to the original bug
paddymul Nov 11, 2024
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
40 changes: 21 additions & 19 deletions js/components/DFViewerParts/HistogramCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ export const HistogramCell = (props: any) => {
console.log('dumbClickHandler', rechartsArgs);
};

// used to prevent duplicate IDs which lead to a nasty bug where patterns aren't applied
// https://github.com/paddymul/buckaroo/issues/292
const gensym = (base: string) => {
const id = `${base}-${crypto.randomUUID()}`;
return [id, `url(#${id})`];
};
const [starId, starUrl] = gensym('star');
const [stripeId, stripeUrl] = gensym('stripe');
const [circleId, circleUrl] = gensym('circle');
const [checkersId, checkersUrl] = gensym('checkers');
const [leafsId, leafsUrl] = gensym('leafs');
const [screenCoords, setScreenCoords] = React.useState<{
x: number;
y: number;
Expand All @@ -106,7 +117,7 @@ export const HistogramCell = (props: any) => {
>
<defs>
<pattern
id="star"
id={starId}
width="10"
height="10"
patternUnits="userSpaceOnUse"
Expand All @@ -117,7 +128,7 @@ export const HistogramCell = (props: any) => {
/>
</pattern>
<pattern
id="stripe"
id={stripeId}
width="4"
height="4"
patternUnits="userSpaceOnUse"
Expand All @@ -126,7 +137,7 @@ export const HistogramCell = (props: any) => {
<rect width="2" height="4" fill="red" />
</pattern>
<pattern
id="circles"
id={circleId}
width="4"
height="4"
patternUnits="userSpaceOnUse"
Expand All @@ -141,7 +152,7 @@ export const HistogramCell = (props: any) => {
</pattern>

<pattern
id="checkers"
id={checkersId}
x="0"
y="0"
width="4"
Expand All @@ -153,7 +164,7 @@ export const HistogramCell = (props: any) => {
</pattern>

<pattern
id="leafs"
id={leafsId}
x="0"
y="0"
width="6"
Expand All @@ -172,25 +183,16 @@ export const HistogramCell = (props: any) => {
<Bar dataKey="tail" stroke="#000" fill="gray" stackId="stack" />
<Bar dataKey="true" stroke="#00f" fill="#00f" stackId="stack" />
<Bar dataKey="false" stroke="#000" fill="#fff" stackId="stack" />
<Bar
dataKey="cat_pop"
stroke="pink"
fill="url(#circles)"
stackId="stack"
/>
<Bar dataKey="cat_pop" stroke="pink" fill={circleUrl} stackId="stack" />
<Bar
dataKey="unique"
stroke="#0f0"
fill="url(#checkers)"
stackId="stack"
/>
<Bar
dataKey="longtail"
stroke="teal"
fill="url(#leafs)"
fill={checkersUrl}
stackId="stack"
/>
<Bar dataKey="NA" fill="url(#stripe)" stackId="stack" />
<Bar dataKey="longtail" stroke="teal" fill={leafsUrl} stackId="stack" />
<Bar dataKey="user1" stroke="teal" fill={starUrl} stackId="stack" />
<Bar dataKey="NA" fill={stripeUrl} stackId="stack" />
<Tooltip
formatter={formatter}
allowEscapeViewBox={{ x: true, y: true }}
Expand Down
Loading