Skip to content

Commit 5029864

Browse files
committed
Kill ChildViewsSupport mixin
1 parent ff02141 commit 5029864

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
@@ -113,12 +113,6 @@ d('@ember/-internals/views/lib/component_lookup', emberinternalsViewsLibComponen
113113
import * as emberinternalsViewsLibMixinsActionSupport from '@ember/-internals/views/lib/mixins/action_support';
114114
d('@ember/-internals/views/lib/mixins/action_support', emberinternalsViewsLibMixinsActionSupport);
115115

116-
import * as emberinternalsViewsLibMixinsChildViewsSupport from '@ember/-internals/views/lib/mixins/child_views_support';
117-
d(
118-
'@ember/-internals/views/lib/mixins/child_views_support',
119-
emberinternalsViewsLibMixinsChildViewsSupport
120-
);
121-
122116
import * as emberinternalsViewsLibMixinsClassNamesSupport from '@ember/-internals/views/lib/mixins/class_names_support';
123117
d(
124118
'@ember/-internals/views/lib/mixins/class_names_support',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
"@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
218218
"@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
219219
"@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
220-
"@ember/-internals/views/lib/mixins/child_views_support.js": "ember-source/@ember/-internals/views/lib/mixins/child_views_support.js",
221220
"@ember/-internals/views/lib/mixins/class_names_support.js": "ember-source/@ember/-internals/views/lib/mixins/class_names_support.js",
222221
"@ember/-internals/views/lib/mixins/view_state_support.js": "ember-source/@ember/-internals/views/lib/mixins/view_state_support.js",
223222
"@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,
@@ -1132,6 +1132,27 @@ class Component<S = unknown>
11321132
*/
11331133
declare ariaRole?: string;
11341134

1135+
/**
1136+
Array of child views. You should never edit this array directly.
1137+
1138+
@property childViews
1139+
@type Array
1140+
@default []
1141+
@private
1142+
*/
1143+
// @ts-expect-error TODO: Fix these types
1144+
@nativeDescDecorator({
1145+
configurable: false,
1146+
enumerable: false,
1147+
})
1148+
get childViews() {
1149+
return getChildViews(this);
1150+
}
1151+
1152+
appendChild(view: View) {
1153+
addChildView(this, view);
1154+
}
1155+
11351156
static isComponentFactory = true;
11361157

11371158
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)