Fix mixin existing issue with layout, see phetsims/sun#865

phetsims · Dec 20, 2023 · 6a4eacf · 6a4eacf
1 parent 654f21a
commit 6a4eacf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/js/layout/HeightSizable.ts b/js/layout/HeightSizable.ts
@@ -353,8 +353,8 @@ const HeightSizable = memoize( <SuperType extends Constructor<Node>>( type: Supe
   } );
 
   // If we're extending into a Node type, include option keys
-  if ( type.prototype._mutatorKeys ) {
-    const existingKeys = type.prototype._mutatorKeys;
+  if ( HeightSizableTrait.prototype._mutatorKeys ) {
+    const existingKeys = HeightSizableTrait.prototype._mutatorKeys;
     const newKeys = HEIGHT_SIZABLE_OPTION_KEYS;
     const indexOfBoundsBasedOptions = existingKeys.indexOf( REQUIRES_BOUNDS_OPTION_KEYS[ 0 ] );
     HeightSizableTrait.prototype._mutatorKeys = [

diff --git a/js/layout/Sizable.ts b/js/layout/Sizable.ts
@@ -342,8 +342,8 @@ const Sizable = memoize( <SuperType extends Constructor<Node>>( type: SuperType
   } );
 
   // If we're extending into a Node type, include option keys
-  if ( SuperExtendedType.prototype._mutatorKeys ) {
-    const existingKeys = SuperExtendedType.prototype._mutatorKeys;
+  if ( SizableTrait.prototype._mutatorKeys ) {
+    const existingKeys = SizableTrait.prototype._mutatorKeys;
     const newKeys = SIZABLE_SELF_OPTION_KEYS;
     const indexOfBoundsBasedOptions = existingKeys.indexOf( REQUIRES_BOUNDS_OPTION_KEYS[ 0 ] );
     SizableTrait.prototype._mutatorKeys = [

diff --git a/js/layout/WidthSizable.ts b/js/layout/WidthSizable.ts
@@ -355,8 +355,8 @@ const WidthSizable = memoize( <SuperType extends Constructor<Node>>( type: Super
   } );
 
   // If we're extending into a Node type, include option keys
-  if ( type.prototype._mutatorKeys ) {
-    const existingKeys = type.prototype._mutatorKeys;
+  if ( WidthSizableTrait.prototype._mutatorKeys ) {
+    const existingKeys = WidthSizableTrait.prototype._mutatorKeys;
     const newKeys = WIDTH_SIZABLE_OPTION_KEYS;
     const indexOfBoundsBasedOptions = existingKeys.indexOf( REQUIRES_BOUNDS_OPTION_KEYS[ 0 ] );
     WidthSizableTrait.prototype._mutatorKeys = [