From 131c2f331e77e73d97eeb0be17953c917248c7ad Mon Sep 17 00:00:00 2001 From: Eva Date: Thu, 12 Jan 2023 09:24:03 +0100 Subject: [PATCH] :bug: Fix gap --- common/src/app/common/types/shape/layout.cljc | 6 ++---- .../sidebar/options/menus/layout_container.cljs | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/src/app/common/types/shape/layout.cljc b/common/src/app/common/types/shape/layout.cljc index 534174444..6213668aa 100644 --- a/common/src/app/common/types/shape/layout.cljc +++ b/common/src/app/common/types/shape/layout.cljc @@ -148,11 +148,9 @@ (or (= :row layout-flex-dir) (= :reverse-row layout-flex-dir))) (defn gaps - [{:keys [layout-gap layout-gap-type]}] + [{:keys [layout-gap]}] (let [layout-gap-row (or (-> layout-gap :row-gap) 0) - layout-gap-col (if (= layout-gap-type :simple) - layout-gap-row - (or (-> layout-gap :column-gap) 0))] + layout-gap-col (or (-> layout-gap :column-gap) 0)] [layout-gap-row layout-gap-col])) (defn child-min-width diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs index 5ddedf697..66d8f8e05 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs @@ -250,11 +250,11 @@ [:> numeric-input {:no-validate true :placeholder "--" :on-click (fn [event] - (reset! gap-selected? :row-gap) + (reset! gap-selected? :column-gap) (dom/select-target event)) - :on-change (partial set-gap (= :no-wrap wrap-type) :row-gap) + :on-change (partial set-gap (= :no-wrap wrap-type) :column-gap) :on-blur #(reset! gap-selected? :none) - :value (:row-gap gap-value) + :value (:column-gap gap-value) :disabled (and (= :no-wrap wrap-type) is-col?)}]] [:div.gap-row.tooltip.tooltip-bottom-left @@ -264,11 +264,11 @@ [:> numeric-input {:no-validate true :placeholder "--" :on-click (fn [event] - (reset! gap-selected? :column-gap) + (reset! gap-selected? :row-gap) (dom/select-target event)) - :on-change (partial set-gap (= :no-wrap wrap-type) :column-gap) + :on-change (partial set-gap (= :no-wrap wrap-type) :row-gap) :on-blur #(reset! gap-selected? :none) - :value (:column-gap gap-value) + :value (:row-gap gap-value) :disabled (and (= :no-wrap wrap-type) (not is-col?))}]]]]) (mf/defc layout-container-menu