fix: remove feature and cypress ci

.github/workflows/cypress.yml

@@ -4,8 +4,8 @@ jobs:
   cypress-run:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: cypress-io/github-action@v2
+      - uses: actions/checkout@v2
+      - uses: cypress-io/github-action@v4
         with:
           record: true
           browser: chrome

cypress.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  projectId: '8759xt',
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:3000/',
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})

cypress/integration/sceneDeletion.spec.js → cypress/e2e/sceneDeletion.spec.js

@@ -85,4 +85,14 @@ context('Scene Deletion', () => {
         cy.get(`[data-testid=${currentSceneId}]`).should("have.css", "border", SelectedSceneBorder)
     })
 
-})
+    it('Make 2nd to current and then delete second', () => {
+        const currentSceneId = getSceneId(scenes[1]);
+        const nextSceneId = getSceneId(scenes[2]);
+        cy.get(`[data-testid=${currentSceneId}]`).click();
+        const sceneIdToDelete = getSceneId(scenes[1]);
+        cy.get(`[data-testid=${sceneIdToDelete}]`).contains(`${DeleteButtonText}`).click({ force: true })
+        cy.get(`[data-testid=${sceneIdToDelete}]`).should("not.exist")
+        cy.get(`[class=Claymate-scenes]`).first()
+          .get(`[data-testid=${nextSceneId}]`).should("have.css", "border", SelectedSceneBorder)
+    })
+})

src/Claymate.tsx

@@ -105,35 +105,33 @@ const Claymate = ({
   };
 
   const deleteScene = (id: string) => {
-    const index = scenes.findIndex((sc) => sc.id === id);
-    if (index >= 0) {
-      const remainingScenes = scenes.length - 1;
-      if (remainingScenes > 0) {
-        let newCurrent;
-        if (currentIndex !== undefined) {
-          const deletingCurrentScene = index === currentIndex;
-          if (currentIndex > index || deletingCurrentScene) {
-            let sourceIndex = currentIndex;
-            if (deletingCurrentScene) {
-              if (currentIndex === remainingScenes) {
-                sourceIndex = currentIndex - 1;
-              } else if (currentIndex === 0) {
-                sourceIndex = 1;
-              }
-            }
-            newCurrent = {
-              index: currentIndex > 0 ? currentIndex - 1 : currentIndex,
-              drawing: scenes[sourceIndex].drawing,
-            };
-          }
-        }
-        updateScenes(
-          (prev: Scene[]) => prev.filter((item) => item.id !== id),
-          newCurrent
-        );
-      }
+    const deletedSceneIndex = scenes.findIndex((item) => item.id === id);
+    if(deletedSceneIndex < 0) return;
+    let nextSelectedScene = undefined;
+
+    if (currentIndex !== undefined){
+      const remainingScenesCount = scenes.length - 1;
+      const nextIndex = currentIndex === remainingScenesCount || currentIndex > deletedSceneIndex
+        ? currentIndex - 1
+        : currentIndex;
+
+      const nextDrawingIndex = deletedSceneIndex <= currentIndex && remainingScenesCount !== deletedSceneIndex
+        ? nextIndex + 1
+        : nextIndex;
+
+      nextSelectedScene = {
+        index: nextIndex,
+        drawing: scenes[nextDrawingIndex].drawing
+      };
     }
-  };
+
+    updateScenes((prev) => {
+        const next = [...prev];
+        next.splice(deletedSceneIndex, 1);
+        return next;
+      }, nextSelectedScene
+    );
+  }
 
   const moveLeft = (id: string) => {
     const index = scenes.findIndex((item) => item.id === id);