- {getArrayOfLength(rows).map((_, index) => {
- return (
-
- {columns.map((col) => {
- return (
-
- );
- })}
-
- );
- })}
+
+
+ {getArrayOfLength(rows).map((_, index) => {
+ return (
+
+ {columns.map((col) => {
+ return (
+
+ );
+ })}
+
+ );
+ })}
+
);
};
diff --git a/packages/main/src/components/AnalyticalTable/defaults/NoDataComponent/index.tsx b/packages/main/src/components/AnalyticalTable/defaults/NoDataComponent/index.tsx
index d50dfcf4fdc..bb481409313 100644
--- a/packages/main/src/components/AnalyticalTable/defaults/NoDataComponent/index.tsx
+++ b/packages/main/src/components/AnalyticalTable/defaults/NoDataComponent/index.tsx
@@ -1,6 +1,11 @@
-export const DefaultNoDataComponent = ({ noDataText, className, style }) => {
+interface NoDataComponentProps {
+ noDataText: string;
+ className: string;
+}
+
+export const DefaultNoDataComponent = ({ noDataText, className }: NoDataComponentProps) => {
return (
-
+
{noDataText}
);
diff --git a/packages/main/src/components/AnalyticalTable/hooks/useKeyboardNavigation.ts b/packages/main/src/components/AnalyticalTable/hooks/useKeyboardNavigation.ts
index 995af9ef182..30c5f8868d1 100644
--- a/packages/main/src/components/AnalyticalTable/hooks/useKeyboardNavigation.ts
+++ b/packages/main/src/components/AnalyticalTable/hooks/useKeyboardNavigation.ts
@@ -106,7 +106,8 @@ const useGetTableProps = (
Object.prototype.hasOwnProperty.call(dataset, 'subcomponentActiveElement') ||
// todo: with the new popover API of ui5wc this might not be necessary anymore
dataset.componentName === 'ATHeaderPopoverList' ||
- dataset.componentName === 'ATHeaderPopover'
+ dataset.componentName === 'ATHeaderPopover' ||
+ dataset.componentName === 'AnalyticalTableNoDataContainer'
) {
return;
}
diff --git a/packages/main/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx
index 5fc7323ca4b..56ab950921b 100644
--- a/packages/main/src/components/AnalyticalTable/index.tsx
+++ b/packages/main/src/components/AnalyticalTable/index.tsx
@@ -43,6 +43,7 @@ import {
INVALID_TABLE,
LIST_NO_DATA,
NO_DATA_FILTERED,
+ PLEASE_WAIT,
ROW_COLLAPSED,
ROW_EXPANDED,
SELECT_ALL,
@@ -797,15 +798,25 @@ const AnalyticalTable = forwardRef
- )}
- {!loading && rows?.length === 0 && (
-
+ data-component-name="AnalyticalTableNoDataContainer"
+ role="row"
+ tabIndex={0}
+ className={classNames.noDataContainer}
+ >
+ {loading ? (
+
+ ) : (
+
+ )}
+
)}
{rows?.length > 0 && tableRef.current && (