From c198ad10a039a59aa67b2b6f9846c19576522ce6 Mon Sep 17 00:00:00 2001 From: Oskar kruger Date: Wed, 17 Sep 2025 14:37:26 +0200 Subject: [PATCH 1/5] added hovering and focus border to RTE --- .../components/input-tiptap/input-tiptap.element.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts index 03ef568b0939..cb38d7bad5d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts @@ -291,6 +291,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin .tiptap { @@ -330,11 +335,15 @@ export class UmbInputTiptapElement extends UmbFormControlMixin Date: Wed, 17 Sep 2025 14:44:14 +0200 Subject: [PATCH 2/5] fix main to OG --- .../input-tiptap/input-tiptap.element.ts | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts index cb38d7bad5d4..a4e75194ad1d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts @@ -1,3 +1,4 @@ + import { UmbTiptapRteContext } from '../../contexts/tiptap-rte.context.js'; import type { UmbTiptapExtensionApi } from '../../extensions/types.js'; import type { UmbTiptapStatusbarValue, UmbTiptapToolbarValue } from '../types.js'; @@ -173,7 +174,12 @@ export class UmbInputTiptapElement extends UmbFormControlMixin .tiptap { @@ -335,15 +336,11 @@ export class UmbInputTiptapElement extends UmbFormControlMixin Date: Wed, 17 Sep 2025 14:48:39 +0200 Subject: [PATCH 3/5] fix to main again --- .../components/input-tiptap/input-tiptap.element.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts index a4e75194ad1d..6bf7cef72a7c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts @@ -1,4 +1,3 @@ - import { UmbTiptapRteContext } from '../../contexts/tiptap-rte.context.js'; import type { UmbTiptapExtensionApi } from '../../extensions/types.js'; import type { UmbTiptapStatusbarValue, UmbTiptapToolbarValue } from '../types.js'; @@ -173,13 +172,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin Date: Wed, 17 Sep 2025 14:49:55 +0200 Subject: [PATCH 4/5] I'm going to cry --- .../tiptap/components/input-tiptap/input-tiptap.element.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts index 6bf7cef72a7c..03ef568b0939 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts @@ -172,6 +172,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin Date: Fri, 19 Sep 2025 12:50:06 +0200 Subject: [PATCH 5/5] added dynamic label to expand/collapse button on parent/child treeitems --- src/Umbraco.Web.UI.Client/src/assets/lang/cy.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/da.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/fr.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/pt.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/sv.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/vi.ts | 1 + .../tree/tree-item/tree-item-base/tree-item-element-base.ts | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/cy.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/cy.ts index 479a00f04426..432123acd57d 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/cy.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/cy.ts @@ -2210,6 +2210,7 @@ export default { searchContentTree: "Chwilio'r coeden cynnwys", maxAmount: 'Uchafswm', expandChildItems: 'Ehangu eitemau plentyn ar gyfer', + collapseChildItems: 'Cuddio eitemau plant ar gyfer', openContextNode: 'Agor nod cyd-destun ar gyfer', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts index 999d49a32418..c24156743829 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts @@ -2349,6 +2349,7 @@ export default { maxAmount: 'Maximum antal', contextDialogDescription: 'Perform action %0% on the %1% node', expandChildItems: 'Udvid underordnede elementer for', + collapseChildItems: 'Skjul underordnede elementer for', openContextNode: 'Åbn kontekstnode for', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index 1c06cc6307cd..2dbcf0e46992 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -2407,6 +2407,7 @@ export default { searchContentTree: 'Search content tree', maxAmount: 'Maximum amount', expandChildItems: 'Expand child items for', + collapseChildItems: 'Collapse child items for', openContextNode: 'Open context node for', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/fr.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/fr.ts index f612acf93f5a..9833f1ed30df 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/fr.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/fr.ts @@ -1872,6 +1872,7 @@ export default { searchContentTree: "Chercher dans l'arborescence de contenu", maxAmount: 'Quantité maximum', expandChildItems: 'Afficher les éléments enfant pour', + collapseChildItems: 'Cacher les éléments enfant pour', openContextNode: 'Ouvrir le noeud de contexte pour', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/pt.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/pt.ts index 7f702cd4a91f..e47684b64863 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/pt.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/pt.ts @@ -2406,6 +2406,7 @@ export default { searchContentTree: 'Pesquisar Árvore de Conteúdo', maxAmount: 'Quantidade máxima', expandChildItems: 'Expandir itens filhos para', + collapseChildItems: 'Fechar itens filhos para', openContextNode: 'Abrir nó de contexto para', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/sv.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/sv.ts index 95ff3be2869e..8564b0afc33e 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/sv.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/sv.ts @@ -317,6 +317,7 @@ export default { searchContentTree: 'Sök i innehållsträdet', maxAmount: 'Maximalt värde', expandChildItems: 'Visa underliggande noder för', + collapseChildItems: 'Dölj underliggande noder för', openContextNode: 'Öppna kontext för', }, prompt: { diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/vi.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/vi.ts index a5e256b7d1a3..1fd88fb5d653 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/vi.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/vi.ts @@ -2409,6 +2409,7 @@ export default { searchContentTree: 'Tìm kiếm cây nội dung', maxAmount: 'Số lượng tối đa', expandChildItems: 'Mở rộng các mục con cho', + collapseChildItems: 'Thu gọn các mục con cho', openContextNode: 'Mở nút ngữ cảnh cho %0%', }, references: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts index b325590d1ffa..aaced243ab24 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts @@ -136,7 +136,7 @@ export abstract class UmbTreeItemElementBase< .loading=${this._isLoading} .hasChildren=${this._hasChildren} .showChildren=${this._isOpen} - .caretLabel=${this.localize.term('visuallyHiddenTexts_expandChildItems') + ' ' + this._label} + .caretLabel=${this._isOpen ? this.localize.term('visuallyHiddenTexts_collapseChildItems') + ' ' + this._label: this.localize.term('visuallyHiddenTexts_expandChildItems') + ' ' + this._label} label=${this._label} href="${ifDefined(this._isSelectableContext ? undefined : this._href)}"> ${this.renderIconContainer()} ${this.renderLabel()} ${this.#renderActions()} ${this.#renderChildItems()}