Address some re-select inputStabilityCheck warnings.

src/state/selectors/companionWindows.js

@@ -3,13 +3,15 @@ import groupBy from 'lodash/groupBy';
 import { miradorSlice } from './utils';
 import { getWindow, getWindows } from './getters';
 
+const defaultConfig = Object.freeze({});
+
 /**
  * Returns companion windows.
  * @param {object} state
  * @returns {object}
  */
 export function getCompanionWindows(state) {
-  return miradorSlice(state).companionWindows || {};
+  return miradorSlice(state).companionWindows || defaultConfig;
 }
 
 /**

src/state/selectors/config.js

@@ -3,14 +3,16 @@ import deepmerge from 'deepmerge';
 import { miradorSlice } from './utils';
 import { getWorkspace } from './getters';
 
+const defaultConfig = Object.freeze({});
+
 /**
  * Returns the config from the redux state.
  * @param {object} state
  * @returns {object} containing config
  */
 export function getConfig(state) {
   const slice = miradorSlice(state || {});
-  return slice.config || {};
+  return slice.config || defaultConfig;
 }
 
 /**

src/state/selectors/manifests.js

@@ -29,6 +29,8 @@ const getLocale = createSelector(
   ),
 );
 
+const defaultManifestStatus = Object.freeze({ missing: true });
+
 /**
  * Convenience selector to get a manifest (or placeholder).
  * @param {object} state
@@ -38,7 +40,7 @@ const getLocale = createSelector(
  */
 export const getManifestStatus = createSelector(
   [getManifest],
-  manifest => manifest || { missing: true },
+  manifest => manifest || defaultManifestStatus,
 );
 
 /**

src/state/selectors/searches.js

@@ -146,6 +146,13 @@ const getSearchHitsForCompanionWindow = createSelector(
   })),
 );
 
+export const getSearchAnnotationsForCompanionWindow = createSelector(
+  [
+    getSearchResponsesForCompanionWindow,
+  ],
+  results => results && searchResultsToAnnotation(results),
+);
+
 /**
  * Returns sorted search hits based on canvas order.
  * @param {object} state
@@ -156,18 +163,20 @@ export const getSortedSearchHitsForCompanionWindow = createSelector(
   [
     getSearchHitsForCompanionWindow,
     getCanvases,
-    (state, { companionWindowId, windowId }) => (
-      annotationUri => getResourceAnnotationForSearchHit(state, { annotationUri, companionWindowId, windowId })
-    ),
+    getSearchAnnotationsForCompanionWindow,
   ],
-  (searchHits, canvases, annotationForSearchHit) => {
+  (searchHits, canvases, annotation) => {
     if (!canvases || canvases.length === 0) return [];
     if (!searchHits || searchHits.length === 0) return [];
     const canvasIds = canvases.map(canvas => canvas.id);
 
     return [].concat(searchHits).sort((a, b) => {
-      const hitA = annotationForSearchHit(a.annotations[0]);
-      const hitB = annotationForSearchHit(b.annotations[0]);
+      const hitA = annotation.resources.find(
+        r => r.id === a.annotations[0],
+      );
+      const hitB = annotation.resources.find(
+        r => r.id === b.annotations[0],
+      );
       return canvasIds.indexOf(hitA.targetId) - canvasIds.indexOf(hitB.targetId);
     });
   },
@@ -190,13 +199,6 @@ const searchResultsToAnnotation = (results) => {
   };
 };
 
-export const getSearchAnnotationsForCompanionWindow = createSelector(
-  [
-    getSearchResponsesForCompanionWindow,
-  ],
-  results => results && searchResultsToAnnotation(results),
-);
-
 /**
  * Sorts search annotations based on canvas order.
  * @returns {Array}