From 18b8e35584f4b2b6d8371e508f2041603e9f1175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Fri, 24 Apr 2026 14:32:24 +0200
Subject: [PATCH] :bug: Fix loss of swap slot in some cases of variant switch

---
 CHANGES.md                                 |  1 +
 common/src/app/common/logic/libraries.cljc | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index eae932e466..747f7d90ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@
 - Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
 - Fix color dropdown option update [Taiga #14035](https://tree.taiga.io/project/penpot/issue/14035)
 - Fix themes modal height [Taiga #14046](https://tree.taiga.io/project/penpot/issue/14046)
+- Fix file crashing when switching a variant [Taiga #14014](https://tree.taiga.io/project/penpot/issue/14014)
 
 
 ## 2.15.0 (Unreleased)
diff --git a/common/src/app/common/logic/libraries.cljc b/common/src/app/common/logic/libraries.cljc
index 7e703385e7..584bd3c440 100644
--- a/common/src/app/common/logic/libraries.cljc
+++ b/common/src/app/common/logic/libraries.cljc
@@ -2114,8 +2114,8 @@
                             (contains? #{:auto-height :auto-width} (:grow-type current-shape)))]
 
     (loop [attrs       updatable-attrs
-           roperations [{:type :set-touched :touched (:touched previous-shape)}]
-           uoperations (list {:type :set-touched :touched (:touched current-shape)})]
+           roperations []
+           uoperations []]
       (if-let [attr (first attrs)]
         (let [sync-group
               (ctk/resolve-sync-group (:type previous-shape) attr)
@@ -2257,7 +2257,13 @@
 
         (let [updated-attrs (into #{} (comp (filter #(= :set (:type %)))
                                             (map :attr))
-                                  roperations)]
+                                  roperations)
+              updated-sync-groups (into #{}
+                                        (keep #(ctk/resolve-sync-group (:type previous-shape) %))
+                                        updated-attrs)
+              new-touched (set/union (or (:touched current-shape) #{}) updated-sync-groups)
+              roperations (into [{:type :set-touched :touched new-touched}] roperations)
+              uoperations (into [{:type :set-touched :touched (:touched current-shape)}] uoperations)]
           (cond-> changes
             (> (count roperations) 1)
             (-> (add-update-attr-changes current-shape container roperations uoperations)