@vitessce/scatterplot-embedding 3.1.0 → 3.1.2

package/dist/index.js

@@ -1,4 +1,4 @@
-import { E } from "./index-d8ac68c1.js";
+import { E } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-07b73b88.js → jpeg-e27c7111.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-d8ac68c1.js";
+import { B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lerc-8b917065.js → lerc-a121511e.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-d8ac68c1.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lzw-ad66c72b.js → lzw-6da36e65.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-d8ac68c1.js";
+import { B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{packbits-8c472a15.js → packbits-f9f4e24f.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-d8ac68c1.js";
+import { B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{raw-58aad486.js → raw-589273c1.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-d8ac68c1.js";
+import { B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{webimage-adebb0c3.js → webimage-532eb642.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-d8ac68c1.js";
+import { B as BaseDecoder } from "./index-841c8a1c.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist-tsc/EmbeddingScatterplotOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmbeddingScatterplotOptions.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotOptions.js"],"names":[],"mappings":"AAIA,oFAyCC"}
+{"version":3,"file":"EmbeddingScatterplotOptions.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotOptions.js"],"names":[],"mappings":"AAIA,oFA8CC"}

package/dist-tsc/EmbeddingScatterplotOptions.js

@@ -1,17 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from 'react';
+import React, { useId } from 'react';
 import { TableCell, TableRow } from '@material-ui/core';
 import { usePlotOptionsStyles, OptionSelect } from '@vitessce/vit-s';
 export default function EmbeddingScatterplotOptions(props) {
     const { mappingSelectEnabled, mappings, selectedMapping, setSelectedMapping, } = props;
     const classes = usePlotOptionsStyles();
+    const scatterplotOptionsId = useId();
     // Handlers for custom option field changes.
     const handleSelectedMappingChange = (event) => {
         setSelectedMapping(event.target.value);
     };
     return mappingSelectEnabled
-        ? (_jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, children: "Embedding Type" }), _jsx(TableCell, { className: classes.inputCell, children: _jsx(OptionSelect, { className: classes.select, value: selectedMapping, onChange: handleSelectedMappingChange, inputProps: {
-                            id: 'scatterplot-mapping-select',
-                        }, children: mappings.map(name => (_jsx("option", { value: name, children: name }, name))) }, "scatterplot-mapping-select") })] }, "mapping-option-row"))
+        ? (_jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsx("label", { htmlFor: `scatterplot-mapping-select-${scatterplotOptionsId}`, children: "Embedding Type" }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsx(OptionSelect, { className: classes.select, value: selectedMapping, onChange: handleSelectedMappingChange, inputProps: {
+                            id: `scatterplot-mapping-select-${scatterplotOptionsId}`,
+                        }, children: mappings.map(name => (_jsx("option", { value: name, children: name }, name))) }) })] }))
         : null;
 }

package/dist-tsc/EmbeddingScatterplotSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;GAYG;AACH;IAVyB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;gBA0WhB"}
+{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AAkCA;;;;;;;;;;;;GAYG;AACH;IAVyB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;gBA0WhB"}

package/dist-tsc/EmbeddingScatterplotSubscriber.js

@@ -2,10 +2,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useEffect, useCallback, useMemo, } from 'react';
 import { extent } from 'd3-array';
 import { isEqual } from 'lodash-es';
-import plur from 'plur';
 import { TitleInfo, useReady, useUrls, useDeckCanvasSize, useUint8FeatureSelection, useExpressionValueGetter, useGetObsInfo, useObsEmbeddingData, useObsSetsData, useFeatureSelection, useObsFeatureMatrixIndices, useFeatureLabelsData, useMultiObsLabels, useCoordination, useLoaders, useSetComponentHover, useSetComponentViewInfo, useInitialCoordination, } from '@vitessce/vit-s';
 import { setObsSelection, mergeObsSets, getCellSetPolygons } from '@vitessce/sets-utils';
-import { getCellColors, commaNumber } from '@vitessce/utils';
+import { pluralize as plur, getCellColors, commaNumber } from '@vitessce/utils';
 import { Scatterplot, ScatterplotTooltipSubscriber, ScatterplotOptions, getPointSizeDevicePixels, getPointOpacity, } from '@vitessce/scatterplot';
 import { Legend } from '@vitessce/legend';
 import { ViewType, COMPONENT_COORDINATION_TYPES } from '@vitessce/constants-internal';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-embedding",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -19,13 +19,12 @@
     "@material-ui/core": "~4.12.3",
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
-    "plur": "^5.1.0",
-    "@vitessce/constants-internal": "3.1.0",
-    "@vitessce/legend": "3.1.0",
-    "@vitessce/scatterplot": "3.1.0",
-    "@vitessce/sets-utils": "3.1.0",
-    "@vitessce/utils": "3.1.0",
-    "@vitessce/vit-s": "3.1.0"
+    "@vitessce/constants-internal": "3.1.2",
+    "@vitessce/legend": "3.1.2",
+    "@vitessce/scatterplot": "3.1.2",
+    "@vitessce/sets-utils": "3.1.2",
+    "@vitessce/utils": "3.1.2",
+    "@vitessce/vit-s": "3.1.2"
   },
   "devDependencies": {
     "react": "^18.0.0",

package/src/EmbeddingScatterplotOptions.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useId } from 'react';
 import { TableCell, TableRow } from '@material-ui/core';
 import { usePlotOptionsStyles, OptionSelect } from '@vitessce/vit-s';
 
@@ -12,6 +12,8 @@ export default function EmbeddingScatterplotOptions(props) {
 
   const classes = usePlotOptionsStyles();
 
+  const scatterplotOptionsId = useId();
+
   // Handlers for custom option field changes.
   const handleSelectedMappingChange = (event) => {
     setSelectedMapping(event.target.value);
@@ -19,18 +21,21 @@ export default function EmbeddingScatterplotOptions(props) {
 
   return mappingSelectEnabled
     ? (
-      <TableRow key="mapping-option-row">
-        <TableCell className={classes.labelCell}>
-          Embedding Type
+      <TableRow>
+        <TableCell className={classes.labelCell} variant="head" scope="row">
+          <label
+            htmlFor={`scatterplot-mapping-select-${scatterplotOptionsId}`}
+          >
+            Embedding Type
+          </label>
         </TableCell>
-        <TableCell className={classes.inputCell}>
+        <TableCell className={classes.inputCell} variant="body">
           <OptionSelect
-            key="scatterplot-mapping-select"
             className={classes.select}
             value={selectedMapping}
             onChange={handleSelectedMappingChange}
             inputProps={{
-              id: 'scatterplot-mapping-select',
+              id: `scatterplot-mapping-select-${scatterplotOptionsId}`,
             }}
           >
             {mappings.map(name => (

package/src/EmbeddingScatterplotSubscriber.js

@@ -3,7 +3,6 @@ import React, {
 } from 'react';
 import { extent } from 'd3-array';
 import { isEqual } from 'lodash-es';
-import plur from 'plur';
 import {
   TitleInfo,
   useReady, useUrls,
@@ -24,7 +23,7 @@ import {
   useInitialCoordination,
 } from '@vitessce/vit-s';
 import { setObsSelection, mergeObsSets, getCellSetPolygons } from '@vitessce/sets-utils';
-import { getCellColors, commaNumber } from '@vitessce/utils';
+import { pluralize as plur, getCellColors, commaNumber } from '@vitessce/utils';
 import {
   Scatterplot, ScatterplotTooltipSubscriber, ScatterplotOptions,
   getPointSizeDevicePixels,