Skip to content

Commit 2d14d57

Browse files
authored
Pin react version to 18.2.0 (#304)
* Pin react version to 18.2.0 * Removed unnecessary error comments
1 parent 1557f1c commit 2d14d57

19 files changed

Lines changed: 45 additions & 69 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [UNRELEASED] - YYYY-MM-DD
9+
10+
### Changed
11+
- [#304](https://github.com/equinor/webviz-core-components/pull/304) - Pinned `React` to version `18.2` in `package-lock.json` in order to comply with supported versions in `Dash`.
12+
813
## [0.7.0] - 2024-01-29
914

1015
### Changed

react/package-lock.json

Lines changed: 36 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

react/src/lib/components/Dialog/components/DialogComponent.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ export const DialogComponent: React.FC<DialogProps> = (props) => {
126126
color: "#ccc",
127127
}}
128128
>
129-
{ /* @ts-expect-error - this is a very weird bug */}
130129
<Icon name="close" />
131130
</IconButton>
132131
</DialogTitle>

react/src/lib/components/EdsIcon/EdsIcon.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export const EdsIcon: React.FC<EdsIconProps> = (props) => {
2828
`https://eds-storybook-react.azurewebsites.net/?path=/story/icons--preview.`
2929
}
3030
>
31-
{ /* @ts-expect-error - this is a very weird bug */}
3231
<Icon
3332
id={props.id}
3433
data={edsIcons.report}
@@ -42,7 +41,6 @@ export const EdsIcon: React.FC<EdsIconProps> = (props) => {
4241

4342
return (
4443
<>
45-
{ /* @ts-expect-error - this is a very weird bug */}
4644
<Icon id={props.id} data={icon} size={props.size} color={props.color} />
4745
</>
4846
);

react/src/lib/components/Menu/components/Group/Group.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export const Group: React.FC<GroupProps> = (props) => {
7373
: "Collapse group"
7474
}
7575
>
76-
{ /* @ts-expect-error - this is a very weird bug */}
7776
<EdsIcon
7877
name={
7978
!collapsed || props.forceOpen

react/src/lib/components/Menu/components/Icon/Icon.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export const Icon: React.FC<IconProps> = (props) => {
2727
`https://eds-storybook-react.azurewebsites.net/?path=/story/icons--preview.`
2828
}
2929
>
30-
{ /* @ts-expect-error - this is a very weird bug */}
3130
<EdsIcon
3231
data={edsIcons.report}
3332
color="hsla(0, 100%, 50%, 1)"
@@ -39,7 +38,6 @@ export const Icon: React.FC<IconProps> = (props) => {
3938

4039
return (
4140
<>
42-
{ /* @ts-expect-error - this is a very weird bug */}
4341
<EdsIcon
4442
data={icon}
4543
color={props.active ? "#FF1243" : "#989898"}

react/src/lib/components/Menu/components/MenuBar/MenuBar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ export const MenuBar = React.forwardRef<HTMLDivElement, MenuBarProps>(
331331
variant="ghost_icon"
332332
onClick={handleMenuButtonClick}
333333
>
334-
{ /* @ts-expect-error - this is a very weird bug */}
335334
<Icon name="menu" title="Open menu" />
336335
</Button>
337336
</div>

react/src/lib/components/WebvizDialog/components/WebvizDialogTitle/WebvizDialogTitle.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const WebvizDialogTitle = React.forwardRef<
7474
aria-label="close"
7575
onClick={() => handleCloseClick()}
7676
>
77-
{ /* @ts-expect-error - this is a very weird bug */}
7877
<Icon name="close" />
7978
</IconButton>
8079
</div>

react/src/lib/components/WebvizPluginPlaceholder/components/WebvizContentOverlay.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ const WebvizContentOverlay: React.FC<InferProps<typeof propTypes>> = ({
4343
<div className="webviz-plugin-data-owner">
4444
{contactPerson && "name" in contactPerson && (
4545
<p>
46-
{ /* @ts-expect-error - this is a very weird bug */}
4746
<Icon name="person" style={{ marginRight: "5px" }} />
4847
{contactPerson.name}
4948
</p>
5049
)}
5150
{contactPerson && "email" in contactPerson && (
5251
<p>
53-
{ /* @ts-expect-error - this is a very weird bug */}
5452
<Icon name="email" style={{ marginRight: "5px" }} />
5553
<a href="mailto:{this.props.contactPerson.email}">
5654
{contactPerson.email}
@@ -59,7 +57,6 @@ const WebvizContentOverlay: React.FC<InferProps<typeof propTypes>> = ({
5957
)}
6058
{contactPerson && "phone" in contactPerson && (
6159
<p>
62-
{ /* @ts-expect-error - this is a very weird bug */}
6360
<Icon name="call" style={{ marginRight: "5px" }} />
6461
{contactPerson.phone}
6562
</p>

react/src/lib/components/WebvizPluginPlaceholder/components/WebvizToolbarButton.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const WebvizToolbarButton: React.FC<WebvizToolbarButtonProps> = ({
2424
target,
2525
}) => {
2626
const createIcon = (useOnClick: boolean) => (
27-
// @ts-expect-error - this is a very weird bug
2827
<Icon
2928
data={icon}
3029
className={classNames({

0 commit comments

Comments
 (0)