From 2942f288802c04877177bd08b30a0e0837e61828 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 21 Feb 2024 15:58:47 +0100
Subject: [PATCH] :bug: Fix problem with layout child properties

---
 common/src/app/common/types/component.cljc    |  6 +++--
 .../data/workspace/libraries_helpers.cljs     | 25 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common/src/app/common/types/component.cljc b/common/src/app/common/types/component.cljc
index 42b48dd11..ec9a679a9 100644
--- a/common/src/app/common/types/component.cljc
+++ b/common/src/app/common/types/component.cljc
@@ -94,7 +94,8 @@
    :layout-item-max-w       :layout-item-max-w
    :layout-item-min-w       :layout-item-min-w
    :layout-item-absolute    :layout-item-absolute
-   :layout-item-z-index     :layout-item-z-index})
+   :layout-item-z-index     :layout-item-z-index
+   :layout-item-align-self  :layout-item-align-self})
 
 (def swap-keep-attrs
   #{:layout-item-margin
@@ -106,7 +107,8 @@
     :layout-item-max-w
     :layout-item-min-w
     :layout-item-absolute
-    :layout-item-z-index})
+    :layout-item-z-index
+    :layout-item-align-self})
 
 (defn instance-root?
   "Check if this shape is the head of a top instance."
diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
index ec6d8bf91..47b805b09 100644
--- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs
+++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
@@ -1445,19 +1445,18 @@
 (defn- update-flex-child-copy-attrs
   "Synchronizes the attributes inside the flex-child items (main->copy)"
   [changes _shape-main shape-copy main-container main-component copy-container omit-touched?]
-  (let [do-changes
-        (fn [cc]
-          (-> cc
-              (pcb/with-container copy-container)
-              (pcb/with-objects (:objects copy-container))
-              (pcb/update-shapes
-               (:shapes shape-copy)
-               (fn [child-copy]
-                 (let [child-main (ctf/get-ref-shape main-container main-component child-copy)]
-                   (-> child-copy
-                       (propagate-attrs child-main ctk/swap-keep-attrs omit-touched?))))
-               {:ignore-touched true})))]
-    (pcb/concat-changes changes (do-changes (pcb/empty-changes)))))
+  (let [new-changes
+        (-> (pcb/empty-changes)
+            (pcb/with-container copy-container)
+            (pcb/with-objects (:objects copy-container))
+            (pcb/update-shapes
+             (:shapes shape-copy)
+             (fn [child-copy]
+               (let [child-main (ctf/get-ref-shape main-container main-component child-copy)]
+                 (-> child-copy
+                     (propagate-attrs child-main ctk/swap-keep-attrs omit-touched?))))
+             {:ignore-touched true}))]
+    (pcb/concat-changes changes new-changes)))
 
 (defn- update-flex-child-main-attrs
   "Synchronizes the attributes inside the flex-child items (copy->main)"