From 58497e2b2146912bbf65dc05249e1ee42c7e81d9 Mon Sep 17 00:00:00 2001 From: zepumph Date: Tue, 8 Feb 2022 11:40:21 -0700 Subject: [PATCH] pass bounds options to mutate at end of constructor, provide options arg index to all mixins (and assert), remove unneeded mutate calls next to super, https://github.com/phetsims/scenery/issues/1340 --- js/accessibility/voicing/InteractiveHighlighting.ts | 1 + js/accessibility/voicing/ReadingBlockNode.js | 2 +- js/accessibility/voicing/nodes/VoicingRichText.js | 2 +- js/accessibility/voicing/nodes/VoicingText.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/accessibility/voicing/InteractiveHighlighting.ts b/js/accessibility/voicing/InteractiveHighlighting.ts index c721e1e34..a89353392 100644 --- a/js/accessibility/voicing/InteractiveHighlighting.ts +++ b/js/accessibility/voicing/InteractiveHighlighting.ts @@ -31,6 +31,7 @@ type InteractiveHighlightingOptions = InteractiveHighlightingSelfOptions & NodeO * @param optionsArgPosition - zero-indexed number that the options argument is provided at */ const InteractiveHighlighting = ( Type: SuperType, optionsArgPosition: number ) => { + assert && assert( typeof optionsArgPosition === 'number', 'Must provide an index to access options arg from (zero-indexed)' ); assert && assert( _.includes( inheritance( Type ), Node ), 'Only Node subtypes should compose InteractiveHighlighting' ); const InteractiveHighlightingClass = class extends Type { diff --git a/js/accessibility/voicing/ReadingBlockNode.js b/js/accessibility/voicing/ReadingBlockNode.js index 4003b370c..60915503c 100644 --- a/js/accessibility/voicing/ReadingBlockNode.js +++ b/js/accessibility/voicing/ReadingBlockNode.js @@ -17,7 +17,7 @@ import merge from '../../../../phet-core/js/merge.js'; import { scenery, Node, ReadingBlock, ReadingBlockHighlight } from '../../imports.js'; -class ReadingBlockNode extends ReadingBlock( Node ) { +class ReadingBlockNode extends ReadingBlock( Node, 0 ) { /** * @param {Object} [options] diff --git a/js/accessibility/voicing/nodes/VoicingRichText.js b/js/accessibility/voicing/nodes/VoicingRichText.js index 55b6cb6da..bc7ee7c33 100644 --- a/js/accessibility/voicing/nodes/VoicingRichText.js +++ b/js/accessibility/voicing/nodes/VoicingRichText.js @@ -10,7 +10,7 @@ import merge from '../../../../../phet-core/js/merge.js'; import { ReadingBlock, ReadingBlockHighlight, RichText, scenery } from '../../../imports.js'; -class VoicingRichText extends ReadingBlock( RichText ) { +class VoicingRichText extends ReadingBlock( RichText, 1 ) { /** * @param {string} text diff --git a/js/accessibility/voicing/nodes/VoicingText.js b/js/accessibility/voicing/nodes/VoicingText.js index 27f5abe9d..138ca6170 100644 --- a/js/accessibility/voicing/nodes/VoicingText.js +++ b/js/accessibility/voicing/nodes/VoicingText.js @@ -10,7 +10,7 @@ import merge from '../../../../../phet-core/js/merge.js'; import { ReadingBlock, ReadingBlockHighlight, scenery, Text } from '../../../imports.js'; -class VoicingText extends ReadingBlock( Text ) { +class VoicingText extends ReadingBlock( Text, 1 ) { /** * @param {string} text