Skip to content
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.

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

fix(popover): popover opens on chrome 109 #26672

Merged
merged 11 commits into from
Jan 30, 2023
33 changes: 29 additions & 4 deletions angular/src/providers/angular-delegate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@ export class AngularDelegate {
create(
resolverOrInjector: ComponentFactoryResolver,
injector: Injector,
location?: ViewContainerRef
location?: ViewContainerRef,
elementReferenceKey?: string
): AngularFrameworkDelegate {
return new AngularFrameworkDelegate(resolverOrInjector, injector, location, this.appRef, this.zone);
return new AngularFrameworkDelegate(
resolverOrInjector,
injector,
location,
this.appRef,
this.zone,
elementReferenceKey
);
}
}

Expand All @@ -45,12 +53,29 @@ export class AngularFrameworkDelegate implements FrameworkDelegate {
private injector: Injector,
private location: ViewContainerRef | undefined,
private appRef: ApplicationRef,
private zone: NgZone
private zone: NgZone,
private elementReferenceKey?: string
) {}

attachViewToDom(container: any, component: any, params?: any, cssClasses?: string[]): Promise<any> {
return this.zone.run(() => {
return new Promise((resolve) => {
const componentProps = {
...params,
};

/**
* Ionic Angular passes a reference to a modal
* or popover that can be accessed using a
* variable in the overlay component. If
* elementReferenceKey is defined, then we should
* pass a reference to the component using
* elementReferenceKey as the key.
*/
if (this.elementReferenceKey !== undefined) {
componentProps[this.elementReferenceKey] = container;
}

const el = attachView(
this.zone,
this.resolverOrInjector,
Expand All @@ -61,7 +86,7 @@ export class AngularFrameworkDelegate implements FrameworkDelegate {
this.elEventsMap,
container,
component,
params,
componentProps,
cssClasses
);
resolve(el);
Expand Down
7 changes: 6 additions & 1 deletion angular/src/providers/modal-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ export class ModalController extends OverlayBaseController<ModalOptions, HTMLIon
create(opts: ModalOptions): Promise<HTMLIonModalElement> {
return super.create({
...opts,
delegate: this.angularDelegate.create(this.resolver ?? this.environmentInjector, this.injector),
delegate: this.angularDelegate.create(
this.resolver ?? this.environmentInjector,
this.injector,
undefined,
'modal'
),
});
}
}
7 changes: 6 additions & 1 deletion angular/src/providers/popover-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ export class PopoverController extends OverlayBaseController<PopoverOptions, HTM
create(opts: PopoverOptions): Promise<HTMLIonPopoverElement> {
return super.create({
...opts,
delegate: this.angularDelegate.create(this.resolver ?? this.environmentInjector, this.injector),
delegate: this.angularDelegate.create(
this.resolver ?? this.environmentInjector,
this.injector,
undefined,
'popover'
),
});
}
}
14 changes: 8 additions & 6 deletions core/src/components/modal/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -512,13 +512,15 @@ export class Modal implements ComponentInterface, OverlayInterface {
*/
this.currentBreakpoint = this.initialBreakpoint;

const data = {
...this.componentProps,
modal: this.el,
};

const { inline, delegate } = this.getDelegate(true);
this.usersElement = await attachComponent(delegate, this.el, this.component, ['ion-page'], data, inline);
this.usersElement = await attachComponent(
delegate,
this.el,
this.component,
['ion-page'],
this.componentProps,
inline
);

await deepReady(this.usersElement);

Expand Down
14 changes: 8 additions & 6 deletions core/src/components/popover/popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,15 @@ export class Popover implements ComponentInterface, PopoverInterface {
await this.currentTransition;
}

const data = {
...this.componentProps,
popover: this.el,
};

const { inline, delegate } = this.getDelegate(true);
this.usersElement = await attachComponent(delegate, this.el, this.component, ['popover-viewport'], data, inline);
this.usersElement = await attachComponent(
delegate,
this.el,
this.component,
['popover-viewport'],
this.componentProps,
inline
);
await deepReady(this.usersElement);

if (!this.keyboardEvents) {
Expand Down
9 changes: 0 additions & 9 deletions packages/vue/src/framework-delegate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ export const VueDelegate = (
componentProps: any = {},
classes?: string[]
) => {
/**
* Ionic Framework passes in modal and popover element
* refs as props, but if these are not defined
* on the Vue component instance as props, Vue will
* warn the user.
*/
delete componentProps["modal"];
delete componentProps["popover"];

const div = document.createElement("div");
classes && div.classList.add(...classes);
parentElement.appendChild(div);
Expand Down