mirror of
https://github.com/penpot/penpot.git
synced 2026-10-30 14:30:37 +00:00
cb8f563bb2
* 🐛 Keep swapped and moved children in place when a component syncs A sync resets an untouched shape of a copy to the main's geometry and the layout then moves it back. Children the sync keeps, because they are swapped or the user moved them, did not take the first move but did take the second, so each sync pushed them away from their parent by the gap between the copy and the main (e.g. a swapped icon in a copy that fills a wider layout). The sync now moves those children by the offset it applies to their parent. Flex-child attributes still sync as before, so swapped children keep their absolute position. Closes #12657 * 🐛 Place swapped children where the swap puts them on sync and switch A swapped child that the user never moved now goes to the top-left of the shape it replaced, as a swap does: on a sync, the place of the main's slot occupant; on a variant switch, the place of the new variant's occupant. A swapped child the user moved keeps its offset inside its parent. This stops the variant switch from leaving the swapped child at its old position while the new variant is created at the main's size, and puts back children that drifted before the sync fix the next time their copy syncs. * 🐛 Make kept children follow their parent's constraints on component sync When a sync resets the size of a copy's shape, for example a copy root that fills a wider layout, the layout then grows it back and moves its children by their constraints. Children the sync keeps (moved by the user, or swapped) only followed the parent's top-left, so with a right, center or scale constraint they drifted on every sync, and a swapped child with a scale constraint grew on every sync. The sync now passes the parent's geometry before and after down the tree, and kept children follow that change through their constraints. Untouched swapped children also undo the change through their constraints before they go to the swap place, so they keep their size. The default constraint modifier returns empty modifiers instead of an empty vector, which add-modifiers could not take. * 🐛 Make swapped children follow their parent's constraints on switch A variant switch only moved a swapped child by the parent's position change. When the new variant's root had a different size, a user-moved child with a right constraint drifted, and a scale-constrained one kept its grown size. The switch now applies the parent change from the old parent to the new one through the child's constraints. An untouched swapped child then takes the place of the shape it replaces, as a swap does. * 🐛 Sync nested swapped copies before the copies that hold them A swapped child is a copy of its own component, so one sync handles it twice: once on its own, and once when the copy that holds it places it. Each step read the shape from the data as it was before the sync, so the step that ran last won, and the order came from the order of shape ids. When the swapped child came last, it wrote its old size and position back over the placement, leaving its x and selrect apart, and a swapped child with a scale constraint grew on every sync. The sync now visits the most deeply nested shapes first, and each step reads the shapes as the earlier steps left them, so the placement always comes last and builds on the child's own sync. * 🐛 Keep moved children with a scale constraint at their size on switch A variant switch carries the size of a child the user moved as an override. In a copy that fills a wider layout, a child with a scale constraint already has the size the layout gave it, so the switch carried that size onto the new variant, created at the main's size, and the layout then scaled it again: the child grew on every switch. Before comparing, the switch now resizes the previous child the way its constraints follow the change from its old parent to its new one. A child that only grew with the layout then matches the main and is not carried as an override. * 🐛 Keep the content of swapped children at its size on sync and switch When a sync or a variant switch undid the parent change on a swapped child through its constraints, it applied the child's resize to every shape inside it. The layout then grows the child back through its own constraint, but its content follows its own constraints (left and top by default), so it stayed shrunk: the shape inside a swapped icon with a scale constraint lost most of its width on every switch. The change of the swapped child now goes down its subtree the way a layout update does, each shape through its own constraints. * 🐛 Accept mixed and empty values in the layout size constraints menu With several shapes or a group selected, the sidebar merges the layout item attributes and tokens of the shapes: nil when a shape lacks one, :multiple when they differ. The props schema of layout-size-constraints* only accepted the values of a single shape, so selecting such shapes with fill sizing raised "invalid props". The schema now accepts nil and :multiple, as the numeric inputs those values go to do. * ♻️ Share the swapped child follow-parent step between sync and switch The component sync and the variant switch both make a swapped child and its children follow the parent change through their constraints and then move them to the swap place. Both now use generate-follow-parent, so the two paths stay the same. The helper that writes geometry without marking it touched is renamed to update-geometry-untouched. Adds a test for a swapped child without absolute position in a slot without layout, and fixes the test comments on why constraints are set again after a swap.