@vitessce/vit-s 2.0.3 → 3.0.0

package/src/vitessce-grid-layout/VitessceGridLayout.test.jsx

@@ -1,11 +1,13 @@
 import '@testing-library/jest-dom';
-import { cleanup, render, screen, waitForElement } from '@testing-library/react'
-import { afterEach } from 'vitest'
+import { cleanup, render, screen } from '@testing-library/react';
+import { afterEach } from 'vitest';
 
-import { VitessceGridLayout } from './VitessceGridLayout';
+import React from 'react';
+import { PluginViewType } from '@vitessce/plugins';
+import { VitessceGridLayout } from './VitessceGridLayout.js';
 
 afterEach(() => {
-  cleanup()
+  cleanup();
 });
 
 function FakeComponent(props) {
@@ -17,19 +19,24 @@ const layoutJson = {
     600: [0, 2, 4, 8],
   },
   components: [
-    { component: 'FakeComponent',
+    {
+      component: 'FakeComponent',
       uid: 'fake',
       props: { text: 'Hello World' },
-      x: 0, y: 0, w: 2 },
+      x: 0,
+      y: 0,
+      w: 2,
+    },
   ],
 };
 
 describe('VitessceGridLayout.js', () => {
   describe('<VitessceGridLayout />', () => {
     it('mount() works', async () => {
+      const viewTypes = [new PluginViewType('FakeComponent', FakeComponent, [])];
       const { container } = render(<VitessceGridLayout
         layout={layoutJson}
-        getComponent={() => FakeComponent}
+        viewTypes={viewTypes}
         draggableHandle=".my-handle"
       />);
 
@@ -43,9 +50,10 @@ describe('VitessceGridLayout.js', () => {
     });
 
     it('rowHeight works', () => {
+      const viewTypes = [new PluginViewType('FakeComponent', FakeComponent, [])];
       const { container } = render(<VitessceGridLayout
         layout={layoutJson}
-        getComponent={() => FakeComponent}
+        viewTypes={viewTypes}
         draggableHandle=".my-handle"
         rowHeight={123}
       />);
@@ -53,4 +61,4 @@ describe('VitessceGridLayout.js', () => {
       expect(container.querySelector('.react-grid-item').style.height).toEqual('123px');
     });
   });
-});
+});

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

@@ -1 +1 @@
-export { VitessceGridLayout } from './VitessceGridLayout';
+export { VitessceGridLayout } from './VitessceGridLayout.js';

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

@@ -1,4 +1,4 @@
-import range from 'lodash/range';
+import { range } from 'lodash-es';
 
 function sum(a) {
   return a.reduce((x, y) => x + y, 0);

package/src/vitessce-grid-layout/layout-utils.test.js

@@ -1,6 +1,6 @@
 import {
   makeGridLayout, getMaxRows, resolveLayout,
-} from './layout-utils';
+} from './layout-utils.js';
 
 describe('layout-utils.js', () => {
   describe('makeGridLayout', () => {

package/src/vitessce-grid-utils.js

@@ -2,11 +2,10 @@ import {
   useState, useEffect, useRef,
 } from 'react';
 import { InternMap } from 'internmap';
-import isEqual from 'lodash/isEqual';
-import pick from 'lodash/pick';
-import { DEFAULT_COORDINATION_VALUES, DATA_TYPE_COORDINATION_VALUE_USAGE } from '@vitessce/constants-internal';
-import { getSourceAndLoaderFromFileType } from './data/loader-registry';
-import { getFileTypeDataTypeMapping } from './plugins';
+import { isEqual, pick } from 'lodash-es';
+import { fromEntries } from '@vitessce/utils';
+import { DATA_TYPE_COORDINATION_VALUE_USAGE } from '@vitessce/constants-internal';
+import { getSourceAndLoaderFromFileType, getDataTypeFromFileType } from './data/loader-registry.js';
 
 /**
  * Return the bottom coordinate of the layout.
@@ -88,14 +87,20 @@ export function useRowHeight(config, initialRowHeight, height, margin, padding)
   return [rowHeight, containerRef];
 }
 
-function withDefaults(coordinationValues, dataType, fileType, datasetUid) {
+function withDefaults(
+  coordinationValues,
+  dataType,
+  fileType,
+  datasetUid,
+  defaultCoordinationValues,
+) {
   const defaultKeys = DATA_TYPE_COORDINATION_VALUE_USAGE[dataType]
     .filter(k => (
-      Object.keys(DEFAULT_COORDINATION_VALUES).includes(k)
-      && DEFAULT_COORDINATION_VALUES[k]
+      Object.keys(defaultCoordinationValues).includes(k)
+      && defaultCoordinationValues[k]
       && !Object.keys(coordinationValues).includes(k)
     ));
-  const defaultValues = pick(DEFAULT_COORDINATION_VALUES, defaultKeys);
+  const defaultValues = pick(defaultCoordinationValues, defaultKeys);
   const coordinationValuesWithDefaults = {
     ...defaultValues,
     // The user-provided values should take precedence.
@@ -112,14 +117,18 @@ function withDefaults(coordinationValues, dataType, fileType, datasetUid) {
  * Create a mapping from dataset ID to loader objects by data type.
  * @param {object[]} datasets The datasets array from the view config.
  * @param {string} configDescription The top-level description in the
+ * @param {PluginFileType[]} fileTypes
+ * @param {PluginCoordinationType[]} coordinationTypes
  * view config.
  * @returns {object} Mapping from dataset ID to data type to loader
  * instance.
  */
-export function createLoaders(datasets, configDescription) {
+export function createLoaders(datasets, configDescription, fileTypes, coordinationTypes) {
   const result = {};
   const dataSources = {};
-  const fileTypeDataTypeMapping = getFileTypeDataTypeMapping();
+  const defaultCoordinationValues = fromEntries(
+    coordinationTypes.map(ct => ([ct.name, ct.defaultValue])),
+  );
   datasets.forEach((dataset) => {
     const datasetLoaders = {
       name: dataset.name,
@@ -134,12 +143,15 @@ export function createLoaders(datasets, configDescription) {
         fileType,
         coordinationValues = {},
       } = file;
-      const dataType = fileTypeDataTypeMapping[fileType];
+      const dataType = getDataTypeFromFileType(fileType, fileTypes);
       const coordinationValuesWithDefaults = withDefaults(
-        coordinationValues, dataType,
-        fileType, dataset.uid,
+        coordinationValues,
+        dataType,
+        fileType,
+        dataset.uid,
+        defaultCoordinationValues,
       );
-      const [DataSourceClass, LoaderClass] = getSourceAndLoaderFromFileType(fileType);
+      const [DataSourceClass, LoaderClass] = getSourceAndLoaderFromFileType(fileType, fileTypes);
       // Create _one_ DataSourceClass instance per URL. Derived loaders share this object.
       const fileId = url || JSON.stringify(options);
       if (!(fileId in dataSources)) {