diff --git a/js/accessibility/describers/Alerter.ts b/js/accessibility/describers/Alerter.ts index cf662ad5..87adf7d3 100644 --- a/js/accessibility/describers/Alerter.ts +++ b/js/accessibility/describers/Alerter.ts @@ -5,12 +5,12 @@ * @author Michael Kauzmann (PhET Interactive Simulations) */ +import EnabledComponent, { EnabledComponentOptions } from '../../../../axon/js/EnabledComponent.js'; import optionize from '../../../../phet-core/js/optionize.js'; import { Node, Voicing } from '../../../../scenery/js/imports.js'; import Utterance, { TAlertable } from '../../../../utterance-queue/js/Utterance.js'; import UtteranceQueue from '../../../../utterance-queue/js/UtteranceQueue.js'; import sceneryPhet from '../../sceneryPhet.js'; -import EnabledComponent, { EnabledComponentOptions } from '../../../../axon/js/EnabledComponent.js'; type UtteranceQueueCallback = ( queue: UtteranceQueue ) => void; diff --git a/js/accessibility/grab-drag/GrabDragModel.ts b/js/accessibility/grab-drag/GrabDragModel.ts index af804ded..5f2b961c 100644 --- a/js/accessibility/grab-drag/GrabDragModel.ts +++ b/js/accessibility/grab-drag/GrabDragModel.ts @@ -9,13 +9,13 @@ * @author Sam Reid (PhET Interactive Simulations) */ -import sceneryPhet from '../../sceneryPhet.js'; -import GrabDragUsageTracker from './GrabDragUsageTracker.js'; -import Property from '../../../../axon/js/Property.js'; import Emitter from '../../../../axon/js/Emitter.js'; import EnabledComponent, { EnabledComponentOptions } from '../../../../axon/js/EnabledComponent.js'; +import Property from '../../../../axon/js/Property.js'; import { TReadOnlyEmitter } from '../../../../axon/js/TEmitter.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import sceneryPhet from '../../sceneryPhet.js'; +import GrabDragUsageTracker from './GrabDragUsageTracker.js'; // Interaction states that this component interaction can be in: // "idle": In the default state where you can interact with the node to grab it. It is ready to be diff --git a/js/accessibility/group-sort/model/GroupSelectModel.ts b/js/accessibility/group-sort/model/GroupSelectModel.ts index 4206bac0..9d798c39 100644 --- a/js/accessibility/group-sort/model/GroupSelectModel.ts +++ b/js/accessibility/group-sort/model/GroupSelectModel.ts @@ -52,20 +52,20 @@ * @author Marla Schulz (PhET Interactive Simulations) */ -import sceneryPhet from '../../../sceneryPhet.js'; -import optionize from '../../../../../phet-core/js/optionize.js'; -import Property from '../../../../../axon/js/Property.js'; -import Tandem from '../../../../../tandem/js/Tandem.js'; -import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; import BooleanProperty from '../../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../../axon/js/DerivedProperty.js'; -import PhetioObject, { PhetioObjectOptions } from '../../../../../tandem/js/PhetioObject.js'; -import TProperty from '../../../../../axon/js/TProperty.js'; import EnabledComponent, { EnabledComponentOptions } from '../../../../../axon/js/EnabledComponent.js'; +import Property from '../../../../../axon/js/Property.js'; +import TProperty from '../../../../../axon/js/TProperty.js'; +import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; +import optionize from '../../../../../phet-core/js/optionize.js'; +import PhetioObject, { PhetioObjectOptions } from '../../../../../tandem/js/PhetioObject.js'; +import phetioStateSetEmitter from '../../../../../tandem/js/phetioStateSetEmitter.js'; +import Tandem from '../../../../../tandem/js/Tandem.js'; import IOType from '../../../../../tandem/js/types/IOType.js'; -import ReferenceIO from '../../../../../tandem/js/types/ReferenceIO.js'; import NullableIO from '../../../../../tandem/js/types/NullableIO.js'; -import phetioStateSetEmitter from '../../../../../tandem/js/phetioStateSetEmitter.js'; +import ReferenceIO from '../../../../../tandem/js/types/ReferenceIO.js'; +import sceneryPhet from '../../../sceneryPhet.js'; type SelfOptions = { diff --git a/js/accessibility/group-sort/view/GroupSelectView.ts b/js/accessibility/group-sort/view/GroupSelectView.ts index 0274b3aa..56397fa2 100644 --- a/js/accessibility/group-sort/view/GroupSelectView.ts +++ b/js/accessibility/group-sort/view/GroupSelectView.ts @@ -13,18 +13,18 @@ * @author Marla Schulz (PhET Interactive Simulations) */ -import { animatedPanZoomSingleton, HighlightFromNode, HighlightPath, isInteractiveHighlighting, KeyboardListener, Node, NodeOptions, ParallelDOMOptions, Path, PDOMValueType } from '../../../../../scenery/js/imports.js'; -import sceneryPhet from '../../../sceneryPhet.js'; -import Multilink from '../../../../../axon/js/Multilink.js'; -import GroupSelectModel from '../model/GroupSelectModel.js'; +import Disposable, { DisposableOptions } from '../../../../../axon/js/Disposable.js'; import Emitter from '../../../../../axon/js/Emitter.js'; +import Multilink from '../../../../../axon/js/Multilink.js'; +import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; import { Shape } from '../../../../../kite/js/imports.js'; import optionize, { combineOptions } from '../../../../../phet-core/js/optionize.js'; -import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; -import SortCueArrowNode from './SortCueArrowNode.js'; -import Disposable, { DisposableOptions } from '../../../../../axon/js/Disposable.js'; -import GrabReleaseCueNode, { GrabReleaseCueNodeOptions } from '../../nodes/GrabReleaseCueNode.js'; import StrictOmit from '../../../../../phet-core/js/types/StrictOmit.js'; +import { animatedPanZoomSingleton, HighlightFromNode, HighlightPath, isInteractiveHighlighting, KeyboardListener, Node, NodeOptions, ParallelDOMOptions, Path, PDOMValueType } from '../../../../../scenery/js/imports.js'; +import sceneryPhet from '../../../sceneryPhet.js'; +import GrabReleaseCueNode, { GrabReleaseCueNodeOptions } from '../../nodes/GrabReleaseCueNode.js'; +import GroupSelectModel from '../model/GroupSelectModel.js'; +import SortCueArrowNode from './SortCueArrowNode.js'; function GROUP_SELECT_ACCESSIBLE_NAME_BEHAVIOR( node: Node, options: NodeOptions, accessibleName: PDOMValueType ): NodeOptions { options.ariaLabel = accessibleName; // IMPORTANT! Divs with innerContent aren't recognized with accessibleNames diff --git a/js/accessibility/group-sort/view/GroupSortInteractionView.ts b/js/accessibility/group-sort/view/GroupSortInteractionView.ts index 27e5a329..4a299922 100644 --- a/js/accessibility/group-sort/view/GroupSortInteractionView.ts +++ b/js/accessibility/group-sort/view/GroupSortInteractionView.ts @@ -11,14 +11,14 @@ * @author Marla Schulz (PhET Interactive Simulations) */ -import { KeyboardListener, Node } from '../../../../../scenery/js/imports.js'; -import sceneryPhet from '../../../sceneryPhet.js'; -import Range from '../../../../../dot/js/Range.js'; import Multilink from '../../../../../axon/js/Multilink.js'; -import GroupSelectModel from '../model/GroupSelectModel.js'; -import optionize from '../../../../../phet-core/js/optionize.js'; import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; +import Range from '../../../../../dot/js/Range.js'; +import optionize from '../../../../../phet-core/js/optionize.js'; +import { KeyboardListener, Node } from '../../../../../scenery/js/imports.js'; +import sceneryPhet from '../../../sceneryPhet.js'; import SceneryPhetStrings from '../../../SceneryPhetStrings.js'; +import GroupSelectModel from '../model/GroupSelectModel.js'; import GroupSelectView, { GroupSelectViewOptions } from './GroupSelectView.js'; const navigableStringProperty = SceneryPhetStrings.a11y.groupSort.navigableStringProperty; diff --git a/js/accessibility/group-sort/view/SortCueArrowNode.ts b/js/accessibility/group-sort/view/SortCueArrowNode.ts index d43aaa25..2aa1557b 100644 --- a/js/accessibility/group-sort/view/SortCueArrowNode.ts +++ b/js/accessibility/group-sort/view/SortCueArrowNode.ts @@ -7,11 +7,11 @@ * @author Michael Kauzmann (PhET Interactive Simulations) */ -import { HBox, HBoxOptions, Node, Rectangle } from '../../../../../scenery/js/imports.js'; -import TriangleNode, { TriangleNodeOptions } from '../../../TriangleNode.js'; import optionize, { combineOptions } from '../../../../../phet-core/js/optionize.js'; import StrictOmit from '../../../../../phet-core/js/types/StrictOmit.js'; +import { HBox, HBoxOptions, Node, Rectangle } from '../../../../../scenery/js/imports.js'; import sceneryPhet from '../../../sceneryPhet.js'; +import TriangleNode, { TriangleNodeOptions } from '../../../TriangleNode.js'; type SelfOptions = { numberOfDashes: number; diff --git a/js/accessibility/nodes/WASDCueNode.ts b/js/accessibility/nodes/WASDCueNode.ts index 2f77a2c2..327875cb 100644 --- a/js/accessibility/nodes/WASDCueNode.ts +++ b/js/accessibility/nodes/WASDCueNode.ts @@ -9,13 +9,13 @@ * @author Michael Kauzmann (PhET Interactive Simulations) */ +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; import { Shape } from '../../../../kite/js/imports.js'; -import LetterKeyNode, { LetterKeyNodeOptions } from '../../keyboard/LetterKeyNode.js'; -import PhetFont from '../../PhetFont.js'; import { HBox, Node, Path, VBox } from '../../../../scenery/js/imports.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import LetterKeyNode, { LetterKeyNodeOptions } from '../../keyboard/LetterKeyNode.js'; import TextKeyNode from '../../keyboard/TextKeyNode.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; +import PhetFont from '../../PhetFont.js'; import sceneryPhet from '../../sceneryPhet.js'; // constants diff --git a/js/keyboard/ArrowKeyNode.ts b/js/keyboard/ArrowKeyNode.ts index e5edab01..62be8d84 100644 --- a/js/keyboard/ArrowKeyNode.ts +++ b/js/keyboard/ArrowKeyNode.ts @@ -8,7 +8,7 @@ import { LineJoin, Shape } from '../../../kite/js/imports.js'; import optionize from '../../../phet-core/js/optionize.js'; -import { TColor, Path } from '../../../scenery/js/imports.js'; +import { Path, TColor } from '../../../scenery/js/imports.js'; import sceneryPhet from '../sceneryPhet.js'; import KeyNode, { KeyNodeOptions } from './KeyNode.js'; diff --git a/js/keyboard/LetterKeyNode.ts b/js/keyboard/LetterKeyNode.ts index 7dad048b..493fc8ad 100644 --- a/js/keyboard/LetterKeyNode.ts +++ b/js/keyboard/LetterKeyNode.ts @@ -7,13 +7,13 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import TReadOnlyProperty from '../../../axon/js/TReadOnlyProperty.js'; import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js'; import StrictOmit from '../../../phet-core/js/types/StrictOmit.js'; import sceneryPhet from '../sceneryPhet.js'; -import TextKeyNode, { TextKeyNodeOptions } from './TextKeyNode.js'; -import KeyNode from './KeyNode.js'; import SceneryPhetStrings from '../SceneryPhetStrings.js'; -import TReadOnlyProperty from '../../../axon/js/TReadOnlyProperty.js'; +import KeyNode from './KeyNode.js'; +import TextKeyNode, { TextKeyNodeOptions } from './TextKeyNode.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/keyboard/TextKeyNode.ts b/js/keyboard/TextKeyNode.ts index 5f0fe134..8921b6e0 100644 --- a/js/keyboard/TextKeyNode.ts +++ b/js/keyboard/TextKeyNode.ts @@ -6,6 +6,7 @@ * @author Jesse Greenberg */ +import PhetioProperty from '../../../axon/js/PhetioProperty.js'; import TReadOnlyProperty from '../../../axon/js/TReadOnlyProperty.js'; import optionize from '../../../phet-core/js/optionize.js'; import platform from '../../../phet-core/js/platform.js'; @@ -14,7 +15,6 @@ import PhetFont from '../PhetFont.js'; import sceneryPhet from '../sceneryPhet.js'; import SceneryPhetStrings from '../SceneryPhetStrings.js'; import KeyNode, { KeyNodeOptions } from './KeyNode.js'; -import PhetioProperty from '../../../axon/js/PhetioProperty.js'; type SelfOptions = { font?: Font; diff --git a/js/keyboard/help/HeatCoolControlsKeyboardHelpSection.ts b/js/keyboard/help/HeatCoolControlsKeyboardHelpSection.ts index 34e2774a..38d39ec0 100644 --- a/js/keyboard/help/HeatCoolControlsKeyboardHelpSection.ts +++ b/js/keyboard/help/HeatCoolControlsKeyboardHelpSection.ts @@ -6,12 +6,12 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import SliderControlsKeyboardHelpSection, { ArrowKeyIconDisplay, SliderControlsKeyboardHelpSectionOptions } from './SliderControlsKeyboardHelpSection.js'; -import sceneryPhet from '../../sceneryPhet.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import KeyboardHelpSectionRow from './KeyboardHelpSectionRow.js'; -import NumberKeyNode from '../NumberKeyNode.js'; +import sceneryPhet from '../../sceneryPhet.js'; import SceneryPhetStrings from '../../SceneryPhetStrings.js'; +import NumberKeyNode from '../NumberKeyNode.js'; +import KeyboardHelpSectionRow from './KeyboardHelpSectionRow.js'; +import SliderControlsKeyboardHelpSection, { ArrowKeyIconDisplay, SliderControlsKeyboardHelpSectionOptions } from './SliderControlsKeyboardHelpSection.js'; type SelfOptions = EmptySelfOptions; type ParentOptions = SliderControlsKeyboardHelpSectionOptions; diff --git a/js/keyboard/help/MoveDraggableItemsKeyboardHelpSection.ts b/js/keyboard/help/MoveDraggableItemsKeyboardHelpSection.ts index 5547b6f9..827cad04 100644 --- a/js/keyboard/help/MoveDraggableItemsKeyboardHelpSection.ts +++ b/js/keyboard/help/MoveDraggableItemsKeyboardHelpSection.ts @@ -7,10 +7,10 @@ */ import sceneryPhet from '../../sceneryPhet.js'; -import KeyboardHelpSection from './KeyboardHelpSection.js'; -import KeyboardHelpSectionRow from './KeyboardHelpSectionRow.js'; import SceneryPhetStrings from '../../SceneryPhetStrings.js'; import KeyboardHelpIconFactory from './KeyboardHelpIconFactory.js'; +import KeyboardHelpSection from './KeyboardHelpSection.js'; +import KeyboardHelpSectionRow from './KeyboardHelpSectionRow.js'; export default class MoveDraggableItemsKeyboardHelpSection extends KeyboardHelpSection { diff --git a/js/keyboard/help/SliderControlsKeyboardHelpSection.ts b/js/keyboard/help/SliderControlsKeyboardHelpSection.ts index 7887eaa8..ebbcaed1 100644 --- a/js/keyboard/help/SliderControlsKeyboardHelpSection.ts +++ b/js/keyboard/help/SliderControlsKeyboardHelpSection.ts @@ -8,18 +8,18 @@ import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import assertMutuallyExclusiveOptions from '../../../../phet-core/js/assertMutuallyExclusiveOptions.js'; import Enumeration from '../../../../phet-core/js/Enumeration.js'; import EnumerationValue from '../../../../phet-core/js/EnumerationValue.js'; import optionize from '../../../../phet-core/js/optionize.js'; import { HBox } from '../../../../scenery/js/imports.js'; +import AccessibleValueHandlerHotkeyDataCollection from '../../../../sun/js/accessibility/AccessibleValueHandlerHotkeyDataCollection.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import sceneryPhet from '../../sceneryPhet.js'; import SceneryPhetStrings from '../../SceneryPhetStrings.js'; import KeyboardHelpIconFactory from './KeyboardHelpIconFactory.js'; import KeyboardHelpSection, { KeyboardHelpSectionOptions } from './KeyboardHelpSection.js'; import KeyboardHelpSectionRow from './KeyboardHelpSectionRow.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import assertMutuallyExclusiveOptions from '../../../../phet-core/js/assertMutuallyExclusiveOptions.js'; -import AccessibleValueHandlerHotkeyDataCollection from '../../../../sun/js/accessibility/AccessibleValueHandlerHotkeyDataCollection.js'; // Configurations of arrow keys that can be displayed for 'Move between items in a group' export class ArrowKeyIconDisplay extends EnumerationValue { diff --git a/js/keyboard/help/SpinnerControlsKeyboardHelpSection.ts b/js/keyboard/help/SpinnerControlsKeyboardHelpSection.ts index f32fec0a..f0b061fb 100644 --- a/js/keyboard/help/SpinnerControlsKeyboardHelpSection.ts +++ b/js/keyboard/help/SpinnerControlsKeyboardHelpSection.ts @@ -6,10 +6,10 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import SliderControlsKeyboardHelpSection, { SliderControlsKeyboardHelpSectionOptions } from './SliderControlsKeyboardHelpSection.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import sceneryPhet from '../../sceneryPhet.js'; import SceneryPhetStrings from '../../SceneryPhetStrings.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import SliderControlsKeyboardHelpSection, { SliderControlsKeyboardHelpSectionOptions } from './SliderControlsKeyboardHelpSection.js'; const spinnerControlsStringProperty = SceneryPhetStrings.keyboardHelpDialog.spinnerControlsStringProperty; const spinnerStringProperty = SceneryPhetStrings.keyboardHelpDialog.spinnerStringProperty;