Fixes from code review

samvera-labs · Jun 24, 2024 · 99678a7 · 99678a7
1 parent 18d8b22
commit 99678a7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/src/components/MediaPlayer/MediaPlayer.js b/src/components/MediaPlayer/MediaPlayer.js
@@ -286,18 +286,15 @@ const MediaPlayer = ({
    * Switch player when navigating across canvases
    * @param {Number} index canvas index to be loaded into the player
    * @param {Boolean} fromStart flag to indicate set player start time to zero or not
-   * @param {Boolean} checkAutoAdvance flag to indicate to check value of autoadvance in state
    * @param {String} focusElement element to be focused within the player when using
    * next or previous buttons with keyboard
    */
-  const switchPlayer = (index, fromStart, focusElement = '', checkAutoAdvance = false) => {
+  const switchPlayer = (index, fromStart, focusElement = '') => {
     if (canvasIndexRef.current != index && index <= lastCanvasIndexRef.current) {
-      if (!checkAutoAdvance || (checkAutoAdvance && autoAdvanceRef.current)) {
-        manifestDispatch({
-          canvasIndex: index,
-          type: 'switchCanvas',
-        });
-      }
+      manifestDispatch({
+        canvasIndex: index,
+        type: 'switchCanvas',
+      });
       initCanvas(index, fromStart);
       playerDispatch({ element: focusElement, type: 'setPlayerFocusElement' });
     }
@@ -352,8 +349,7 @@ const MediaPlayer = ({
             srcIndex,
             targets,
             currentTime: currentTime || 0,
-            nextItemClicked,
-            switchPlayer
+            nextItemClicked
           },
           videoJSCurrentTime: { srcIndex, targets, currentTime: currentTime || 0 },
         },

diff --git a/src/components/MediaPlayer/MediaPlayer.test.js b/src/components/MediaPlayer/MediaPlayer.test.js
@@ -500,7 +500,7 @@ describe('MediaPlayer component', () => {
         expect(screen.queryByTestId('inaccessible-message-display')).toBeInTheDocument();
         expect(screen.getByText('You do not have permission to playback this item.')).toBeInTheDocument();
         expect(screen.queryByTestId('inaccessible-message-timer')).toBeInTheDocument();
-        expect(screen.getByTestId('inaccessible-message-timer')).toHaveClass('disabled');
+        expect(screen.getByTestId('inaccessible-message-timer')).toHaveClass('hidden');
         expect(screen.queryByTestId('inaccessible-next-button')).toBeInTheDocument();
       });
 
@@ -525,7 +525,7 @@ describe('MediaPlayer component', () => {
         expect(screen.queryByTestId('inaccessible-message-display')).toBeInTheDocument();
         expect(screen.getByText('You do not have permission to playback this item.')).toBeInTheDocument();
         expect(screen.queryByTestId('inaccessible-message-timer')).toBeInTheDocument();
-        expect(screen.getByTestId('inaccessible-message-timer')).toHaveClass('disabled');
+        expect(screen.getByTestId('inaccessible-message-timer')).toHaveClass('hidden');
         expect(screen.queryByTestId('inaccessible-next-button')).toBeInTheDocument();
         fireEvent.click(screen.getByTestId('inaccessible-next-button'));
         // Loads video player for the next item in the list

diff --git a/src/components/MediaPlayer/VideoJS/VideoJSPlayer.js b/src/components/MediaPlayer/VideoJS/VideoJSPlayer.js
@@ -880,7 +880,7 @@ function VideoJSPlayer({
               dangerouslySetInnerHTML={{ __html: placeholderText }}>
             </p>
             <p data-testid="inaccessible-message-timer"
-              className={`ramp--media-player_inaccessible-message-timer ${autoAdvanceRef.current ? '' : 'disabled'}`}>
+              className={`ramp--media-player_inaccessible-message-timer ${autoAdvanceRef.current ? '' : 'hidden'}`}>
               {`Next item in ${messageTime} second${messageTime === 1 ? '' : 's'}`}
             </p>
             <div className="ramp--media-player_inaccessible-message-buttons">

diff --git a/src/components/MediaPlayer/VideoJS/VideoJSPlayer.scss b/src/components/MediaPlayer/VideoJS/VideoJSPlayer.scss
@@ -29,6 +29,6 @@
   color: inherit;
 }
 
-.ramp--media-player_inaccessible-message-timer.disabled {
-  color: $primaryDark;
+.ramp--media-player_inaccessible-message-timer.hidden {
+  visibility: hidden
 }