Use context to pass the window id around

ProjectMirador · Feb 28, 2023 · c474cc9 · c474cc9
1 parent e0cfcc7
commit c474cc9
Show file tree

Hide file tree

Showing 81 changed files with 250 additions and 140 deletions.
diff --git a/src/components/AnnotationSettings.js b/src/components/AnnotationSettings.js
@@ -35,5 +35,4 @@ AnnotationSettings.propTypes = {
   displayAllDisabled: PropTypes.bool.isRequired,
   t: PropTypes.func.isRequired,
   toggleAnnotationDisplay: PropTypes.func.isRequired,
-  windowId: PropTypes.string.isRequired, // eslint-disable-line react/no-unused-prop-types
 };
diff --git a/src/components/AttributionPanel.js b/src/components/AttributionPanel.js
@@ -22,7 +22,6 @@ export class AttributionPanel extends Component {
       manifestLogo,
       requiredStatement,
       rights,
-      windowId,
       id,
       classes,
       t,
@@ -32,7 +31,6 @@ export class AttributionPanel extends Component {
       <CompanionWindow
         title={t('attributionTitle')}
         paperClassName={ns('attribution-panel')}
-        windowId={windowId}
         id={id}
       >
         <div className={classes.section}>
@@ -85,7 +83,6 @@ AttributionPanel.propTypes = {
   })),
   rights: PropTypes.arrayOf(PropTypes.string),
   t: PropTypes.func,
