Skip to content

fix(deps): update react monorepo to v19 (major) #370

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

Open
dev-kraken wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deps): update react monorepo to v19 (major) #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
327 changes: 164 additions & 163 deletions packages/windrose/src/WindRose/components/Chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { JSX } from 'react';
import * as React from "react";
import * as d3 from "d3";
import styled from "styled-components";
Expand All @@ -24,7 +25,7 @@ export function Chart(props: PropType): JSX.Element {
legendGap,
} = { ...DefaultProps, ...props } as Required<PropType>;
const containerRef = React.useRef<SVGSVGElement>(null);
const axisContainerRef = React.useRef<HTMLDivElement>(null);
const axisContainerRef = React.useRef<HTMLDivElement>(null!);
const containerSize = useResponsive(axisContainerRef, {
width: propWidth,
height: propHeight,
Expand Down Expand Up @@ -54,18 +55,18 @@ export function Chart(props: PropType): JSX.Element {
const chartHeight = height - margin.top - margin.bottom;
const outerRadius = innerRadius + Math.min(chartWidth, chartHeight) / 2;
const g = svg
.append("g")
.attr("transform", `translate(${width / 2}, ${height / 2})`);
.append("g")
.attr("transform", `translate(${width / 2}, ${height / 2})`);
const angle = d3.scaleLinear().range([0, 2 * Math.PI]);
const radius = d3.scaleLinear().range([innerRadius, outerRadius]);
const x = d3
.scaleBand()
.range([0, 2 * Math.PI])
.align(0);
.scaleBand()
.range([0, 2 * Math.PI])
.align(0);
const xGroup = d3
.scaleBand()
.range([0, 2 * Math.PI])
.align(0);
.scaleBand()
.range([0, 2 * Math.PI])
.align(0);
const y = d3.scaleLinear().range([innerRadius, outerRadius]);
x.domain(angles.map((d) => d));
xGroup.domain(columns.map((d) => d));
Expand All @@ -80,182 +81,182 @@ export function Chart(props: PropType): JSX.Element {
radius.domain([0, d3.max(data, () => 0) as number]);
const angleOffset = -360.0 / data.length / 2.0;
const stackGen: d3.Stack<any, { [key: string]: number }, string> = d3
.stack()
.keys(dataKeys);
.stack()
.keys(dataKeys);
const arcVal: d3.Arc<SVGPathElement, d3.DefaultArcObject> = d3
.arc()
// @ts-ignore
.innerRadius((d) => Number(y(d[0])))
// @ts-ignore
.outerRadius((d) => Number(y(d[1])))
.startAngle((_d, i) => Number(x(angles[i])))
.endAngle((_d, i) => Number(x(angles[i])) + x.bandwidth())
.padAngle(0.0)
.padRadius(innerRadius);
.arc()
// @ts-ignore
.innerRadius((d) => Number(y(d[0])))
// @ts-ignore
.outerRadius((d) => Number(y(d[1])))
.startAngle((_d, i) => Number(x(angles[i])))
.endAngle((_d, i) => Number(x(angles[i])) + x.bandwidth())
.padAngle(0.0)
.padRadius(innerRadius);
const arcParent = g
.append("g")
.selectAll("g")
// @ts-ignore
.data(stackGen(data))
.enter();
.append("g")
.selectAll("g")
// @ts-ignore
.data(stackGen(data))
.enter();
// @ts-ignore
const arc: d3.Selection<
SVGPathElement,
d3.SeriesPoint<DataType>,
d3.EnterElement,
d3.Series<DataType, string>
SVGPathElement,
d3.SeriesPoint<DataType>,
d3.EnterElement,
d3.Series<DataType, string>
> = arcParent
.selectAll<SVGPathElement, d3.SeriesPoint<DataType>>("path")
.data((d) => d)
.enter()
.append("path");
.selectAll<SVGPathElement, d3.SeriesPoint<DataType>>("path")
.data((d) => d)
.enter()
.append("path");
arc
// @ts-ignore
.attr("d", arcVal)
.attr("transform", `rotate(${angleOffset})`)
.attr("fill", (d: d3.SeriesPoint<DataType>) => d.data.color)
.attr("class", (_d: d3.SeriesPoint<DataType>, i: number) => `arc_${i}`)
.attr("data-tooltip-id", "segment-tooltip")
.attr(
"data-tooltip-content",
(item: d3.SeriesPoint<DataType>) =>
`${item.data.coreCompetency}@${item.data.survey}`
)
.on(
"mouseover",
function (
this: SVGPathElement,
_event: any,
_d: d3.SeriesPoint<DataType>
) {
this.setAttribute("fill", mouseOverColor);
this.setAttribute("style", "transition: fill 0.5s; cursor: pointer;");
}
)
.on(
"mouseout",
function (
this: SVGPathElement,
_event: any,
d: d3.SeriesPoint<DataType>
) {
this.setAttribute("fill", String(d.data!.color) || "#ffffff");
}
);
// @ts-ignore
.attr("d", arcVal)
.attr("transform", `rotate(${angleOffset})`)
.attr("fill", (d: d3.SeriesPoint<DataType>) => d.data.color)
.attr("class", (_d: d3.SeriesPoint<DataType>, i: number) => `arc_${i}`)
.attr("data-tooltip-id", "segment-tooltip")
.attr(
"data-tooltip-content",
(item: d3.SeriesPoint<DataType>) =>
`${item.data.coreCompetency}@${item.data.survey}`
)
.on(
"mouseover",
function (
this: SVGPathElement,
_event: any,
_d: d3.SeriesPoint<DataType>
) {
this.setAttribute("fill", mouseOverColor);
this.setAttribute("style", "transition: fill 0.5s; cursor: pointer;");
}
)
.on(
"mouseout",
function (
this: SVGPathElement,
_event: any,
d: d3.SeriesPoint<DataType>
) {
this.setAttribute("fill", String(d.data!.color) || "#ffffff");
}
);

const label = g
.append("g")
.selectAll("g")
.data(columns)
.enter()
.append("g")
.attr("text-anchor", "middle")
.attr("transform", (d) => {
if (typeof d === "undefined") return null;
return `rotate(${
((Number(xGroup(d)) + xGroup.bandwidth() / 2) * 180) / Math.PI -
(90 - angleOffset)
})translate(${outerRadius},0)`;
});
.append("g")
.selectAll("g")
.data(columns)
.enter()
.append("g")
.attr("text-anchor", "middle")
.attr("transform", (d) => {
if (typeof d === "undefined") return null;
return `rotate(${
((Number(xGroup(d)) + xGroup.bandwidth() / 2) * 180) / Math.PI -
(90 - angleOffset)
})translate(${outerRadius},0)`;
});
label
.append("text")
.attr("transform", "rotate(90)translate(0,-9)")
.text((_d, i) => columns[i])
.style("font-size", 14);
.append("text")
.attr("transform", "rotate(90)translate(0,-9)")
.text((_d, i) => columns[i])
.style("font-size", 14);
const yAxis = g.append("g").attr("text-anchor", "middle");
const yTick = yAxis
.selectAll("g")
.data(y.ticks(5).slice(1))
.enter()
.append("g");
.selectAll("g")
.data(y.ticks(5).slice(1))
.enter()
.append("g");
yTick
.append("circle")
.attr("fill", "none")
.attr("stroke", "gray")
.attr("stroke-dasharray", "4,4")
// @ts-ignore
.attr("r", y);
.append("circle")
.attr("fill", "none")
.attr("stroke", "gray")
.attr("stroke-dasharray", "4,4")
// @ts-ignore
.attr("r", y);
yTick
.append("text")
// @ts-ignore
.attr("y", (d) => -y(d))
.attr("dy", "-0.35em")
.attr("x", () => -10)
.text(y.tickFormat(5, "s"))
.style("font-size", 14);
.append("text")
// @ts-ignore
.attr("y", (d) => -y(d))
.attr("dy", "-0.35em")
.attr("x", () => -10)
.text(y.tickFormat(5, "s"))
.style("font-size", 14);
const legend = g
.append("g")
.selectAll("g")
.data(columns)
.enter()
.append("g")
.attr(
"transform",
(_d, i) =>
`translate(${outerRadius + 0},${
-outerRadius + 40 + (i - (columns.length - 1) / 2) * 20
})`
);
.append("g")
.selectAll("g")
.data(columns)
.enter()
.append("g")
.attr(
"transform",
(_d, i) =>
`translate(${outerRadius + 0},${
-outerRadius + 40 + (i - (columns.length - 1) / 2) * 20
})`
);
legend
.append("rect")
.attr("width", 18)
.attr("height", 18)
.attr("fill", (_d, i) => z[i]);
.append("rect")
.attr("width", 18)
.attr("height", 18)
.attr("fill", (_d, i) => z[i]);
legend
.append("text")
.attr("x", 24)
.attr("y", 9)
.attr("dy", "0.35em")
.text((d) => d)
.style("font-size", 12);
.append("text")
.attr("x", 24)
.attr("y", 9)
.attr("dy", "0.35em")
.text((d) => d)
.style("font-size", 12);
g.exit().remove();
}, [containerSize.width]);
// React.useEffect(() => {
// // Tooltip.rebuild();
// }, [containerSize.width]);
return (
<AxisContainer ref={axisContainerRef} role="main">
<Axis
className="axis"
width={size.width}
height={size.height}
ref={containerRef}
role="document"
/>
<Tooltip
id="segment-tooltip"
render={({ content }) => {
if (isNull(content)) return <></>;
const title = content.split("@")[0];
const survey = content.split("@")[1];
return (
<div>
<p
style={{
color: mouseOverTitleColor,
fontSize: "1em",
}}
>
{title}
</p>
<p
style={{
color: mouseOverSurveyColor,
fontSize: "1.5em",
}}
>
{survey}
</p>
</div>
);
}}
// type="light"
// effect="float"
delayHide={100}
openEvents={{ mouseover: true, focus: false }}
closeEvents={{ mouseout: true, blur: false }}
/>
</AxisContainer>
<AxisContainer ref={axisContainerRef} role="main">
<Axis
className="axis"
width={size.width}
height={size.height}
ref={containerRef}
role="document"
/>
<Tooltip
id="segment-tooltip"
render={({ content }) => {
if (isNull(content)) return <></>;
const title = content.split("@")[0];
const survey = content.split("@")[1];
return (
<div>
<p
style={{
color: mouseOverTitleColor,
fontSize: "1em",
}}
>
{title}
</p>
<p
style={{
color: mouseOverSurveyColor,
fontSize: "1.5em",
}}
>
{survey}
</p>
</div>
);
}}
// type="light"
// effect="float"
delayHide={100}
openEvents={{ mouseover: true, focus: false }}
closeEvents={{ mouseout: true, blur: false }}
/>
</AxisContainer>
);
}

Expand Down