diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts index 91ba770e4e..cd2c99c25f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts @@ -65,8 +65,8 @@ export class UmbVariantSelectorElement extends UmbLitElement { this.consumeContext(UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, (instance) => { this.#splitViewContext = instance; - this._observeVariants(); - this._observeActiveVariants(); + this.#observeVariants(); + this.#observeActiveVariants(); }); this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (instance) => { this.#datasetContext = instance; @@ -82,7 +82,7 @@ export class UmbVariantSelectorElement extends UmbLitElement { this.#languages.setValue(languages.items); } - private async _observeVariants() { + async #observeVariants() { if (!this.#splitViewContext) return; const workspaceContext = this.#splitViewContext.getWorkspaceContext(); @@ -105,7 +105,7 @@ export class UmbVariantSelectorElement extends UmbLitElement { ); } - private async _observeActiveVariants() { + async #observeActiveVariants() { if (!this.#splitViewContext) return; const workspaceContext = this.#splitViewContext.getWorkspaceContext(); @@ -150,8 +150,7 @@ export class UmbVariantSelectorElement extends UmbLitElement { ); } - // TODO: find a way where we don't have to do this for all workspaces. - private _handleInput(event: UUIInputEvent) { + #handleInput(event: UUIInputEvent) { if (event instanceof UUIInputEvent) { const target = event.composedPath()[0] as UUIInputElement; @@ -165,24 +164,24 @@ export class UmbVariantSelectorElement extends UmbLitElement { } } - private _switchVariant(variant: UmbDocumentVariantOption) { + #switchVariant(variant: UmbDocumentVariantOption) { this.#splitViewContext?.switchVariant(UmbVariantId.Create(variant)); } - private _openSplitView(variant: UmbDocumentVariantOption) { + #openSplitView(variant: UmbDocumentVariantOption) { this.#splitViewContext?.openSplitView(UmbVariantId.Create(variant)); } - private _closeSplitView() { + #closeSplitView() { this.#splitViewContext?.closeSplitView(); } - private _isVariantActive(culture: string | null) { + #isVariantActive(culture: string | null) { return culture !== null ? this._activeVariantsCultures.includes(culture) : true; } - private _isNotPublishedMode(culture: string | null, state: DocumentVariantStateModel) { - return state !== DocumentVariantStateModel.PUBLISHED && !this._isVariantActive(culture); + #isNotPublishedMode(culture: string | null, state: DocumentVariantStateModel) { + return state !== DocumentVariantStateModel.PUBLISHED && !this.#isVariantActive(culture); } // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet. @@ -197,12 +196,13 @@ export class UmbVariantSelectorElement extends UmbLitElement { if (!isOpen) return; const host = this.getBoundingClientRect(); + // TODO: Ideally this is kept updated while open, but for now we just set it once: this._popoverElement.style.width = `${host.width}px`; } render() { return html` - + ${ this._variants?.length ? html` @@ -216,7 +216,7 @@ export class UmbVariantSelectorElement extends UmbLitElement { ${this._activeVariants.length > 1 ? html` - + ` @@ -238,12 +238,12 @@ export class UmbVariantSelectorElement extends UmbLitElement {
    ${this._variants.map( (variant) => html` -
  • +
  • - ${this._isVariantActive(variant.culture) + ${this.#isVariantActive(variant.culture) ? nothing : html` this._openSplitView(variant)}> + @click=${() => this.#openSplitView(variant)}> Split view `}