foosinn/ergogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Separate row extensions and overrides

Browse source
This commit is contained in:
Bán Dénes 2020-08-16 16:11:48 +02:00
parent 212d9366b7
commit 1a92a7d214
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/points.js
View file

@ -48,7 +48,7 @@ const render_zone = exports._render_zone = (zone_name, zone, anchor, global_key)
a.detect_unexpected( a.detect_unexpected(
col, col,
`points.zones.${zone_name}.columns.${col_name}`, `points.zones.${zone_name}.columns.${col_name}`,
['stagger', 'spread', 'rotate', 'origin', 'rows', 'key'] ['stagger', 'spread', 'rotate', 'origin', 'rows', 'row_overrides', 'key']
) )
col.stagger = a.sane( col.stagger = a.sane(
col.stagger || 0, col.stagger || 0,
@ -69,11 +69,20 @@ const render_zone = exports._render_zone = (zone_name, zone, anchor, global_key)
col.origin || [0, 0], col.origin || [0, 0],
`points.zones.${zone_name}.columns.${col_name}.origin`, `points.zones.${zone_name}.columns.${col_name}.origin`,
) )
let override = false
col.rows = a.sane( col.rows = a.sane(
col.rows || {}, col.rows || {},
`points.zones.${zone_name}.columns.${col_name}.rows`, `points.zones.${zone_name}.columns.${col_name}.rows`,
'object' 'object'
) )
if (col.row_overrides) {
override = true
col.rows = a.sane(
col.row_overrides,
`points.zones.${zone_name}.columns.${col_name}.row_overrides`,
'object'
)
}
for (const [key, val] of Object.entries(col.rows)) { for (const [key, val] of Object.entries(col.rows)) {
col.rows[key] = a.sane( col.rows[key] = a.sane(
val || {}, val || {},
@ -87,12 +96,15 @@ const render_zone = exports._render_zone = (zone_name, zone, anchor, global_key)
'object' 'object'
) )
// column-level prep // propagating object key to name field
// propagate object key to name field
col.name = col_name col.name = col_name
// combine row data from zone-wide defs and col-specific defs
const actual_rows = Object.keys(col.rows).length ? col.rows : zone_wide_rows // combining row data from zone-wide defs and col-specific defs
// (while also handling potential overrides)
const actual_rows = override ? Object.keys(col.rows)
: Object.keys(a.extend(zone_wide_rows, col.rows))
// setting up column-level anchor // setting up column-level anchor
@ -123,7 +135,7 @@ const render_zone = exports._render_zone = (zone_name, zone, anchor, global_key)
skip: false, skip: false,
asym: 'both' asym: 'both'
} }
for (const row of Object.keys(actual_rows)) { for (const row of actual_rows) {
const key = a.extend( const key = a.extend(
default_key, default_key,
global_key, global_key,
@ -139,10 +151,7 @@ const render_zone = exports._render_zone = (zone_name, zone, anchor, global_key)
key.rotate = a.sane(key.rotate, `${key.name}.rotate`, 'number') key.rotate = a.sane(key.rotate, `${key.name}.rotate`, 'number')
key.padding = a.sane(key.padding, `${key.name}.padding`, 'number') key.padding = a.sane(key.padding, `${key.name}.padding`, 'number')
key.skip = a.sane(key.skip, `${key.name}.skip`, 'boolean') key.skip = a.sane(key.skip, `${key.name}.skip`, 'boolean')
a.assert( key.asym = a.in(key.asym, `${key.name}.asym`, ['left', 'right', 'both'])
['left', 'right', 'both'].includes(key.asym),
`${key.name}.asym should be one of "left", "right", or "both"!`
)
key.col = col key.col = col
key.row = row key.row = row
keys.push(key) keys.push(key)