Merge branch 'master' into fix/popovers-bubbling

Author: MarcusNotheis

packages/main/package.json

@@ -36,7 +36,7 @@
     "lodash.debounce": "^4.0.8",
     "react-content-loader": "5.1.0",
     "react-jss": "10.1.1",
-    "react-table": "7.2.2",
+    "react-table": "7.3.2",
     "react-virtual": "2.2.1"
   },
   "peerDependencies": {

packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.mdx

@@ -85,7 +85,6 @@ import { FlexBoxJustifyContent } from '@ui5/webcomponents-react/lib/FlexBoxJusti
       }
     ],
     title: 'Table Title',
-    busyIndicatorEnabled: true,
     sortable: true,
     filterable: true,
     visibleRows: 15,
@@ -135,7 +134,6 @@ import { FlexBoxJustifyContent } from '@ui5/webcomponents-react/lib/FlexBoxJusti
           data={args.data}
           columns={args.columns}
           loading={args.loading}
-          busyIndicatorEnabled={args.busyIndicatorEnabled}
           alternateRowColor={args.alternateRowColor}
           sortable={args.sortable}
           filterable={args.filterable}
@@ -283,7 +281,6 @@ This even works if you resize the browser window!
         data={args.dataTree}
         columns={args.columns}
         loading={args.loading}
-        busyIndicatorEnabled={args.busyIndicatorEnabled}
         sortable={args.sortable}
         filterable={args.filterable}
         visibleRows={args.visibleRows}

packages/main/src/components/AnalyticalTable/AnalyticalTable.test.tsx

@@ -169,7 +169,6 @@ describe('AnalyticalTable', () => {
         data={dataTree}
         columns={columns}
         loading={false}
-        busyIndicatorEnabled={true}
         sortable={true}
         filterable={true}
         visibleRows={15}

packages/main/src/components/AnalyticalTable/index.tsx

@@ -72,7 +72,6 @@ export interface TableProps extends CommonProps {
   minRows?: number;
   visibleRows?: number;
   loading?: boolean;
-  busyIndicatorEnabled?: boolean;
   noDataText?: string;
   rowHeight?: number;
   alternateRowColor?: boolean;
@@ -143,7 +142,6 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
     onSort,
     reactTableOptions,
     tableHooks,
-    busyIndicatorEnabled,
     subRowsKey,
     onGroup,
     rowHeight,
@@ -227,8 +225,8 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
       ...reactTableOptions
     },
     useFilters,
-    useGroupBy,
     useColumnOrder,
+    useGroupBy,
     useSortBy,
     useExpanded,
     useRowSelect,
@@ -403,9 +401,7 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
             </header>
           );
         })}
-        {loading && busyIndicatorEnabled && props.data?.length > 0 && (
-          <LoadingComponent style={{ width: `${totalColumnsWidth}px` }} />
-        )}
+        {loading && props.data?.length > 0 && <LoadingComponent style={{ width: `${totalColumnsWidth}px` }} />}
         {loading && props.data?.length === 0 && (
           <TablePlaceholder
             columns={tableInternalColumns.filter(
@@ -448,7 +444,6 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
 AnalyticalTable.displayName = 'AnalyticalTable';
 AnalyticalTable.defaultProps = {
   loading: false,
-  busyIndicatorEnabled: true,
   sortable: true,
   filterable: false,
   groupable: false,

yarn.lock

@@ -4481,7 +4481,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16.9.34", "@types/react@^16.9.34":
+"@types/react@*", "@types/react@^16.9.34":
   version "16.9.34"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
   integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
@@ -16870,10 +16870,10 @@ react-syntax-highlighter@^12.2.1:
     prismjs "^1.8.4"
     refractor "^2.4.1"
 
-react-table@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.2.2.tgz#2978a903f0e367e1ceab25d60a6a40ae23498f77"
-  integrity sha512-JBE3QUyRQJkHRU72NKo7HRGtSGcrzIcVLDbsoZI+KhWkFEZ2t9UfpqeHBdbc3R5RRJZ6qC7+NzZZxJPSYWKPBQ==
+react-table@7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.3.2.tgz#def43b9777e0ef5839608104a557c3f1c365b2ff"
+  integrity sha512-n8ZvC8tzuDa3qK9PFlcXmo58JCRfxg/3LlvG8YJywvsQKiCnTfK6lDSp8a3WsAOBcZvBtGgyeoke7pBfAdB8jA==
 
 react-test-renderer@^16.0.0-0:
   version "16.13.1"