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, #1340
phetsims · Feb 8, 2022 · 58497e2 · 58497e2
1 parent 57e524f
commit 58497e2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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 = <SuperType extends Constructor>( 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
@@ -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
@@ -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
@@ -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