mirror of
https://github.com/portainer/portainer.git
synced 2025-08-02 20:35:25 +02:00
chore(deps): upgrade typescript [EE-4841] (#8247)
This commit is contained in:
parent
365316971b
commit
6ef53f0598
17 changed files with 62 additions and 41 deletions
|
@ -64,7 +64,7 @@ function mergeOptions<T>(options: T[]) {
|
|||
...acc,
|
||||
...option,
|
||||
}),
|
||||
{}
|
||||
{} as T
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ type PropNames<T> = Exclude<keyof T, number | symbol>;
|
|||
* if the second parameter has any ts errors check that the component has the correct props
|
||||
*/
|
||||
export function react2angular<T, U extends PropNames<T>[]>(
|
||||
Component: React.ComponentType<T>,
|
||||
Component: React.ComponentType<T & JSX.IntrinsicAttributes>,
|
||||
propNames: U & ([PropNames<T>] extends [U[number]] ? unknown : PropNames<T>)
|
||||
): IComponentOptions & { name: string } {
|
||||
const bindings = Object.fromEntries(propNames.map((key) => [key, '<']));
|
||||
|
@ -61,7 +61,7 @@ export function react2angular<T, U extends PropNames<T>[]>(
|
|||
ReactDOM.render(
|
||||
<StrictMode>
|
||||
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
||||
<Component {...(props as T)} />
|
||||
<Component {...(props as T & JSX.IntrinsicAttributes)} />
|
||||
</StrictMode>,
|
||||
|
||||
el
|
||||
|
|
|
@ -5,13 +5,13 @@ import { UserProvider } from '@/react/hooks/useUser';
|
|||
import { withReactQuery } from './withReactQuery';
|
||||
|
||||
export function withCurrentUser<T>(
|
||||
WrappedComponent: ComponentType<T>
|
||||
): ComponentType<T> {
|
||||
WrappedComponent: ComponentType<T & JSX.IntrinsicAttributes>
|
||||
): ComponentType<T & JSX.IntrinsicAttributes> {
|
||||
// Try to create a nice displayName for React Dev Tools.
|
||||
const displayName =
|
||||
WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||
|
||||
function WrapperComponent(props: T) {
|
||||
function WrapperComponent(props: T & JSX.IntrinsicAttributes) {
|
||||
return (
|
||||
<UserProvider>
|
||||
<WrappedComponent {...props} />
|
||||
|
|
|
@ -7,7 +7,7 @@ export function withI18nSuspense<T>(
|
|||
const displayName =
|
||||
WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||
|
||||
function WrapperComponent(props: T) {
|
||||
function WrapperComponent(props: T & JSX.IntrinsicAttributes) {
|
||||
return (
|
||||
<Suspense fallback="Loading translations...">
|
||||
<WrappedComponent {...props} />
|
||||
|
|
|
@ -4,14 +4,14 @@ import { QueryClientProvider } from 'react-query';
|
|||
import { queryClient as defaultQueryClient } from './react-query';
|
||||
|
||||
export function withReactQuery<T>(
|
||||
WrappedComponent: ComponentType<T>,
|
||||
WrappedComponent: ComponentType<T & JSX.IntrinsicAttributes>,
|
||||
queryClient = defaultQueryClient
|
||||
): ComponentType<T> {
|
||||
): ComponentType<T & JSX.IntrinsicAttributes> {
|
||||
// Try to create a nice displayName for React Dev Tools.
|
||||
const displayName =
|
||||
WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||
|
||||
function WrapperComponent(props: T) {
|
||||
function WrapperComponent(props: T & JSX.IntrinsicAttributes) {
|
||||
return (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<WrappedComponent {...props} />
|
||||
|
|
|
@ -8,7 +8,7 @@ export function withUIRouter<T>(
|
|||
const displayName =
|
||||
WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||
|
||||
function WrapperComponent(props: T) {
|
||||
function WrapperComponent(props: T & JSX.IntrinsicAttributes) {
|
||||
return (
|
||||
<UIRouterContextComponent>
|
||||
<WrappedComponent {...props} />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue