From 4e3dbd42f49cda52a35b935d3740423df66088e7 Mon Sep 17 00:00:00 2001 From: Filip Siderov Date: Mon, 17 May 2021 12:07:52 +0300 Subject: [PATCH 1/4] fix(list items): rename info & infoState properties --- packages/fiori/test/pages/FCL.html | 26 +++++----- packages/fiori/test/pages/ShellBar.html | 28 +++++----- .../samples/FlexibleColumnLayout.sample.html | 26 +++++----- packages/main/src/InputPopover.hbs | 4 +- packages/main/src/StandardListItem.hbs | 8 +-- packages/main/src/StandardListItem.js | 14 ++--- packages/main/src/SuggestionItem.js | 10 ++-- packages/main/src/Tree.hbs | 4 +- packages/main/src/TreeItem.js | 12 ++--- packages/main/src/TreeListItem.js | 14 ++--- .../main/src/features/InputSuggestions.js | 4 +- packages/main/src/themes/ListItem.css | 12 ++--- packages/main/src/themes/TreeListItem.css | 12 ++--- packages/main/test/pages/Carousel.html | 10 ++-- packages/main/test/pages/Input.html | 4 +- packages/main/test/pages/Input_quickview.html | 12 ++--- packages/main/test/pages/List.html | 38 +++++++------- .../main/test/pages/ListGrowing_Button.html | 14 ++--- .../main/test/pages/ListGrowing_Scroll.html | 38 +++++++------- packages/main/test/pages/Popover.html | 6 +-- packages/main/test/pages/Tree.html | 8 +-- packages/main/test/samples/Input.sample.html | 8 +-- packages/main/test/samples/List.sample.html | 52 +++++++++---------- 23 files changed, 183 insertions(+), 181 deletions(-) diff --git a/packages/fiori/test/pages/FCL.html b/packages/fiori/test/pages/FCL.html index 1035520c50174..a01753f333870 100644 --- a/packages/fiori/test/pages/FCL.html +++ b/packages/fiori/test/pages/FCL.html @@ -526,26 +526,26 @@

- 10 inch Portable DVD + 10 inch Portable DVD - 7 inch Widescreen + 7 inch Widescreen Portable DVD Player w MP3 - Astro Laptop 1516 + Astro Laptop 1516 - Astro Phone 6 - Audio/Video Cable Kit - 4m + Astro Phone 6 + Audio/Video Cable Kit - 4m - Beam Breaker B-1 - Beam Breaker B-2 - Beam Breaker B-3 - Beam Breaker B-4 + Beam Breaker B-1 + Beam Breaker B-2 + Beam Breaker B-3 + Beam Breaker B-4 - Camcorder View - Benda Laptop 1408 + Camcorder View + Benda Laptop 1408 - Cepat Tablet 10.5 + Cepat Tablet 10.5 - Gladiator MX + Gladiator MX diff --git a/packages/fiori/test/pages/ShellBar.html b/packages/fiori/test/pages/ShellBar.html index d6d2aa4276371..a56ab072f8479 100644 --- a/packages/fiori/test/pages/ShellBar.html +++ b/packages/fiori/test/pages/ShellBar.html @@ -189,20 +189,20 @@

ShellBar in Compact

Instructions
- 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 diff --git a/packages/fiori/test/samples/FlexibleColumnLayout.sample.html b/packages/fiori/test/samples/FlexibleColumnLayout.sample.html index e5b000b2cb887..212809ab1d4c9 100644 --- a/packages/fiori/test/samples/FlexibleColumnLayout.sample.html +++ b/packages/fiori/test/samples/FlexibleColumnLayout.sample.html @@ -61,19 +61,19 @@

FlexibleColumnLayout - One Initial Column



