Skip to content

Quick fix for output() support in elements #57535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alxhub wants to merge 1 commit into from
Closed

Quick fix for output() support in elements #57535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions packages/elements/src/component-factory-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import {
ɵChangeDetectionScheduler as ChangeDetectionScheduler,
ɵNotificationSource as NotificationSource,
ɵViewRef as ViewRef,
OutputRef,
} from '@angular/core';
import {merge, Observable, ReplaySubject} from 'rxjs';
import {map, switchMap} from 'rxjs/operators';
import {switchMap} from 'rxjs/operators';

import {
NgElementStrategy,
Expand Down Expand Up @@ -219,8 +220,11 @@ export class ComponentNgElementStrategy implements NgElementStrategy {
protected initializeOutputs(componentRef: ComponentRef<any>): void {
const eventEmitters: Observable<NgElementStrategyEvent>[] = this.componentFactory.outputs.map(
({propName, templateName}) => {
const emitter: EventEmitter<any> = componentRef.instance[propName];
return emitter.pipe(map((value) => ({name: templateName, value})));
const emitter: EventEmitter<any> | OutputRef<any> = componentRef.instance[propName];
return new Observable((observer) => {
const sub = emitter.subscribe((value) => observer.next({name: templateName, value}));
return () => sub.unsubscribe();
});
},
);

Expand Down
14 changes: 14 additions & 0 deletions packages/elements/test/component-factory-strategy_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
Input,
NgZone,
Output,
OutputEmitterRef,
SimpleChange,
SimpleChanges,
createComponent,
Expand Down Expand Up @@ -113,6 +114,18 @@ describe('ComponentFactoryNgElementStrategy', () => {
]);
});

it('should listen to output() emitters', () => {
const events: NgElementStrategyEvent[] = [];
strategy.events.subscribe((e) => events.push(e));

componentRef.instance.output3.emit('output-a');
componentRef.instance.output3.emit('output-b');
expect(events).toEqual([
{name: 'templateOutput3', value: 'output-a'},
{name: 'templateOutput3', value: 'output-b'},
]);
});

it('should initialize the component with initial values', () => {
expect(strategy.getInputValue('fooFoo')).toBe('fooFoo-1');
expect(componentRef.instance.fooFoo).toBe('fooFoo-1');
Expand Down Expand Up @@ -369,6 +382,7 @@ export class CdTrackerDir {
export class TestComponent {
@Output('templateOutput1') output1 = new Subject();
@Output('templateOutput2') output2 = new Subject();
@Output('templateOutput3') output3 = new OutputEmitterRef();

@Input() fooFoo: unknown;
@Input({alias: 'my-bar-bar'}) barBar: unknown;
Expand Down