@openui5/sap.f 1.139.0 → 1.141.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/THIRDPARTY.txt +2 -2
- package/package.json +4 -4
- package/src/sap/f/.library +1 -1
- package/src/sap/f/Avatar.js +1 -1
- package/src/sap/f/AvatarGroup.js +1 -1
- package/src/sap/f/AvatarGroupItem.js +1 -1
- package/src/sap/f/CalendarAppointmentInCard.js +1 -1
- package/src/sap/f/CalendarInCard.js +1 -1
- package/src/sap/f/Card.js +1 -1
- package/src/sap/f/CardBase.js +14 -2
- package/src/sap/f/CardRenderer.js +16 -4
- package/src/sap/f/DynamicPage.js +22 -6
- package/src/sap/f/DynamicPageAccessibleLandmarkInfo.js +1 -1
- package/src/sap/f/DynamicPageHeader.js +1 -1
- package/src/sap/f/DynamicPageTitle.js +1 -1
- package/src/sap/f/FlexibleColumnLayout.js +6 -5
- package/src/sap/f/FlexibleColumnLayoutAccessibleLandmarkInfo.js +1 -1
- package/src/sap/f/FlexibleColumnLayoutData.js +1 -1
- package/src/sap/f/FlexibleColumnLayoutDataForDesktop.js +1 -1
- package/src/sap/f/FlexibleColumnLayoutDataForTablet.js +1 -1
- package/src/sap/f/FlexibleColumnLayoutSemanticHelper.js +1 -1
- package/src/sap/f/GridContainer.js +1 -1
- package/src/sap/f/GridContainerItemLayoutData.js +1 -1
- package/src/sap/f/GridContainerSettings.js +2 -2
- package/src/sap/f/GridList.js +1 -1
- package/src/sap/f/GridListItem.js +1 -1
- package/src/sap/f/IllustratedMessage.js +1 -1
- package/src/sap/f/Illustration.js +1 -1
- package/src/sap/f/PlanningCalendarInCardLegend.js +1 -1
- package/src/sap/f/ProductSwitch.js +1 -1
- package/src/sap/f/ProductSwitchItem.js +43 -1
- package/src/sap/f/ProductSwitchItemRenderer.js +12 -8
- package/src/sap/f/SearchManager.js +1 -1
- package/src/sap/f/ShellBar.js +1 -1
- package/src/sap/f/SidePanel.js +1 -1
- package/src/sap/f/SidePanelItem.js +1 -1
- package/src/sap/f/cards/BaseHeader.js +16 -23
- package/src/sap/f/cards/BaseHeaderRenderer.js +116 -46
- package/src/sap/f/cards/Header.js +61 -13
- package/src/sap/f/cards/NumericHeader.js +4 -2
- package/src/sap/f/cards/NumericHeaderRenderer.js +35 -13
- package/src/sap/f/cards/NumericIndicators.js +1 -1
- package/src/sap/f/cards/NumericSideIndicator.js +1 -1
- package/src/sap/f/cards/loading/AnalyticalPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/CalendarPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/GenericPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/ListPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/ObjectPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/PlaceholderBase.js +1 -1
- package/src/sap/f/cards/loading/TablePlaceholder.js +1 -1
- package/src/sap/f/cards/loading/TimelinePlaceholder.js +1 -1
- package/src/sap/f/changeHandler/MoveDynamicPageTitleActions.js +1 -1
- package/src/sap/f/delegate/GridContainerItemNavigation.js +1 -1
- package/src/sap/f/delegate/GridItemNavigation.js +1 -1
- package/src/sap/f/dnd/GridDragOver.js +1 -1
- package/src/sap/f/dnd/GridDropInfo.js +1 -1
- package/src/sap/f/library.js +3 -3
- package/src/sap/f/messagebundle_da.properties +2 -2
- package/src/sap/f/messagebundle_pt.properties +1 -1
- package/src/sap/f/routing/Router.js +20 -15
- package/src/sap/f/semantic/AddAction.js +1 -1
- package/src/sap/f/semantic/CloseAction.js +1 -1
- package/src/sap/f/semantic/CopyAction.js +1 -1
- package/src/sap/f/semantic/DeleteAction.js +1 -1
- package/src/sap/f/semantic/DiscussInJamAction.js +1 -1
- package/src/sap/f/semantic/EditAction.js +1 -1
- package/src/sap/f/semantic/ExitFullScreenAction.js +1 -1
- package/src/sap/f/semantic/FavoriteAction.js +1 -1
- package/src/sap/f/semantic/FlagAction.js +1 -1
- package/src/sap/f/semantic/FooterMainAction.js +1 -1
- package/src/sap/f/semantic/FullScreenAction.js +1 -1
- package/src/sap/f/semantic/MainAction.js +1 -1
- package/src/sap/f/semantic/MessagesIndicator.js +1 -1
- package/src/sap/f/semantic/NegativeAction.js +1 -1
- package/src/sap/f/semantic/PositiveAction.js +1 -1
- package/src/sap/f/semantic/PrintAction.js +1 -1
- package/src/sap/f/semantic/SemanticButton.js +1 -1
- package/src/sap/f/semantic/SemanticConfiguration.js +1 -1
- package/src/sap/f/semantic/SemanticControl.js +1 -1
- package/src/sap/f/semantic/SemanticPage.js +1 -1
- package/src/sap/f/semantic/SemanticToggleButton.js +1 -1
- package/src/sap/f/semantic/SendEmailAction.js +1 -1
- package/src/sap/f/semantic/SendMessageAction.js +1 -1
- package/src/sap/f/semantic/ShareInJamAction.js +1 -1
- package/src/sap/f/semantic/TitleMainAction.js +1 -1
- package/src/sap/f/shellBar/AdditionalContentSupport.js +1 -1
- package/src/sap/f/shellBar/CoPilot.js +1 -1
- package/src/sap/f/shellBar/ControlSpacer.js +1 -1
- package/src/sap/f/shellBar/Search.js +1 -1
- package/src/sap/f/themes/base/Card.less +9 -5
- package/src/sap/f/themes/base/CardHeaders.less +92 -19
package/THIRDPARTY.txt
CHANGED
|
@@ -379,7 +379,7 @@ License: MIT
|
|
|
379
379
|
License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
|
|
380
380
|
Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
|
|
381
381
|
|
|
382
|
-
Component: Markdown-it, version:
|
|
382
|
+
Component: Markdown-it, version: 14.1.0
|
|
383
383
|
Copyright: 2014 Vitaly Puzrin, Alex Kocharin
|
|
384
384
|
License: MIT
|
|
385
385
|
License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
|
|
@@ -444,7 +444,7 @@ License: Apache-2.0
|
|
|
444
444
|
License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
|
|
445
445
|
Contained in: lib/jsdoc/ui5/plugin.js
|
|
446
446
|
|
|
447
|
-
Component: SAP Theming Base Content, version: 11.
|
|
447
|
+
Component: SAP Theming Base Content, version: 11.32.2-20250827135846+79bb30d311678435d61b21db26ecbe07d6b05079
|
|
448
448
|
Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
|
|
449
449
|
License: Apache-2.0
|
|
450
450
|
License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.f",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.141.0",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.f",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"url": "https://github.com/UI5/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.m": "1.
|
|
18
|
-
"@openui5/sap.ui.core": "1.
|
|
19
|
-
"@openui5/sap.ui.layout": "1.
|
|
17
|
+
"@openui5/sap.m": "1.141.0",
|
|
18
|
+
"@openui5/sap.ui.core": "1.141.0",
|
|
19
|
+
"@openui5/sap.ui.layout": "1.141.0"
|
|
20
20
|
}
|
|
21
21
|
}
|
package/src/sap/f/.library
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2025 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.141.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with Fiori controls.</documentation>
|
|
12
12
|
|
package/src/sap/f/Avatar.js
CHANGED
package/src/sap/f/AvatarGroup.js
CHANGED
package/src/sap/f/Card.js
CHANGED
package/src/sap/f/CardBase.js
CHANGED
|
@@ -41,7 +41,7 @@ sap.ui.define([
|
|
|
41
41
|
* @extends sap.ui.core.Control
|
|
42
42
|
*
|
|
43
43
|
* @author SAP SE
|
|
44
|
-
* @version 1.
|
|
44
|
+
* @version 1.141.0
|
|
45
45
|
*
|
|
46
46
|
* @constructor
|
|
47
47
|
* @public
|
|
@@ -310,11 +310,23 @@ sap.ui.define([
|
|
|
310
310
|
return this._ariaText.getId();
|
|
311
311
|
};
|
|
312
312
|
|
|
313
|
+
/**
|
|
314
|
+
* @private
|
|
315
|
+
* @ui5-restricted sap.f
|
|
316
|
+
* @returns {boolean} hook to determine if the card is a tile variant
|
|
317
|
+
*/
|
|
318
|
+
CardBase.prototype.isTileDisplayVariant = function () {
|
|
319
|
+
return false;
|
|
320
|
+
};
|
|
321
|
+
|
|
313
322
|
CardBase.prototype._getAriaDescribedByIds = function () {
|
|
314
323
|
const bHasCardBadgeCustomData = this._getCardBadgeCustomData().length > 0;
|
|
315
324
|
const aIds = [];
|
|
316
325
|
|
|
317
|
-
|
|
326
|
+
|
|
327
|
+
if (!this.isTileDisplayVariant()) {
|
|
328
|
+
aIds.push(this._describedByCardTypeText.getId());
|
|
329
|
+
}
|
|
318
330
|
|
|
319
331
|
if (this.isInteractive() && this.isRoleListItem()) {
|
|
320
332
|
aIds.push(this._describedByInteractiveText.getId());
|
|
@@ -33,7 +33,10 @@ sap.ui.define([
|
|
|
33
33
|
CardRenderer.render = function (oRm, oCard) {
|
|
34
34
|
var oHeader = oCard._getHeaderAggregation(),
|
|
35
35
|
bHeaderTop = oHeader && oCard.getCardHeaderPosition() === HeaderPosition.Top,
|
|
36
|
-
bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0
|
|
36
|
+
bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0,
|
|
37
|
+
oContent = oCard.getCardContent(),
|
|
38
|
+
bHasContent = !!oContent,
|
|
39
|
+
bIsInteractive = oCard.isInteractive();
|
|
37
40
|
|
|
38
41
|
oRm.openStart("div", oCard);
|
|
39
42
|
this.renderContainerAttributes(oRm, oCard);
|
|
@@ -60,10 +63,19 @@ sap.ui.define([
|
|
|
60
63
|
this.renderFooterSection(oRm, oCard);
|
|
61
64
|
|
|
62
65
|
oRm.renderControl(oCard._ariaText);
|
|
63
|
-
oRm.renderControl(oCard._ariaContentText);
|
|
64
66
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
+
if (bHasContent) {
|
|
68
|
+
oRm.renderControl(oCard._ariaContentText);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (!oCard.isTileDisplayVariant()) {
|
|
72
|
+
oRm.renderControl(oCard._describedByCardTypeText);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
if (bIsInteractive) {
|
|
76
|
+
oRm.renderControl(oCard._describedByInteractiveText);
|
|
77
|
+
}
|
|
78
|
+
|
|
67
79
|
if (oCard._invisibleTitle) {
|
|
68
80
|
oRm.renderControl(oCard._invisibleTitle);
|
|
69
81
|
}
|
package/src/sap/f/DynamicPage.js
CHANGED
|
@@ -118,7 +118,7 @@ sap.ui.define([
|
|
|
118
118
|
* @extends sap.ui.core.Control
|
|
119
119
|
*
|
|
120
120
|
* @author SAP SE
|
|
121
|
-
* @version 1.
|
|
121
|
+
* @version 1.141.0
|
|
122
122
|
*
|
|
123
123
|
* @constructor
|
|
124
124
|
* @public
|
|
@@ -1266,12 +1266,22 @@ sap.ui.define([
|
|
|
1266
1266
|
* @private
|
|
1267
1267
|
*/
|
|
1268
1268
|
DynamicPage.prototype._needsVerticalScrollBar = function () {
|
|
1269
|
+
return this._isContentOverflowingScrollContainer()
|
|
1270
|
+
|| this._isContentOverflowingFullscreenContainer(); // overlap between fullscreen-area and footer-area
|
|
1271
|
+
};
|
|
1272
|
+
|
|
1273
|
+
DynamicPage.prototype._isContentOverflowingScrollContainer = function () {
|
|
1269
1274
|
// treat maxScrollHeight values in the range [0, 1] as 0,
|
|
1270
1275
|
// to cover the known cases where the nested content overflows
|
|
1271
1276
|
// the container with up to 1px because of rounding issues
|
|
1272
1277
|
return Math.floor(this._getMaxScrollPosition()) > 1;
|
|
1273
1278
|
};
|
|
1274
1279
|
|
|
1280
|
+
DynamicPage.prototype._isContentOverflowingFullscreenContainer = function () {
|
|
1281
|
+
return exists(this.$contentFitContainer)
|
|
1282
|
+
&& this.$contentFitContainer[0].scrollHeight > this.$contentFitContainer[0].clientHeight;
|
|
1283
|
+
};
|
|
1284
|
+
|
|
1275
1285
|
/**
|
|
1276
1286
|
* Retrieves the height of the <code>DynamicPage</code> control.
|
|
1277
1287
|
* @returns {number}
|
|
@@ -1903,6 +1913,8 @@ sap.ui.define([
|
|
|
1903
1913
|
this._updateHeaderVisualState(bCurrentHeight !== bOldHeight);
|
|
1904
1914
|
this._adaptScrollPositionOnHeaderChange(bCurrentHeight, bOldHeight);
|
|
1905
1915
|
}
|
|
1916
|
+
|
|
1917
|
+
this._expandHeaderIfNeeded(oEvent);
|
|
1906
1918
|
};
|
|
1907
1919
|
|
|
1908
1920
|
/**
|
|
@@ -1925,20 +1937,24 @@ sap.ui.define([
|
|
|
1925
1937
|
oDynamicPageTitle._onResize(iCurrentWidth);
|
|
1926
1938
|
}
|
|
1927
1939
|
|
|
1928
|
-
|
|
1929
|
-
this._expandHeader(true, false /* bUserInteraction */);
|
|
1930
|
-
this.getHeader().$().removeClass("sapFDynamicPageHeaderHidden");
|
|
1931
|
-
}
|
|
1940
|
+
this._expandHeaderIfNeeded(oEvent);
|
|
1932
1941
|
|
|
1933
1942
|
this._adjustSnap();
|
|
1934
1943
|
this._updateTitlePositioning();
|
|
1935
1944
|
this._updateMedia(iCurrentWidth);
|
|
1936
1945
|
};
|
|
1937
1946
|
|
|
1947
|
+
DynamicPage.prototype._expandHeaderIfNeeded = function (oEvent) {
|
|
1948
|
+
if (this._shouldAutoExpandHeaderOnResize(oEvent)) {
|
|
1949
|
+
this._expandHeader(true, false /* bUserInteraction */);
|
|
1950
|
+
this.getHeader().$().removeClass("sapFDynamicPageHeaderHidden");
|
|
1951
|
+
}
|
|
1952
|
+
};
|
|
1953
|
+
|
|
1938
1954
|
DynamicPage.prototype._shouldAutoExpandHeaderOnResize = function (oResizeEvent) {
|
|
1939
1955
|
var oDynamicPageHeader = this.getHeader(),
|
|
1940
1956
|
bHeaderSnappedByUser = exists(oDynamicPageHeader) && !this.getHeaderExpanded() && this._bIsLastToggleUserInitiated,
|
|
1941
|
-
bPageResized = oResizeEvent.target === this.getDomRef(),
|
|
1957
|
+
bPageResized = oResizeEvent.target === this.getDomRef() || oResizeEvent.target === this.$contentFitContainer?.get(0),
|
|
1942
1958
|
canToggleHeaderOnScroll = this._canSnapHeaderOnScroll.bind(this);
|
|
1943
1959
|
|
|
1944
1960
|
// auto-expand the header if the user had snapped it but
|
|
@@ -108,7 +108,7 @@ sap.ui.define([
|
|
|
108
108
|
*
|
|
109
109
|
* @extends sap.ui.core.Control
|
|
110
110
|
* @author SAP SE
|
|
111
|
-
* @version 1.
|
|
111
|
+
* @version 1.141.0
|
|
112
112
|
*
|
|
113
113
|
* @constructor
|
|
114
114
|
* @public
|
|
@@ -733,7 +733,7 @@ sap.ui.define([
|
|
|
733
733
|
this._boundColumnSeparatorMove = this._onColumnSeparatorMove.bind(this);
|
|
734
734
|
this._boundColumnSeparatorMoveEnd = this._onColumnSeparatorMoveEnd.bind(this);
|
|
735
735
|
this._oLocalStorage = {};
|
|
736
|
-
this.
|
|
736
|
+
this._bInitialColumnsResizeDone = false;
|
|
737
737
|
|
|
738
738
|
this._oBeginColumnWidth = {
|
|
739
739
|
tablet: 0,
|
|
@@ -1002,7 +1002,6 @@ sap.ui.define([
|
|
|
1002
1002
|
this._flushColumnContent("end");
|
|
1003
1003
|
|
|
1004
1004
|
this._fireStateChange(false, false);
|
|
1005
|
-
this._bNeverRendered = false;
|
|
1006
1005
|
};
|
|
1007
1006
|
|
|
1008
1007
|
FlexibleColumnLayout.prototype.setLayoutData = function (oLayoutData) {
|
|
@@ -1427,6 +1426,8 @@ sap.ui.define([
|
|
|
1427
1426
|
} else {
|
|
1428
1427
|
this._updateSeparatorsAriaPositionInfo();
|
|
1429
1428
|
}
|
|
1429
|
+
|
|
1430
|
+
this._bInitialColumnsResizeDone = true;
|
|
1430
1431
|
};
|
|
1431
1432
|
|
|
1432
1433
|
/**
|
|
@@ -2544,8 +2545,8 @@ sap.ui.define([
|
|
|
2544
2545
|
return oColumn.width() !== iNewWidth;
|
|
2545
2546
|
}
|
|
2546
2547
|
|
|
2547
|
-
if (this.
|
|
2548
|
-
return false; // initial
|
|
2548
|
+
if (!this._bInitialColumnsResizeDone || oOptions.autoSize) {
|
|
2549
|
+
return false; // initial columns-resize or autosized
|
|
2549
2550
|
}
|
|
2550
2551
|
|
|
2551
2552
|
return this._getColumnWidth(sColumn) !== iNewWidth;
|
|
@@ -49,7 +49,7 @@ sap.ui.define([
|
|
|
49
49
|
*
|
|
50
50
|
* For more information, see {@link sap.f.FlexibleColumnLayoutSemanticHelper#getCurrentUIState} and {@link sap.f.FlexibleColumnLayoutSemanticHelper#getNextUIState}
|
|
51
51
|
*
|
|
52
|
-
* @version 1.
|
|
52
|
+
* @version 1.141.0
|
|
53
53
|
* @param {sap.f.FlexibleColumnLayout} oFlexibleColumnLayout
|
|
54
54
|
* The <code>sap.f.FlexibleColumnLayout</code> object whose state will be manipulated.
|
|
55
55
|
*
|
|
@@ -58,14 +58,14 @@ sap.ui.define([
|
|
|
58
58
|
* Can be used to define the sizes of columns and rows for different screen sizes, by using the <code>layout</code> aggregations of <code>sap.f.GridContainer</code>.
|
|
59
59
|
*
|
|
60
60
|
* @author SAP SE
|
|
61
|
-
* @version 1.
|
|
61
|
+
* @version 1.141.0
|
|
62
62
|
*
|
|
63
63
|
* @extends sap.ui.base.ManagedObject
|
|
64
64
|
*
|
|
65
65
|
* @see {@link topic:32d4b9c2b981425dbc374d3e9d5d0c2e Grid Controls}
|
|
66
66
|
*
|
|
67
67
|
* @author SAP SE
|
|
68
|
-
* @version 1.
|
|
68
|
+
* @version 1.141.0
|
|
69
69
|
*
|
|
70
70
|
* @since 1.65
|
|
71
71
|
* @public
|
package/src/sap/f/GridList.js
CHANGED
|
@@ -93,7 +93,7 @@ sap.ui.define([
|
|
|
93
93
|
* @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
|
|
94
94
|
*
|
|
95
95
|
* @author SAP SE
|
|
96
|
-
* @version 1.
|
|
96
|
+
* @version 1.141.0
|
|
97
97
|
*
|
|
98
98
|
* @extends sap.m.ListBase
|
|
99
99
|
* @implements sap.ui.layout.cssgrid.IGridConfigurable
|
|
@@ -9,6 +9,10 @@ sap.ui.define([
|
|
|
9
9
|
"sap/ui/core/Control",
|
|
10
10
|
"sap/ui/core/Icon",
|
|
11
11
|
"sap/ui/core/library",
|
|
12
|
+
"sap/m/Avatar",
|
|
13
|
+
"sap/m/AvatarShape",
|
|
14
|
+
"sap/m/AvatarImageFitType",
|
|
15
|
+
"sap/m/AvatarColor",
|
|
12
16
|
"sap/m/Text",
|
|
13
17
|
"sap/ui/events/KeyCodes",
|
|
14
18
|
"sap/f/ProductSwitchItemRenderer"
|
|
@@ -17,6 +21,10 @@ sap.ui.define([
|
|
|
17
21
|
Control,
|
|
18
22
|
Icon,
|
|
19
23
|
library,
|
|
24
|
+
Avatar,
|
|
25
|
+
AvatarShape,
|
|
26
|
+
AvatarImageFitType,
|
|
27
|
+
AvatarColor,
|
|
20
28
|
Text,
|
|
21
29
|
KeyCodes,
|
|
22
30
|
ProductSwitchItemRenderer
|
|
@@ -40,7 +48,7 @@ sap.ui.define([
|
|
|
40
48
|
* @extends sap.ui.core.Control
|
|
41
49
|
*
|
|
42
50
|
* @author SAP SE
|
|
43
|
-
* @version 1.
|
|
51
|
+
* @version 1.141.0
|
|
44
52
|
*
|
|
45
53
|
* @constructor
|
|
46
54
|
* @public
|
|
@@ -56,6 +64,14 @@ sap.ui.define([
|
|
|
56
64
|
* It can be an icon from the SAP icon font.
|
|
57
65
|
*/
|
|
58
66
|
src: { type: "sap.ui.core.URI", defaultValue: null },
|
|
67
|
+
/**
|
|
68
|
+
* Defines the image to be displayed as graphical element within the <code>ProductSwitchItem</code>.
|
|
69
|
+
*
|
|
70
|
+
* <b>Note:</b> This property takes precedence over the <code>src</code> property.
|
|
71
|
+
*
|
|
72
|
+
* @since 1.140
|
|
73
|
+
*/
|
|
74
|
+
imageSrc: { type: "sap.ui.core.URI", defaultValue: null },
|
|
59
75
|
/**
|
|
60
76
|
* Determines the title of the <code>ProductSwitchItem</code>.
|
|
61
77
|
*/
|
|
@@ -81,6 +97,10 @@ sap.ui.define([
|
|
|
81
97
|
target: { type: "string", group: "Behavior", defaultValue: null }
|
|
82
98
|
},
|
|
83
99
|
aggregations: {
|
|
100
|
+
/**
|
|
101
|
+
* Holds the internally created Avatar.
|
|
102
|
+
*/
|
|
103
|
+
_avatar: { type: "sap.m.Avatar", visibility: "hidden", multiple: false },
|
|
84
104
|
/**
|
|
85
105
|
* Holds the internally created Icon.
|
|
86
106
|
*/
|
|
@@ -121,6 +141,28 @@ sap.ui.define([
|
|
|
121
141
|
return this;
|
|
122
142
|
};
|
|
123
143
|
|
|
144
|
+
/**
|
|
145
|
+
* Gets content of aggregation _avatar.
|
|
146
|
+
* @returns {sap.m.Avatar} The avatar aggregation instance.
|
|
147
|
+
* @private
|
|
148
|
+
*/
|
|
149
|
+
ProductSwitchItem.prototype._getAvatar = function () {
|
|
150
|
+
var oAvatar = this.getAggregation("_avatar");
|
|
151
|
+
|
|
152
|
+
if (!oAvatar) {
|
|
153
|
+
oAvatar = new Avatar({
|
|
154
|
+
displayShape: AvatarShape.Square,
|
|
155
|
+
src: this.getImageSrc(),
|
|
156
|
+
imageFitType: AvatarImageFitType.Contain,
|
|
157
|
+
backgroundColor: AvatarColor.Transparent
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
this.setAggregation("_avatar", oAvatar);
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
return oAvatar;
|
|
164
|
+
};
|
|
165
|
+
|
|
124
166
|
/**
|
|
125
167
|
* Gets content of aggregation _icon.
|
|
126
168
|
* @returns {sap.ui.core.Icon}
|
|
@@ -12,16 +12,16 @@ sap.ui.define([],
|
|
|
12
12
|
};
|
|
13
13
|
|
|
14
14
|
ProductSwitchItemRenderer.render = function (oRm, oControl) {
|
|
15
|
-
var
|
|
15
|
+
var oProductSwitch = oControl._getProductSwitch(),
|
|
16
16
|
oAccessibilityState = {
|
|
17
17
|
role: "menuitemradio"
|
|
18
18
|
},
|
|
19
19
|
sTooltip = oControl.getTooltip_AsString();
|
|
20
20
|
|
|
21
|
-
if (
|
|
22
|
-
oAccessibilityState.setsize =
|
|
23
|
-
oAccessibilityState.posinset =
|
|
24
|
-
oAccessibilityState.checked = oControl.getId() ===
|
|
21
|
+
if (oProductSwitch) {
|
|
22
|
+
oAccessibilityState.setsize = oProductSwitch._getItemsCount();
|
|
23
|
+
oAccessibilityState.posinset = oProductSwitch._getItemPosition(oControl);
|
|
24
|
+
oAccessibilityState.checked = oControl.getId() === oProductSwitch.getSelectedItem() ? "true" : "false";
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
oRm.openStart("div", oControl);
|
|
@@ -36,9 +36,13 @@ sap.ui.define([],
|
|
|
36
36
|
oRm.class("sapFPSItemIconPlaceholder");
|
|
37
37
|
oRm.class("sapUiTinyMarginBottom");
|
|
38
38
|
oRm.openEnd();
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
|
|
40
|
+
if (oControl.getImageSrc()) {
|
|
41
|
+
oRm.renderControl(oControl._getAvatar());
|
|
42
|
+
} else if (oControl.getSrc()) {
|
|
43
|
+
oRm.renderControl(oControl._getIcon());
|
|
44
|
+
}
|
|
45
|
+
|
|
42
46
|
oRm.close("span");
|
|
43
47
|
oRm.openStart("div");
|
|
44
48
|
oRm.class("sapFPSItemTextSection");
|
package/src/sap/f/ShellBar.js
CHANGED
package/src/sap/f/SidePanel.js
CHANGED