Skip to content

Commit

Permalink
fix: react component type errors (#2440)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickofthyme
nickofthyme committed May 28, 2024
1 parent 96b0779 commit f0b3a00
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 39 deletions.
4 changes: 2 additions & 2 deletions e2e_server/server/mocks/use_global_parameters.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
*/

import { useMemo, useState } from 'react';
import { BackgroundParameter } from 'storybook-addon-background-toggle';
import { ThemeParameter } from 'storybook-addon-theme-toggle';

import type { StoryGlobals, StoryParameters } from './../../../storybook/types';
import { BackgroundParameter } from '../../../storybook/node_modules/storybook-addon-background-toggle';
import { ThemeParameter } from '../../../storybook/node_modules/storybook-addon-theme-toggle';
import { storybookParameters as globalParams } from '../../../storybook/parameters';
import { ThemeId } from '../../../storybook/use_base_theme';

Expand Down
3 changes: 0 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,8 @@
"postcss-loader": "^4.2.0",
"prettier": "^3.2.5",
"pretty-quick": "^4.0.0",
"react": "^16.13.0",
"react-docgen-typescript-loader": "^3.7.2",
"react-docgen-typescript-webpack-plugin": "^1.1.0",
"react-dom": "^16.13.0",
"react-is": "^16.13.0",
"sass": "^1.49.9",
"sass-graph": "^3.0.5",
"seedrandom": "^3.0.5",
Expand Down
24 changes: 12 additions & 12 deletions packages/charts/api/charts.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ export class Chart extends React_2.Component<ChartProps, ChartState> {
browser: 'IE11' | 'other';
} | null;
// (undocumented)
render(): JSX.Element;
render(): React_2.JSX.Element;
}

// @public
Expand Down Expand Up @@ -3139,7 +3139,7 @@ export type TooltipCellStyle = Pick<CSSProperties, 'maxHeight' | 'textAlign' | '
// @public (undocumented)
export const TooltipContainer: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>(props: PropsWithChildren_2<{
className?: string;
}>) => JSX.Element;
}>) => React_2.JSX.Element;

