Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 19:48:22 -05:00
Code Issues Activity

🐛 Fix problem with grid multiple selection

Browse source
This commit is contained in:
alonso.torres 2024-03-05 09:55:45 +01:00
parent 38148cf87f
commit ff22208ec2
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/app/common/types/shape/attrs.cljc
View file

@ -65,6 +65,11 @@
:layout-padding-type :layout-padding-type
:layout-padding :layout-padding
:layout-grid-dir
:layout-justify-items
:layout-grid-columns
:layout-grid-rows
:layout-item-margin :layout-item-margin
:layout-item-margin-type :layout-item-margin-type
:layout-item-h-sizing :layout-item-h-sizing

3
frontend/src/app/main/data/workspace/layout.cljs
View file

@ -7,6 +7,7 @@
(ns app.main.data.workspace.layout (ns app.main.data.workspace.layout
"Workspace layout management events and helpers." "Workspace layout management events and helpers."
(:require (:require
[app.common.data :as d]
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.main.data.events :as ev] [app.main.data.events :as ev]
[app.util.storage :refer [storage]] [app.util.storage :refer [storage]]
@ -123,7 +124,7 @@
ev/Event ev/Event
(-data [_] (-data [_]
{::ev/origin "workspace:sidebar" {::ev/origin "workspace:sidebar"
:mode (name mode)}) :mode (d/name mode)})
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]

2
frontend/src/app/main/data/workspace/shape_layout.cljs
View file

@ -211,7 +211,7 @@
(ptk/reify ::create-shape-layout (ptk/reify ::create-shape-layout
ev/Event ev/Event
(-data [_] (-data [_]
{:layout (name type)}) {:layout (d/name type)})
ptk/WatchEvent ptk/WatchEvent
(watch [_ state _] (watch [_ state _]

12
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
View file

@ -492,7 +492,7 @@
[:button {:class (stl/css-case [:button {:class (stl/css-case
:padding-toggle true :padding-toggle true
:selected (= type :multiple)) :selected (= type :multiple))
:data-type (name type) :data-type (d/name type)
:on-click on-type-change'} :on-click on-type-change'}
i/padding-extended-refactor]])) i/padding-extended-refactor]]))
@ -557,7 +557,7 @@
:no-validate true :no-validate true
:placeholder "--" :placeholder "--"
:data-type "row-gap" :data-type "row-gap"
:data-wrap-type (name wrap-type) :data-wrap-type (d/name wrap-type)
:on-focus on-gap-focus :on-focus on-gap-focus
:on-change on-change' :on-change on-change'
:on-blur on-gap-blur :on-blur on-gap-blur
@ -576,7 +576,7 @@
:no-validate true :no-validate true
:placeholder "--" :placeholder "--"
:data-type "column-gap" :data-type "column-gap"
:data-wrap-type (name wrap-type) :data-wrap-type (d/name wrap-type)
:on-focus on-gap-focus :on-focus on-gap-focus
:on-change on-change' :on-change on-change'
:on-blur on-gap-blur :on-blur on-gap-blur
@ -627,7 +627,7 @@
::mf/private true} ::mf/private true}
[{:keys [is-column value on-change]}] [{:keys [is-column value on-change]}]
(let [type (if ^boolean is-column "column" "row")] (let [type (if ^boolean is-column "column" "row")]
[:& radio-buttons {:selected (name value) [:& radio-buttons {:selected (d/name value)
:decode-fn keyword :decode-fn keyword
:on-change on-change :on-change on-change
:name (dm/str "flex-align-items-" type)} :name (dm/str "flex-align-items-" type)}
@ -649,7 +649,7 @@
::mf/private :obj} ::mf/private :obj}
[{:keys [is-column value on-change]}] [{:keys [is-column value on-change]}]
(let [type (if ^boolean is-column "column" "row")] (let [type (if ^boolean is-column "column" "row")]
[:& radio-buttons {:selected (name value) [:& radio-buttons {:selected (d/name value)
:on-change on-change :on-change on-change
:decode-fn keyword :decode-fn keyword
:name (dm/str "grid-justify-items-" type)} :name (dm/str "grid-justify-items-" type)}
@ -811,7 +811,7 @@
[:& h/sortable-container {} [:& h/sortable-container {}
[:div {:class (stl/css :grid-tracks-info-container)} [:div {:class (stl/css :grid-tracks-info-container)}
(for [[index column] (d/enumerate column-values)] (for [[index column] (d/enumerate column-values)]
[:& grid-track-info {:key (dm/str index "-" (name type)) [:& grid-track-info {:key (dm/str index "-" (d/name type))
:type type :type type
:is-column is-column :is-column is-column
:index index :index index