mirror of
https://github.com/penpot/penpot.git
synced 2026-11-21 09:42:01 +00:00
🐛 Keep on the copy a layout child override no layout parent pushes
A copy can author a layout child attribute, such as a margin, on a shape whose main has no layout parent. Update-main pushed it into the main, where it does nothing, and sync, which sends layout child attributes only through layout parents, left the main's other copies without it. A later switch could turn one of them into a swapped head, which takes its placement from the main, with the stale value. Update-main now pushes neither the value nor the touched group of such a layout child group; the copy keeps its override. The composable model keeps those groups on the copy too, and the update-main check takes layout child groups as pushed only under a layout parent in the main. Tests: switching-to-a-head-under-a-plain-parent-keeps-the-margin-its- main-never-took (the variant gate program of round 15, seed 371855618); updating-a-main-keeps-on-the-copy-a-margin-a-switch-carried-out-of-a- layout, renamed from the test of the push it replaces. Common suite: 2439 tests, 0 failures. Benchmark (scripts/bench-components, ms, lower 2.5% quantile): | :world | :baseline | :now | :mean | :ratio | |------------------------------------+-----------+---------+---------+--------| | deepest-edit-through-three-levels | 35.215 | 21.015 | 21.76 | 0.6 | | edit-through-a-chain-of-dependents | 68.931 | 39.553 | 41.298 | 0.57 | | library-update-into-copies | 83.083 | 51.286 | 55.732 | 0.62 | | main-edit-among-many-shapes | 4.837 | 2.221 | 2.392 | 0.46 | | main-edit-into-10-copies | 1.79 | 1.034 | 1.069 | 0.58 | | main-edit-into-100-copies | 15.415 | 10.101 | 10.67 | 0.66 | | main-edit-into-1000-copies | 153.086 | 100.646 | 103.375 | 0.66 | | variant-switch-into-copies | 32.052 | 22.132 | 22.822 | 0.69 | AI-assisted-by: claude-opus-5-5
This commit is contained in:
parent
35f4b5ef91
commit
b9a62f23ea
@ -113,8 +113,6 @@
|
||||
(declare set-touched)
|
||||
(declare change-remote-synced)
|
||||
(declare update-attrs)
|
||||
(declare attr-operations)
|
||||
(declare add-update-attr-changes)
|
||||
(declare update-grid-main-attrs)
|
||||
(declare update-grid-copy-attrs)
|
||||
(declare update-layout-children)
|
||||
@ -985,8 +983,8 @@
|
||||
pairs with: the copy's values, overrides included, go into the main, and
|
||||
its touched groups move there (the copy keeps a swap). A geometry that
|
||||
sync kept for the copy (`:kept?`) is not the copy's, so the main keeps
|
||||
its own. A layout parent pushes the layout child attributes of its
|
||||
children; under any other parent, those the copy authored go alone."
|
||||
its own. Only a layout parent pushes the layout child attributes of its
|
||||
children; under any other parent, the copy keeps those it authored."
|
||||
[changes {:keys [container main-container root-inst root-main remote-synced inherited-turn kept? keep-name?]} shape-inst shape-main]
|
||||
(let [;; the root of a variant keeps its name, and the copy its override of it
|
||||
keep-name? (and keep-name? (= (:id shape-inst) (:id root-inst)))
|
||||
@ -1000,38 +998,33 @@
|
||||
;; the axes a layout sized that take the pushed size, fixed as a resize fixes them
|
||||
fixed (when-not kept? (pushed-size-sizing (:objects main-container) shape-main
|
||||
(:objects container) shape-inst source))
|
||||
;; the layout child attributes the copy authored that no layout parent pushes
|
||||
item-attrs (when (and (not= (:id shape-inst) (:id root-inst))
|
||||
;; the layout child groups the copy authored that no layout parent pushes
|
||||
kept-items (when (and (not= (:id shape-inst) (:id root-inst))
|
||||
(not (ctsl/any-layout? (:objects main-container) (:parent-id shape-main))))
|
||||
(into #{}
|
||||
(filter #(and (ctk/touched-group? shape-inst (ctk/resolve-sync-group (:type shape-inst) %))
|
||||
(not= (get shape-inst %) (get shape-main %))))
|
||||
layout-child-attrs))
|
||||
[item-roperations item-uoperations]
|
||||
(attr-operations shape-main #(when (contains? item-attrs %) [[% (get shape-inst %)]])
|
||||
item-attrs)]
|
||||
(set/intersection inst-touched
|
||||
(into #{} (map #(ctk/resolve-sync-group (:type shape-inst) %))
|
||||
layout-child-attrs)))]
|
||||
(cond-> (-> changes
|
||||
(update-attrs shape-main
|
||||
source
|
||||
root-main
|
||||
(cond-> root-inst (some? inherited-turn) inherited-turn)
|
||||
main-container false)
|
||||
(cond-> (seq item-roperations)
|
||||
(add-update-attr-changes shape-main main-container item-roperations item-uoperations))
|
||||
;; the copy keeps the sizing it pushed
|
||||
(cond-> (seq fixed)
|
||||
(-> (set-sizing main-container shape-main fixed)
|
||||
(set-sizing container shape-inst fixed)))
|
||||
;; the copy keeps its swap, and the main takes the copy's overrides
|
||||
;; the copy keeps its swap and the overrides it does not push,
|
||||
;; and the main takes the others
|
||||
(set-touched shape-inst container
|
||||
(not-empty (cond-> #{}
|
||||
(not-empty (cond-> (set kept-items)
|
||||
(ctk/swapped? shape-inst) (conj :swap-group)
|
||||
(and keep-name? (ctk/touched-group? shape-inst :name-group))
|
||||
(conj :name-group))))
|
||||
;; A previous update is not a reset of the main's authored
|
||||
;; overrides. Repeating it must retain the groups it pushed.
|
||||
(set-touched shape-main main-container
|
||||
(set/union (:touched shape-main) inst-touched)))
|
||||
(set/union (:touched shape-main) (set/difference inst-touched kept-items))))
|
||||
(ctsl/any-layout? shape-main)
|
||||
(update-layout-children main-container shape-main shape-inst
|
||||
#(ctf/get-shape-in-copy container % shape-inst) false)
|
||||
|
||||
@ -2226,7 +2226,7 @@
|
||||
[:add-variant] [:combine] [:add-variant] [:combine] [:update-main]
|
||||
[:nest 13]]}))))
|
||||
|
||||
(t/deftest updating-a-main-pushes-a-margin-a-switch-carried-out-of-a-layout
|
||||
(t/deftest updating-a-main-keeps-on-the-copy-a-margin-a-switch-carried-out-of-a-layout
|
||||
(t/is (map? (cg/run {:world [3 2 {:variants true :text-styles true :layout :flex :variant-diff false
|
||||
:layout-item-margins false :grid-square false :rich-variants true
|
||||
:layout-children false :grid-empty false :layout-copies true :text true}]
|
||||
@ -2244,6 +2244,36 @@
|
||||
:ops [[:make-variant 3] [:nest 4] [:combine 4] [:rotate 2] [:detach 1] [:combine 3]
|
||||
[:switch] [:update-main] [:detach 2] [:resize 2] [:switch 5] [:update-main]]}))))
|
||||
|
||||
(t/deftest switching-to-a-head-under-a-plain-parent-keeps-the-margin-its-main-never-took
|
||||
(t/is (map? (cg/run {:world [3 2 {:variants true :text-styles true :layout :flex :variant-diff true
|
||||
:layout-item-margins true :grid-square true :rich-variants true
|
||||
:layout-children false :grid-empty false :layout-copies true :text true}]
|
||||
:ops [[:edit 26 0 1 1] [:update-main 26] [:combine 10 4 3 4] [:edit 24 0 1 1]
|
||||
[:update-main 24] [:add-variant 3 22 9 6] [:combine 1] [:rotate 8 0 15 17]
|
||||
[:combine 13] [:switch 24] [:variant-property 8 6 27 16] [:switch 19]
|
||||
[:duplicate 14 16 18 1] [:delete 2] [:restore 2] [:transform 15 16 17 19]
|
||||
[:combine 8 20 15 5] [:restore 3] [:delete 15 13 14 0] [:restore 15 2 3 23]
|
||||
[:add-variant 4] [:switch 24] [:switch 0 22 11 21] [:restore 18]
|
||||
[:combine 18 2 19 17] [:style 17 7 15 20] [:resize 10 7 1 6]
|
||||
[:text-style 27 21 20 1] [:remove-child 9 13 12 10]
|
||||
[:variant-property 16 3 25 0] [:rotate 26 0 8 14] [:remove-child 22 15 10 27]
|
||||
[:grid-cell 4 13 3 12] [:make-variant 15 11 13 10] [:edit 16 1 1 :copy-head]
|
||||
[:reset 16] [:switch 18 17 4 10] [:combine 21 21 15 3] [:style 22 27 20 12]
|
||||
[:add-child 7 16 13 1] [:restore 17 14 17 0] [:switch 2] [:text-style 7 8 1]
|
||||
[:delete 4] [:restore 4] [:restore 11 2 5 7] [:detach 20 14 19 7]
|
||||
[:text-style 3 5 1] [:transform 14 12 18 8] [:add-variant 25] [:switch 22]
|
||||
[:make-variant 17 1 20 5] [:rotate 8 9 10 1] [:duplicate 1 12 11 0]
|
||||
[:style 3 26 1] [:style 2 20 5 21] [:grid-direction 24 0 0 1]
|
||||
[:grid-cell 24 4 3 1] [:text-style 10 1 1] [:update-main 20 3 12 15]
|
||||
[:variant-property 21 3 19 2] [:switch 24] [:switch 22 26 5 15]
|
||||
[:grid-cell 11 20 18 3] [:detach 20 23 12 11] [:add-variant 13 0 2 27]
|
||||
[:add-child 13 24 12 16] [:undo 14 10 15 25] [:edit 15 1 1 :copy-head]
|
||||
[:reset 15] [:remove-child 23 17 24 27] [:reset 27 21 15 14]
|
||||
[:add-variant 1 19 19 11] [:duplicate 7 20 19 8] [:add-variant 11 26 22 16]
|
||||
[:make-variant 4] [:switch 6] [:redo 6 18 5 13] [:nest 23 14 6 6]
|
||||
[:update-main 22 21 23 7] [:text-style 18 0 25 10] [:variant-property 1 9 23 5]
|
||||
[:switch 20]]}))))
|
||||
|
||||
(t/deftest pushing-a-grid-direction-orders-the-copies-like-the-reflowed-main
|
||||
(t/is (map? (cg/run {:world [3 2 {:variants true :text-styles false :layout :grid :variant-diff false
|
||||
:layout-item-margins false :grid-square true :rich-variants false
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user