// @public (undocumented)
export interface TooltipContext<D extends BaseDatum = Datum, SI extends SeriesIdentifier = SeriesIdentifier> {
Expand Down Expand Up @@ -3172,15 +3172,15 @@ export interface TooltipContext<D extends BaseDatum = Datum, SI extends SeriesId
// Warning: (ae-forgotten-export) The symbol "TooltipDividerProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipDivider: ({ margin }: TooltipDividerProps) => JSX.Element;
export const TooltipDivider: ({ margin }: TooltipDividerProps) => React_2.JSX.Element;

// Warning: (ae-forgotten-export) The symbol "TooltipFooterProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipFooter: ({ children }: TooltipFooterProps) => JSX.Element;
export const TooltipFooter: ({ children }: TooltipFooterProps) => React_2.JSX.Element;

// @public (undocumented)
export const TooltipHeader: <D extends BaseDatum = any>(props: TooltipHeaderProps<D>) => JSX.Element | null;
export const TooltipHeader: <D extends BaseDatum = any>(props: TooltipHeaderProps<D>) => React_2.JSX.Element | null;

// @public
export type TooltipHeaderFormatter<D extends BaseDatum = Datum> = (data: PointerValue<D>) => JSX.Element | string;
Expand All @@ -3200,7 +3200,7 @@ export interface TooltipInfo<D extends BaseDatum = Datum, SI extends SeriesIdent
// Warning: (ae-forgotten-export) The symbol "TooltipMetricRowProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipMetricRow: React_2.MemoExoticComponent<({ label, metric }: TooltipMetricRowProps) => JSX.Element>;
export const TooltipMetricRow: React_2.MemoExoticComponent<({ label, metric }: TooltipMetricRowProps) => React_2.JSX.Element>;

// @public
export interface TooltipPortalSettings<B = never> {
Expand Down Expand Up @@ -3274,15 +3274,15 @@ export interface TooltipStyle {
// Warning: (ae-forgotten-export) The symbol "TooltipTableProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipTable: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableProps<D, SI>) => JSX.Element;
export const TooltipTable: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableProps<D, SI>) => React_2.JSX.Element;

// Warning: (ae-forgotten-export) The symbol "TooltipTableBodyProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipTableBody: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableBodyProps<D, SI>) => JSX.Element;
export const TooltipTableBody: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableBodyProps<D, SI>) => React_2.JSX.Element;

// @public (undocumented)
export const TooltipTableCell: ({ style, truncate, tagName, className, children, title: manualTitle, }: TooltipTableCellProps) => JSX.Element;
export const TooltipTableCell: ({ style, truncate, tagName, className, children, title: manualTitle, }: TooltipTableCellProps) => React_2.JSX.Element;

// @public (undocumented)
export type TooltipTableCellProps = PropsWithChildren_2<{
Expand Down Expand Up @@ -3345,17 +3345,17 @@ export interface TooltipTableColumnText<D extends BaseDatum = Datum, SI extends
// Warning: (ae-forgotten-export) The symbol "TooltipTableFooterProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipTableFooter: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableFooterProps<D, SI>) => JSX.Element | null;
export const TooltipTableFooter: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableFooterProps<D, SI>) => React_2.JSX.Element | null;

// Warning: (ae-forgotten-export) The symbol "TooltipTableHeaderProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipTableHeader: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableHeaderProps<D, SI>) => JSX.Element | null;
export const TooltipTableHeader: <D extends BaseDatum = any, SI extends SeriesIdentifier = SeriesIdentifier>({ className, ...props }: TooltipTableHeaderProps<D, SI>) => React_2.JSX.Element | null;

// Warning: (ae-forgotten-export) The symbol "TooltipTableRowProps" needs to be exported by the entry point index.d.ts
//
// @public (undocumented)
export const TooltipTableRow: ({ id, isHighlighted, isSelected, children, onSelect, className, }: TooltipTableRowProps) => JSX.Element;
export const TooltipTableRow: ({ id, isHighlighted, isSelected, children, onSelect, className, }: TooltipTableRowProps) => React_2.JSX.Element;

// @public
export const TooltipType: Readonly<{
Expand Down
4 changes: 4 additions & 0 deletions packages/charts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
"react": "^16.12 || ^17.0 || ^18.0",
"react-dom": "^16.12 || ^17.0 || ^18.0"
},
"devDependencies": {
"@types/react": "^16",
"@types/react-dom": "^16"
},
"browserslist": [
"last 2 versions",
"ie 11"
Expand Down
3 changes: 3 additions & 0 deletions packages/charts/tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../tsconfig"
}
41 changes: 19 additions & 22 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6920,12 +6920,12 @@
dependencies:
"@types/react" "*"

"@types/react-dom@^16.9.8":
version "16.9.8"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
"@types/react-dom@^16", "@types/react-dom@^16.9.8":
version "16.9.24"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.24.tgz#4d193d7d011267fca842e8a10a2d738f92ec5c30"
integrity sha512-Gcmq2JTDheyWn/1eteqyzzWKSqDjYU6KYsIvH7thb7CR5OYInAWOX+7WnKf6PaU/cbdOc4szJItcDEJO7UGmfA==
dependencies:
"@types/react" "*"
"@types/react" "^16"

"@types/react-redux@^7.1.1":
version "7.1.4"
Expand All @@ -6951,12 +6951,13 @@
dependencies:
"@types/react" "*"

"@types/react@*":
version "16.9.49"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
integrity sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==
"@types/react@*", "@types/react@^16":
version "16.14.60"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81"
integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "^0.16"
csstype "^3.0.2"

"@types/refractor@^3.4.0":
Expand All @@ -6971,6 +6972,11 @@
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==

"@types/scheduler@^0.16":
version "0.16.8"
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==

"@types/seedrandom@^2.4.28":
version "2.4.28"
resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.28.tgz#9ce8fa048c1e8c85cb71d7fe4d704e000226036f"
Expand Down Expand Up @@ -11781,7 +11787,8 @@ eslint-module-utils@^2.8.0:
debug "^3.2.7"

"eslint-plugin-elastic-charts@link:./packages/eslint-plugin-elastic-charts":
version "1.0.0"
version "0.0.0"
uid ""

eslint-plugin-eslint-comments@^3.2.0:
version "3.2.0"
Expand Down Expand Up @@ -19676,16 +19683,6 @@ react-dom@^16.12.0:
prop-types "^15.6.2"
scheduler "^0.19.1"

react-dom@^16.13.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.19.1"

react-draggable@^4.4.3:
version "4.4.3"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
Expand Down Expand Up @@ -19779,7 +19776,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==

react-is@^16.13.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
Expand Down Expand Up @@ -19954,7 +19951,7 @@ react-window@^1.8.10:
"@babel/runtime" "^7.0.0"
memoize-one ">=3.1.1 <6"

react@^16.12.0, react@^16.13.0:
react@^16.12.0:
version "16.14.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
Expand Down

0 comments on commit f0b3a00

Please sign in to comment.