minor refactoring

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "@rcsb/rcsb-saguaro-3d",
-  "version": "1.5.0-models.6",
+  "version": "1.5.0-models.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@rcsb/rcsb-saguaro-3d",
-      "version": "1.5.0-models.6",
+      "version": "1.5.0-models.7",
       "license": "MIT",
       "dependencies": {
         "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
         "@rcsb/rcsb-molstar": "^2.5.5",
-        "@rcsb/rcsb-saguaro": "^2.1.7",
-        "@rcsb/rcsb-saguaro-app": "^4.4.0-models.35",
+        "@rcsb/rcsb-saguaro": "^2.2.1",
+        "@rcsb/rcsb-saguaro-app": "^4.4.0-models.37",
         "molstar": "^3.13.0"
       },
       "devDependencies": {
@@ -2490,9 +2490,9 @@
       }
     },
     "node_modules/@rcsb/rcsb-saguaro": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro/-/rcsb-saguaro-2.2.0.tgz",
-      "integrity": "sha512-0WQWZaLZU9OO5lFKATmwI3F64iTocbhsuqapKUz9sGwfhiIJn+UQ1Wyg78d9QVrFD9tsAmwB3QFdqkdZ2DpmGw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro/-/rcsb-saguaro-2.2.1.tgz",
+      "integrity": "sha512-ngtnmaoCNobtnKihh8+S7nvr2mEYkrPNrKaMJUTCgjdH+F4V3wBaPD4PSCLbTm838oiFc5B4eEQGwoWPzMQGfw==",
       "dependencies": {
         "@d3fc/d3fc-sample": "^5.0.1",
         "d3": "^7.6.1",
@@ -2504,12 +2504,12 @@
       }
     },
     "node_modules/@rcsb/rcsb-saguaro-app": {
-      "version": "4.4.0-models.35",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.35.tgz",
-      "integrity": "sha512-VSNX/lnBTh9WBVSS+p1i8VkKTpfYoZn3AsILD2/zaKBaKLx4PYn1MUSPNaJrwHIt/js0urS7mVajfmKAXk9lcw==",
+      "version": "4.4.0-models.37",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.37.tgz",
+      "integrity": "sha512-TT1qhLkS+yMaNZ9f3HHrYCRgJlrWRoQL+FgzI5tnR+Go1yzjP0TzKaBsVBfpWn/JG88zWBXg4RcmNi9w2gLhnQ==",
       "dependencies": {
         "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
-        "@rcsb/rcsb-saguaro": "^2.2.0",
+        "@rcsb/rcsb-saguaro": "^2.2.1",
         "react-select": "^5.4.0",
         "rxjs": "^7.5.5",
         "victory": "^36.5.0"
@@ -14037,9 +14037,9 @@
       }
     },
     "@rcsb/rcsb-saguaro": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro/-/rcsb-saguaro-2.2.0.tgz",
