From 7e512f21da86ca0f236d6a6cd7d4a41e6bbc35d0 Mon Sep 17 00:00:00 2001 From: Jens Pflueger Date: Fri, 8 Nov 2024 14:36:00 +0100 Subject: [PATCH] [INTERNAL] Tables: Support Indication09 and Indication10 for row highlighting Jira: CPOUIFTEAMB-2427 Fixes: https://github.com/SAP/openui5/issues/4119 Change-Id: Iea16b501d4cd0a6915c49899dd76099577caf7e7 --- src/sap.m/src/sap/m/ListItemBase.js | 3 ++- src/sap.m/src/sap/m/themes/base/ListItemBase.less | 8 ++++++++ src/sap.m/test/sap/m/qunit/ListBase.qunit.js | 2 +- src/sap.ui.mdc/src/sap/ui/mdc/table/RowSettings.js | 3 ++- src/sap.ui.table/src/sap/ui/table/RowSettings.js | 3 ++- .../src/sap/ui/table/themes/base/RowHighlight.less | 10 ++++++++++ .../test/sap/ui/table/qunit/RowSettings.qunit.js | 14 +++++++++++++- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/sap.m/src/sap/m/ListItemBase.js b/src/sap.m/src/sap/m/ListItemBase.js index 8b818fcb3332..51406594922c 100644 --- a/src/sap.m/src/sap/m/ListItemBase.js +++ b/src/sap.m/src/sap/m/ListItemBase.js @@ -113,7 +113,8 @@ function( * Defines the highlight state of the list items. * * Valid values for the highlight property are values of the enumerations {@link sap.ui.core.MessageType} or - * {@link sap.ui.core.IndicationColor}. + * {@link sap.ui.core.IndicationColor} (only values of Indication01 to Indication10 are supported + * for accessibility contrast reasons). * * Accessibility support is provided through the associated {@link sap.m.ListItemBase#setHighlightText highlightText} property. * If the highlight property is set to a value of {@link sap.ui.core.MessageType}, the highlightText diff --git a/src/sap.m/src/sap/m/themes/base/ListItemBase.less b/src/sap.m/src/sap/m/themes/base/ListItemBase.less index 6379d3683f60..c70a14af96a4 100644 --- a/src/sap.m/src/sap/m/themes/base/ListItemBase.less +++ b/src/sap.m/src/sap/m/themes/base/ListItemBase.less @@ -156,6 +156,14 @@ background: var(--sapIndicationColor_8); } +.sapMLIBHighlightIndication09 { + background: var(--sapIndicationColor_9); +} + +.sapMLIBHighlightIndication10 { + background: var(--sapIndicationColor_10); +} + :not(.sapMListModeDelete) > .sapMLIB.sapMLIBTypeNavigation { padding-right: 0; } diff --git a/src/sap.m/test/sap/m/qunit/ListBase.qunit.js b/src/sap.m/test/sap/m/qunit/ListBase.qunit.js index 672a14608d3b..7485351c068c 100644 --- a/src/sap.m/test/sap/m/qunit/ListBase.qunit.js +++ b/src/sap.m/test/sap/m/qunit/ListBase.qunit.js @@ -2572,7 +2572,7 @@ sap.ui.define([ assert.ok(oLI.getDomRef().firstChild.classList.contains("sapMLIBHighlight" + sHighlight), sHighlight + " Highlight is rendered"); }; - const aHighlightColors = ["Error", "Warning", "Success", "Information", "Indication01", "Indication02", "Indication03", "Indication04", "Indication05"]; + const aHighlightColors = ["Error", "Warning", "Success", "Information", "Indication01", "Indication02", "Indication03", "Indication04", "Indication05", "Indication06", "Indication07", "Indication08", "Indication09", "Indication10"]; for (let i = 0; i < aHighlightColors.length; i++) { await fnTestHighlight(aHighlightColors[i]); } diff --git a/src/sap.ui.mdc/src/sap/ui/mdc/table/RowSettings.js b/src/sap.ui.mdc/src/sap/ui/mdc/table/RowSettings.js index 0ade9bdbd72f..412c968b2eb3 100644 --- a/src/sap.ui.mdc/src/sap/ui/mdc/table/RowSettings.js +++ b/src/sap.ui.mdc/src/sap/ui/mdc/table/RowSettings.js @@ -35,7 +35,8 @@ sap.ui.define([ * * If the highlight is set to {@link sap.ui.core.MessageType sap.ui.core.MessageType.None} (default), no highlights are visible. * Valid values for the highlight property are values of the enumerations {@link sap.ui.core.MessageType} or - * {@link sap.ui.core.IndicationColor}. + * {@link sap.ui.core.IndicationColor} (only values of Indication01 to Indication10 are supported + * for accessibility contrast reasons). * * Accessibility support is provided with the {@link sap.ui.mdc.table.RowSettings#setHighlightText highlightText} property. * If the highlight property is set to a value of {@link sap.ui.core.MessageType}, the highlightText diff --git a/src/sap.ui.table/src/sap/ui/table/RowSettings.js b/src/sap.ui.table/src/sap/ui/table/RowSettings.js index 9d1ae458a219..69f4b108c9a6 100644 --- a/src/sap.ui.table/src/sap/ui/table/RowSettings.js +++ b/src/sap.ui.table/src/sap/ui/table/RowSettings.js @@ -42,7 +42,8 @@ sap.ui.define([ * * If the highlight is set to {@link sap.ui.core.MessageType sap.ui.core.MessageType.None} (default), no highlights are visible. * Valid values for the highlight property are values of the enumerations {@link sap.ui.core.MessageType} or - * {@link sap.ui.core.IndicationColor}. + * {@link sap.ui.core.IndicationColor} (only values of Indication01 to Indication10 are supported + * for accessibility contrast reasons). * * Accessibility support is provided through the associated {@link sap.ui.table.RowSettings#setHighlightText highlightText} property. * If the highlight property is set to a value of {@link sap.ui.core.MessageType}, the highlightText diff --git a/src/sap.ui.table/src/sap/ui/table/themes/base/RowHighlight.less b/src/sap.ui.table/src/sap/ui/table/themes/base/RowHighlight.less index 43aa2cabd264..9be2e5f17fad 100644 --- a/src/sap.ui.table/src/sap/ui/table/themes/base/RowHighlight.less +++ b/src/sap.ui.table/src/sap/ui/table/themes/base/RowHighlight.less @@ -15,6 +15,8 @@ @_sap_ui_table_RowHighlight_Indication06Color: @sapUiIndication6; @_sap_ui_table_RowHighlight_Indication07Color: @sapUiIndication7; @_sap_ui_table_RowHighlight_Indication08Color: @sapUiIndication8; +@_sap_ui_table_RowHighlight_Indication09Color: @sapUiIndication9; +@_sap_ui_table_RowHighlight_Indication10Color: @sapUiIndication10; .sapUiTableRowHighlight { height: 100%; @@ -77,4 +79,12 @@ &.sapUiTableRowHighlightIndication08 { background-color: @_sap_ui_table_RowHighlight_Indication08Color; } + + &.sapUiTableRowHighlightIndication09 { + background-color: @_sap_ui_table_RowHighlight_Indication09Color; + } + + &.sapUiTableRowHighlightIndication10 { + background-color: @_sap_ui_table_RowHighlight_Indication10Color; + } } \ No newline at end of file diff --git a/src/sap.ui.table/test/sap/ui/table/qunit/RowSettings.qunit.js b/src/sap.ui.table/test/sap/ui/table/qunit/RowSettings.qunit.js index a0cefabc536f..a13e0bcf76bc 100644 --- a/src/sap.ui.table/test/sap/ui/table/qunit/RowSettings.qunit.js +++ b/src/sap.ui.table/test/sap/ui/table/qunit/RowSettings.qunit.js @@ -43,7 +43,9 @@ sap.ui.define([ {highlight: IndicationColor.Indication05}, {highlight: IndicationColor.Indication06}, {highlight: IndicationColor.Indication07}, - {highlight: IndicationColor.Indication08} + {highlight: IndicationColor.Indication08}, + {highlight: IndicationColor.Indication09}, + {highlight: IndicationColor.Indication10} ]), columns: TableQUnitUtils.createTextColumn(), rowMode: new FixedRowMode({ @@ -161,6 +163,12 @@ sap.ui.define([ case IndicationColor.Indication08: sRGBBackgroundColor = this.getColorRgb("sapUiIndication8"); break; + case IndicationColor.Indication09: + sRGBBackgroundColor = this.getColorRgb("sapUiIndication9"); + break; + case IndicationColor.Indication10: + sRGBBackgroundColor = this.getColorRgb("sapUiIndication10"); + break; default: sRGBBackgroundColor = "transparent"; // transparent } @@ -316,6 +324,10 @@ sap.ui.define([ sCSSClassName += "Indication07"; } else if (iRowIndex === 12) { sCSSClassName += "Indication08"; + } else if (iRowIndex === 13) { + sCSSClassName += "Indication09"; + } else if (iRowIndex === 14) { + sCSSClassName += "Indication10"; } assert.strictEqual(oRowSettings._getHighlightCSSClassName(), sCSSClassName,