diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts index 8ea8de878c..a58f3c0a9b 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts @@ -37,7 +37,7 @@ declare class UmbClassMixinDeclaration implements UmbClassMixinInterface { addController(controller: UmbController): void; removeControllerByAlias(controllerAlias: UmbControllerAlias): void; removeController(controller: UmbController): void; - getElement(): EventTarget; + getHostElement(): EventTarget; get controllerAlias(): UmbControllerAlias; hostConnected(): void; @@ -56,8 +56,8 @@ export const UmbClassMixin = (superClass: T) => { this._controllerAlias = controllerAlias ?? undefined; // ?? Symbol(); } - getElement(): EventTarget { - return this._host.getElement(); + getHostElement(): EventTarget { + return this._host.getHostElement(); } get controllerAlias(): UmbControllerAlias { diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.controller.ts index 577123507e..a09e9a6d72 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.controller.ts @@ -12,7 +12,7 @@ export class UmbContextConsumerController extends UmbContextConsume } constructor(host: UmbControllerHost, contextAlias: string | UmbContextToken, callback: UmbContextCallback) { - super(host.getElement(), contextAlias, callback); + super(host.getHostElement(), contextAlias, callback); this.#host = host; host.addController(this); } diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts index 1367a82973..f049ef675e 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.ts @@ -10,7 +10,7 @@ export class UmbContextProviderController extends UmbContextProvide } constructor(host: UmbControllerHost, contextAlias: string | UmbContextToken, instance: T) { - super(host.getElement(), contextAlias, instance); + super(host.getHostElement(), contextAlias, instance); this.#host = host; // If this API is already provided with this alias? Then we do not want to register this controller: diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.interface.ts index 51b269b36b..243a2e3791 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.interface.ts @@ -6,5 +6,5 @@ export declare class UmbControllerHost { addController(controller: UmbController): void; removeControllerByAlias(unique: UmbController['controllerAlias']): void; removeController(controller: UmbController): void; - getElement(): EventTarget; + getHostElement(): EventTarget; } diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.mixin.ts index 880ce7e215..25ecfa49b1 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.mixin.ts @@ -10,7 +10,7 @@ export declare class UmbControllerHostElement extends HTMLElement implements Umb addController(controller: UmbController): void; removeControllerByAlias(alias: UmbControllerAlias): void; removeController(controller: UmbController): void; - getElement(): EventTarget; + getHostElement(): EventTarget; } /** @@ -22,7 +22,7 @@ export declare class UmbControllerHostElement extends HTMLElement implements Umb */ export const UmbControllerHostMixin = (superClass: T) => { class UmbControllerHostClass extends UmbControllerHostBaseMixin(superClass) implements UmbControllerHost { - getElement(): EventTarget { + getHostElement(): EventTarget { return this; } diff --git a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts index 07e6d72432..fe6387c1c2 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/controller-api/controller.test.ts @@ -36,8 +36,8 @@ describe('UmbController', () => { describe('Public API', () => { describe('methods', () => { - it('has an getElement method', () => { - expect(hostElement).to.have.property('getElement').that.is.a('function'); + it('has an getHostElement method', () => { + expect(hostElement).to.have.property('getHostElement').that.is.a('function'); }); /* diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts index d10a699a46..815cd1d94f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts @@ -104,12 +104,12 @@ export class UmbTreeContextBase public select(unique: string | null) { if (!this.getSelectable()) return; this.#selectionManager.select(unique); - this._host.getElement().dispatchEvent(new CustomEvent('selected')); + this._host.getHostElement().dispatchEvent(new CustomEvent('selected')); } public deselect(unique: string | null) { this.#selectionManager.deselect(unique); - this._host.getElement().dispatchEvent(new CustomEvent('selected')); + this._host.getHostElement().dispatchEvent(new CustomEvent('selected')); } public async requestTreeRoot() {