+
{noDataText}
);
diff --git a/packages/main/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx
index a2bae2c6988..f6f0c10bc2f 100644
--- a/packages/main/src/components/AnalyticalTable/index.tsx
+++ b/packages/main/src/components/AnalyticalTable/index.tsx
@@ -24,6 +24,7 @@ import {
useSortBy,
useTable,
} from 'react-table';
+import { AnalyticalTableNoDataReason } from '../../enums/AnalyticalTableNoDataReason.js';
import { AnalyticalTablePopinDisplay } from '../../enums/AnalyticalTablePopinDisplay.js';
import { AnalyticalTableScaleWidthMode } from '../../enums/AnalyticalTableScaleWidthMode.js';
import { AnalyticalTableSelectionBehavior } from '../../enums/AnalyticalTableSelectionBehavior.js';
@@ -85,9 +86,9 @@ import type {
AnalyticalTableDomRef,
AnalyticalTablePropTypes,
AnalyticalTableState,
+ CellInstance,
DivWithCustomScrollProp,
TableInstance,
- CellInstance,
} from './types/index.js';
import {
getCombinedElementsHeight,
@@ -325,8 +326,8 @@ const AnalyticalTable = forwardRef
0 || tableState.globalFilter ? noDataTextFiltered : noDataTextI18n);
+ const noDataFiltered = tableState.filters?.length > 0 || tableState.globalFilter;
+ const noDataTextLocal = noDataText ?? (noDataFiltered ? noDataTextFiltered : noDataTextI18n);
const [componentRef, analyticalTableRef] = useSyncRef(ref);
const [cbRef, scrollToRef] = useScrollToRef(componentRef, dispatch);
@@ -844,7 +845,14 @@ const AnalyticalTable = forwardRef
) : (
-
+
)}
)}
diff --git a/packages/main/src/components/AnalyticalTable/types/index.ts b/packages/main/src/components/AnalyticalTable/types/index.ts
index 560a656030e..33937d4b64a 100644
--- a/packages/main/src/components/AnalyticalTable/types/index.ts
+++ b/packages/main/src/components/AnalyticalTable/types/index.ts
@@ -10,6 +10,7 @@ import type {
RefObject,
SetStateAction,
} from 'react';
+import type { AnalyticalTableNoDataReason } from '../../../enums/AnalyticalTableNoDataReason.js';
import type { AnalyticalTablePopinDisplay } from '../../../enums/AnalyticalTablePopinDisplay.js';
import type { AnalyticalTableScaleWidthMode } from '../../../enums/AnalyticalTableScaleWidthMode.js';
import type { AnalyticalTableScrollMode } from '../../../enums/AnalyticalTableScrollMode.js';
@@ -1040,7 +1041,12 @@ export interface AnalyticalTablePropTypes extends Omit