Discriminate between ChartableMixin models and References

TerriaJS · Feb 28, 2024 · 9727542 · 9727542
1 parent 84fb691
commit 9727542
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/ModelMixins/ChartableMixin.ts b/lib/ModelMixins/ChartableMixin.ts
@@ -68,6 +68,10 @@ type BaseType = Model<ModelTraits>;
 
 function ChartableMixin<T extends AbstractConstructor<BaseType>>(Base: T) {
   abstract class ChartableMixin extends Base {
+    get hasChartableMixin() {
+      return true;
+    }
+
     get isChartable() {
       return true;
     }
@@ -85,7 +89,7 @@ namespace ChartableMixin {
   export interface Instance
     extends InstanceType<ReturnType<typeof ChartableMixin>> {}
   export function isMixedInto(model: any): model is Instance {
-    return model && model.isChartable;
+    return !!model?.hasChartableMixin;
   }
 }