From 66094d3caaca7d69d56e817fd01727c07d8eb0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz?= <l.mordasiewicz@gmail.com>
Date: Fri, 17 Mar 2023 16:16:42 +0100
Subject: [PATCH] Variant selector - notpublished helper functon

---
 .../variant-selector/variant-selector.element.ts    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
index 4b35cb9621..16b1c12ef9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
@@ -292,6 +292,10 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 		return this._activeVariantsCultures.includes(culture);
 	}
 
+	private _isNotPublishedMode(culture: string, state: ContentStateModel) {
+		return state !== ContentStateModel.PUBLISHED && !this._isVariantActive(culture!);
+	}
+
 	render() {
 		return html`
 			<uui-input id="name-input" .value=${this._name} @input="${this._handleInput}">
@@ -328,13 +332,12 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 											${this._variants.map(
 												(variant) =>
 													html`
-														<li class="${this._isVariantActive(variant.culture as string) ? 'selected' : ''}">
+														<li class="${this._isVariantActive(variant.culture!) ? 'selected' : ''}">
 															<button
 																class="variant-selector-switch-button 
-																${variant.state !== ContentStateModel.PUBLISHED && !this._isVariantActive(variant.culture as string) ? 'add-mode' : ''}"
+																${this._isNotPublishedMode(variant.culture!, variant.state!) ? 'add-mode' : ''}"
 																@click=${() => this._switchVariant(variant)}>
-																${variant.state !== ContentStateModel.PUBLISHED &&
-																!this._isVariantActive(variant.culture as string)
+																${this._isNotPublishedMode(variant.culture!, variant.state!)
 																	? html`<uui-icon class="add-icon" name="umb:add"></uui-icon>`
 																	: nothing}
 																<div>
@@ -343,7 +346,7 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 																</div>
 															</button>
 
-															${this._isVariantActive(variant.culture as string)
+															${this._isVariantActive(variant.culture!)
 																? nothing
 																: html`
 																		<uui-button