From 3e345274af26c48da4c617afca0cb2f09f3d1909 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 23 Jun 2026 11:57:15 +0200
Subject: [PATCH] fix(developer): fixup references to layer after deleting in
 Touch Layout Editor

Also address fixup after renaming a layer so that it does not touch the
key `layer` property, because that refers actually to "modifier", not
"layer" (these terms were conflated in the original design).

Fixes: #15340
Test-bot: skip
---
 .../tike/xml/layoutbuilder/layer-controls.js  | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/developer/src/tike/xml/layoutbuilder/layer-controls.js b/developer/src/tike/xml/layoutbuilder/layer-controls.js
index 8fa04d369ee..0f1797d413e 100644
--- a/developer/src/tike/xml/layoutbuilder/layer-controls.js
+++ b/developer/src/tike/xml/layoutbuilder/layer-controls.js
@@ -31,7 +31,8 @@ $(function() {
   $('#btnDelLayer').click(function () {
     if ($('#selLayer option').length == 1) return;
     builder.saveUndo();
-    KVKL[builder.lastPlatform].layer.splice(builder.lastLayerIndex, 1);
+    const deletedLayer = KVKL[builder.lastPlatform].layer.splice(builder.lastLayerIndex, 1)[0];
+    updateNextLayerReferences(KVKL[builder.lastPlatform], deletedLayer.id, '');
     builder.selectPlatform();
     builder.generate(false,true);
   });
@@ -45,29 +46,8 @@ $(function() {
   // Layer dialogs
   //
 
-  function submitLayerProperties() {
-    var newLayerName = $('#layerName').val();
-    if (!newLayerName.match(/^[a-zA-Z0-9_-]+$/)) {
-      alert('Layer name must contain only alphanumerics, underscore and hyphen.');
-      return false;
-    }
-    for(var i = 0; i < KVKL[builder.lastPlatform].layer.length; i++) {
-      if(i != builder.lastLayerIndex && KVKL[builder.lastPlatform].layer[i].id == newLayerName) {
-        alert('Layer name must not already be in use for the current platform.');
-        return false;
-      }
-    }
-
-    builder.saveUndo();
-    builder.generate();
-
-    var platform = KVKL[builder.lastPlatform];
-    var oldLayerName = platform.layer[builder.lastLayerIndex].id;
-
-    let fixup = function(key) {
-      if (key.layer == oldLayerName) {
-        key.layer = newLayerName;
-      }
+  function updateNextLayerReferences(platform, oldLayerName, newLayerName) {
+    const fixup = function(key) {
       if (key.nextlayer == oldLayerName) {
         key.nextlayer = newLayerName;
       }
@@ -94,6 +74,28 @@ $(function() {
         });
       }
     });
+  }
+
+  function submitLayerProperties() {
+    const newLayerName = $('#layerName').val();
+    if (!newLayerName.match(/^[a-zA-Z0-9_-]+$/)) {
+      alert('Layer name must contain only alphanumerics, underscore and hyphen.');
+      return false;
+    }
+    for(let i = 0; i < KVKL[builder.lastPlatform].layer.length; i++) {
+      if(i != builder.lastLayerIndex && KVKL[builder.lastPlatform].layer[i].id == newLayerName) {
+        alert('Layer name must not already be in use for the current platform.');
+        return false;
+      }
+    }
+
+    builder.saveUndo();
+    builder.generate();
+
+    const platform = KVKL[builder.lastPlatform];
+    const oldLayerName = platform.layer[builder.lastLayerIndex].id;
+
+    updateNextLayerReferences(platform, oldLayerName, newLayerName);
 
     platform.layer[builder.lastLayerIndex].id = newLayerName;
     builder.prepareLayers();