@vitessce/vit-s 3.5.6 → 3.5.8

package/src/vitessce-grid-layout/VitessceGridLayout.js

@@ -1,8 +1,10 @@
 import React, { useState, useMemo, useCallback } from 'react';
 import { Responsive, WidthProvider } from 'react-grid-layout-with-lodash';
 import { isEqual } from 'lodash-es';
+import { ErrorBoundary } from 'react-error-boundary';
 import { getMaxRows, resolveLayout } from './layout-utils.js';
 import { PageModeViewContext } from '../contexts.js';
+import { FallbackForView } from '../FallbackForView.js';
 
 const ResponsiveGridLayout = WidthProvider(Responsive);
 
@@ -131,19 +133,21 @@ export function VitessceGridLayout(props) {
       const Component = getComponent(v.component);
       return [v.uid, () => (
         <div key={v.uid} style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-          <Component
-            {... v.props}
-            uuid={v.uid}
-            coordinationScopes={v.coordinationScopes}
-            coordinationScopesBy={v.coordinationScopesBy}
-            theme={theme}
-            removeGridComponent={null}
-            // Props used by LinkControllerSubscriber:
-            viewTypes={viewTypes}
-            fileTypes={fileTypes}
-            coordinationTypes={coordinationTypes}
-            stores={stores}
-          />
+          <ErrorBoundary FallbackComponent={FallbackForView}>
+            <Component
+              {... v.props}
+              uuid={v.uid}
+              coordinationScopes={v.coordinationScopes}
+              coordinationScopesBy={v.coordinationScopesBy}
+              theme={theme}
+              removeGridComponent={null}
+              // Props used by LinkControllerSubscriber:
+              viewTypes={viewTypes}
+              fileTypes={fileTypes}
+              coordinationTypes={coordinationTypes}
+              stores={stores}
+            />
+          </ErrorBoundary>
         </div>
       )];
     }));
@@ -157,19 +161,21 @@ export function VitessceGridLayout(props) {
       };
       return (
         <div key={v.uid}>
-          <Component
-            {...v.props}
-            uuid={v.uid}
-            coordinationScopes={v.coordinationScopes}
-            coordinationScopesBy={v.coordinationScopesBy}
-            theme={theme}
-            removeGridComponent={removeGridComponent}
-            // Props used by LinkControllerSubscriber:
-            viewTypes={viewTypes}
-            fileTypes={fileTypes}
-            coordinationTypes={coordinationTypes}
-            stores={stores}
-          />
+          <ErrorBoundary FallbackComponent={FallbackForView}>
+            <Component
+              {...v.props}
+              uuid={v.uid}
+              coordinationScopes={v.coordinationScopes}
+              coordinationScopesBy={v.coordinationScopesBy}
+              theme={theme}
+              removeGridComponent={removeGridComponent}
+              // Props used by LinkControllerSubscriber:
+              viewTypes={viewTypes}
+              fileTypes={fileTypes}
+              coordinationTypes={coordinationTypes}
+              stores={stores}
+            />
+          </ErrorBoundary>
         </div>
       );
     }), contextValue];

package/src/vitessce-grid-utils.js

@@ -5,7 +5,7 @@ import { InternMap } from 'internmap';
 import { isEqual, pick } from 'lodash-es';
 import { DATA_TYPE_COORDINATION_VALUE_USAGE } from '@vitessce/constants-internal';
 import { getSourceAndLoaderFromFileType, getDataTypeFromFileType } from '@vitessce/abstract';
-
+import { log } from '@vitessce/globals';
 /**
  * Return the bottom coordinate of the layout.
  * https://github.com/STRML/react-grid-layout/blob/20dac73f91274526034c00968b5bedb9c2ed36b9/lib/utils.js#L82
@@ -107,7 +107,7 @@ function withDefaults(
   };
   if (!isEqual(coordinationValues, coordinationValuesWithDefaults)) {
     // eslint-disable-next-line max-len
-    console.warn(`Using coordination value defaults for file type ${fileType} in dataset ${datasetUid}\nBefore: ${JSON.stringify(coordinationValues)}\nAfter: ${JSON.stringify(coordinationValuesWithDefaults)}`);
+    log.warn(`Using coordination value defaults for file type ${fileType} in dataset ${datasetUid}\nBefore: ${JSON.stringify(coordinationValues)}\nAfter: ${JSON.stringify(coordinationValuesWithDefaults)}`);
   }
   return coordinationValuesWithDefaults;
 }