Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
"@ember/-internals/runtime/lib/mixins/action_handler.js": "ember-source/@ember/-internals/runtime/lib/mixins/action_handler.js",
"@ember/-internals/runtime/lib/mixins/comparable.js": "ember-source/@ember/-internals/runtime/lib/mixins/comparable.js",
"@ember/-internals/runtime/lib/mixins/container_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/container_proxy.js",
"@ember/-internals/runtime/lib/mixins/evented.js": "ember-source/@ember/-internals/runtime/lib/mixins/evented.js",
"@ember/-internals/runtime/lib/mixins/registry_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/registry_proxy.js",
"@ember/-internals/runtime/lib/mixins/target_action_support.js": "ember-source/@ember/-internals/runtime/lib/mixins/target_action_support.js",
"@ember/-internals/string/index.js": "ember-source/@ember/-internals/string/index.js",
Expand All @@ -226,6 +227,7 @@
"@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",
"@ember/-internals/views/lib/system/utils.js": "ember-source/@ember/-internals/views/lib/system/utils.js",
"@ember/-internals/views/lib/views/core-view-utils.js": "ember-source/@ember/-internals/views/lib/views/core-view-utils.js",
"@ember/-internals/views/lib/views/core_view.js": "ember-source/@ember/-internals/views/lib/views/core_view.js",
"@ember/-internals/views/lib/views/states.js": "ember-source/@ember/-internals/views/lib/views/states.js",
"@ember/application/index.js": "ember-source/@ember/application/index.js",
Expand Down
33 changes: 19 additions & 14 deletions packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import {
setOwner,
} from '@ember/-internals/owner';
import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
import {
addChildView,
sendCoreViewEvent,
setElementView,
setViewElement,
} from '@ember/-internals/views';
import type { Nullable } from '@ember/-internals/utility-types';
import { assert, debugFreeze } from '@ember/debug';
import { _instrumentStart } from '@ember/instrumentation';
Expand Down Expand Up @@ -305,20 +310,20 @@ export default class CurlyComponentManager
addChildView(parentView, component);
}

component.trigger('didReceiveAttrs');
sendCoreViewEvent(component, 'didReceiveAttrs');

let hasWrappedElement = component.tagName !== '';

// We usually do this in the `didCreateElement`, but that hook doesn't fire for tagless components
if (!hasWrappedElement) {
if (isInteractive) {
component.trigger('willRender');
sendCoreViewEvent(component, 'willRender');
}

component._transitionTo('hasElement');

if (isInteractive) {
component.trigger('willInsertElement');
sendCoreViewEvent(component, 'willInsertElement');
}
}

Expand All @@ -342,7 +347,7 @@ export default class CurlyComponentManager
}

if (isInteractive && hasWrappedElement) {
component.trigger('willRender');
sendCoreViewEvent(component, 'willRender');
}

endUntrackFrame();
Expand Down Expand Up @@ -407,7 +412,7 @@ export default class CurlyComponentManager

if (isInteractive) {
beginUntrackFrame();
component.trigger('willInsertElement');
sendCoreViewEvent(component, 'willInsertElement');
endUntrackFrame();
}
}
Expand All @@ -420,8 +425,8 @@ export default class CurlyComponentManager
didCreate({ component, isInteractive }: ComponentStateBucket): void {
if (isInteractive) {
component._transitionTo('inDOM');
component.trigger('didInsertElement');
component.trigger('didRender');
sendCoreViewEvent(component, 'didInsertElement');
sendCoreViewEvent(component, 'didRender');
}
}

Expand All @@ -443,13 +448,13 @@ export default class CurlyComponentManager
component.setProperties(props);
component[IS_DISPATCHING_ATTRS] = false;

component.trigger('didUpdateAttrs');
component.trigger('didReceiveAttrs');
sendCoreViewEvent(component, 'didUpdateAttrs');
sendCoreViewEvent(component, 'didReceiveAttrs');
}

if (isInteractive) {
component.trigger('willUpdate');
component.trigger('willRender');
sendCoreViewEvent(component, 'willUpdate');
sendCoreViewEvent(component, 'willRender');
}

endUntrackFrame();
Expand All @@ -464,8 +469,8 @@ export default class CurlyComponentManager

