Update seq select icon background ...

color, update getCurrentCanvas
ProjectMirador · Nov 19, 2020 · f92b5dd · f92b5dd
1 parent c97d5da
commit f92b5dd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/__tests__/fixtures/version-3/001.json b/__tests__/fixtures/version-3/001.json
@@ -240,7 +240,11 @@
     {
       "id": "https://iiif.bodleian.ox.ac.uk/iiif/canvas/9cca8fdd-4a61-4429-8ac1-f648764b4d6d.json",
       "type": "Canvas",
-      "label": "Whole Page",
+      "label": {
+        "en": [
+          "Whole Page"
+        ]
+      },
       "width": 5776,
       "height": 9125,
       "items": [
@@ -360,4 +364,4 @@
       ]
     }
   ]
-}
+}
diff --git a/src/containers/WindowSideBarCanvasPanel.js b/src/containers/WindowSideBarCanvasPanel.js
@@ -73,15 +73,15 @@ const styles = theme => ({
   },
   select: {
     '& .MuiSelect-icon': {
-      backgroundColor: 'white',
+      backgroundColor: theme.palette.background.paper,
     },
     '&:focus': {
       backgroundColor: theme.palette.background.paper,
     },
   },
   selectEmpty: {
     '& .MuiSelect-icon': {
-      backgroundColor: 'white',
+      backgroundColor: theme.palette.background.paper,
     },
     backgroundColor: theme.palette.background.paper,
   },

diff --git a/src/state/selectors/canvases.js b/src/state/selectors/canvases.js
@@ -49,24 +49,23 @@ export const getCurrentCanvas = createSelector(
     getWindow,
   ],
   (sequence, window) => {
-    let canvas;
     if (!sequence || !window) return undefined;
 
     if (!window.canvasId && (typeof sequence.getCanvasByIndex == 'function')) {
-      canvas = sequence.getCanvasByIndex(0);
-    } else if (!window.canvasId) {
+      return sequence.getCanvasByIndex(0);
+    }
+
+    if (!window.canvasId) {
       const { items } = sequence;
       const [firstCanvas] = items;
-      canvas = firstCanvas;
+      return firstCanvas;
     }
 
     if (typeof sequence.getCanvasById == 'function') {
-      canvas = sequence.getCanvasById(window.canvasId);
-    } else if (sequence.items) {
-      canvas = sequence.items.filter(c => c.id === window.canvasId) || [];
+      return sequence.getCanvasById(window.canvasId);
     }
 
-    return canvas;
+    return sequence.items.filter(c => c.id === window.canvasId) || [];
   },
 );
 

diff --git a/src/state/selectors/sequences.js b/src/state/selectors/sequences.js
@@ -18,8 +18,14 @@ export const getSequences = createSelector(
     if (v2TopRanges.length === 0 && topRangesOrRoot.length === 1) {
       v3RangeSequences = topRangesOrRoot[0].getRanges().filter(r => r.getBehavior() === 'sequence');
 
+      /**  Add manifesto canvases (items) to the ranges if 'items' property of ranges
+       *  is empty
+       */
       if (v3RangeSequences.length > 0 && manifest.items && manifest.items.length > 0
           && manifest.items[0].items && manifest.items[0].items.length > 0) {
+        /** Use manifesto canvases provided in manifest 'items' property to populate
+         * range 'items'/canvases
+        */
         const canvases = manifest.items[0].items;
 
         v3RangeSequences.map((sequence) => {
@@ -36,7 +42,10 @@ export const getSequences = createSelector(
       }
     }
 
-    // v3 sequence (not range sequence): assign id if not there
+    /** v3 sequence (not range sequence): assign id if not there
+     * Case: only sequence (not range) for v3 manifest is created by manifesto from all
+     * the items/canvases to display as default; this has id listed as undefined
+    */
     const manifestSequences = manifest.getSequences();
     if (v3RangeSequences && manifestSequences && manifestSequences.length > 0
        && !manifestSequences[0].id) {