fix: selected block after blocks reorder

Author: qradle-yndx

editor-v2/containers/Overlay/Overlay.tsx

@@ -65,15 +65,13 @@ const Overlay = ({className, canvasElement}: OverlayProps) => {
         const destination = [...selectedBlock];
         destination[destination.length - 1] = destination[destination.length - 1] - 1;
         reorderBlock(selectedBlock, destination, 'prepend');
-        setSelectedBlock(undefined);
     };
 
     const handleMoveDown = () => {
         if (!selectedBlock) return;
         const destination = [...selectedBlock];
         destination[destination.length - 1] = destination[destination.length - 1] + 1;
         reorderBlock(selectedBlock, destination, 'append');
-        setSelectedBlock(undefined);
     };
 
     return (

editor-v2/hooks/useMainEditorInitialize.ts

@@ -13,7 +13,6 @@ const useMainEditorInitialize = () => {
         disableMode,
         insertBlock,
         reorderBlock,
-        setSelectedBlock,
         preInsertBlockType,
         preReorderBlockPath,
     } = useMainEditorStore();
@@ -52,7 +51,6 @@ const useMainEditorInitialize = () => {
                     path,
                     ['left', 'top'].includes(position) ? 'prepend' : 'append',
                 );
-                setSelectedBlock(path);
             }
             disableMode();
         },

editor-v2/store.ts

@@ -109,6 +109,9 @@ export const createEditorStore = initializeStore<EditorState, EditorMethods>(
                 ...state,
                 content: {...state.content, blocks: newBlocksConfig},
             }));
+
+            // Set the inserted block as selected
+            get().setSelectedBlock(arrayPath);
         },
         enableInsertMode(blockType: string) {
             set((state) => ({
@@ -180,6 +183,9 @@ export const createEditorStore = initializeStore<EditorState, EditorMethods>(
             }));
         },
         reorderBlock: (arrayPath, destination, position = 'append') => {
+            // Create a copy of the destination array before any modifications
+            let finalDestinationPath: number[] = _.cloneDeep(destination);
+
             if (position === 'append') {
                 // TODO: fix
                 // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
@@ -199,8 +205,17 @@ export const createEditorStore = initializeStore<EditorState, EditorMethods>(
                         destination[destination.length - 1],
                     );
                 });
+
+                if (
+                    position === 'append' &&
+                    destination[destination.length - 1] < arrayPath[arrayPath.length - 1]
+                ) {
+                    finalDestinationPath[finalDestinationPath.length - 1] =
+                        finalDestinationPath[finalDestinationPath.length - 1] + 1;
+                }
             } else {
                 const arrayDest = getDestinationShiftBeforeReorder(arrayPath, destination);
+                finalDestinationPath = _.cloneDeep(arrayDest);
 
                 // Delete
                 const blocksConfigWithoutBlock = modifyObjectByPath(
@@ -220,6 +235,8 @@ export const createEditorStore = initializeStore<EditorState, EditorMethods>(
                 ...state,
                 content: {...state.content, blocks: newBlocksConfig},
             }));
+
+            get().setSelectedBlock(finalDestinationPath);
         },
         resetInitialize: () => {
             set((state) => ({