fix merge issues

Author: slax57

packages/ra-core/src/controller/list/useListController.ts

@@ -119,8 +119,6 @@ export const useListController = <
         isPending,
         isPlaceholderData,
         refetch,
-        isPaused,
-        isPlaceholderData,
     } = useGetList<RecordType, ErrorType>(
         resource,
         {

packages/ra-core/src/dataTable/DataTableBase.tsx

@@ -39,7 +39,9 @@ export const DataTableBase = function DataTable<
     const {
         sort,
         data,
+        isPaused,
         isPending,
+        isPlaceholderData,
         onSelect,
         onToggleItem,
         selectedIds,
@@ -154,7 +156,12 @@ export const DataTableBase = function DataTable<
      * displaying the table header with zero data rows,
      * the DataTable displays the empty component.
      */
-    if (data == null || data.length === 0 || total === 0) {
+    if (
+        data == null ||
+        data.length === 0 ||
+        total === 0 ||
+        (isPaused && isPlaceholderData)
+    ) {
         if (empty) {
             return empty;
         }