Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
<li class="item" ?selected=${this.value.selection.includes(propertyEditorUI.alias)}>
<button type="button" @click=${() => this.#handleClick(propertyEditorUI)}>
<umb-icon name=${propertyEditorUI.meta.icon} class="icon"></umb-icon>
${propertyEditorUI.meta.label || propertyEditorUI.name}
${this.localize.string(propertyEditorUI.meta.label || propertyEditorUI.name)}
</button>
</li>
`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,30 +347,27 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
}

#renderDataTypeButton(propertyEditorUI: ManifestPropertyEditorUi, createAsNewOnPick?: boolean) {
const label = this.localize.string(propertyEditorUI.meta.label || propertyEditorUI.name);
if (createAsNewOnPick) {
return html`
<uui-button
label=${propertyEditorUI.meta.label || propertyEditorUI.name}
@click=${() => this.#createDataType(propertyEditorUI.alias)}>
${this.#renderItemContent(propertyEditorUI)}
<uui-button label=${label} @click=${() => this.#createDataType(propertyEditorUI.alias)}>
${this.#renderItemContent(label, propertyEditorUI)}
</uui-button>
`;
} else {
return html`
<uui-button
label=${propertyEditorUI.meta.label || propertyEditorUI.name}
href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
${this.#renderItemContent(propertyEditorUI)}
<uui-button label=${label} href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
${this.#renderItemContent(label, propertyEditorUI)}
</uui-button>
`;
}
}

#renderItemContent(propertyEditorUI: ManifestPropertyEditorUi) {
#renderItemContent(label: string, propertyEditorUI: ManifestPropertyEditorUi) {
return html`
<div class="item-content">
<umb-icon name=${propertyEditorUI.meta.icon} class="icon"></umb-icon>
${propertyEditorUI.meta.label || propertyEditorUI.name}
${label}
</div>
`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const manifests: Array<ManifestPropertyEditorUi> = [
name: 'Rich Text Editor [Tiptap] Property Editor UI',
element: () => import('./property-editor-ui-tiptap.element.js'),
meta: {
label: 'Rich Text Editor [Tiptap]',
label: '#rte_label',
propertyEditorSchemaAlias: 'Umbraco.RichText',
icon: 'icon-browser-window',
group: 'richContent',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test.afterEach(async ({umbracoApi}) => {

test('can create a rich text editor with tiptap', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
// Arrange
const tipTapLocatorName = 'Rich Text Editor [Tiptap]';
const tipTapLocatorName = 'Rich Text Editor';
const tipTapAlias = 'Umbraco.RichText';
const tipTapUiAlias = 'Umb.PropertyEditorUi.Tiptap';

Expand Down
Loading