mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-14 02:56:36 +00:00
merge: fold the #569 review fixes into the alias-aware layout rows
Four commits landed on this branch from review while the layout wiring was in progress, and the two solved overlapping problems differently. Theirs made elementKeys() append every layout-only key, matched by exact name. Against football that also lists `score` and `odds` -- entries the alias resolution already pairs with score_text and odds_text -- so those offsets would get two controls posting the same field. The row split here (styleRows via core's x-layout-key, positionRows for what nothing claims) replaces that append; elementKeys() is back to listing style elements only. Theirs also covered cases this side had missed, all kept: - A leaf straight under layout (a show_logo toggle, no x/y object) now gets a position row with a self-keyed column bound to customization.layout.<key>. Core no longer lets an element claim a leaf as its offsets. - Leaf columns keep their namespaced id, so a leaf sharing a name with another entry's axis cannot be shadowed. - columnsFor(schema) still works with one argument (every row), so their column tests run unchanged. - The owned key is CSS.escape()'d before it becomes a selector. test_style_editor_element_keys.js is rewritten for the new contract, and says why the old one had to go. All six JS suites pass; in a browser football's 92 layout fields each render once, and a synthetic leaf -- including one named `scale` alongside a `scale` axis -- gets exactly one correctly named control. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -780,8 +780,14 @@ def _adopt_handwritten_block(schema: Dict[str, Any],
|
||||
# editor matched them by exact name, so it drew one offset in eleven
|
||||
# and the rest had no control anywhere. Recording the answer here
|
||||
# keeps the alias rules in one place instead of a JavaScript copy.
|
||||
# Only an object-shaped entry (x_offset/y_offset/...) can hold an
|
||||
# element's offsets. A leaf directly under layout -- a show_logo
|
||||
# toggle -- is its own control, so it is never claimed by a row and
|
||||
# always gets a position row of its own.
|
||||
layout_key = next((name for name in alias_keys(key)
|
||||
if isinstance(layout_fields.get(name), dict)), None)
|
||||
if isinstance(layout_fields.get(name), dict)
|
||||
and isinstance(layout_fields[name].get('properties'),
|
||||
dict)), None)
|
||||
if layout_key is not None:
|
||||
props[key]['x-layout-key'] = layout_key
|
||||
|
||||
|
||||
Reference in New Issue
Block a user