diff --git a/src/mol-repr/representation.ts b/src/mol-repr/representation.ts index 5032bef59feeebf06e2b78c8a41b4ddad4644495..8900e9ee121c7e06df5b36397f81d5c1cb3dc38d 100644 --- a/src/mol-repr/representation.ts +++ b/src/mol-repr/representation.ts @@ -188,11 +188,7 @@ namespace Representation { } return renderObjects }, - get props() { - const props = {} - reprList.forEach(r => Object.assign(props, r.props)) - return props as P - }, + get props() { return currentProps }, get params() { return currentParams }, createOrUpdate: (props: Partial<P> = {}, data?: D) => { if (data && data !== currentData) { diff --git a/src/mol-theme/color.ts b/src/mol-theme/color.ts index ba17219d3f3ed1d39ed855a0e5188ef2ba811311..33f4c9e3c93fc5544682676f33d55a30f9f8c863 100644 --- a/src/mol-theme/color.ts +++ b/src/mol-theme/color.ts @@ -29,8 +29,6 @@ import { TableLegend } from 'mol-util/color/tables'; export type LocationColor = (location: Location, isSecondary: boolean) => Color -export type ColorThemeProps = { [k: string]: any } - export { ColorTheme } interface ColorTheme<P extends PD.Params> { readonly factory: ColorTheme.Factory<P> @@ -75,4 +73,5 @@ export const BuiltInColorThemes = { 'shape-group': ShapeGroupColorThemeProvider, 'unit-index': UnitIndexColorThemeProvider, 'uniform': UniformColorThemeProvider, -} \ No newline at end of file +} +export type BuiltInColorThemeName = keyof typeof BuiltInColorThemes \ No newline at end of file diff --git a/src/mol-theme/size.ts b/src/mol-theme/size.ts index 52469b7a1dff63f6b1b740e50e6abd96347827fb..c0dbbe3e39e03b5ec59e7296ce5b21eb3d4c00c1 100644 --- a/src/mol-theme/size.ts +++ b/src/mol-theme/size.ts @@ -43,4 +43,5 @@ export const BuiltInSizeThemes = { 'physical': PhysicalSizeThemeProvider, 'shape-group': ShapeGroupSizeThemeProvider, 'uniform': UniformSizeThemeProvider -} \ No newline at end of file +} +export type BuiltInSizeThemeName = keyof typeof BuiltInSizeThemes \ No newline at end of file