- 10 inch Portable DVD - 7 inch WidescreenPortable DVD Player w MP3 - Astro Laptop 1516 - Astro Phone 6 - Audio/Video Cable Kit - 4m - Beam Breaker B-1 - Beam Breaker B-2 - Beam Breaker B-3 - Beam Breaker B-4 - Camcorder View - Benda Laptop 1408 - Cepat Tablet 10.5 - Gladiator MX + 10 inch Portable DVD + 7 inch WidescreenPortable DVD Player w MP3 + Astro Laptop 1516 + Astro Phone 6 + Audio/Video Cable Kit - 4m + Beam Breaker B-1 + Beam Breaker B-2 + Beam Breaker B-3 + Beam Breaker B-4 + Camcorder View + Benda Laptop 1408 + Cepat Tablet 10.5 + Gladiator MX diff --git a/packages/main/src/InputPopover.hbs b/packages/main/src/InputPopover.hbs index 2605baa251c23..9a69939b58b9e 100644 --- a/packages/main/src/InputPopover.hbs +++ b/packages/main/src/InputPopover.hbs @@ -98,9 +98,9 @@ diff --git a/packages/main/src/StandardListItem.hbs b/packages/main/src/StandardListItem.hbs index 5ec825d124ca7..76976080a9d0d 100644 --- a/packages/main/src/StandardListItem.hbs +++ b/packages/main/src/StandardListItem.hbs @@ -7,8 +7,8 @@
{{description}} - {{#if info}} - {{info}} + {{#if additionalText}} + {{additionalText}} {{/if}}
{{/if}} @@ -17,8 +17,8 @@ {{/unless}} {{#unless description}} - {{#if info}} - {{info}} + {{#if additionalText}} + {{additionalText}} {{/if}} {{/unless}} {{/inline}} diff --git a/packages/main/src/StandardListItem.js b/packages/main/src/StandardListItem.js index a40576a1949ec..a1b504042e6c6 100644 --- a/packages/main/src/StandardListItem.js +++ b/packages/main/src/StandardListItem.js @@ -62,25 +62,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the list item. + * Defines the additionalText, displayed in the end of the list item. * @type {string} * @public - * @since 0.13.0 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 0.13.0 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, @@ -126,7 +126,7 @@ const metadata = { * * diff --git a/packages/main/src/SuggestionItem.js b/packages/main/src/SuggestionItem.js index 012f3e1dd2a72..9c11631d8a070 100644 --- a/packages/main/src/SuggestionItem.js +++ b/packages/main/src/SuggestionItem.js @@ -89,23 +89,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the item. + * Defines the additionalText, displayed in the end of the item. * @type {string} + * @since 1.0.0-rc.15 * @public */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *

* Available options are: "None" (by default), "Success", "Warning" and "Erorr". * @type {ValueState} * @defaultvalue "None" + * @since 1.0.0-rc.15 * @public */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, diff --git a/packages/main/src/Tree.hbs b/packages/main/src/Tree.hbs index b8076eca7da50..3fbfcf5fb8368 100644 --- a/packages/main/src/Tree.hbs +++ b/packages/main/src/Tree.hbs @@ -15,8 +15,8 @@ type="Active" level="{{this.level}}" icon="{{this.treeItem.icon}}" - info="{{this.treeItem.info}}" - info-state="{{this.treeItem.infoState}}" + additional-text="{{this.treeItem.additionalText}}" + additional-text-state="{{this.treeItem.additionalTextState}}" ?_toggle-button-end="{{ ../_toggleButtonEnd}}" ?_minimal="{{../_minimal}}" .treeItem="{{this.treeItem}}" diff --git a/packages/main/src/TreeItem.js b/packages/main/src/TreeItem.js index 99d9be6c9a55d..b50fd7d4ac8f2 100644 --- a/packages/main/src/TreeItem.js +++ b/packages/main/src/TreeItem.js @@ -69,25 +69,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the tree item. + * Defines the additionalText, displayed in the end of the tree item. * @type {string} * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, diff --git a/packages/main/src/TreeListItem.js b/packages/main/src/TreeListItem.js index a12a076349160..309d07b12a2d1 100644 --- a/packages/main/src/TreeListItem.js +++ b/packages/main/src/TreeListItem.js @@ -73,25 +73,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the tree item. + * Defines the additionalText, displayed in the end of the tree item. * @type {string} * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, @@ -207,7 +207,7 @@ const metadata = { * The ui5-li-tree exposes the following CSS Shadow Parts: * * diff --git a/packages/main/src/features/InputSuggestions.js b/packages/main/src/features/InputSuggestions.js index 2ccb98d376d93..a9bd909a620a0 100644 --- a/packages/main/src/features/InputSuggestions.js +++ b/packages/main/src/features/InputSuggestions.js @@ -64,8 +64,8 @@ class Suggestions { image: suggestion.image || undefined, icon: suggestion.icon || undefined, type: suggestion.type || undefined, - info: suggestion.info || undefined, - infoState: suggestion.infoState, + additionalText: suggestion.additionalText || undefined, + additionalTextState: suggestion.additionalTextState, group: suggestion.group, key: idx, }); diff --git a/packages/main/src/themes/ListItem.css b/packages/main/src/themes/ListItem.css index 322bb25236204..ea03fd37d40a7 100644 --- a/packages/main/src/themes/ListItem.css +++ b/packages/main/src/themes/ListItem.css @@ -32,27 +32,27 @@ color: var(--sapList_Active_TextColor); } -/* [ui5-li]: title, description, info state */ +/* [ui5-li]: title, description, additionalTextState */ :host([active][actionable]) .ui5-li-title, :host([active][actionable]) .ui5-li-desc, :host([active][actionable]) .ui5-li-info { color: var(--sapList_Active_TextColor); } -/* [ui5-li]: infoState */ -:host([info-state="Warning"]) .ui5-li-info { +/* [ui5-li]: additionalTextState */ +:host([additional-text-state="Warning"]) .ui5-li-info { color: var(--sapCriticalTextColor); } -:host([info-state="Success"]) .ui5-li-info { +:host([additional-text-state="Success"]) .ui5-li-info { color: var(--sapPositiveTextColor); } -:host([info-state="Error"]) .ui5-li-info { +:host([additional-text-state="Error"]) .ui5-li-info { color: var(--sapNegativeTextColor); } -:host([info-state="Information"]) .ui5-li-info { +:host([additional-text-state="Information"]) .ui5-li-info { color: var(--sapInformativeTextColor); } diff --git a/packages/main/src/themes/TreeListItem.css b/packages/main/src/themes/TreeListItem.css index a1457b0870fb7..72f83b0671284 100644 --- a/packages/main/src/themes/TreeListItem.css +++ b/packages/main/src/themes/TreeListItem.css @@ -89,24 +89,24 @@ color: var(--sapList_Active_TextColor); } -/* [ui5-li]: infoState */ -:host([info-state="Warning"]) .ui5-li-tree-info { +/* [ui5-li]: additionalTextState */ +:host([additional-text-state="Warning"]) .ui5-li-tree-info { color: var(--sapCriticalTextColor); } -:host([info-state="Success"]) .ui5-li-tree-info { +:host([additional-text-state="Success"]) .ui5-li-tree-info { color: var(--sapPositiveTextColor); } -:host([info-state="Error"]) .ui5-li-tree-info { +:host([additional-text-state="Error"]) .ui5-li-tree-info { color: var(--sapNegativeTextColor); } -:host([info-state="Information"]) .ui5-li-tree-info { +:host([additional-text-state="Information"]) .ui5-li-tree-info { color: var(--sapInformativeTextColor); } -/* [ui5-li]: info */ +/* [ui5-li]: additionalText */ .ui5-li-tree-info { margin: 0 0.25rem; color: var(--sapNeutralTextColor); diff --git a/packages/main/test/pages/Carousel.html b/packages/main/test/pages/Carousel.html index d54814c7657fb..8b128abee3670 100644 --- a/packages/main/test/pages/Carousel.html +++ b/packages/main/test/pages/Carousel.html @@ -332,15 +332,15 @@ New Items - Voluptate do eu cupidatat + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Laptop Lenovo + IPhone 3 diff --git a/packages/main/test/pages/Input.html b/packages/main/test/pages/Input.html index a3772f2801133..0ac1006221cc9 100644 --- a/packages/main/test/pages/Input.html +++ b/packages/main/test/pages/Input.html @@ -393,9 +393,9 @@

Test Backspace

var suggestion = document.createElement("ui5-suggestion-item"); suggestion.id = item.key; suggestion.icon = "world"; - suggestion.info = "explore"; + suggestion.additionalText = "explore"; suggestion.group = item.text.length === 1; - suggestion.infoState = "Success"; + suggestion.additionalTextState = "Success"; suggestion.description = "travel the world"; suggestion.text = item.text input.appendChild(suggestion); diff --git a/packages/main/test/pages/Input_quickview.html b/packages/main/test/pages/Input_quickview.html index 65cb93376da1e..0b19b804d1457 100644 --- a/packages/main/test/pages/Input_quickview.html +++ b/packages/main/test/pages/Input_quickview.html @@ -44,9 +44,9 @@

Quick View sample

Audit Log Settings OData API Audit Products - Laptop Lenovo - IPhone 3 - HP Monitor 24 + Laptop Lenovo + IPhone 3 + HP Monitor 24 @@ -88,9 +88,9 @@

Test Quick View sample

Audit Log Settings OData API Audit Products - Laptop Lenovo - IPhone 3 - HP Monitor 24 + Laptop Lenovo + IPhone 3 + HP Monitor 24 diff --git a/packages/main/test/pages/List.html b/packages/main/test/pages/List.html index c972199ea203c..e6925eeeeac42 100644 --- a/packages/main/test/pages/List.html +++ b/packages/main/test/pages/List.html @@ -20,14 +20,14 @@ New Items - Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. + Laptop Lenovo + IPhone 3 Discounted Items - HP Monitor 24 - Audio cabel - DVD set + HP Monitor 24 + Audio cabel + DVD set Discounted Items HP Monitor 24 @@ -41,14 +41,14 @@

ui5-list

New Items - Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. + Laptop Lenovo + IPhone 3 Discounted Items - HP Monitor 24 - Audio cabel - DVD set + HP Monitor 24 + Audio cabel + DVD set Discounted Items HP Monitor 24 @@ -240,16 +240,16 @@

Items 3/3

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.