fix: pass canManageFolderStructure as the canDrag cb dep (#3681)

webiny · Nov 9, 2023 · 511c4d9 · 511c4d9
1 parent 6a0cac5
commit 511c4d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/packages/app-aco/src/components/FolderTree/List/index.tsx b/packages/app-aco/src/components/FolderTree/List/index.tsx
@@ -99,10 +99,13 @@ export const List: React.VFC<ListProps> = ({
         setOpenFolderIds([ROOT_FOLDER, ...folderIds]);
     };
 
-    const canDrag = useCallback((folderId: string) => {
-        const isRootFolder = folderId === ROOT_FOLDER;
-        return !isRootFolder && canManageFolderStructure(folderId);
-    }, []);
+    const canDrag = useCallback(
+        (folderId: string) => {
+            const isRootFolder = folderId === ROOT_FOLDER;
+            return !isRootFolder && canManageFolderStructure(folderId);
+        },
+        [canManageFolderStructure]
+    );
 
     return (
         <>

diff --git a/packages/app-form-builder/src/components/Form/FormRender.tsx b/packages/app-form-builder/src/components/Form/FormRender.tsx
@@ -89,8 +89,8 @@ const FormRender: React.FC<FbFormRenderComponentProps> = props => {
     // Check if the form is a multi step.
     const isMultiStepForm = formData.steps.length > 1;
 
-    const isFirstStep = isMultiStepForm && currentStepIndex === 0;
-    const isLastStep = !isMultiStepForm || currentStepIndex === steps.length - 1;
+    const isFirstStep = currentStepIndex === 0;
+    const isLastStep = currentStepIndex === steps.length - 1;
 
     // We need this check in case we deleted last step and at the same time we were previewing it.
     const currentStep =

diff --git a/packages/app-page-builder-elements/src/renderers/form/FormRender.tsx b/packages/app-page-builder-elements/src/renderers/form/FormRender.tsx
@@ -49,8 +49,8 @@ const FormRender: React.FC<FormRenderProps> = props => {
         setCurrentStepIndex(prevStep => (prevStep -= 1));
     };
 
-    const isFirstStep = isMultiStepForm && currentStepIndex === 0;
-    const isLastStep = isMultiStepForm && currentStepIndex === formData.steps.length - 1;
+    const isFirstStep = currentStepIndex === 0;
+    const isLastStep = currentStepIndex === formData.steps.length - 1;
 
     const currentStep =
         formData.steps[currentStepIndex] === undefined
@@ -191,6 +191,7 @@ const FormRender: React.FC<FormRenderProps> = props => {
                 }
             };
         }
+
         const formSubmission = await createFormSubmission({
             props,
             formSubmissionFieldValues,