Make DimensionMapping type non-nullable

silx-kit · Nov 26, 2020 · 9326602 · 9326602
1 parent b104850
commit 9326602
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,6 @@
   },
 
   "typescript.tsdk": "node_modules/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "typescript.preferences.importModuleSpecifier": "relative"
 }
diff --git a/src/h5web/dimension-mapper/AxisMapper.tsx b/src/h5web/dimension-mapper/AxisMapper.tsx
@@ -7,7 +7,7 @@ import type { Axis, DimensionMapping } from './models';
 interface Props {
   axis: Axis;
   rawDims: number[];
-  mapperState: NonNullable<DimensionMapping>;
+  mapperState: DimensionMapping;
   onChange: (mapperState: DimensionMapping) => void;
 }
 

diff --git a/src/h5web/dimension-mapper/SlicingSlider.tsx b/src/h5web/dimension-mapper/SlicingSlider.tsx
@@ -7,7 +7,7 @@ interface Props {
   dimension: number;
   slicingIndex: number;
   rawDims: number[];
-  mapperState: NonNullable<DimensionMapping>;
+  mapperState: DimensionMapping;
   onChange: (mapperState: DimensionMapping) => void;
 }
 

diff --git a/src/h5web/dimension-mapper/models.ts b/src/h5web/dimension-mapper/models.ts
@@ -1,3 +1,2 @@
 export type Axis = 'x' | 'y';
-export type MappingType = number | Axis;
-export type DimensionMapping = MappingType[] | undefined;
+export type DimensionMapping = (number | Axis)[];
diff --git a/src/h5web/visualizations/heatmap/MappedHeatmapVis.tsx b/src/h5web/visualizations/heatmap/MappedHeatmapVis.tsx
@@ -7,7 +7,7 @@ import { assertArray } from '../shared/utils';
 import { useDomain, useDataArrays } from '../shared/hooks';
 import { useHeatmapConfig } from './config';
 import { AxisMapping } from '../shared/models';
-import DimensionMapper from 'src/h5web/dimension-mapper/DimensionMapper';
+import DimensionMapper from '../../dimension-mapper/DimensionMapper';
 
 interface Props {
   value: HDF5Value;
@@ -76,12 +76,8 @@ function MappedHeatmapVis(props: Props): ReactElement {
         scaleType={scaleType}
         keepAspectRatio={keepAspectRatio}
         showGrid={showGrid}
-        abscissaParams={
-          dimensionMapping && axisMapping[dimensionMapping.indexOf('x')]
-        }
-        ordinateParams={
-          dimensionMapping && axisMapping[dimensionMapping.indexOf('y')]
-        }
+        abscissaParams={axisMapping[dimensionMapping.indexOf('x')]}
+        ordinateParams={axisMapping[dimensionMapping.indexOf('y')]}
       />
     </>
   );

diff --git a/src/h5web/visualizations/line/MappedLineVis.tsx b/src/h5web/visualizations/line/MappedLineVis.tsx
@@ -11,7 +11,7 @@ import {
 } from '../shared/hooks';
 import { useLineConfig } from './config';
 import { AxisMapping, ScaleType } from '../shared/models';
-import DimensionMapper from 'src/h5web/dimension-mapper/DimensionMapper';
+import DimensionMapper from '../../dimension-mapper/DimensionMapper';
 
 interface Props {
   value: HDF5Value;
@@ -73,9 +73,7 @@ function MappedLineVis(props: Props): ReactElement {
     : baseErrorsArray && (baseErrorsArray.data as number[]);
   const dataDomain = useDomain(dataValues, yScaleType, errorValues);
 
-  const mappedAbscissaParams =
-    dimensionMapping && axisMapping[dimensionMapping.indexOf('x')];
-
+  const mappedAbscissaParams = axisMapping[dimensionMapping.indexOf('x')];
   useEffect(() => {
     if (mappedAbscissaParams?.scaleType) {
       setXScaleType(mappedAbscissaParams?.scaleType);