From cb5d7c1963b4c88448ac709dcbe84312ba667c72 Mon Sep 17 00:00:00 2001 From: Michael Kauzmann Date: Thu, 3 Oct 2024 16:16:30 -0600 Subject: [PATCH] include maxCustomMass in range, https://github.com/phetsims/density-buoyancy-common/issues/409 --- js/common/view/MaterialMassVolumeControlNode.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/common/view/MaterialMassVolumeControlNode.ts b/js/common/view/MaterialMassVolumeControlNode.ts index eb6c2957..b2b0800c 100644 --- a/js/common/view/MaterialMassVolumeControlNode.ts +++ b/js/common/view/MaterialMassVolumeControlNode.ts @@ -170,9 +170,11 @@ export default class MaterialMassVolumeControlNode extends MaterialControlNode { valueComparisonStrategy: 'equalsFunction' } ); + const maxMass = Math.max( ...[ options.maxMass, options.maxCustomMass, options.highDensityMaxMass ].filter( x => typeof x === 'number' ) ); + // passed to the NumberControl const numberControlMassProperty = new GuardedNumberProperty( massProperty.value, { - range: new Range( options.minMass, options.highDensityMaxMass || options.maxMass ), + range: new Range( options.minMass, maxMass ), units: 'kg', tandem: massNumberControlContainerTandem.createTandem( 'massProperty' ), phetioFeatured: true,