Skip to content

fix(icons): fix types, upgrade typescript #3978

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

Merged
redallen merged 7 commits into from
Mar 27, 2020
Merged

fix(icons): fix types, upgrade typescript #3978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb580ef
half refactor
redallen Mar 26, 2020
dcdb31d
cleanup
redallen Mar 26, 2020
1e1fcbf
fix lint
redallen Mar 26, 2020
5ef3463
upgrade typescript to fix build
redallen Mar 26, 2020
07179e6
fix tests
redallen Mar 26, 2020
0d2ac6d
fix lint
redallen Mar 26, 2020
5d2dd00
Merge remote-tracking branch 'upstream/v4' into fix/icon-types
redallen Mar 26, 2020
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
1 change: 0 additions & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ coverage
**/Generated
**/build
css
packages/react-icons/src/index.js
packages/react-icons/src/icons

# package managers
Expand Down
2 changes: 1 addition & 1 deletion packages/react-catalog-view-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"node-sass": "^4.12.0",
"rimraf": "^2.6.2",
"shx": "^0.3.2",
"typescript": "3.4.5"
"typescript": "^3.8.3"
},
"peerDependencies": {
"prop-types": "^15.6.1",
Expand Down
427 changes: 238 additions & 189 deletions ...catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/react-charts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
"rimraf": "^2.6.2",
"typescript": "3.4.5"
"typescript": "^3.8.3"
}
}
7 changes: 3 additions & 4 deletions packages/react-charts/src/components/Chart/Chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,10 +447,9 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
};

// Note: containerComponent is required for theme, but @types/victory is missing a prop type
const VictoryChartWithContainerComponent = VictoryChart as any;
return (
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// @ts-ignore
<VictoryChart
<VictoryChartWithContainerComponent
containerComponent={container}
height={height}
padding={defaultPadding}
Expand All @@ -460,7 +459,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
>
{children}
{getLegend()}
</VictoryChart>
</VictoryChartWithContainerComponent>
Copy link
Member

@dlabrecq dlabrecq Mar 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a required change (i.e., do we need to cast to any)?

There are more components that use containerComponent prop, other than Chart and ChartAxis, so curious if this is blocking the typescript change?

Copy link
Contributor Author

@redallen redallen Mar 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the only 2 that threw errors. I agree it'd be better to redefine victory types or update them upstream. We can open an issue for this.

);
};

Expand Down
5 changes: 2 additions & 3 deletions packages/react-charts/src/components/ChartAxis/ChartAxis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,9 @@ export const ChartAxis: React.FunctionComponent<ChartAxisProps> = ({
});

// Note: containerComponent is required for theme, but @types/victory is missing a prop type
const VictoryAxisWithContainerComponent = VictoryAxis as any;
return (
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// @ts-ignore
<VictoryAxis
<VictoryAxisWithContainerComponent
containerComponent={container}
theme={showGrid ? getAxisTheme(themeColor, themeVariant) : theme}
{...rest}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"generator-tsx-docgen": "^0.1.0",
"glob": "^7.1.2",
"rimraf": "^2.6.2",
"typescript": "3.4.5",
"typescript": "^3.8.3",
"yo": "^3.1.1"
},
"peerDependencies": {
Expand Down
7 changes: 1 addition & 6 deletions ...nents/AboutModal/__tests__/Generated/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ exports[`AboutModalBoxCloseButton should match snapshot (auto-generated) 1`] = `
onClick={[Function]}
variant="plain"
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<TimesIcon />
</Button>
</div>
`;
21 changes: 3 additions & 18 deletions .../src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ exports[`AboutModalBoxCloseButton Test 1`] = `
onClick={[Function]}
variant="plain"
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<TimesIcon />
</Button>
</div>
`;
Expand All @@ -28,12 +23,7 @@ exports[`AboutModalBoxCloseButton Test close button aria label 1`] = `
onClick={[Function]}
variant="plain"
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<TimesIcon />
</Button>
</div>
`;
Expand All @@ -47,12 +37,7 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = `
onClick={[MockFunction]}
variant="plain"
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<TimesIcon />
</Button>
</div>
`;
7 changes: 1 addition & 6 deletions ...c/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ exports[`AlertActionCloseButton should match snapshot (auto-generated) 1`] = `
onClick={[Function]}
variant="plain"
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<TimesIcon />
</Button>
`;
7 changes: 1 addition & 6 deletions ...react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertIcon.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ exports[`AlertIcon should match snapshot (auto-generated) 1`] = `
<div
className="pf-c-alert__icon ''"
>
<CheckCircleIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
<CheckCircleIcon />
</div>
`;
Loading