Skip to content

Commit e0e4332

Browse files
committed
Kill ChildViewsSupport mixin
1 parent c902478 commit e0e4332

File tree

5 files changed

+25
-47
lines changed

5 files changed

+25
-47
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ d('@ember/-internals/views/lib/component_lookup', emberinternalsViewsLibComponen
107107
import * as emberinternalsViewsLibMixinsActionSupport from '@ember/-internals/views/lib/mixins/action_support';
108108
d('@ember/-internals/views/lib/mixins/action_support', emberinternalsViewsLibMixinsActionSupport);
109109

110-
import * as emberinternalsViewsLibMixinsChildViewsSupport from '@ember/-internals/views/lib/mixins/child_views_support';
111-
d(
112-
'@ember/-internals/views/lib/mixins/child_views_support',
113-
emberinternalsViewsLibMixinsChildViewsSupport
114-
);
115-
116110
import * as emberinternalsViewsLibMixinsClassNamesSupport from '@ember/-internals/views/lib/mixins/class_names_support';
117111
d(
118112
'@ember/-internals/views/lib/mixins/class_names_support',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@
215215
"@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
216216
"@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
217217
"@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
218-
"@ember/-internals/views/lib/mixins/child_views_support.js": "ember-source/@ember/-internals/views/lib/mixins/child_views_support.js",
219218
"@ember/-internals/views/lib/mixins/class_names_support.js": "ember-source/@ember/-internals/views/lib/mixins/class_names_support.js",
220219
"@ember/-internals/views/lib/mixins/view_state_support.js": "ember-source/@ember/-internals/views/lib/mixins/view_state_support.js",
221220
"@ember/-internals/views/lib/mixins/view_support.js": "ember-source/@ember/-internals/views/lib/mixins/view_support.js",

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
1+
import type { View } from '@ember/-internals/glimmer/lib/renderer';
2+
import { get, nativeDescDecorator, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
23
import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
34
import { getOwner } from '@ember/-internals/owner';
45
import { TargetActionSupport } from '@ember/-internals/runtime';
56
import {
67
ActionSupport,
7-
ChildViewsSupport,
8+
addChildView,
89
ClassNamesSupport,
910
CoreView,
1011
EventDispatcher,
12+
getChildViews,
1113
getViewElement,
1214
ViewMixin,
1315
ViewStateSupport,
@@ -775,7 +777,6 @@ declare const SIGNATURE: unique symbol;
775777
// eslint-disable-next-line @typescript-eslint/no-unused-vars
776778
interface Component<S = unknown>
777779
extends CoreView,
778-
ChildViewsSupport,
779780
ViewStateSupport,
780781
ClassNamesSupport,
781782
TargetActionSupport,
@@ -785,7 +786,6 @@ interface Component<S = unknown>
785786

786787
class Component<S = unknown>
787788
extends CoreView.extend(
788-
ChildViewsSupport,
789789
ViewStateSupport,
790790
ClassNamesSupport,
791791
TargetActionSupport,
@@ -1118,6 +1118,27 @@ class Component<S = unknown>
11181118
*/
11191119
declare ariaRole?: string;
11201120

1121+
/**
1122+
Array of child views. You should never edit this array directly.
1123+
1124+
@property childViews
1125+
@type Array
1126+
@default []
1127+
@private
1128+
*/
1129+
// @ts-expect-error TODO: Fix these types
1130+
@nativeDescDecorator({
1131+
configurable: false,
1132+
enumerable: false,
1133+
})
1134+
get childViews() {
1135+
return getChildViews(this);
1136+
}
1137+
1138+
appendChild(view: View) {
1139+
addChildView(this, view);
1140+
}
1141+
11211142
static isComponentFactory = true;
11221143

11231144
static toString() {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export { default as EventDispatcher } from './lib/system/event_dispatcher';
1919
export { default as ComponentLookup } from './lib/component_lookup';
2020
export { default as CoreView } from './lib/views/core_view';
2121
export { default as ClassNamesSupport } from './lib/mixins/class_names_support';
22-
export { default as ChildViewsSupport } from './lib/mixins/child_views_support';
2322
export { default as ViewStateSupport } from './lib/mixins/view_state_support';
2423
export { default as ViewMixin } from './lib/mixins/view_support';
2524
export { default as ActionSupport } from './lib/mixins/action_support';

packages/@ember/-internals/views/lib/mixins/child_views_support.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)