Removing supportHiddenMaterial option, see #256

phetsims · Jul 22, 2024 · 5168e56 · 5168e56 · AgustinVallejo · Jul 23, 2024
1 parent 4a01214
commit 5168e56
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 15 deletions.
diff --git a/js/buoyancy-basics/view/BuoyancyBasicsExploreScreenView.ts b/js/buoyancy-basics/view/BuoyancyBasicsExploreScreenView.ts
@@ -77,7 +77,6 @@ export default class BuoyancyBasicsExploreScreenView extends BuoyancyScreenView<
         tandem: tandem,
         minCustomMass: 0.1,
         maxCustomMass: 15,
-        supportHiddenMaterial: true,
         mysteryMaterials: []
       }
     );

diff --git a/js/buoyancy/view/BuoyancyExploreScreenView.ts b/js/buoyancy/view/BuoyancyExploreScreenView.ts
@@ -86,7 +86,6 @@ export default class BuoyancyExploreScreenView extends BuoyancyScreenView<Buoyan
       {
         tandem: tandem,
         minCustomMass: 0.1,
-        supportHiddenMaterial: true,
         mysteryMaterials: [ Material.MATERIAL_X, Material.MATERIAL_Y ]
       }
     );

diff --git a/js/buoyancy/view/BuoyancyLabScreenView.ts b/js/buoyancy/view/BuoyancyLabScreenView.ts
@@ -133,7 +133,6 @@ export default class BuoyancyLabScreenView extends BuoyancyScreenView<BuoyancyLa
       {
         tandem: tandem.createTandem( 'blockPanel' ),
         minCustomMass: 0.1,
-        supportHiddenMaterial: true,
         maxVolumeLiters: maxBlockVolume,
         mysteryMaterials: [ Material.MATERIAL_O, Material.MATERIAL_P ]
       }

diff --git a/js/buoyancy/view/applications/BuoyancyApplicationsScreenView.ts b/js/buoyancy/view/applications/BuoyancyApplicationsScreenView.ts
@@ -129,7 +129,6 @@ export default class BuoyancyApplicationsScreenView extends BuoyancyScreenView<B
       maxVolumeLiters: model.bottle.materialInsideVolumeRange.max,
       minCustomVolumeLiters: 0.5,
       showMassAsReadout: true,
-      supportHiddenMaterial: true,
       customKeepsConstantDensity: true,
       tandem: materialInsideControlsTandem,
 
@@ -229,8 +228,7 @@ export default class BuoyancyApplicationsScreenView extends BuoyancyScreenView<B
       Material.MATERIAL_W
     ] ), cubicMeters => model.block.updateSize( Cube.boundsFromVolume( cubicMeters ) ), this.popupLayer, true, {
       tandem: tandem.createTandem( 'blockControls' ),
-      highDensityMaxMass: 215,
-      supportHiddenMaterial: true
+      highDensityMaxMass: 215
     } );
 
     model.block.materialProperty.link( material => {

diff --git a/js/common/view/MaterialControlNode.ts b/js/common/view/MaterialControlNode.ts
@@ -27,10 +27,6 @@ type SelfMaterialControlNodeOptions = {
   // A label, if provided to be placed to the right of the ComboBox
   labelNode?: Node | null;
 
-  // If a hidden material (Mystery materials for example) should be added to the ComboBox
-  // TODO AV: why can't this just be derived from if you pass in mystery material in the parameter? https://github.com/phetsims/density-buoyancy-common/issues/256
-  supportHiddenMaterial?: boolean;
-
   minCustomMass?: number;
   maxCustomMass?: number;
   minCustomVolumeLiters?: number;
@@ -51,7 +47,6 @@ export default class MaterialControlNode extends VBox {
     const options = optionize<MaterialControlNodeOptions, SelfMaterialControlNodeOptions, VBoxOptions>()( {
       syncCustomMaterialDensity: true,
       labelNode: null,
-      supportHiddenMaterial: false,
       minCustomMass: 0.5,
       maxCustomMass: 10,
       minCustomVolumeLiters: 1,
@@ -63,10 +58,6 @@ export default class MaterialControlNode extends VBox {
       align: 'left'
     } );
 
-    if ( !options.supportHiddenMaterial ) {
-      materials = materials.filter( material => !material.hidden );
-    }
-
     const comboMaxWidth = 110;
 
     // TODO AV: sort at usage sites instead? https://github.com/phetsims/density-buoyancy-common/issues/256