Skip to content
Open
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
12 changes: 9 additions & 3 deletions packages/upgrade/src/common/src/downgrade_component_adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,15 @@ export class DowngradeComponentAdapter {
}

this.inputChangeCount++;
if (isSignal && !this.unsafelyOverwriteSignalInputs) {
const node = componentRef.instance[prop][SIGNAL] as InputSignalNode<unknown, unknown>;
node.applyValueToInputSignal(node, currValue);
const instanceProp = componentRef.instance[prop];
const node = instanceProp?.[SIGNAL] as InputSignalNode<unknown, unknown> | undefined;
// Model signals are writable signal inputs (they expose a `.set()` method). Overwriting
// them would destroy the internal OutputEmitterRef that setupOutputs() already subscribed
// to, severing the Angular→AngularJS two-way binding. Always use applyValueToInputSignal
// for model signals regardless of the unsafelyOverwriteSignalInputs flag.
const isModelSignal = node != null && typeof instanceProp.set === 'function';
if (isModelSignal || (isSignal && !this.unsafelyOverwriteSignalInputs)) {
node!.applyValueToInputSignal(node!, currValue);
} else {
componentRef.instance[prop] = currValue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
Injector,
input,
Input,
model,
NgModule,
NgModuleRef,
OnChanges,
Expand Down Expand Up @@ -220,6 +221,93 @@ withEachNg1Version(() => {
});
}));

it('should propagate AngularJS→Angular changes through model() signals', waitForAsync(() => {
const ng1Module = angular.module_('ng1', []).run(($rootScope: angular.IScope) => {
$rootScope['value'] = 'initial';
});

@Component({
selector: 'ng2',
template: 'Value: {{value()}}',
changeDetection: ChangeDetectionStrategy.Eager,
standalone: false,
})
class Ng2Component {
value = model<string>('');
}

@NgModule({declarations: [Ng2Component], imports: [BrowserModule, UpgradeModule]})
class Ng2Module {
ngDoBootstrap() {}
}

// Wire up the model() signal for JIT tests. AOT compilation handles this automatically.
(Ng2Component as any).ɵcmp.inputs = {value: ['value', /* InputFlags.SignalBased */ 1]};
(Ng2Component as any).ɵcmp.outputs = {valueChange: 'value'};

ng1Module.directive('ng2', downgradeComponent({component: Ng2Component}));

const element = html(`
<div>
<ng2 bindon-value="value"></ng2>
| value: {{value}}
</div>`);

bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then((upgrade) => {
expect(multiTrim(document.body.textContent)).toEqual('Value: initial | value: initial');

$apply(upgrade, 'value = "updated"');
expect(multiTrim(document.body.textContent)).toEqual('Value: updated | value: updated');
});
}));

it('should propagate Angular→AngularJS changes through model() signals', waitForAsync(() => {
const ng1Module = angular.module_('ng1', []).run(($rootScope: angular.IScope) => {
$rootScope['value'] = 'initial';
});

let componentInstance: Ng2Component;

@Component({
selector: 'ng2',
template: 'Value: {{value()}}',
changeDetection: ChangeDetectionStrategy.Eager,
standalone: false,
})
class Ng2Component {
value = model<string>('');
constructor() {
componentInstance = this;
}
}

@NgModule({declarations: [Ng2Component], imports: [BrowserModule, UpgradeModule]})
class Ng2Module {
ngDoBootstrap() {}
}

// Wire up the model() signal for JIT tests. AOT compilation handles this automatically.
(Ng2Component as any).ɵcmp.inputs = {value: ['value', /* InputFlags.SignalBased */ 1]};
(Ng2Component as any).ɵcmp.outputs = {valueChange: 'value'};

ng1Module.directive('ng2', downgradeComponent({component: Ng2Component}));

const element = html(`
<div>
<ng2 bindon-value="value"></ng2>
| value: {{value}}
</div>`);

bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then((upgrade) => {
expect(multiTrim(document.body.textContent)).toEqual('Value: initial | value: initial');

$apply(upgrade, () => componentInstance.value.set('from-angular'));
expect(multiTrim(document.body.textContent)).toEqual(
'Value: from-angular | value: from-angular',
);
});
}));

it('should bind properties to onpush components', waitForAsync(() => {
const ng1Module = angular.module_('ng1', []).run(($rootScope: angular.IScope) => {
$rootScope['dataB'] = 'B';
Expand Down
Loading