-      "integrity": "sha512-0WQWZaLZU9OO5lFKATmwI3F64iTocbhsuqapKUz9sGwfhiIJn+UQ1Wyg78d9QVrFD9tsAmwB3QFdqkdZ2DpmGw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro/-/rcsb-saguaro-2.2.1.tgz",
+      "integrity": "sha512-ngtnmaoCNobtnKihh8+S7nvr2mEYkrPNrKaMJUTCgjdH+F4V3wBaPD4PSCLbTm838oiFc5B4eEQGwoWPzMQGfw==",
       "requires": {
         "@d3fc/d3fc-sample": "^5.0.1",
         "d3": "^7.6.1",
@@ -14051,12 +14051,12 @@
       }
     },
     "@rcsb/rcsb-saguaro-app": {
-      "version": "4.4.0-models.35",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.35.tgz",
-      "integrity": "sha512-VSNX/lnBTh9WBVSS+p1i8VkKTpfYoZn3AsILD2/zaKBaKLx4PYn1MUSPNaJrwHIt/js0urS7mVajfmKAXk9lcw==",
+      "version": "4.4.0-models.37",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.37.tgz",
+      "integrity": "sha512-TT1qhLkS+yMaNZ9f3HHrYCRgJlrWRoQL+FgzI5tnR+Go1yzjP0TzKaBsVBfpWn/JG88zWBXg4RcmNi9w2gLhnQ==",
       "requires": {
         "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
-        "@rcsb/rcsb-saguaro": "^2.2.0",
+        "@rcsb/rcsb-saguaro": "^2.2.1",
         "react-select": "^5.4.0",
         "rxjs": "^7.5.5",
         "victory": "^36.5.0"

package.json

@@ -80,8 +80,8 @@
   "dependencies": {
     "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
     "@rcsb/rcsb-molstar": "^2.5.5",
-    "@rcsb/rcsb-saguaro": "^2.1.7",
-    "@rcsb/rcsb-saguaro-app": "^4.4.0-models.35",
+    "@rcsb/rcsb-saguaro": "^2.2.1",
+    "@rcsb/rcsb-saguaro-app": "^4.4.0-models.37",
     "molstar": "^3.13.0"
   },
   "bugs": {

src/RcsbFv3D/RcsbFv3DAssembly.tsx

@@ -69,7 +69,7 @@ export class RcsbFv3DAssembly extends RcsbFv3DAbstract<{instanceSequenceConfig?:
                         }
                     }
                 },
-                pluginConfig: {
+                structureViewerConfig: {
                     viewerElement: RcsbFvStructure.componentId(elementId),
                     viewerProps:params.molstarProps ?? {}
                 }

src/RcsbFv3D/RcsbFv3DComponent.tsx

@@ -68,7 +68,7 @@ export class RcsbFv3DComponent<T,R,S,U> extends React.Component <RcsbFv3DCompone
                         <RcsbFvStructure<R,S>
                             {...this.state.structurePanelConfig}
                             componentId={this.props.id}
-                            plugin={this.props.structureViewer}
+                            structureViewer={this.props.structureViewer}
                             selectorManager={this.selectorManager}
                         />
                     </div>
@@ -77,7 +77,7 @@ export class RcsbFv3DComponent<T,R,S,U> extends React.Component <RcsbFv3DCompone
                             type={this.state.sequencePanelConfig.type}
                             config={this.state.sequencePanelConfig.config}
                             componentId={this.props.id}
-                            plugin={this.props.structureViewer}
+                            structureViewer={this.props.structureViewer}
                             selectorManager={this.selectorManager}
                             title={this.state.sequencePanelConfig.title}
                             subtitle={this.state.sequencePanelConfig.subtitle}

src/RcsbFv3D/RcsbFv3DCustom.tsx

@@ -30,8 +30,8 @@ export class RcsbFv3DCustom extends RcsbFv3DAbstract<{},LoadMolstarInterface,{vi
             elementId: elementId,
             structureConfig: {
                 loadConfig: params.structurePanelConfig.loadConfig,
-                pluginConfig:{
-                    ...params.structurePanelConfig.pluginConfig,
+                structureViewerConfig:{
+                    ...params.structurePanelConfig.structureViewerConfig,
                     viewerElement:RcsbFvStructure.componentId(elementId),
                 }
             },

src/RcsbFv3D/RcsbFv3DUniprot.tsx

@@ -15,7 +15,7 @@ import {StructureViewer} from "../RcsbFvStructure/StructureViewers/StructureView
 import {MolstarManagerFactory} from "../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarManagerFactory";
 import {
     UniprotPfvManagerFactory
-} from "../RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/UniprotPfvFactory";
+} from "../RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/UniprotPfvManagerFactory";
 import {
     UniprotCallbackManagerFactory
 } from "../RcsbFvSequence/SequenceViews/RcsbView/CallbackManagerFactoryImplementation/UniprotCallbackManager";
@@ -34,7 +34,7 @@ export interface RcsbFv3DUniprotInterface  {
     cssConfig?: RcsbFv3DCssConfig;
 }
 
-export class RcsbFv3DUniprot extends RcsbFv3DAbstract<{upAcc:string},LoadMolstarInterface,{viewerElement:string|HTMLElement,viewerProps:Partial<ViewerProps>},{context:UniprotSequenceOnchangeInterface,module:RcsbFvModulePublicInterface}> {
+export class RcsbFv3DUniprot extends RcsbFv3DAbstract<{upAcc:string},LoadMolstarInterface|undefined,{viewerElement:string|HTMLElement,viewerProps:Partial<ViewerProps>},{context:UniprotSequenceOnchangeInterface,module:RcsbFvModulePublicInterface}> {
     constructor(params:RcsbFv3DUniprotInterface){
         const elementId: string = params.elementId ?? uniqid("RcsbFv3D_");
         super({
@@ -60,11 +60,8 @@ export class RcsbFv3DUniprot extends RcsbFv3DAbstract<{upAcc:string},LoadMolstar
                 }
             },
             structureConfig: {
-                loadConfig: {
-                    loadMethod: LoadMethod.loadPdbId,
-                    loadParams: []
-                },
-                pluginConfig: {
+                loadConfig: undefined,
+                structureViewerConfig: {
                     viewerElement:RcsbFvStructure.componentId(elementId),
                     viewerProps: params.molstarProps ?? {}
                 }

src/RcsbFvSequence/RcsbFvSequence.tsx

@@ -21,8 +21,8 @@ interface CallbackConfig {
     sequenceCallback?: (rcsbFv: RcsbFv)=>void;
 }
 
-type PluginType<R> = ViewerCallbackManagerInterface & ViewerActionManagerInterface<R>;
-export class RcsbFvSequence<T,R,U> extends React.Component <RcsbFvSequenceInterface<T,R,U> & CallbackConfig & {unmount:(flag:boolean)=>void, plugin: PluginType<R>, selectorManager:RcsbFvSelectorManager, componentId:string}, RcsbFvSequenceInterface<T,R,U> > {
+type StructureViewerType<R> = ViewerCallbackManagerInterface & ViewerActionManagerInterface<R>;
+export class RcsbFvSequence<T,R,U> extends React.Component <RcsbFvSequenceInterface<T,R,U> & CallbackConfig & {unmount:(flag:boolean)=>void, structureViewer: StructureViewerType<R>, selectorManager:RcsbFvSelectorManager, componentId:string}, RcsbFvSequenceInterface<T,R,U> > {
 
     render() {
         if(this.props.type == "custom"){
@@ -30,7 +30,7 @@ export class RcsbFvSequence<T,R,U> extends React.Component <RcsbFvSequenceInterf
             return (<CustomView<R>
                 {...config}
                 componentId={this.props.componentId}
-                plugin={this.props.plugin}
+                structureViewer={this.props.structureViewer}
                 selectorManager={this.props.selectorManager}
                 title={this.props.title}
                 subtitle={this.props.subtitle}
@@ -41,7 +41,7 @@ export class RcsbFvSequence<T,R,U> extends React.Component <RcsbFvSequenceInterf
             return (<RcsbView<T,R,U>
                 {...config}
                 componentId={this.props.componentId}
-                plugin={this.props.plugin}
+                structureViewer={this.props.structureViewer}
                 selectorManager={this.props.selectorManager}
                 title={this.props.title}
                 subtitle={this.props.subtitle}

src/RcsbFvSequence/SequenceViews/AbstractView.tsx

@@ -14,7 +14,7 @@ export interface AbstractViewInterface<R> {
     componentId: string;
     title?: string;
     subtitle?: string;
-    plugin: ViewerCallbackManagerInterface & ViewerActionManagerInterface<R>;
+    structureViewer: ViewerCallbackManagerInterface & ViewerActionManagerInterface<R>;
     selectorManager: RcsbFvSelectorManager;
     unmount:(flag:boolean,callback:()=>void)=>void;
 }
@@ -45,15 +45,15 @@ export abstract class AbstractView<P,S,R> extends React.Component <P & AbstractV
     }
 
     componentDidMount() {
-        this.props.plugin.setSelectCallback(this.structureSelectionCallback.bind(this));
-        this.props.plugin.setModelChangeCallback(this.modelChangeCallback.bind(this));
-        this.props.plugin.setHoverCallback(this.structureHoverCallback.bind(this));
-        this.props.plugin.setRepresentationChangeCallback(this.representationChangeCallback.bind(this));
+        this.props.structureViewer.setSelectCallback(this.structureSelectionCallback.bind(this));
+        this.props.structureViewer.setModelChangeCallback(this.modelChangeCallback.bind(this));
+        this.props.structureViewer.setHoverCallback(this.structureHoverCallback.bind(this));
+        this.props.structureViewer.setRepresentationChangeCallback(this.representationChangeCallback.bind(this));
         window.addEventListener('resize', this.resizeCallback);
     }
 
     componentWillUnmount() {
-        this.props.plugin.unsetCallbacks();
+        this.props.structureViewer.unsetCallbacks();
         window.removeEventListener('resize', this.resizeCallback);
     }
 

src/RcsbFvSequence/SequenceViews/CustomView/CustomView.tsx

@@ -128,7 +128,7 @@ export class CustomView<R> extends AbstractView<CustomViewInterface<R>, CustomVi
         this.buildBlockFv();
         asyncScheduler.schedule(()=>{
             if(typeof this.state.blockChangeCallback === "function")
-                this.state.blockChangeCallback(this.props.plugin, Array.from(this.blockMap.get(this.blockViewSelector.getActiveBlock())!.values()).map(boardId=>(this.rcsbFvMap.get(boardId)!)), this.props.selectorManager);
+                this.state.blockChangeCallback(this.props.structureViewer, Array.from(this.blockMap.get(this.blockViewSelector.getActiveBlock())!.values()).map(boardId=>(this.rcsbFvMap.get(boardId)!)), this.props.selectorManager);
             else
                 this.structureSelectionCallback();
         },1000);
@@ -142,7 +142,7 @@ export class CustomView<R> extends AbstractView<CustomViewInterface<R>, CustomVi
             document.getElementById("boardDiv_"+boardId)?.remove()
         });
         this.rcsbFvMap.clear();
-        this.props.plugin.unsetCallbacks();
+        this.props.structureViewer.unsetCallbacks();
     }
 
     private buildBlockFv(){
@@ -164,20 +164,20 @@ export class CustomView<R> extends AbstractView<CustomViewInterface<R>, CustomVi
                     selectionChangeCallBack:(selection: RcsbFvTrackDataElementInterface[])=>{
                         if(this.innerSelectionFlag)
                             return;
-                        this.boardMap.get(boardId)!.sequenceSelectionChangeCallback(this.props.plugin, this.props.selectorManager, selection);
+                        this.boardMap.get(boardId)!.sequenceSelectionChangeCallback(this.props.structureViewer, this.props.selectorManager, selection);
                     },
                     highlightHoverCallback:(elements:Array<RcsbFvTrackDataElementInterface>)=>{
-                        this.boardMap.get(boardId)!.sequenceHoverCallback(this.props.plugin, this.props.selectorManager, elements);
+                        this.boardMap.get(boardId)!.sequenceHoverCallback(this.props.structureViewer, this.props.selectorManager, elements);
                     },
                     elementClickCallBack: (element: RcsbFvTrackDataElementInterface)=>{
-                        this.boardMap.get(boardId)!.sequenceElementClickCallback(this.props.plugin, this.props.selectorManager, element);
+                        this.boardMap.get(boardId)!.sequenceElementClickCallback(this.props.structureViewer, this.props.selectorManager, element);
                     }
                 },
                 rowConfigData: this.boardMap.get(boardId)!.rowConfig
             });
             this.rcsbFvMap.set(boardId, rcsbFv);
         });
-        this.props.plugin.setSelectCallback(()=>{
+        this.props.structureViewer.setSelectCallback(()=>{
            this.structureSelectionCallback();
         });
     }
@@ -188,7 +188,7 @@ export class CustomView<R> extends AbstractView<CustomViewInterface<R>, CustomVi
             const pfv: RcsbFv | undefined = this.rcsbFvMap.get(boardId);
             if(pfv == null)
                 return;
-            this.boardMap.get(boardId)?.structureSelectionCallback(this.props.plugin, pfv, this.props.selectorManager);
+            this.boardMap.get(boardId)?.structureSelectionCallback(this.props.structureViewer, pfv, this.props.selectorManager);
         });
         this.innerSelectionFlag = false;
     }
@@ -198,7 +198,7 @@ export class CustomView<R> extends AbstractView<CustomViewInterface<R>, CustomVi
             const pfv: RcsbFv | undefined = this.rcsbFvMap.get(boardId);
             if(pfv == null)
                 return;
-            this.boardMap.get(boardId)?.structureHoverCallback(this.props.plugin, pfv, this.props.selectorManager);
+            this.boardMap.get(boardId)?.structureHoverCallback(this.props.structureViewer, pfv, this.props.selectorManager);
         });
     }
 

src/RcsbFvSequence/SequenceViews/RcsbView/CallbackManagerFactoryImplementation/UniprotCallbackManager.ts

@@ -12,6 +12,7 @@ import {AlignmentResponse} from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Bo
 import {
     UniprotSequenceOnchangeInterface
 } from "@rcsb/rcsb-saguaro-app/build/dist/RcsbFvWeb/RcsbFvBuilder/RcsbFvUniprotBuilder";
+import {TagDelimiter} from "@rcsb/rcsb-saguaro-app";
 
 export class UniprotCallbackManagerFactory<R> implements CallbackManagerFactoryInterface<R,{context: UniprotSequenceOnchangeInterface, module: RcsbFvModulePublicInterface}> {
 
@@ -56,36 +57,14 @@ class UniprotCallbackManager<R>  extends AbstractCallbackManager<R,{context: Uni
             await this.plugin.load(this.loadParamRequest(params.context.entryId));
         }else{
             const alignments: AlignmentResponse = await params.module.getAlignmentResponse();
-            if(alignments.target_alignment && alignments.target_alignment.length > 0){
-                const entryId: string|undefined = alignments.target_alignment[0]!.target_id?.split("_")[0];
+            if(alignments.target_alignment && alignments.target_alignment.length > 0 && typeof alignments.target_alignment[0]?.target_id === "string"){
+                const entryId: string = TagDelimiter.parseEntity(alignments.target_alignment[0]?.target_id).entryId;
                 if(entryId)
                     await this.plugin.load(this.loadParamRequest(entryId));
             }
         }
     }
 
-    /*async pfvChangeCallback(context: UniprotSequenceOnchangeInterface, module: RcsbFvModulePublicInterface): Promise<void> {
-        if(context.entryId) {
-            await this.plugin.load({
-                loadMethod: LoadMethod.loadPdbId,
-                loadParams: {
-                    pdbId: context.entryId
-                }
-            });
-        }else{
-            const alignments: AlignmentResponse = await module.getAlignmentResponse();
-            if(alignments.target_alignment && alignments.target_alignment.length > 0){
-                const entryId: string|undefined = alignments.target_alignment[0]!.target_id?.split("_")[0];
-                await this.plugin.load({
-                    loadMethod: LoadMethod.loadPdbId,
-                    loadParams: {
-                        pdbId: entryId
-                    }
-                });
-            }
-        }
-    }*/
-
     protected innerPluginSelect(mode: "select" | "hover"): Promise<void> {
         return Promise.resolve(undefined);
     }

src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/AssemblyPfvManagerFactory.tsx

@@ -102,7 +102,7 @@ class AssemblyPfvManager<R> extends AbstractPfvManager<{instanceSequenceConfig:
                     filterInstances: assemblyInstances.get(this.assemblyModelSate.getString("entryId")),
                     selectButtonOptionProps: (props: SelectOptionProps) => (
                         <div style={{display: 'flex'}}>
-                            <ChainDisplay plugin={this.plugin} label={props.data.label}/>
+                            <ChainDisplay structureViewer={this.plugin} label={props.data.label}/>
                             {props.children}
                         </div>)
                 },

src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/ChainDisplay.tsx

@@ -5,7 +5,7 @@ import {
 
 type DisplayComponentMethod = (StructureViewerInterface<undefined,[]>)["displayComponent"]
 interface ChainDisplayInterface {
-    plugin: {
+    structureViewer: {
         displayComponent:DisplayComponentMethod
     };
     label: string;
@@ -18,15 +18,15 @@ interface ChainDisplayState {
 export class ChainDisplay extends React.Component<ChainDisplayInterface, ChainDisplayState>{
 
     readonly state: ChainDisplayState = {
-        display: this.props.plugin.displayComponent(this.props.label) ? 'visible' : 'hidden'
+        display: this.props.structureViewer.displayComponent(this.props.label) ? 'visible' : 'hidden'
     };
 
     private changeDisplay(): void{
         if(this.state.display === 'visible') {
-            this.props.plugin.displayComponent(this.props.label, false);
+            this.props.structureViewer.displayComponent(this.props.label, false);
             this.setState({display: 'hidden'});
         }else{
-            this.props.plugin.displayComponent(this.props.label, true);
+            this.props.structureViewer.displayComponent(this.props.label, true);
             this.setState({display: 'visible'});
         }
     }

src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/UniprotPfvFactory.ts → src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/UniprotPfvManagerFactory.ts

@@ -46,6 +46,7 @@ class UniprotPfvManager<R> extends AbstractPfvManager<{upAcc:string},R,{context:
             this.additionalConfig
         );
         const module: RcsbFvModulePublicInterface = await this.module;
+        console.log(module);
         this.rcsbFvContainer.set(module);
         return module;
     }

src/RcsbFvSequence/SequenceViews/RcsbView/RcsbView.tsx

@@ -42,7 +42,7 @@ export class RcsbView<T,R,U> extends AbstractView<RcsbViewInterface<T,R,U>, {},
             ...this.props.pfvParams,
             rcsbFvContainer: this.rcsbFvContainer,
             selectorManager: this.props.selectorManager,
-            plugin: this.props.plugin,
+            plugin: this.props.structureViewer,
             assemblyModelSate: this.assemblyModelSate,
             boardConfigContainer: this.boardConfigContainer,
             rcsbFvDivId: this.rcsbFvDivId,
@@ -53,7 +53,7 @@ export class RcsbView<T,R,U> extends AbstractView<RcsbViewInterface<T,R,U>, {},
         this.callbackManager = this.props.callbackManagerFactory.getCallbackManager({
             rcsbFvContainer: this.rcsbFvContainer,
             selectorManager: this.props.selectorManager,
-            plugin: this.props.plugin,
+            plugin: this.props.structureViewer,
             assemblyModelSate: this.assemblyModelSate,
             pfvFactory: this.pfvFactory
         });

src/RcsbFvStructure/RcsbFvStructure.tsx

@@ -5,10 +5,10 @@ import {RcsbFvSelectorManager} from "../RcsbFvSelection/RcsbFvSelectorManager";
 
 export interface RcsbFvStructureConfigInterface<R,S> {
     loadConfig: R | Array<R>;
-    pluginConfig: S;
+    structureViewerConfig: S;
 }
 
-export class RcsbFvStructure<R,S> extends React.Component <RcsbFvStructureConfigInterface<R,S> & {plugin: StructureViewerInterface<R,S>, componentId: string, selectorManager: RcsbFvSelectorManager}, RcsbFvStructureConfigInterface<R,S> > {
+export class RcsbFvStructure<R,S> extends React.Component <RcsbFvStructureConfigInterface<R,S> & {structureViewer: StructureViewerInterface<R,S>, componentId: string, selectorManager: RcsbFvSelectorManager}, RcsbFvStructureConfigInterface<R,S> > {
 
     render():JSX.Element {
         return (
@@ -20,9 +20,9 @@ export class RcsbFvStructure<R,S> extends React.Component <RcsbFvStructureConfig
 
     async componentDidMount() {
         this.updateDimensions();
-        this.props.plugin.init(this.props.selectorManager, this.props.pluginConfig);
+        this.props.structureViewer.init(this.props.selectorManager, this.props.structureViewerConfig);
         if(this.props.loadConfig)
-            await this.props.plugin.load(this.props.loadConfig);
+            await this.props.structureViewer.load(this.props.loadConfig);
         window.addEventListener('resize', this.updateDimensions.bind(this));
     }
 

src/examples/css-config/index.ts

@@ -233,7 +233,7 @@ const molstarConfig: RcsbFvStructureConfigInterface<LoadMolstarInterface,{viewer
             ])
         }]
     },
-    pluginConfig: {
+    structureViewerConfig: {
         viewerElement:"pfv",
         viewerProps:{
             showImportControls: true,

src/examples/external-mapping/index.ts

@@ -62,7 +62,7 @@ const molstarConfig: RcsbFvStructureConfigInterface<LoadMolstarInterface,{viewer
             }
         }
     }],
-    pluginConfig: {
+    structureViewerConfig: {
         viewerProps:{
             showImportControls: true,
             showSessionControls: false

src/examples/multiple-chain/index.tsx

@@ -252,7 +252,7 @@ const molstarConfig: RcsbFvStructureConfigInterface<LoadMolstarInterface,{viewer
             id:"1acb_board"
         }]
     },
-    pluginConfig: {
+    structureViewerConfig: {
         viewerProps:{
             showImportControls: true,
             showSessionControls: false

src/examples/single-chain/index.ts

@@ -138,7 +138,7 @@ const molstarConfig: RcsbFvStructureConfigInterface<LoadMolstarInterface,{viewer
             id:"1ash_model"
         }]
     },
-    pluginConfig: {
+    structureViewerConfig: {
         viewerProps:{
             showImportControls: true,
             showSessionControls: false

src/examples/structural-alignment/index.ts

@@ -232,7 +232,7 @@ const molstarConfig: RcsbFvStructureConfigInterface<LoadMolstarInterface,{viewer
             ])
         }]
     },
-    pluginConfig: {
+    structureViewerConfig: {
         viewerProps:{
             showImportControls: true,
             showSessionControls: false