From 40da1c302adde502416275f54092ea44a20c3a83 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 28 Dec 2022 12:41:46 +0100 Subject: [PATCH] :sparkles: Support hidden elements in flex layout --- .../geom/shapes/flex_layout/drop_area.cljc | 1 + .../src/app/common/geom/shapes/modifiers.cljc | 9 +++-- .../src/app/main/data/workspace/changes.cljs | 35 +++++++++++++------ .../app/main/ui/workspace/viewport/debug.cljs | 10 ++++-- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/common/src/app/common/geom/shapes/flex_layout/drop_area.cljc b/common/src/app/common/geom/shapes/flex_layout/drop_area.cljc index 8a5c7a562..3c1117447 100644 --- a/common/src/app/common/geom/shapes/flex_layout/drop_area.cljc +++ b/common/src/app/common/geom/shapes/flex_layout/drop_area.cljc @@ -184,6 +184,7 @@ (let [frame (get objects frame-id) position (gmt/transform-point-center position (gco/center-shape frame) (:transform-inverse frame)) children (->> (cph/get-immediate-children objects frame-id) + (remove :hidden) (map #(vector (gpo/parent-coords-bounds (:points %) (:points frame)) %))) layout-data (fli/calc-layout-data frame children (:points frame)) drop-areas (layout-drop-areas frame layout-data children) diff --git a/common/src/app/common/geom/shapes/modifiers.cljc b/common/src/app/common/geom/shapes/modifiers.cljc index 1966fc03f..b1761aac5 100644 --- a/common/src/app/common/geom/shapes/modifiers.cljc +++ b/common/src/app/common/geom/shapes/modifiers.cljc @@ -169,8 +169,9 @@ [layout-line modif-tree]))] - (let [children (->> (:shapes parent) - (map (comp apply-modifiers (d/getf objects)))) + (let [children (->> (cph/get-immediate-children objects (:id parent)) + (remove :hidden) + (map apply-modifiers)) layout-data (gcl/calc-layout-data parent children @transformed-parent-bounds) children (into [] (cond-> children (not (:reverse? layout-data)) reverse)) max-idx (dec (count children)) @@ -209,7 +210,9 @@ (-> modifiers (ctm/resize-parent (gpt/point 1 scale-height) origin (:transform parent) (:transform-inverse parent))))) - children (->> parent :shapes (map (d/getf objects))) + children (->> (cph/get-immediate-children objects parent-id) + (remove :hidden)) + content-bounds (when (and (d/not-empty? children) (or (ctl/auto-height? parent) (ctl/auto-width? parent))) (gcl/layout-content-bounds bounds parent children)) diff --git a/frontend/src/app/main/data/workspace/changes.cljs b/frontend/src/app/main/data/workspace/changes.cljs index b00c2904e..15d1c9b7e 100644 --- a/frontend/src/app/main/data/workspace/changes.cljs +++ b/frontend/src/app/main/data/workspace/changes.cljs @@ -30,6 +30,7 @@ (s/every ::us/uuid)) (defonce page-change? #{:add-page :mod-page :del-page :mov-page}) +(defonce update-layout-attr? #{:hidden}) (declare commit-changes) @@ -50,18 +51,30 @@ objects (wsh/lookup-page-objects state page-id) ids (into [] (filter some?) ids) - changes (reduce - (fn [changes id] - (let [opts {:attrs attrs :ignore-geometry? (get ignore-tree id)}] - (pcb/update-shapes changes [id] update-fn opts))) - (-> (pcb/empty-changes it page-id) - (pcb/set-save-undo? save-undo?) - (pcb/with-objects objects)) - ids)] + update-layout-ids + (->> ids + (map (d/getf objects)) + (filter #(some update-layout-attr? (pcb/changed-attrs % update-fn {:attrs attrs}))) + (map :id)) - (when (seq (:redo-changes changes)) - (let [changes (cond-> changes reg-objects? (pcb/resize-parents ids))] - (rx/of (commit-changes changes))))))))) + changes (reduce + (fn [changes id] + (let [opts {:attrs attrs :ignore-geometry? (get ignore-tree id)}] + (pcb/update-shapes changes [id] update-fn opts))) + (-> (pcb/empty-changes it page-id) + (pcb/set-save-undo? save-undo?) + (pcb/with-objects objects)) + ids)] + (rx/concat + (if (seq (:redo-changes changes)) + (let [changes (cond-> changes reg-objects? (pcb/resize-parents ids))] + (rx/of (commit-changes changes))) + (rx/empty)) + + ;; Update layouts for properties marked + (if (d/not-empty? update-layout-ids) + (rx/of (ptk/data-event :layout/update update-layout-ids)) + (rx/empty)))))))) (defn send-update-indices [] diff --git a/frontend/src/app/main/ui/workspace/viewport/debug.cljs b/frontend/src/app/main/ui/workspace/viewport/debug.cljs index 845e38ca4..21b5aecf3 100644 --- a/frontend/src/app/main/ui/workspace/viewport/debug.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/debug.cljs @@ -35,7 +35,8 @@ shape (or selected-frame (get objects hover-top-frame-id))] (when (and shape (:layout shape)) - (let [children (cph/get-immediate-children objects (:id shape)) + (let [children (->> (cph/get-immediate-children objects (:id shape)) + (remove :hidden)) layout-bounds (gsl/layout-content-bounds (d/lazy-map (keys objects) #(dm/get-in objects [% :points])) shape children)] [:g.debug-layout {:pointer-events "none"} [:polygon {:points (->> layout-bounds (map #(dm/fmt "%, %" (:x %) (:y %))) (str/join " ")) @@ -61,7 +62,8 @@ (let [row? (ctl/row? shape) col? (ctl/col? shape) - children (cph/get-immediate-children objects (:id shape)) + children (->> (cph/get-immediate-children objects (:id shape)) + (remove :hidden)) layout-data (gsl/calc-layout-data shape children (:points shape)) layout-bounds (:layout-bounds layout-data) @@ -99,6 +101,7 @@ (when (and shape (:layout shape)) (let [children (->> (cph/get-immediate-children objects (:id shape)) + (remove :hidden) (map #(vector (gpo/parent-coords-bounds (:points %) (:points shape)) %))) layout-data (gsl/calc-layout-data shape children (:points shape)) drop-areas (gsl/layout-drop-areas shape layout-data children)] @@ -164,7 +167,8 @@ parent-bounds (:points parent)] (when (and (some? parent) (not= uuid/zero (:id parent))) - (let [children (cph/get-immediate-children objects (:id parent))] + (let [children (->> (cph/get-immediate-children objects (:id parent)) + (remove :hidden))] [:g.debug-parent-bounds {:pointer-events "none"} (for [[idx child] (d/enumerate children)] [:*