diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs index 6ab72287a..c455bd585 100644 --- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs +++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs @@ -1367,9 +1367,6 @@ attr-group (get ctk/sync-attrs attr)] - (and (not= (get origin-shape attr) (get dest-shape attr)) - (or (not (touched attr-group)) (not omit-touched?))) - (if (or (= (get origin-shape attr) (get dest-shape attr)) (and (touched attr-group) omit-touched?)) (recur (next attrs) @@ -1380,18 +1377,18 @@ (conj uoperations uoperation))))))))) (defn- propagate-attrs - "Helper that puts the src-shape attributes (attrs) into tgt-shape but only if + "Helper that puts the origin attributes (attrs) into dest but only if not touched the group or if omit-touched? flag is true" - [tgt-shape src-shape attrs omit-touched?] - (let [touched (get tgt-shape :touched #{})] + [dest origin attrs omit-touched?] + (let [touched (get dest :touched #{})] (->> attrs (reduce - (fn [tgt-shape attr] + (fn [dest attr] (let [attr-group (get ctk/sync-attrs attr)] - (cond-> tgt-shape + (cond-> dest (or (not (touched attr-group)) (not omit-touched?)) - (assoc attr (get src-shape attr))))) - tgt-shape)))) + (assoc attr (get origin attr))))) + dest)))) (defn- update-flex-child-copy-attrs "Synchronizes the attributes inside the flex-child items (main->copy)" diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss index eb71a9392..93490738f 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.scss @@ -24,6 +24,9 @@ .layout-options { width: $s-92; } + .layout-option { + white-space: nowrap; + } .remove-layout, .add-layout { @extend .button-tertiary;