From 7508627dc52046fe078a1df940fb5cf172838801 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 27 Dec 2023 17:19:45 +0100
Subject: [PATCH] :sparkles: Change defaults for new grid tracks

---
 common/src/app/common/geom/shapes/grid_layout/params.cljc | 8 ++++----
 common/src/app/common/types/shape/layout.cljc             | 3 ++-
 .../workspace/sidebar/options/menus/layout_container.cljs | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/src/app/common/geom/shapes/grid_layout/params.cljc b/common/src/app/common/geom/shapes/grid_layout/params.cljc
index b50fbf4483..7c0dafc4ed 100644
--- a/common/src/app/common/geom/shapes/grid_layout/params.cljc
+++ b/common/src/app/common/geom/shapes/grid_layout/params.cljc
@@ -113,8 +113,8 @@
 
   ([_objects shapes parent]
    (if (empty? shapes)
-     (-> {:layout-grid-columns [{:type :auto} {:type :auto}]
-          :layout-grid-rows [{:type :auto} {:type :auto}]}
+     (-> {:layout-grid-columns [ctl/default-track-value ctl/default-track-value]
+          :layout-grid-rows [ctl/default-track-value ctl/default-track-value]}
          (ctl/create-cells [1 1 2 2]))
 
      (let [all-shapes-rect (gco/shapes->rect shapes)
@@ -149,8 +149,8 @@
              0
              (/ (- (:height all-shapes-rect) total-rows-height) (dec num-rows)))
 
-           layout-grid-rows (mapv (constantly (array-map :type :auto)) rows)
-           layout-grid-columns (mapv (constantly (array-map :type :auto)) cols)
+           layout-grid-rows (mapv (constantly ctl/default-track-value) rows)
+           layout-grid-columns (mapv (constantly ctl/default-track-value) cols)
 
            parent-childs-vector (gpt/to-vec (gpo/origin (:points parent)) (gpt/point all-shapes-rect))
            p-left (:x parent-childs-vector)
diff --git a/common/src/app/common/types/shape/layout.cljc b/common/src/app/common/types/shape/layout.cljc
index 30a866b76a..0745a4f9e3 100644
--- a/common/src/app/common/types/shape/layout.cljc
+++ b/common/src/app/common/types/shape/layout.cljc
@@ -590,7 +590,8 @@
 (declare assign-cells)
 
 (def default-track-value
-  {:type :auto})
+  {:type :flex
+   :value 1})
 
 (def grid-cell-defaults
   {:row-span 1
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 8138f0a3e4..dc97af314b 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
@@ -966,7 +966,7 @@
         (mf/use-fn
          (mf/deps type reorder-track index)
          (fn [drop-position data event]
-           (reorder-track type (:index data) (if (= :top drop-position) (dec index) index) (kbd/mod? event))))
+           (reorder-track type (:index data) (if (= :top drop-position) (dec index) index) (not (kbd/mod? event)))))
 
         pointer-enter
         (mf/use-fn