variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sanitize sequence's length and subUnitsPerUnit

Browse source 
Possibly fixes P-173
This commit is contained in:
Aria Minaei 2022-07-08 13:58:03 +02:00 committed by Aria
parent ac9345ddbd
commit 8f1d26536b
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
theatre/core/src/sheets/Sheet.ts
View file

@ -9,6 +9,7 @@ import type SheetTemplate from './SheetTemplate'
import type {ObjectAddressKey, SheetInstanceId} from '@theatre/shared/utils/ids'
import type {StrictRecord} from '@theatre/shared/utils/types'
import type {ILogger} from '@theatre/shared/logger'
import {isInteger} from 'lodash-es'
type SheetObjectMap = StrictRecord<ObjectAddressKey, SheetObject>
@ -77,12 +78,12 @@ export default class Sheet {
const lengthD = valueDerivation(
this.project.pointers.historic.sheetsById[this.address.sheetId].sequence
.length,
).map((s) => (typeof s === 'number' ? s : 10))
).map(sanitizeSequenceLength)
const subUnitsPerUnitD = valueDerivation(
this.project.pointers.historic.sheetsById[this.address.sheetId].sequence
.subUnitsPerUnit,
).map((s) => (typeof s === 'number' ? s : 30))
).map(sanitizeSequenceSubUnitsPerUnit)
this._sequence = new Sequence(
this.template.project,
@ -94,3 +95,11 @@ export default class Sheet {
return this._sequence
}
}
const sanitizeSequenceLength = (len: number | undefined): number =>
typeof len === 'number' && isFinite(len) && len > 0 ? len : 10
const sanitizeSequenceSubUnitsPerUnit = (subs: number | undefined): number =>
typeof subs === 'number' && isInteger(subs) && subs >= 1 && subs <= 1000
? subs
: 30