Merge pull request #47 from rokoroku/issue-45

Fix Typescript compilation issue
rokoroku · Jul 22, 2018 · 9a3722a · 9a3722a
2 parents 46dce57 + 20e47ca
commit 9a3722a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "postcss-url": "^7.3.2",
     "prettier": "^1.13.5",
     "react-hot-loader": "^4.3.1",
-    "redux-devtools-extension": "^2.13.2",
+    "redux-devtools-extension": "^2.13.5",
     "style-loader": "^0.21.0",
     "ts-loader": "^4.4.1",
     "typescript": "^2.9.1",

diff --git a/types/global.d.ts b/types/global.d.ts
@@ -7,7 +7,8 @@ declare module '*.css' {
 }
 
 // Omit type https://github.com/Microsoft/TypeScript/issues/12215
+type SimpleKeyOf<T> = Extract<keyof T, 'number' | 'string'>;
 type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-type Omit<T, K extends keyof T> = { [P in Diff<keyof T, K>]: T[P] };
+type Omit<T, K extends SimpleKeyOf<T>> = { [P in Diff<SimpleKeyOf<T>, K>]: T[P] };
 
 type PartialPick<T, K extends keyof T> = Partial<T> & Pick<T, K>;