penpot/common/test/common_tests/logic/groups_test.cljc
alonso.torres 61b52860e5 🐛 Give a bool created in a grid the cell of the shape it replaces
Creating a bool from shapes in a grid board left the bool without a grid
cell: the JVM layout read the cell of a missing row and threw, and the
frontend laid the bool out in no cell. A group takes the cell of its
last shape and reassigns its grid's cells; the bool now takes the cell
of the shape whose place it takes in the parent, and the grid parents of
its shapes reassign their cells.

Test: a-bool-in-a-grid-takes-the-cell-of-its-last-shape (found by the new
shape structure gate).
Focused: groups-test, 6 tests, 0 failures; the full common suite runs at
the end of this series.

Benchmark (scripts/bench-components, ms, lower 2.5% quantile), measured
with the other production changes of this series in the tree; none of
them is on a measured path:
|                             :world | :baseline |    :now |   :mean | :ratio |
|------------------------------------+-----------+---------+---------+--------|
|  deepest-edit-through-three-levels |    35.215 |  22.167 |  22.682 |   0.63 |
| edit-through-a-chain-of-dependents |    68.931 |  43.218 |  44.696 |   0.63 |
|         library-update-into-copies |    83.083 |  47.824 |  50.506 |   0.58 |
|        main-edit-among-many-shapes |     4.837 |   2.216 |    2.34 |   0.46 |
|           main-edit-into-10-copies |      1.79 |   1.067 |   1.133 |    0.6 |
|          main-edit-into-100-copies |    15.415 |  10.604 |  10.813 |   0.69 |
|         main-edit-into-1000-copies |   153.086 | 106.085 | 108.631 |   0.69 |
|         variant-switch-into-copies |    32.052 |  22.556 |  23.137 |    0.7 |

AI-assisted-by: claude-opus-5-5
2026-11-18 10:29:48 +01:00

103 lines
5.0 KiB
Clojure

;; This Source Code Form is subject to the terms of the Mozilla Public
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) KALEIDOS SUBSIDIARY SL
(ns common-tests.logic.groups-test
(:require
[app.common.files.changes-builder :as pcb]
[app.common.logic.bool :as clb]
[app.common.logic.groups :as clg]
[app.common.test-helpers.compositions :as tho]
[app.common.test-helpers.files :as thf]
[app.common.test-helpers.ids-map :as thi]
[app.common.test-helpers.shapes :as ths]
[app.common.types.shape.layout :as ctl]
[app.common.uuid :as uuid]
[clojure.test :as t]))
(t/use-fixtures :each thi/test-fixture)
(defn- two-rects
[]
(-> (thf/sample-file :file1)
(ths/add-sample-shape :rect-a)
(ths/add-sample-shape :rect-b)))
(defn- objects
[file]
(:objects (thf/current-page file)))
(defn- group
[file labels]
(let [page (thf/current-page file)
shapes (clg/shapes-for-group-or-mask (:objects page) (map thi/id labels))
[group changes] (clg/prepare-create-group (pcb/empty-changes nil) (uuid/next) (:objects page)
(:id page) shapes "Group" false)]
[(:id group) (thf/apply-changes file changes)]))
(t/deftest grouping-puts-the-shapes-in-a-new-group
(let [[id file] (group (two-rects) [:rect-a :rect-b])
group (get (objects file) id)]
(t/is (= :group (:type group)))
(t/is (= #{(thi/id :rect-a) (thi/id :rect-b)} (set (:shapes group))))
(t/is (every? #(= id (:parent-id (get (objects file) %))) (:shapes group)))))
(t/deftest ungrouping-gives-the-children-back-to-the-parent
(let [[id file] (group (two-rects) [:rect-a :rect-b])
page (thf/current-page file)
ids (clg/ungroup-ids (:objects page) [id])
file (thf/apply-changes file (clg/generate-ungroup-changes nil (:id page) (:objects page) ids))]
(t/is (nil? (get (objects file) id)))
(t/is (= #{(thi/id :rect-a) (thi/id :rect-b)} (clg/ungrouped-children (:objects page) ids)))
(t/is (= uuid/zero (:parent-id (get (objects file) (thi/id :rect-a)))))))
(t/deftest ungrouping-leaves-copy-heads-whole
(let [file (-> (thf/sample-file :file1)
(tho/add-simple-component-with-copy :component :main-root :main-child :copy-root))]
(t/is (empty? (clg/ungroup-ids (objects file) [(thi/id :copy-root)])))))
(t/deftest masking-a-lone-group-masks-it-and-unmasking-takes-the-mask-off
(let [[id file] (group (two-rects) [:rect-a :rect-b])
page (thf/current-page file)
shapes (clg/shapes-for-group-or-mask (:objects page) [id])
[mask changes] (clg/generate-mask-changes nil (uuid/next) (:id page) (:objects page) shapes)
masked (thf/apply-changes file changes)
page (thf/current-page masked)
unmasked (thf/apply-changes masked (clg/generate-unmask-changes nil (:id page) (:objects page) [id]))]
(t/is (= id (:id mask)))
(t/is (true? (:masked-group (get (objects masked) id))))
(t/is (nil? (:masked-group (get (objects unmasked) id))))))
(t/deftest a-bool-combines-shapes-but-not-boards
(let [file (-> (two-rects)
(ths/add-sample-shape :board :type :frame))
page (thf/current-page file)
ids (map thi/id [:rect-a :rect-b :board])
[shape changes] (clb/generate-create-bool nil (:id page) (:objects page) ids :union nil)
file (thf/apply-changes file changes)]
(t/is (= :bool (:type (get (objects file) (:id shape)))))
(t/is (= #{(thi/id :rect-a) (thi/id :rect-b)} (set (:shapes (get (objects file) (:id shape))))))
(t/is (nil? (clb/generate-create-bool nil (:id page) (:objects page) [(thi/id :board)] :union nil)))))
(t/deftest a-bool-in-a-grid-takes-the-cell-of-its-last-shape
(let [file (-> (thf/sample-file :file1)
(tho/add-frame :grid :layout :grid
:layout-grid-rows [{:type :flex :value 1}]
:layout-grid-columns [{:type :flex :value 1} {:type :flex :value 1}])
(ths/add-sample-shape :rect-a :parent-label :grid)
(ths/add-sample-shape :rect-b :parent-label :grid)
(ths/update-shape :grid :layout-grid-cells {})
(as-> file (let [page (thf/current-page file)]
(ths/update-shape file :grid :layout-grid-cells
(:layout-grid-cells
(ctl/assign-cells (get (:objects page) (thi/id :grid))
(:objects page)))))))
page (thf/current-page file)
ids (map thi/id [:rect-a :rect-b])
[shape changes] (clb/generate-create-bool nil (:id page) (:objects page) ids :union nil)
file (thf/apply-changes file changes)
grid (get (objects file) (thi/id :grid))]
(t/is (some #(= [(:id shape)] (:shapes %)) (vals (:layout-grid-cells grid))))))