From bccffe54b8563f840e19f6701ca42a79e4ff4c57 Mon Sep 17 00:00:00 2001 From: TeodorTaushanov Date: Tue, 14 Nov 2023 17:09:08 +0200 Subject: [PATCH] refactor(ui5-tree): remove unnecessary code (#7804) * refactor(ui5-tree): remove unnecessary code * refactor(ui5-tree): fix comment * refactor(ui5-tree): remove unnecessary parameters --- packages/main/src/Tree.ts | 22 +--------- packages/main/src/TreeItem.ts | 2 +- packages/main/src/TreeItemBase.hbs | 13 +----- packages/main/src/TreeItemBase.ts | 42 ++----------------- packages/main/src/themes/ListItemBase.css | 9 ++-- packages/main/src/themes/TreeItem.css | 37 ---------------- .../themes/base/ListItemBase-parameters.css | 3 -- .../src/themes/base/TreeItem-parameters.css | 4 -- .../themes/sap_fiori_3/parameters-bundle.css | 1 - .../sap_fiori_3_dark/parameters-bundle.css | 1 - .../sap_fiori_3_hcb/parameters-bundle.css | 1 - .../sap_fiori_3_hcw/parameters-bundle.css | 1 - .../sap_horizon/TreeItem-parameters.css | 6 --- .../themes/sap_horizon/parameters-bundle.css | 1 - .../sap_horizon_dark/TreeItem-parameters.css | 6 --- .../sap_horizon_dark/parameters-bundle.css | 1 - .../TreeItem-parameters.css | 6 --- .../parameters-bundle.css | 1 - .../sap_horizon_exp/TreeItem-parameters.css | 6 --- .../sap_horizon_exp/parameters-bundle.css | 1 - .../sap_horizon_hcb/TreeItem-parameters.css | 6 --- .../sap_horizon_hcb/parameters-bundle.css | 1 - .../TreeItem-parameters.css | 6 --- .../sap_horizon_hcb_exp/parameters-bundle.css | 1 - .../sap_horizon_hcw/TreeItem-parameters.css | 6 --- .../sap_horizon_hcw/parameters-bundle.css | 1 - .../TreeItem-parameters.css | 6 --- .../sap_horizon_hcw_exp/parameters-bundle.css | 1 - 28 files changed, 10 insertions(+), 182 deletions(-) delete mode 100644 packages/main/src/themes/base/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_dark/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_dark_exp/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_exp/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_hcb/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_hcb_exp/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_hcw/TreeItem-parameters.css delete mode 100644 packages/main/src/themes/sap_horizon_hcw_exp/TreeItem-parameters.css diff --git a/packages/main/src/Tree.ts b/packages/main/src/Tree.ts index 8b948a061a7f..842ebd0b7868 100644 --- a/packages/main/src/Tree.ts +++ b/packages/main/src/Tree.ts @@ -276,24 +276,6 @@ class Tree extends UI5Element { @property({ defaultValue: undefined, noAttribute: true }) accessibleRoleDescription?: string; - /** - * Shows the toggle button at the end, rather than at the beginning of the items - * - * @protected - * @since 1.0.0-rc.8 - */ - @property({ type: Boolean }) - _toggleButtonEnd!: boolean; - - /** - * Represents the tree in a very minimal state - icons only with no text and no toggle buttons - * - * @protected - * @since 1.0.0-rc.8 - */ - @property({ type: Boolean }) - _minimal!: boolean; - /** * Defines the items of the component. Tree items may have other tree items as children. *

@@ -336,7 +318,7 @@ class Tree extends UI5Element { } get _role() { - return this._minimal ? "menubar" : "tree"; + return "tree"; } get _label() { @@ -429,8 +411,6 @@ class Tree extends UI5Element { item.setAttribute("level", level.toString()); - item._toggleButtonEnd = this._toggleButtonEnd; - item._minimal = this._minimal; item._setsize = ariaSetSize; item._posinset = index + 1; }); diff --git a/packages/main/src/TreeItem.ts b/packages/main/src/TreeItem.ts index 2ae26ae4b5c1..ce123ea0729b 100644 --- a/packages/main/src/TreeItem.ts +++ b/packages/main/src/TreeItem.ts @@ -81,7 +81,7 @@ class TreeItem extends TreeItemBase { additionalTextState!: `${ValueState}`; get _showTitle() { - return this.text.length && !this._minimal; + return this.text.length; } } diff --git a/packages/main/src/TreeItemBase.hbs b/packages/main/src/TreeItemBase.hbs index 2cf49ca9f39f..cfaf020a6b6d 100644 --- a/packages/main/src/TreeItemBase.hbs +++ b/packages/main/src/TreeItemBase.hbs @@ -9,7 +9,7 @@ class="ui5-li-tree-toggle-box" style="{{styles.preContent}}" > - {{#if _showToggleButtonBeginning}} + {{#if showToggleButton}} - {{/if}} -{{/inline}} - {{#*inline "listItemPostContent"}} {{#if expanded}}