Merge branch 'main' into git-merge

Author: DoguhanOzgurAkca

cypress/e2e/data-provider-strapi-v4/all.cy.ts

@@ -133,9 +133,23 @@ describe("data-provider-strapi-v4", () => {
 
       cy.getAntdFilterTrigger(0).click();
       cy.get(".ant-select-selector").eq(1).click();
+
+      // Wait for dropdown options to be visible and have proper dimensions
+      cy.get(".ant-select-dropdown").should("be.visible");
+      cy.get(".ant-select-item-option-content").should(
+        "have.length.at.least",
+        1,
+      );
+
       cy.fixture("categories").then((categories) => {
         const category = categories[0];
 
+        cy.get(".ant-select-item-option-content")
+          .contains(category.title)
+          .should("be.visible")
+          .should("have.css", "width")
+          .and("not.equal", "0px");
+
         cy.get(".ant-select-item-option-content")
           .contains(category.title)
           .click();

cypress/e2e/table-material-ui-cursor-pagination/all.cy.ts

@@ -8,6 +8,8 @@ describe("table-material-ui-cursor-pagination", () => {
 
   it("should work with pagination", () => {
     cy.getMaterialUILoadingCircular().should("not.exist");
+    cy.get(".MuiDataGrid-root").should("be.visible");
+    cy.get(".MuiDataGrid-row").should("have.length.at.least", 1);
 
     cy.intercept({
       url: "https://api.github.com/repos/refinedev/refine/commits*",
@@ -16,6 +18,7 @@ describe("table-material-ui-cursor-pagination", () => {
       },
     }).as("getSecondPageCommits");
 
+    cy.get("[title='Go to next page']").should("not.be.disabled");
     cy.get("[title='Go to next page']").click();
 
     cy.url().should("include", "current=2");
@@ -29,6 +32,8 @@ describe("table-material-ui-cursor-pagination", () => {
       },
     }).as("getFirstPageCommits");
 
+    // Wait for the previous page button to be enabled before clicking
+    cy.get("[title='Go to previous page']").should("not.be.disabled");
     cy.get("[title='Go to previous page']").click();
 
     cy.url().should("include", "current=1");

documentation/docs/packages/react-hook-form/use-modal-form/index.md

@@ -663,6 +663,18 @@ const modalForm = useModalForm({
 });
 ```
 
+### autoResetFormWhenClose
+
+When `true`, form will be reset when modal closes. Defaults to `true`.
+
+```tsx
+const modalForm = useModalForm({
+  modalProps: {
+    autoResetFormWhenClose: false,
+  },
+});
+```
+
 ### warnWhenUnsavedChanges
 
 When you have unsaved changes and try to leave the current page, Refine shows a confirmation modal box. To activate this feature. By default, this feature is disabled.

documentation/docs/ui-integrations/ant-design/hooks/use-modal-form/index.md

@@ -475,6 +475,16 @@ const modalForm = useModalForm({
 });
 ```
 
+### autoResetFormWhenClose
+
+`autoResetFormWhenClose` will reset the form when modal closes. It is `true` by default.
+
+```tsx
+const modalForm = useModalForm({
+  autoResetFormWhenClose: false,
+});
+```
+
 ### warnWhenUnsavedChanges
 
 When set to true, `warnWhenUnsavedChanges` shows a warning when the user tries to leave the page with unsaved changes. It is used to prevent the user from accidentally leaving the page. It is `false` by default

documentation/docs/ui-integrations/mantine/hooks/use-modal-form/index.md

@@ -793,6 +793,18 @@ const modalForm = useModalForm({
 });
 ```
 
+### autoResetFormWhenClose
+
+When `true`, form will be reset when modal closes. It is `true` by default.
+
+```tsx
+const modalForm = useModalForm({
+  modalProps: {
+    autoResetFormWhenClose: false,
+  },
+});
+```
+
 ### syncWithLocation
 
 When `true`, the modals visibility state and the `id` of the record will be synced with the URL. It is `false` by default.

examples/access-control-casbin/package.json

@@ -22,9 +22,9 @@
     ]
   },
   "dependencies": {
-    "@refinedev/antd": "^5.46.1",
+    "@refinedev/antd": "^5.46.2",
     "@refinedev/cli": "^2.16.46",
-    "@refinedev/core": "^4.57.9",
+    "@refinedev/core": "^4.57.10",
     "@refinedev/react-router": "^1.0.1",
     "@refinedev/simple-rest": "^5.0.10",
     "@uiw/react-md-editor": "^3.19.5",

examples/access-control-cerbos/package.json

@@ -23,9 +23,9 @@
   },
   "dependencies": {
     "@cerbos/http": "^0.6.0",
-    "@refinedev/antd": "^5.46.1",
+    "@refinedev/antd": "^5.46.2",
     "@refinedev/cli": "^2.16.46",
-    "@refinedev/core": "^4.57.9",
+    "@refinedev/core": "^4.57.10",
     "@refinedev/react-router": "^1.0.1",
     "@refinedev/simple-rest": "^5.0.10",
     "@uiw/react-md-editor": "^3.19.5",

examples/access-control-permify/package.json

@@ -22,9 +22,9 @@
     ]
   },
   "dependencies": {
-    "@refinedev/antd": "^5.46.1",
+    "@refinedev/antd": "^5.46.2",
     "@refinedev/cli": "^2.16.46",
-    "@refinedev/core": "^4.57.9",
+    "@refinedev/core": "^4.57.10",
     "@refinedev/react-router": "^1.0.1",
     "@refinedev/simple-rest": "^5.0.10",
     "@uiw/react-md-editor": "^3.19.5",

examples/app-crm-minimal/package.json

@@ -19,9 +19,9 @@
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
-    "@refinedev/antd": "^5.46.1",
+    "@refinedev/antd": "^5.46.2",
     "@refinedev/cli": "^2.16.46",
-    "@refinedev/core": "^4.57.9",
+    "@refinedev/core": "^4.57.10",
     "@refinedev/devtools": "^1.2.16",
     "@refinedev/nestjs-query": "^1.3.5",
     "@refinedev/react-router": "^1.0.1",

examples/audit-log-provider/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@refinedev/cli": "^2.16.46",
-    "@refinedev/core": "^4.57.9",
-    "@refinedev/react-hook-form": "^4.10.1",
+    "@refinedev/core": "^4.57.10",
+    "@refinedev/react-hook-form": "^4.10.2",
     "@refinedev/react-router": "^1.0.1",
     "@refinedev/simple-rest": "^5.0.10",
     "react": "^18.0.0",