-  windowId: PropTypes.string.isRequired,
 };
 
 AttributionPanel.defaultProps = {

diff --git a/src/components/CompanionArea.js b/src/components/CompanionArea.js
@@ -61,7 +61,7 @@ export class CompanionArea extends Component {
           <div className={[ns('companion-windows'), companionWindowIds.length > 0 && classes[position], this.areaLayoutClass()].join(' ')} style={{ display: companionAreaOpen ? 'flex' : 'none' }}>
             {
               companionWindowIds.map(id => (
-                <CompanionWindowFactory id={id} key={id} windowId={windowId} />
+                <CompanionWindowFactory id={id} key={id} />
               ))
             }
           </div>

diff --git a/src/components/CompanionWindowFactory.js b/src/components/CompanionWindowFactory.js
@@ -40,7 +40,6 @@ export class CompanionWindowFactory extends Component {
   render() {
     const {
       content,
-      windowId,
       id,
       t,
     } = this.props;
@@ -50,10 +49,9 @@ export class CompanionWindowFactory extends Component {
       return (
         <CompanionWindow
           title={t('error')}
-          windowId={windowId}
           id={id}
         >
-          <ErrorContent error={error} windowId={windowId} companionWindowId={id} />
+          <ErrorContent error={error} companionWindowId={id} />
         </CompanionWindow>
       );
     }
@@ -62,15 +60,14 @@ export class CompanionWindowFactory extends Component {
 
     if (!type) return null;
 
-    return createElement(type, { id, windowId });
+    return createElement(type, { id });
   }
 }
 
 CompanionWindowFactory.propTypes = {
   content: PropTypes.string,
   id: PropTypes.string.isRequired,
   t: PropTypes.func,
-  windowId: PropTypes.string.isRequired,
 };
 
 CompanionWindowFactory.defaultProps = {

diff --git a/src/components/CustomPanel.js b/src/components/CustomPanel.js
@@ -15,14 +15,12 @@ export class CustomPanel extends Component {
       children,
       t,
       title,
-      windowId,
     } = this.props;
 
     return (
       <CompanionWindow
         title={t(title)}
         id={id}
-        windowId={windowId}
       >
         {children}
       </CompanionWindow>
@@ -35,7 +33,6 @@ CustomPanel.propTypes = {
   id: PropTypes.string.isRequired,
   t: PropTypes.func.isRequired,
   title: PropTypes.string.isRequired,
-  windowId: PropTypes.string.isRequired,
 };
 
 CustomPanel.defaultProps = {

diff --git a/src/components/GalleryView.js b/src/components/GalleryView.js
@@ -12,7 +12,7 @@ export class GalleryView extends Component {
    */
   render() {
     const {
-      canvases, classes, viewingDirection, windowId,
+      canvases, classes, viewingDirection,
     } = this.props;
     const htmlDir = viewingDirection === 'right-to-left' ? 'rtl' : 'ltr';
     return (
@@ -22,13 +22,11 @@ export class GalleryView extends Component {
         square
         elevation={0}
         className={classes.galleryContainer}
-        id={`${windowId}-gallery`}
       >
         {
           canvases.map(canvas => (
             <GalleryViewThumbnail
               key={canvas.id}
-              windowId={windowId}
               canvas={canvas}
             />
           ))
@@ -42,7 +40,6 @@ GalleryView.propTypes = {
   canvases: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
   classes: PropTypes.objectOf(PropTypes.string),
   viewingDirection: PropTypes.string,
-  windowId: PropTypes.string.isRequired,
 };
 
 GalleryView.defaultProps = {

diff --git a/src/components/IIIFAuthentication.js b/src/components/IIIFAuthentication.js
@@ -28,14 +28,13 @@ export class IIIFAuthentication extends Component {
   /** */
   defaultAuthBarProps() {
     const {
-      authServiceId, windowId, status, logoutServiceId,
+      authServiceId, status, logoutServiceId,
     } = this.props;
 
     return {
       authServiceId,
       hasLogoutService: !!logoutServiceId,
       status,
-      windowId,
     };
   }
 

diff --git a/src/components/LayersPanel.js b/src/components/LayersPanel.js
@@ -15,22 +15,19 @@ export class LayersPanel extends Component {
       canvasIds,
       id,
       t,
-      windowId,
     } = this.props;
 
     return (
       <CompanionWindow
         title={t('layers')}
         id={id}
-        windowId={windowId}
       >
         {canvasIds.map((canvasId, index) => (
           <CanvasLayers
             canvasId={canvasId}
             index={index}
             key={canvasId}
             totalSize={canvasIds.length}
-            windowId={windowId}
           />
         ))}
       </CompanionWindow>
@@ -42,7 +39,6 @@ LayersPanel.propTypes = {
   canvasIds: PropTypes.arrayOf(PropTypes.string),
   id: PropTypes.string.isRequired,
   t: PropTypes.func.isRequired,
-  windowId: PropTypes.string.isRequired,
 };
 
 LayersPanel.defaultProps = {

diff --git a/src/components/OpenSeadragonViewer.js b/src/components/OpenSeadragonViewer.js
@@ -374,7 +374,7 @@ export class OpenSeadragonViewer extends Component {
         aria-live="polite"
       >
         { drawAnnotations
-            && <AnnotationsOverlay viewer={viewer} windowId={windowId} /> }
+            && <AnnotationsOverlay viewer={viewer} /> }
         { enhancedChildren }
         <PluginHook viewer={viewer} {...{ ...this.props, children: null }} />
       </section>

diff --git a/src/components/PrimaryWindow.js b/src/components/PrimaryWindow.js
@@ -29,41 +29,31 @@ export class PrimaryWindow extends Component {
   renderViewer() {
     const {
       audioResources, isCollection,
-      isFetching, videoResources, view, windowId,
+      isFetching, videoResources, view,
     } = this.props;
     if (isCollection) {
       return (
-        <SelectCollection
-          windowId={windowId}
-        />
+        <SelectCollection />
       );
     }
     if (isFetching === false) {
       if (view === 'gallery') {
         return (
-          <GalleryView
-            windowId={windowId}
-          />
+          <GalleryView />
         );
       }
       if (videoResources.length > 0) {
         return (
-          <VideoViewer
-            windowId={windowId}
-          />
+          <VideoViewer />
         );
       }
       if (audioResources.length > 0) {
         return (
-          <AudioViewer
-            windowId={windowId}
-          />
+          <AudioViewer />
         );
       }
       return (
-        <WindowViewer
-          windowId={windowId}
-        />
+        <WindowViewer />
       );
     }
     return null;
@@ -74,13 +64,13 @@ export class PrimaryWindow extends Component {
    */
   render() {
     const {
-      isCollectionDialogVisible, windowId, classes, children,
+      isCollectionDialogVisible, classes, children,
     } = this.props;
     return (
       <div className={classNames(ns('primary-window'), classes.primaryWindow)}>
-        <WindowSideBar windowId={windowId} />
-        <CompanionArea windowId={windowId} position="left" />
-        { isCollectionDialogVisible && <CollectionDialog windowId={windowId} /> }
+        <WindowSideBar />
+        <CompanionArea position="left" />
+        { isCollectionDialogVisible && <CollectionDialog /> }
         <Suspense fallback={<div />}>
           {children || this.renderViewer()}
         </Suspense>
@@ -98,7 +88,6 @@ PrimaryWindow.propTypes = {
   isFetching: PropTypes.bool,
   videoResources: PropTypes.arrayOf(PropTypes.object), // eslint-disable-line react/forbid-prop-types
   view: PropTypes.string,
-  windowId: PropTypes.string.isRequired,
 };
 
 PrimaryWindow.defaultProps = {

diff --git a/src/components/SearchPanel.js b/src/components/SearchPanel.js
@@ -21,7 +21,6 @@ export class SearchPanel extends Component {
     const {
       classes,
       fetchSearch,
-      windowId,
       id,
       query,
       removeSearch,
@@ -51,15 +50,13 @@ export class SearchPanel extends Component {
             }
           </>
         )}
-        windowId={windowId}
         id={id}
-        titleControls={<SearchPanelControls companionWindowId={id} windowId={windowId} />}
+        titleControls={<SearchPanelControls companionWindowId={id} />}
         ref={this.containerRef}
       >
         <SearchResults
           containerRef={this.containerRef}
           companionWindowId={id}
-          windowId={windowId}
         />
         {
           fetchSearch && suggestedSearches && query === '' && suggestedSearches.map(search => (
@@ -89,7 +86,6 @@ SearchPanel.propTypes = {
   }).isRequired,
   suggestedSearches: PropTypes.arrayOf(PropTypes.string),
   t: PropTypes.func,
-  windowId: PropTypes.string.isRequired,
 };
 
 SearchPanel.defaultProps = {

diff --git a/src/components/SearchPanelControls.js b/src/components/SearchPanelControls.js
@@ -110,7 +110,7 @@ export class SearchPanelControls extends Component {
   /** */
   render() {
     const {
-      classes, companionWindowId, searchIsFetching, t, windowId,
+      classes, companionWindowId, searchIsFetching, t,
     } = this.props;
 
     const { search, suggestions } = this.state;
@@ -152,7 +152,7 @@ export class SearchPanelControls extends Component {
             )}
           />
         </form>
-        <SearchPanelNavigation windowId={windowId} companionWindowId={companionWindowId} />
+        <SearchPanelNavigation companionWindowId={companionWindowId} />
       </>
     );
   }

diff --git a/src/components/SearchPanelNavigation.js b/src/components/SearchPanelNavigation.js
@@ -90,7 +90,6 @@ SearchPanelNavigation.propTypes = {
   selectAnnotation: PropTypes.func.isRequired,
   selectedContentSearchAnnotation: PropTypes.arrayOf(PropTypes.string).isRequired,
   t: PropTypes.func,
-  windowId: PropTypes.string.isRequired, // eslint-disable-line react/no-unused-prop-types
 };
 SearchPanelNavigation.defaultProps = {
   classes: {},

diff --git a/src/components/SearchResults.js b/src/components/SearchResults.js
@@ -38,7 +38,6 @@ export class SearchResults extends Component {
       containerRef,
       searchAnnotations,
       searchHits,
-      windowId,
     } = this.props;
     const {
       focused,
@@ -55,7 +54,6 @@ export class SearchResults extends Component {
           focused={focused}
           index={index}
           total={searchAnnotations.length}
-          windowId={windowId}
           showDetails={this.toggleFocus}
         />
       ));
@@ -71,7 +69,6 @@ export class SearchResults extends Component {
         hit={hit}
         index={index}
         total={searchHits.length}
-        windowId={windowId}
         showDetails={this.toggleFocus}
       />
     ));

diff --git a/src/components/ThumbnailNavigation.js b/src/components/ThumbnailNavigation.js
@@ -180,7 +180,6 @@ export class ThumbnailNavigation extends Component {
       position,
       thumbnailNavigation,
       viewingDirection,
-      windowId,
     } = this.props;
     if (position === 'off') {
       return null;
@@ -190,7 +189,6 @@ export class ThumbnailNavigation extends Component {
       canvasGroupings,
       height: thumbnailNavigation.height - this.spacing - this.scrollbarSize,
       position,
-      windowId,
     };
     return (
       <Paper
@@ -245,7 +243,6 @@ ThumbnailNavigation.propTypes = {
   thumbnailNavigation: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   view: PropTypes.string,
   viewingDirection: PropTypes.string,
-  windowId: PropTypes.string.isRequired,
 };
 
 ThumbnailNavigation.defaultProps = {