didUpdate({ component, isInteractive }: ComponentStateBucket): void {
if (isInteractive) {
component.trigger('didUpdate');
component.trigger('didRender');
sendCoreViewEvent(component, 'didUpdate');
sendCoreViewEvent(component, 'didRender');
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import CurlyComponentManager, {
initialRenderInstrumentDetails,
processComponentInitializationAssertions,
} from './curly';
import { sendCoreViewEvent } from '@ember/-internals/views';

class RootComponentManager extends CurlyComponentManager {
component: Component;
Expand Down Expand Up @@ -47,13 +48,13 @@ class RootComponentManager extends CurlyComponentManager {
// We usually do this in the `didCreateElement`, but that hook doesn't fire for tagless components
if (!hasWrappedElement) {
if (isInteractive) {
component.trigger('willRender');
sendCoreViewEvent(component, 'willRender');
}

component._transitionTo('hasElement');

if (isInteractive) {
component.trigger('willInsertElement');
sendCoreViewEvent(component, 'willInsertElement');
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/-internals/glimmer/lib/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ENV } from '@ember/-internals/environment';
import type { InternalOwner } from '@ember/-internals/owner';
import { getOwner } from '@ember/-internals/owner';
import { guidFor } from '@ember/-internals/utils';
import { getViewElement, getViewId } from '@ember/-internals/views';
import { getViewElement, getViewId, sendCoreViewEvent } from '@ember/-internals/views';
import { assert } from '@ember/debug';
import { _backburner, _getCurrentRunLoop } from '@ember/runloop';
import {
Expand Down Expand Up @@ -893,7 +893,7 @@ export class Renderer extends BaseRenderer {
this.cleanupRootFor(view);

if (this.state.isInteractive) {
view.trigger('didDestroyElement');
sendCoreViewEvent(view, 'didDestroyElement');
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
import {
clearElementView,
clearViewElement,
getViewElement,
sendCoreViewEvent,
} from '@ember/-internals/views';
import { registerDestructor } from '@glimmer/destroyable';
import type { CapturedNamedArguments } from '@glimmer/interfaces';
import type { Reference } from '@glimmer/reference';
Expand Down Expand Up @@ -46,8 +51,8 @@ export default class ComponentStateBucket {

if (isInteractive) {
beginUntrackFrame();
component.trigger('willDestroyElement');
component.trigger('willClearRender');
sendCoreViewEvent(component, 'willDestroyElement');
sendCoreViewEvent(component, 'willClearRender');
endUntrackFrame();

let element = getViewElement(component);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
import {
moduleFor,
RenderingTestCase,
strip,
runTask,
expectDeprecation,
} from 'internal-test-helpers';

import { set } from '@ember/object';

Expand Down Expand Up @@ -56,7 +62,9 @@ class AbstractAppendTest extends RenderingTestCase {
}
componentsByName[name] = this;
pushHook('init');
this.on('init', () => pushHook('on(init)'));
expectDeprecation(() => {
this.on('init', () => pushHook('on(init)'));
}, /`on` is deprecated/);
}

didReceiveAttrs() {
Expand Down Expand Up @@ -299,7 +307,9 @@ class AbstractAppendTest extends RenderingTestCase {
}
componentsByName[name] = this;
pushHook('init');
this.on('init', () => pushHook('on(init)'));
expectDeprecation(() => {
this.on('init', () => pushHook('on(init)'));
}, /`on` is deprecated/);
}

didReceiveAttrs() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
equalsElement,
runTask,
runLoopSettled,
expectDeprecation,
} from 'internal-test-helpers';

import { action } from '@ember/object';
Expand Down Expand Up @@ -3162,45 +3163,49 @@ moduleFor(
['@test triggering an event only attempts to invoke an identically named method, if it actually is a function (GH#15228)'](
assert
) {
assert.expect(3);
assert.expect(5);

let payload = ['arbitrary', 'event', 'data'];

this.registerComponent('evented-component', {
ComponentClass: Component.extend({
someTruthyProperty: true,

init() {
this._super(...arguments);
this.trigger('someMethod', ...payload);
this.trigger('someTruthyProperty', ...payload);
},

someMethod(...data) {
assert.deepEqual(
data,
payload,
'the method `someMethod` should be called, when `someMethod` is triggered'
);
},
expectDeprecation(() => {
this.registerComponent('evented-component', {
ComponentClass: Component.extend({
someTruthyProperty: true,

init() {
this._super(...arguments);
expectDeprecation(() => {
this.trigger('someMethod', ...payload);
this.trigger('someTruthyProperty', ...payload);
}, /`trigger` is deprecated/);
},

listenerForSomeMethod: on('someMethod', function (...data) {
assert.deepEqual(
data,
payload,
'the listener `listenerForSomeMethod` should be called, when `someMethod` is triggered'
);
}),
someMethod(...data) {
assert.deepEqual(
data,
payload,
'the method `someMethod` should be called, when `someMethod` is triggered'
);
},

listenerForSomeTruthyProperty: on('someTruthyProperty', function (...data) {
assert.deepEqual(
data,
payload,
'the listener `listenerForSomeTruthyProperty` should be called, when `someTruthyProperty` is triggered'
);
listenerForSomeMethod: on('someMethod', function (...data) {
assert.deepEqual(
data,
payload,
'the listener `listenerForSomeMethod` should be called, when `someMethod` is triggered'
);
}),

listenerForSomeTruthyProperty: on('someTruthyProperty', function (...data) {
assert.deepEqual(
data,
payload,
'the listener `listenerForSomeTruthyProperty` should be called, when `someTruthyProperty` is triggered'
);
}),
}),
}),
});
});
}, /`on` is deprecated/);

this.render(`{{evented-component}}`);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { classes, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
import {
classes,
expectDeprecation,

Check failure on line 3 in packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js

View workflow job for this annotation

GitHub Actions / Linting

'expectDeprecation' is defined but never used
moduleFor,
RenderingTestCase,
runTask,
strip,
} from 'internal-test-helpers';

import { schedule } from '@ember/runloop';
import { set, setProperties } from '@ember/object';
import { A as emberA } from '@ember/array';
import { getViewElement, getViewId } from '@ember/-internals/views';

import { Component } from '../../utils/helpers';
import { addListener } from '@ember/-internals/metal';

class LifeCycleHooksTest extends RenderingTestCase {
constructor() {
Expand Down Expand Up @@ -174,7 +182,7 @@
assertNoElement('init', this);
assertState('init', 'preRender', this);

this.on('init', () => pushHook('on(init)'));
addListener(this, 'init', () => pushHook('on(init)'));

schedule('afterRender', () => {
this.isInitialRender = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
import { expectDeprecation, moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';

import { Component } from '../utils/helpers';
import { _getCurrentRunLoop } from '@ember/runloop';
Expand Down Expand Up @@ -159,7 +159,9 @@ moduleFor(
init() {
super.init();
Object.keys(SUPPORTED_EMBER_EVENTS).forEach((browserEvent) => {
this.on(SUPPORTED_EMBER_EVENTS[browserEvent], (event) => (receivedEvent = event));
expectDeprecation(() => {
this.on(SUPPORTED_EMBER_EVENTS[browserEvent], (event) => (receivedEvent = event));
}, /`on` is deprecated/);
});
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
import {
moduleFor,
RenderingTestCase,
applyMixins,
strip,
runTask,
expectDeprecation,
} from 'internal-test-helpers';

import { notifyPropertyChange, on } from '@ember/-internals/metal';
import { get, set, computed } from '@ember/object';
Expand Down Expand Up @@ -1121,11 +1128,14 @@ moduleFor(
class extends EachTest {
createList(items) {
let wrapped = emberA(items);
let proxy = ArrayProxy.extend({
setup: on('init', function () {
this.set('content', emberA(wrapped));
}),
}).create();
let proxy;
expectDeprecation(() => {
proxy = ArrayProxy.extend({
setup: on('init', function () {
this.set('content', emberA(wrapped));
}),
}).create();
}, /`on` is deprecated/);

return { list: proxy, delegate: wrapped };
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/meta/lib/meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export class Meta {
addToListeners(
eventName: string,
target: object | null,
method: Function | PropertyKey,
method: ((...args: any[]) => void) | PropertyKey,
once: boolean,
sync: boolean
) {
Expand Down
Loading
Loading