Merge pull request #193 from bobnik/feature/insert-layer

when adding a new layer, insert after current one (vs at end)
jeffeb3 · Jan 11, 2021 · 0e1ca70 · 0e1ca70
2 parents 2b992d3 + 3e4bf30
commit 0e1ca70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/features/layers/layersSlice.js b/src/features/layers/layersSlice.js
@@ -28,7 +28,10 @@ const layersSlice = createSlice({
       layer.id = uniqueId('layer-')
       layer.name = layer.name || state.newLayerName
       state.byId[layer.id] = layer
-      state.allIds.push(layer.id)
+
+      const index = state.allIds.findIndex(id => id === state.current) + 1
+      state.allIds.splice(index, 0, layer.id)
+
       state.current = layer.id
       state.selected = layer.id
       state.newLayerNameOverride = false
@@ -46,7 +49,10 @@ const layersSlice = createSlice({
       const layer = { ...source, name: state.copyLayerName }
       layer.id = uniqueId('layer-')
       state.byId[layer.id] = layer
-      state.allIds.push(layer.id)
+
+      const index = state.allIds.findIndex(id => id === state.current) + 1
+      state.allIds.splice(index, 0, layer.id)
+
       state.current = layer.id
       state.selected = layer.id
     },

diff --git a/src/features/layers/layersSlice.spec.js b/src/features/layers/layersSlice.spec.js
@@ -112,6 +112,7 @@ describe('layers reducer', () => {
           }
         },
         allIds: ['layer-1'],
+        current: 'layer-1',
         copyLayerName: 'foo'
       },
       copyLayer('layer-1'))