Release 14.2.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "visyn_core",
   "description": "Core repository for datavisyn applications.",
-  "version": "14.1.1",
+  "version": "14.2.0",
   "author": {
     "name": "datavisyn GmbH",
     "email": "[email protected]",
@@ -145,6 +145,9 @@
     "storybook": "^7.6.20",
     "storybook-addon-swc": "^1.2.0"
   },
+  "resolutions": {
+    "@swc/core": "1.7.42"
+  },
   "visyn": {
     "entries": {
       "app": {

src/vis/bar/BarChart.tsx

@@ -7,10 +7,8 @@ import { ListChildComponentProps, VariableSizeList } from 'react-window';
 import { BlurredOverlay } from '../../components';
 import { useAsync } from '../../hooks/useAsync';
 import { categoricalColors10 } from '../../utils/colors';
-import { NAN_REPLACEMENT } from '../general';
-import { DownloadPlotButton } from '../general/DownloadPlotButton';
-import { ErrorMessage } from '../general/ErrorMessage';
-import { getLabelOrUnknown } from '../general/utils';
+import { DownloadPlotButton, ErrorMessage } from '../general';
+import { FastTextMeasure } from '../general/FastTextMeasure';
 import { ColumnInfo, EAggregateTypes, EColumnTypes, ICommonVisProps } from '../interfaces';
 import { FocusFacetSelector } from './components';
 import { EBarDirection, EBarDisplayType, EBarGroupingType, IBarConfig } from './interfaces';
@@ -29,6 +27,8 @@ import {
   WorkerWrapper,
 } from './interfaces/internal';
 import { SingleEChartsBarChart } from './SingleEChartsBarChart';
+import { getLabelOrUnknown } from '../general/utils';
+import { NAN_REPLACEMENT } from '../general/constants';
 
 type VirtualizedBarChartProps = {
   aggregatedDataMap: Awaited<ReturnType<typeof generateAggregatedDataLookup>>;
@@ -51,6 +51,8 @@ type VirtualizedBarChartProps = {
   setConfig: (config: IBarConfig) => void;
 };
 
+const textMeasure = new FastTextMeasure('16px Arial');
+
 export function BarChart({
   config,
   setConfig,
@@ -73,6 +75,7 @@ export function BarChart({
     config?.facets as ColumnInfo,
     config?.aggregateColumn as ColumnInfo,
   ]);
+
   const generateDataTableWorker = React.useCallback(async (...args: Parameters<typeof generateDataTable>) => WorkerWrapper.generateDataTable(...args), []);
   const { execute: generateDataTableTrigger, status: dataTableStatus } = useAsync(generateDataTableWorker);
 
@@ -82,12 +85,6 @@ export function BarChart({
   );
   const { execute: generateAggregatedDataLookupTrigger, status: dataLookupStatus } = useAsync(generateAggregateDataLookupWorker);
 
-  const getTruncatedTextMapWorker = React.useCallback(
-    async (...args: Parameters<GenerateAggregatedDataLookup['getTruncatedTextMap']>) => WorkerWrapper.getTruncatedTextMap(...args),
-    [],
-  );
-  const { execute: getTruncatedTextMapTrigger, status: truncatedTextStatus } = useAsync(getTruncatedTextMapWorker);
-
   const [itemData, setItemData] = React.useState<VirtualizedBarChartProps | null>(null);
   const [dataTable, setDataTable] = React.useState<ReturnType<typeof generateDataTable>>([]);
   const [aggregatedDataMap, setAggregatedDataMap] = React.useState<Awaited<ReturnType<typeof generateAggregateDataLookupWorker>> | null>(null);
@@ -102,8 +99,8 @@ export function BarChart({
   const isLoading = React.useMemo(() => barDataStatus === 'pending' || dataTableStatus === 'pending', [barDataStatus, dataTableStatus]);
 
   const isError = React.useMemo(
-    () => barDataStatus === 'error' || dataTableStatus === 'error' || dataLookupStatus === 'error' || truncatedTextStatus === 'error',
-    [barDataStatus, dataLookupStatus, dataTableStatus, truncatedTextStatus],
+    () => barDataStatus === 'error' || dataTableStatus === 'error' || dataLookupStatus === 'error',
+    [barDataStatus, dataLookupStatus, dataTableStatus],
   );
 
   const isSuccess = React.useMemo(() => barDataStatus === 'success' && dataTableStatus === 'success', [barDataStatus, dataTableStatus]);
@@ -315,19 +312,16 @@ export function BarChart({
   ]);
 
   useShallowEffect(() => {
-    const fetchTruncatedTextMap = async () => {
-      const truncatedTextMap = await getTruncatedTextMapTrigger(
-        Object.values(aggregatedDataMap?.facets ?? {})
-          .map((value) => value?.categoriesList ?? [])
-          .flat(),
-        config?.direction === EBarDirection.HORIZONTAL ? Math.max(gridLeft, containerWidth / 3) - 20 : 70,
-      );
-      setLabelsMap(truncatedTextMap.map);
-      setLongestLabelWidth(truncatedTextMap.longestLabelWidth);
-      setGridLeft(Math.min(containerWidth / 3, Math.max(longestLabelWidth + 20, 60)));
-    };
-    fetchTruncatedTextMap();
-  }, [aggregatedDataMap?.facets, aggregatedDataMap?.facetsList, config?.direction, containerWidth, getTruncatedTextMapTrigger, gridLeft, longestLabelWidth]);
+    Object.values(aggregatedDataMap?.facets ?? {})
+      .map((value) => value?.categoriesList ?? [])
+      .flat()
+      .forEach((c) => {
+        const text = textMeasure.textEllipsis(c, config?.direction === EBarDirection.HORIZONTAL ? Math.max(gridLeft, containerWidth / 3) - 20 : 70);
+        setLongestLabelWidth((p) => Math.max(p, textMeasure.fastMeasureText(c)));
+        setLabelsMap((prev) => ({ ...prev, [c]: text }));
+      });
+    setGridLeft(Math.min(containerWidth / 3, Math.max(longestLabelWidth + 20, 60)));
+  }, [aggregatedDataMap?.facets, config?.direction, containerWidth, gridLeft, longestLabelWidth]);
 
   React.useEffect(() => {
     setItemData({

src/vis/bar/SingleEChartsBarChart.tsx

@@ -7,7 +7,7 @@ import { BlurredOverlay } from '../../components';
 import { type ECOption, useChart } from '../../echarts';
 import { useAsync } from '../../hooks';
 import { sanitize, selectionColorDark } from '../../utils';
-import { DEFAULT_COLOR, NAN_REPLACEMENT, SELECT_COLOR, VIS_NEUTRAL_COLOR, VIS_UNSELECTED_OPACITY } from '../general';
+import { DEFAULT_COLOR, NAN_REPLACEMENT, SELECT_COLOR, VIS_NEUTRAL_COLOR, VIS_UNSELECTED_OPACITY } from '../general/constants';
 import { ErrorMessage } from '../general/ErrorMessage';
 import { WarningMessage } from '../general/WarningMessage';
 import { ColumnInfo, EAggregateTypes, ICommonVisProps } from '../interfaces';
@@ -681,9 +681,9 @@ function EagerSingleEChartsBarChart({
       : '';
     const aggregationAxisSortText =
       config?.direction === EBarDirection.HORIZONTAL
-        ? SortDirectionMap[config?.sortState?.x as EBarSortState]
+        ? SortDirectionMap[config?.sortState?.x ?? EBarSortState.NONE]
         : config?.direction === EBarDirection.VERTICAL
-          ? SortDirectionMap[config?.sortState?.y as EBarSortState]
+          ? SortDirectionMap[config?.sortState?.y ?? EBarSortState.NONE]
           : '';
     const aggregationAxisName = `${aggregationAxisNameBase}${aggregationAxisDescription} (${aggregationAxisSortText})`;
 
@@ -695,9 +695,9 @@ function EagerSingleEChartsBarChart({
       : '';
     const categoricalAxisSortText =
       config?.direction === EBarDirection.HORIZONTAL
-        ? SortDirectionMap[config?.sortState?.y as EBarSortState]
+        ? SortDirectionMap[config?.sortState?.y ?? EBarSortState.NONE]
         : config?.direction === EBarDirection.VERTICAL
-          ? SortDirectionMap[config?.sortState?.x as EBarSortState]
+          ? SortDirectionMap[config?.sortState?.x ?? EBarSortState.NONE]
           : '';
     const categoricalAxisName = `${categoricalAxisNameBase}${categoricalAxisDescription} (${categoricalAxisSortText})`;
 

src/vis/bar/interfaces/internal/helpers/bar-vis.worker.ts

@@ -2,9 +2,8 @@ import * as ComLink from 'comlink';
 import { generateAggregatedDataLookup } from './generate-aggregated-data-lookup';
 import { generateBarSeries } from './generate-bar-series';
 import { generateDataTable } from './generate-data-table';
-import { getTruncatedTextMap } from './get-truncated-text-map';
 
-const exposed = { generateAggregatedDataLookup, generateBarSeries, generateDataTable, getTruncatedTextMap };
+const exposed = { generateAggregatedDataLookup, generateBarSeries, generateDataTable };
 
 export type GenerateAggregatedDataLookup = typeof exposed;
 

src/vis/bar/interfaces/internal/helpers/get-bar-data.ts

@@ -1,4 +1,4 @@
-import { resolveSingleColumn } from '../../../../general';
+import { resolveSingleColumn } from '../../../../general/layoutUtils';
 import { ColumnInfo, EColumnTypes, VisCategoricalValue, VisColumn, VisNumericalValue } from '../../../../interfaces';
 import { VisColumnWithResolvedValues } from '../../types';
 

src/vis/bar/interfaces/internal/helpers/get-data-for-aggregate-type.test.ts

@@ -1,4 +1,4 @@
-import { NAN_REPLACEMENT } from '../../../../general';
+import { NAN_REPLACEMENT } from '../../../../general/constants';
 import { defaultConfig } from '../../constants';
 import { getDataForAggregationType } from './get-data-for-aggregate-type';
 

src/vis/bar/interfaces/internal/helpers/index.ts

@@ -5,7 +5,6 @@ export * from './create-bin-lookup';
 export * from './generate-aggregated-data-lookup';
 export * from './generate-bar-series';
 export * from './generate-data-table';
-export * from './get-truncated-text-map';
 export * from './get-bar-data';
 export * from './get-data-for-aggregate-type';
 export * from './median';

src/vis/bar/interfaces/internal/helpers/sort-series.ts

@@ -1,5 +1,5 @@
 import type { BarSeriesOption } from 'echarts/charts';
-import { NAN_REPLACEMENT } from '../../../../general';
+import { NAN_REPLACEMENT } from '../../../../general/constants';
 import { EBarSortState, EBarDirection } from '../../enums';
 
 /**

src/vis/correlation/CorrelationMatrix.tsx

@@ -184,32 +184,34 @@ export function CorrelationMatrix({
   return (
     <Stack pr="40px" style={{ height: '100%', width: '100%' }}>
       {status === 'success' ? (
-        <Stack align="center" gap={0} id={id} style={{ height: '100%', width: '100%' }}>
+        <Stack align="center" gap={0} style={{ height: '100%', width: '100%' }}>
           {showDownloadScreenshot ? (
             <Center>
               <DownloadPlotButton uniquePlotId={id} config={config} />
             </Center>
           ) : null}
-          <Box pl={margin.left} pr={margin.right}>
-            <ColorLegendVert format=".3~g" scale={colorScale} width={availableSize} height={20} range={[-1, 1]} title="Correlation" />
-          </Box>
-          <Box ref={ref} style={{ height: '100%', width: `100%`, overflow: 'hidden' }}>
-            <svg style={{ height, width, overflow: 'hidden' }}>
-              <g transform={`translate(${(width - availableSize - margin.left - margin.right) / 2}, 0)`}>
-                {memoizedCorrelationResults?.map((value) => {
-                  return (
-                    <CorrelationPair
-                      key={`${value.xName}-${value.yName}`}
-                      value={value}
-                      fill={colorScale(value.correlation)}
-                      boundingRect={{ width: xScale.bandwidth(), height: yScale.bandwidth() }}
-                      config={config}
-                    />
-                  );
-                })}
-                {labelsDiagonal}
-              </g>
-            </svg>
+          <Box id={id} style={{ height: '100%', width: '100%' }}>
+            <Box pl={margin.left} pr={margin.right}>
+              <ColorLegendVert format=".3~g" scale={colorScale} width={availableSize} height={20} range={[-1, 1]} title="Correlation" />
+            </Box>
+            <Box ref={ref} style={{ height: '100%', width: `100%`, overflow: 'hidden' }}>
+              <svg style={{ height, width, overflow: 'hidden' }}>
+                <g transform={`translate(${(width - availableSize - margin.left - margin.right) / 2}, 0)`}>
+                  {memoizedCorrelationResults?.map((value) => {
+                    return (
+                      <CorrelationPair
+                        key={`${value.xName}-${value.yName}`}
+                        value={value}
+                        fill={colorScale(value.correlation)}
+                        boundingRect={{ width: xScale.bandwidth(), height: yScale.bandwidth() }}
+                        config={config}
+                      />
+                    );
+                  })}
+                  {labelsDiagonal}
+                </g>
+              </svg>
+            </Box>
           </Box>
         </Stack>
       ) : (

src/vis/general/SortIcon.stories.tsx

@@ -0,0 +1,86 @@
+import React from 'react';
+import { ComponentStory } from '@storybook/react';
+import { Stack, Text, Group } from '@mantine/core';
+import { ESortStates, SortIcon, ISortIconProps } from './SortIcon';
+
+function Wrapper({ props, initialState }: { props?: Omit<ISortIconProps, 'sortState' | 'setSortState'>; initialState?: ESortStates }) {
+  const [sortState, setSortState] = React.useState<ESortStates>(initialState || ESortStates.NONE);
+
+  return (
+    <Stack gap="xs">
+      <Group>
+        <SortIcon {...props} sortState={sortState} setSortState={setSortState} />
+
+        {[2, 1, 5, 3, 4]
+          .sort((a, b) => {
+            switch (sortState) {
+              case ESortStates.ASC:
+                return a - b;
+              case ESortStates.DESC:
+                return b - a;
+              default:
+                return 0;
+            }
+          })
+          .map((i) => (
+            <Text key={i}>{i}</Text>
+          ))}
+      </Group>
+    </Stack>
+  );
+}
+
+function Docs() {
+  return (
+    <Stack p="xl" gap="xl">
+      <Stack gap="xs">
+        <Text fz="xl" fw={500}>
+          Basic example
+        </Text>
+        <Wrapper />
+      </Stack>
+      <Stack gap="xs">
+        <Text fz="xl" fw={500}>
+          Compact icon
+        </Text>
+        <Wrapper props={{ compact: true }} />
+      </Stack>
+      <Stack gap="xs">
+        <Text fz="xl" fw={500}>
+          With priority
+        </Text>
+        <Wrapper props={{ priority: 1 }} />
+      </Stack>
+      <Stack gap="xs">
+        <Text fz="xl" fw={500}>
+          Has no unsorted state
+        </Text>
+        <Wrapper props={{ hasUnsortedState: false }} initialState={ESortStates.ASC} />
+      </Stack>
+      <Stack gap="xs">
+        <Stack gap={0}>
+          <Text fz="xl" fw={500}>
+            Sort descending on first click
+          </Text>
+          <Text c="dimmed">Only for specific use cases - the default is ascending</Text>
+        </Stack>
+        <Wrapper props={{ sortStateOnFirstClick: ESortStates.DESC }} />
+      </Stack>
+    </Stack>
+  );
+}
+
+// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+export default {
+  title: 'Components/SortIcon',
+  component: Docs,
+  // More on argTypes: https://storybook.js.org/docs/react/api/argtypes
+};
+
+// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
+// eslint-disable-next-line react/function-component-definition
+const Template: ComponentStory<typeof Docs> = (args) => {
+  return <Docs />;
+};
+
+export const Default: typeof Template = Template.bind({});