@applica-software-guru/react-admin 1.5.363 → 1.5.364

package/package.json

@@ -108,5 +108,5 @@
   "type": "module",
   "types": "dist/index.d.ts",
   "typings": "dist/index.d.ts",
-  "version": "1.5.363"
+  "version": "1.5.364"
 }

package/src/components/Pagination/Pagination.tsx

@@ -18,7 +18,7 @@ const Pagination: FC<PaginationProps> = memo((props) => {
   const { isLoading, hasNextPage, page, perPage, total, setPage, setPerPage } = useListPaginationContext(props);
   const translate = useTranslate();
   const isSmall = useMediaQuery((theme: Theme) => theme.breakpoints.down('md'));
-  const [currentPage, setCurrentPage] = useState(page - 1); // Stato per la UI
+  const [currentPage, setCurrentPage] = useState(page - 1);
   const { hasCreate } = useResourceDefinition(props);
   const [isSelectedPage, setIsSelectedPage] = useState(false);
   const theme = useTheme();
@@ -173,10 +173,13 @@ const Pagination: FC<PaginationProps> = memo((props) => {
       page={currentPage}
       onPageChange={handlePageChange}
       onRowsPerPageChange={handlePerPageChange}
-      // @ts-ignore
-      ActionsComponent={ActionsComponent}
-      nextIconButtonProps={{
-        disabled: !hasNextPage
+      ActionsComponent={ActionsComponent as any}
+      slotProps={{
+        actions: {
+          nextButton: {
+            disabled: !hasNextPage
+          }
+        }
       }}
       component="span"
       labelRowsPerPage={translate('ra.navigation.page_rows_per_page')}

package/src/components/ra-lists/Datagrid/DatagridHeader.tsx

@@ -134,7 +134,9 @@ function DatagridHeader(props: MultiSortDatagridHeaderProps): ReactElement {
             }
 
             const source =
-              child.props.source ?? (typeof child.props.label === 'string' ? child.props.label : undefined);
+              child.props.sortBy ??
+              child.props.source ??
+              (typeof child.props.label === 'string' ? child.props.label : undefined);
             const sortable = child.props.sortable !== false && !!source;
             const sortInfo = sortable ? getSortForField(source) : null;