Merge pull request #3981 from ProjectMirador/tReady

Stop passing tReady through to the MUI menu component.
ProjectMirador · Nov 18, 2024 · 38b84ff · 38b84ff
2 parents dd3ee4a + 92010e9
commit 38b84ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/WindowList.js b/src/components/WindowList.js
@@ -24,7 +24,7 @@ export class WindowList extends Component {
    */
   render() {
     const {
-      container, handleClose, windowIds, focusWindow, focusedWindowId, t,
+      container, handleClose, windowIds, focusWindow, focusedWindowId, t, tReady,
       ...menuProps
     } = this.props;
 
@@ -73,6 +73,7 @@ WindowList.propTypes = {
   handleClose: PropTypes.func.isRequired,
   t: PropTypes.func,
   titles: PropTypes.objectOf(PropTypes.string),
+  tReady: PropTypes.bool,
   windowIds: PropTypes.arrayOf(PropTypes.string).isRequired,
 };
 
@@ -81,4 +82,5 @@ WindowList.defaultProps = {
   focusedWindowId: null,
   t: key => key,
   titles: {},
+  tReady: false,
 };
diff --git a/src/components/WorkspaceMenu.js b/src/components/WorkspaceMenu.js
@@ -69,12 +69,11 @@ export class WorkspaceMenu extends Component {
       showThemePicker,
       isWorkspaceAddVisible,
       t,
+      tReady,
       showZoomControls,
       toggleZoomControls,
-      ...rest
+      ...menuProps
     } = this.props;
-    const menuProps = { ...rest };
-    delete menuProps.tReady;
 
     const {
       changeTheme,
@@ -156,6 +155,7 @@ WorkspaceMenu.propTypes = {
   showZoomControls: PropTypes.bool,
   t: PropTypes.func,
   toggleZoomControls: PropTypes.func,
+  tReady: PropTypes.bool,
 };
 
 WorkspaceMenu.defaultProps = {
@@ -165,4 +165,5 @@ WorkspaceMenu.defaultProps = {
   showZoomControls: false,
   t: key => key,
   toggleZoomControls: () => {},
+  tReady: false,
 };