fixed search on pdfs to display results when pDF is not selected. fixed presentation transitions to animate. changed so that annotaitons on pdfs would highlight when following a pres slide. fixed scrolling to annotations (and other viewSpecs) from presentations by using the slide target, not the slide as the focus document. cleaned up search and fixed to unhighlight searches on close. fixe pdf search unhighligting to work.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index 8ac0f7d7b..5e1c80f0c 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -114,7 +114,6 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
     @observable openAddSlide: boolean = false;
     @observable openSlideOptions: boolean = false;
 
-    @observable inOptions: boolean = false;
     @observable _controlButton: boolean = false;
     private _disposers: { [name: string]: IReactionDisposer } = {};
 
@@ -602,9 +601,9 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
     }
 
     @computed get currentType() {
-        const documentType = StrCast(this.selectedDoc?.type);
-        const currentType: string = documentType;
-        const capitalizedDocType = ClientUtils.cleanDocumentType(currentType as DocumentType);
+        const docType = StrCast(this.selectedDoc?.type) as DocumentType;
+        const colType = StrCast(this.selectedDoc?.type_collection) as CollectionViewType;
+        const capitalizedDocType = ClientUtils.cleanDocumentType(docType, colType);
 
         return (
             <div>
@@ -1080,7 +1079,7 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
     @computed get optionsSubMenu() {
         return (
             // prettier-ignore
-            <PropertiesSection title="Options" inSection={this.inOptions} isOpen={this.openOptions} setInSection={bool => { this.inOptions = bool; }} setIsOpen={bool => { this.openOptions = bool; }} onDoubleClick={this.CloseAll}>
+            <PropertiesSection title="Options" isOpen={this.openOptions} setIsOpen={bool => { this.openOptions = bool; }} onDoubleClick={this.CloseAll}>
                 <PropertiesButtons />
             </PropertiesSection>
         );