Adding listenerOptions for created button PressListeners, see phetsim…

…s/ph-scale#86
phetsims · Jun 3, 2019 · 7f26ea5 · 7f26ea5
1 parent 800e2ef
commit 7f26ea5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/js/buttons/NodesPushButton.js b/js/buttons/NodesPushButton.js
@@ -35,8 +35,12 @@ define( function( require ) {
       listener: null, // {function}
       xAlign: 'center', // {string} how the nodes are horizontally aligned: center, left, right
       yAlign: 'center', // {string} how the nodes are vertically aligned: center, top, bottom
+      listenerOptions: null,
       tandem: Tandem.required
     }, options );
+    options.listenerOptions = _.extend( {
+      tandem: options.tandem.createTandem( 'pressListener' )
+    }, options.listenerOptions );
     options.children = [ idleNode, overNode, pressedNode, disabledNode ];
 
     Node.call( this );
@@ -46,7 +50,7 @@ define( function( require ) {
     this.buttonModel = new PushButtonModel( options ); // @private
 
     // @private {PressListener}
-    this.pressListener = this.buttonModel.createListener( { tandem: options.tandem.createTandem( 'pressListener' ) } );
+    this.pressListener = this.buttonModel.createListener( options.listenerOptions );
     this.addInputListener( this.pressListener );
 
     // Button interactions

diff --git a/js/buttons/RectangularButtonView.js b/js/buttons/RectangularButtonView.js
@@ -93,6 +93,9 @@ define( function( require ) {
       // version(s) defined in this file.
       contentAppearanceStrategy: RectangularButtonView.FadeContentWhenDisabled,
 
+      // Options that will be passed through to the main input listener (PressListener)
+      listenerOptions: null,
+
       // a11y
       tagName: 'button',
 
@@ -105,6 +108,11 @@ define( function( require ) {
     assert && assert( _.includes( X_ALIGN_VALUES, options.xAlign ), 'invalid xAlign: ' + options.xAlign );
     assert && assert( _.includes( Y_ALIGN_VALUES, options.yAlign ), 'invalid yAlign: ' + options.yAlign );
 
+    options.listenerOptions = _.extend( {
+      tandem: options.tandem.createTandem( 'pressListener' ),
+      accessibleClick: options.accessibleClick
+    }, options.listenerOptions );
+
     this.buttonModel = buttonModel; // @protected
 
     Node.call( this );
@@ -113,10 +121,7 @@ define( function( require ) {
 
     // Hook up the input listener
     // @private (a11y) {PressListener}
-    this._pressListener = buttonModel.createListener( {
-      tandem: options.tandem.createTandem( 'pressListener' ),
-      accessibleClick: options.accessibleClick
-    } );
+    this._pressListener = buttonModel.createListener( options.listenerOptions );
     this.addInputListener( this._pressListener );
 
     // @private - make the base color into a property so that the appearance strategy can update itself if changes occur.

diff --git a/js/buttons/RoundButtonView.js b/js/buttons/RoundButtonView.js
@@ -82,6 +82,9 @@ define( function( require ) {
       // version(s) defined in this file.
       contentAppearanceStrategy: RoundButtonView.FadeContentWhenDisabled,
 
+      // Options that will be passed through to the main input listener (PressListener)
+      listenerOptions: null,
+
       // phet-io
       tandem: Tandem.optional, // This duplicates the parent option and works around https://github.com/phetsims/tandem/issues/50
       phetioComponentOptions: { visibleProperty: { phetioFeatured: true } },
@@ -91,6 +94,10 @@ define( function( require ) {
       focusHighlightDilation: 5 // radius dilation for circular highlight
     }, options );
 
+    options.listenerOptions = _.extend( {
+      tandem: options.tandem.createTandem( 'pressListener' )
+    }, options.listenerOptions );
+
     Node.call( this );
     var content = options.content; // convenience variable
     var upCenter = new Vector2( options.xContentOffset, options.yContentOffset );
@@ -104,7 +111,7 @@ define( function( require ) {
     this.baseColorProperty = new PaintColorProperty( options.baseColor ); // @private
 
     // @private {PressListener}
-    var pressListener = pushButtonModel.createListener( { tandem: options.tandem.createTandem( 'pressListener' ) } );
+    var pressListener = pushButtonModel.createListener( options.listenerOptions );
     this.addInputListener( pressListener );
 
     // Use the user-specified radius if present, otherwise calculate the