Simplify the Omit type

connectedcars · Feb 4, 2019 · e47d6a1 · e47d6a1
1 parent 70deeb2
commit e47d6a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hoc.tsx b/src/hoc.tsx
@@ -4,8 +4,8 @@ import { Omit } from './types'
 
 export interface WithTranslateProps extends I18nContextProps {}
 
-function withTranslate<P extends WithTranslateProps>(
-  BaseComponent: React.ComponentType<P>
+function withTranslate<P extends object>(
+  BaseComponent: React.ComponentType<P & WithTranslateProps>
 ): React.ComponentType<Omit<P, keyof WithTranslateProps>> {
   return class WithTranslate extends React.Component<P> {
     static displayName = `withTranslate(${BaseComponent.displayName})`

diff --git a/src/types.ts b/src/types.ts
@@ -56,4 +56,4 @@ export type TranslatePluralJsxFunc = (
   context?: string
 ) => ReactNode
 
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type Omit<T, K> = Pick<T, Exclude<keyof T, K>>