Kill ViewStateSupport mixin

Author: wagenet

broccoli/amd-compat-entrypoints/ember.debug.js

@@ -113,12 +113,6 @@ d('@ember/-internals/views/lib/component_lookup', emberinternalsViewsLibComponen
 import * as emberinternalsViewsLibMixinsActionSupport from '@ember/-internals/views/lib/mixins/action_support';
 d('@ember/-internals/views/lib/mixins/action_support', emberinternalsViewsLibMixinsActionSupport);
 
-import * as emberinternalsViewsLibMixinsViewStateSupport from '@ember/-internals/views/lib/mixins/view_state_support';
-d(
-  '@ember/-internals/views/lib/mixins/view_state_support',
-  emberinternalsViewsLibMixinsViewStateSupport
-);
-
 import * as emberinternalsViewsLibMixinsViewSupport from '@ember/-internals/views/lib/mixins/view_support';
 d('@ember/-internals/views/lib/mixins/view_support', emberinternalsViewsLibMixinsViewSupport);
 

package.json

@@ -217,7 +217,6 @@
       "@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
       "@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
       "@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
-      "@ember/-internals/views/lib/mixins/view_state_support.js": "ember-source/@ember/-internals/views/lib/mixins/view_state_support.js",
       "@ember/-internals/views/lib/mixins/view_support.js": "ember-source/@ember/-internals/views/lib/mixins/view_support.js",
       "@ember/-internals/views/lib/system/action_manager.js": "ember-source/@ember/-internals/views/lib/system/action_manager.js",
       "@ember/-internals/views/lib/system/event_dispatcher.js": "ember-source/@ember/-internals/views/lib/system/event_dispatcher.js",

packages/@ember/-internals/glimmer/lib/component.ts

@@ -8,6 +8,7 @@ import {
 import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
+import type { ViewStates } from '@ember/-internals/views';
 import {
   ActionSupport,
   addChildView,
@@ -16,7 +17,6 @@ import {
   getChildViews,
   getViewElement,
   ViewMixin,
-  ViewStateSupport,
 } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
@@ -775,22 +775,19 @@ declare const SIGNATURE: unique symbol;
   @uses Ember.TargetActionSupport
   @uses Ember.ActionSupport
   @uses Ember.ViewMixin
-  @uses Ember.ViewStateSupport
   @public
 */
 // This type param is used in the class, so must appear here.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 interface Component<S = unknown>
   extends CoreView,
-    ViewStateSupport,
     TargetActionSupport,
     ActionSupport,
     ViewMixin,
     ComponentMethods {}
 
 class Component<S = unknown>
   extends CoreView.extend(
-    ViewStateSupport,
     TargetActionSupport,
     ActionSupport,
     ViewMixin,
@@ -1242,6 +1239,19 @@ class Component<S = unknown>
     addChildView(this, view);
   }
 
+  _transitionTo(this: Component, state: keyof typeof ViewStates) {
+    let priorState = this._currentState;
+    let currentState = (this._currentState = this._states[state]);
+    this._state = state;
+
+    if (priorState && priorState.exit) {
+      priorState.exit(this);
+    }
+    if (currentState.enter) {
+      currentState.enter(this);
+    }
+  }
+
   static isComponentFactory = true;
 
   static toString() {

packages/@ember/-internals/views/index.ts

@@ -18,8 +18,8 @@ export {
 export { default as EventDispatcher } from './lib/system/event_dispatcher';
 export { default as ComponentLookup } from './lib/component_lookup';
 export { default as CoreView } from './lib/views/core_view';
-export { default as ViewStateSupport } from './lib/mixins/view_state_support';
 export { default as ViewMixin } from './lib/mixins/view_support';
 export { default as ActionSupport } from './lib/mixins/action_support';
 export { MUTABLE_CELL } from './lib/compat/attrs';
 export { default as ActionManager } from './lib/system/action_manager';
+export { default as ViewStates } from './lib/views/states';