From 96e1aa76c17a1ca4a5f24e31fa63e8333f60aa55 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Wed, 3 Apr 2019 12:50:25 +0200
Subject: [PATCH] TypeScript 3.4 related fixes
---
src/apps/model-server-query/index.tsx | 2 +-
src/mol-util/param-definition.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/apps/model-server-query/index.tsx b/src/apps/model-server-query/index.tsx
index a34f8617c..0c143ceba 100644
--- a/src/apps/model-server-query/index.tsx
+++ b/src/apps/model-server-query/index.tsx
@@ -105,7 +105,7 @@ const state: State = {
query: new Rx.BehaviorSubject(QueryList[1].definition),
id: new Rx.BehaviorSubject('1cbs'),
params: new Rx.BehaviorSubject({ }),
- isBinary: new Rx.BehaviorSubject(false),
+ isBinary: new Rx.BehaviorSubject<boolean>(false),
models: new Rx.BehaviorSubject<number[]>([]),
url: new Rx.Subject()
}
diff --git a/src/mol-util/param-definition.ts b/src/mol-util/param-definition.ts
index bfb9311dc..67c6b8d06 100644
--- a/src/mol-util/param-definition.ts
+++ b/src/mol-util/param-definition.ts
@@ -168,7 +168,7 @@ export namespace ParamDefinition {
}
export interface NamedParams<T = any, K = string> { name: K, params: T }
- export type NamedParamUnion<P extends Params, K = keyof P> = K extends any ? NamedParams<P[K]['defaultValue'], K> : never
+ export type NamedParamUnion<P extends Params, K extends keyof P = keyof P> = K extends any ? NamedParams<P[K]['defaultValue'], K> : never
export interface Mapped<T extends NamedParams<any, any>> extends Base<T> {
type: 'mapped',
select: Select<string>,
--
GitLab