From 527e11ba4169acdfda665eef8b1b5b316bfefcff Mon Sep 17 00:00:00 2001 From: Jonathan Olson Date: Tue, 7 Dec 2021 18:32:04 -0700 Subject: [PATCH] Converting DerivedProperty/Multilink to properly parameterized TypeScript, and usage of IReadOnlyProperty. See https://github.com/phetsims/axon/issues/371 --- js/util/IColor.ts | 4 ++-- js/util/IPaint.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/util/IColor.ts b/js/util/IColor.ts index b3804f241..75c673efa 100644 --- a/js/util/IColor.ts +++ b/js/util/IColor.ts @@ -1,6 +1,6 @@ // Copyright 2021, University of Colorado Boulder -import IProperty from '../../../axon/js/IProperty.js'; +import IReadOnlyProperty from '../../../axon/js/IReadOnlyProperty.js'; import { Color } from '../imports.js'; /** @@ -9,6 +9,6 @@ import { Color } from '../imports.js'; * @author Jonathan Olson */ -type IColor = IProperty | IProperty | IProperty | Color | string | null; +type IColor = IReadOnlyProperty | IReadOnlyProperty | IReadOnlyProperty | Color | string | null; export default IColor; \ No newline at end of file diff --git a/js/util/IPaint.ts b/js/util/IPaint.ts index f40ed7cca..3d75c3e6a 100644 --- a/js/util/IPaint.ts +++ b/js/util/IPaint.ts @@ -1,7 +1,7 @@ // Copyright 2021, University of Colorado Boulder -import IProperty from '../../../axon/js/IProperty.js'; -import { Paint, Color } from '../imports.js'; +import IReadOnlyProperty from '../../../axon/js/IReadOnlyProperty.js'; +import { Color, Paint } from '../imports.js'; /** * Type representing a PaintDef @@ -9,6 +9,6 @@ import { Paint, Color } from '../imports.js'; * @author Jonathan Olson */ -type IPaint = Paint | IProperty | IProperty | IProperty | Color | string | null; +type IPaint = Paint | IReadOnlyProperty | IReadOnlyProperty | IReadOnlyProperty | Color | string | null; export default IPaint; \ No newline at end of file