Skip to content

Commit f2cbffc

Browse files
committed
Merge branch 'main' into v14/chore/bundle-core-package
2 parents 2a06525 + b16a459 commit f2cbffc

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
"tiny-glob": "^0.2.9",
260260
"tsc-alias": "^1.8.8",
261261
"typedoc": "^0.25.13",
262-
"typescript": "^5.4.5",
262+
"typescript": "^5.5.2",
263263
"typescript-json-schema": "^0.63.0",
264264
"vite": "^5.2.9",
265265
"vite-plugin-static-copy": "^1.0.5",

src/packages/block/block-type/components/block-type-card/block-type-card.element.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
4646
@state()
4747
_name?: string;
4848

49+
@state()
50+
_description?: string;
51+
4952
@state()
5053
_fallbackIcon?: string | null;
5154

@@ -57,6 +60,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
5760
if (item) {
5861
this._fallbackIcon = item.icon;
5962
this._name = item.name;
63+
this._description = item.description ?? undefined;
6064
}
6165
});
6266
}
@@ -67,6 +71,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
6771
<uui-card-block-type
6872
href=${ifDefined(this.href)}
6973
.name=${this._name ?? 'Unknown'}
74+
.description=${this._description}
7075
.background=${this.backgroundColor}>
7176
${this.iconFile
7277
? html`<img src=${this.iconFile} alt="" />`

src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
475475
renderTabInner(tab: UmbPropertyTypeContainerModel, tabActive: boolean, ownedTab: boolean) {
476476
// TODO: Localize this:
477477
if (this._sortModeActive) {
478-
return html`<div class="not-active">
478+
return html`<div class="tab">
479479
${ownedTab
480480
? html`<uui-icon name="icon-navigation" class="drag-${tab.id}"> </uui-icon>${tab.name!}
481481
<uui-input

src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ const mapper = (item: DocumentTypeItemResponseModel): UmbDocumentTypeItemModel =
3535
icon: item.icon,
3636
unique: item.id,
3737
name: item.name,
38+
description: item.description,
3839
};
3940
};

src/packages/documents/document-types/repository/item/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ export type UmbDocumentTypeItemModel = {
66
name: string;
77
isElement: boolean;
88
icon?: string | null;
9+
description?: string | null;
910
};

0 commit comments

Comments
 (0)