yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make variant selector name more specific

Browse Source
This commit is contained in:
Mads Rasmussen
2024-05-23 14:24:26 +02:00
parent 8557dbc3c6
commit 0071c079aa
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/index.ts
View File

@@ -1 +0,0 @@
export * from './variant-selector.element.js';

14
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts → src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts
View File

@@ -1,4 +1,6 @@
import { UmbVariantId } from '../../../variant/variant-id.class.js';
import type { ActiveVariant } from '../../controllers/index.js';
import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT } from './workspace-split-view.context.js';
import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
import { UMB_PROPERTY_DATASET_CONTEXT, isNameablePropertyDatasetContext } from '@umbraco-cms/backoffice/property';
import {
type UUIInputElement,
@@ -6,7 +8,6 @@ import {
type UUIPopoverContainerElement,
} from '@umbraco-cms/backoffice/external/uui';
import { css, html, nothing, customElement, state, query } from '@umbraco-cms/backoffice/external/lit';
import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, type ActiveVariant } from '@umbraco-cms/backoffice/workspace';
import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -22,8 +23,9 @@ type UmbDocumentVariantOption = {
type UmbDocumentVariantOptions = Array<UmbDocumentVariantOption>;
@customElement('umb-variant-selector')
export class UmbVariantSelectorElement extends UmbLitElement {
const elementName = 'umb-workspace-split-view-variant-selector';
@customElement(elementName)
export class UmbWorkspaceSplitViewVariantSelectorElement extends UmbLitElement {
@query('#variant-selector-popover')
private _popoverElement?: UUIPopoverContainerElement;
@@ -407,10 +409,8 @@ export class UmbVariantSelectorElement extends UmbLitElement {
];
}
export default UmbVariantSelectorElement;
declare global {
interface HTMLElementTagNameMap {
'umb-variant-selector': UmbVariantSelectorElement;
[elementName]: UmbWorkspaceSplitViewVariantSelectorElement;
}
}

7
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
View File

@@ -2,7 +2,10 @@ import { UmbWorkspaceSplitViewContext } from './workspace-split-view.context.js'
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, customElement, property, ifDefined } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import '../variant-selector/index.js';
// import local components
import './workspace-split-view-variant-selector.element.js';
/**
*
* Example. Document Workspace would use a Variant-component(variant component would talk directly to the workspace-context)
@@ -38,7 +41,7 @@ export class UmbWorkspaceSplitViewElement extends UmbLitElement {
.hideNavigation=${!this.displayNavigation}
.enforceNoFooter=${true}>
<div id="header" slot="header">
<umb-variant-selector></umb-variant-selector>
<umb-workspace-split-view-variant-selector></umb-workspace-split-view-variant-selector>
</div>
${this.displayNavigation
? html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`