From fac183c2ee381d9ee6184a39a484eda58d263d61 Mon Sep 17 00:00:00 2001 From: Alexander Rose <alexander.rose@weirdbyte.de> Date: Fri, 23 Aug 2019 22:27:20 -0700 Subject: [PATCH] allow partial reprParams in StructureRepresentation3DHelpers.createParams --- src/mol-plugin/state/transforms/representation.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mol-plugin/state/transforms/representation.ts b/src/mol-plugin/state/transforms/representation.ts index 00349cc8d..262c7bdc9 100644 --- a/src/mol-plugin/state/transforms/representation.ts +++ b/src/mol-plugin/state/transforms/representation.ts @@ -68,9 +68,10 @@ namespace StructureRepresentation3DHelpers { const repr = params.repr ? params.repr instanceof Array ? params.repr[0] : params.repr : ctx.structureRepresentation.registry.default.provider; + const reprDefaultParams = PD.getDefaultValues(repr.getParams(themeCtx, structure)); const reprParams = params.repr instanceof Array - ? params.repr[1](repr as R, themeCtx, structure) - : PD.getDefaultValues(repr.getParams(themeCtx, structure)); + ? { ...reprDefaultParams, ...params.repr[1](repr as R, themeCtx, structure) } + : reprDefaultParams; const color = params.color ? params.color instanceof Array ? params.color[0] : params.color -- GitLab