Skip to content

Commit

Permalink
Sort imports and run grunt modulify, see phetsims/chipper#1462
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Nov 27, 2024
1 parent 69be130 commit 044b746
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion js/accessibility/describers/Alerter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions js/accessibility/grab-drag/GrabDragModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions js/accessibility/group-sort/model/GroupSelectModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<ItemModel> = {

Expand Down
16 changes: 8 additions & 8 deletions js/accessibility/group-sort/view/GroupSelectView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions js/accessibility/group-sort/view/GroupSortInteractionView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions js/accessibility/group-sort/view/SortCueArrowNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions js/accessibility/nodes/WASDCueNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion js/keyboard/ArrowKeyNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions js/keyboard/LetterKeyNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion js/keyboard/TextKeyNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions js/keyboard/help/HeatCoolControlsKeyboardHelpSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions js/keyboard/help/MoveDraggableItemsKeyboardHelpSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions js/keyboard/help/SliderControlsKeyboardHelpSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions js/keyboard/help/SpinnerControlsKeyboardHelpSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 044b746

Please sign in to comment.