@ui5/webcomponents-fiori 1.1.0 → 1.2.0

package/dist/ViewSettingsDialog.js

@@ -8,6 +8,7 @@ import Label from "@ui5/webcomponents/dist/Label.js";
 import GroupHeaderListItem from "@ui5/webcomponents/dist/GroupHeaderListItem.js";
 import List from "@ui5/webcomponents/dist/List.js";
 import StandardListItem from "@ui5/webcomponents/dist/StandardListItem.js";
+import Title from "@ui5/webcomponents/dist/Title.js";
 import SegmentedButton from "@ui5/webcomponents/dist/SegmentedButton.js";
 import SegmentedButtonItem from "@ui5/webcomponents/dist/SegmentedButtonItem.js";
 import Bar from "./Bar.js";
@@ -146,12 +147,17 @@ const metadata = {
 		 * @event sap.ui.webcomponents.fiori.ViewSettingsDialog#confirm
 		 * @param {String} sortOrder The current sort order selected.
 		 * @param {String} sortBy The currently selected <code>ui5-sort-item</code> text attribute.
+		 * @param {HTMLElement} sortByItem The currently selected <code>ui5-sort-item</code>.
+		 * @param {Boolean} sortDescending The selected sort order (true = descending, false = ascending).
+		 * @param {Array} filterItems The selected filters items.
 		 * @public
 		 */
 		confirm: {
 			detail: {
 				sortOrder: { type: String },
 				sortBy: { type: String },
+				sortByItem: { type: HTMLElement },
+				sortDescending: { type: Boolean },
 				filters: { type: Array },
 			},
 		},
@@ -162,12 +168,17 @@ const metadata = {
 		 * @event sap.ui.webcomponents.fiori.ViewSettingsDialog#cancel
 		 * @param {String} sortOrder The current sort order selected.
 		 * @param {String} sortBy The currently selected <code>ui5-sort-item</code> text attribute.
+		 * @param {HTMLElement} sortByItem The currently selected <code>ui5-sort-item</code>.
+		 * @param {Boolean} sortDescending The selected sort order (true = descending, false = ascending).
+		 * @param {Array} filterItems The selected filters items.
 		 * @public
 		 */
 		cancel: {
 			detail: {
 				sortOrder: { type: String },
 				sortBy: { type: String },
+				sortByItem: { type: HTMLElement },
+				sortDescending: { type: Boolean },
 				filters: { type: Array },
 			},
 		},
@@ -251,6 +262,7 @@ class ViewSettingsDialog extends UI5Element {
 		return [
 			Bar,
 			Button,
+			Title,
 			Dialog,
 			Label,
 			List,
@@ -400,10 +412,12 @@ class ViewSettingsDialog extends UI5Element {
 	}
 
 	get initSortByItems() {
-		return this.sortItems.map(item => {
+		return this.sortItems.map((item, index) => {
 			return {
 				text: item.text,
 				selected: item.selected,
+				associatedItem: item,
+				index,
 			};
 		});
 	}
@@ -412,11 +426,11 @@ class ViewSettingsDialog extends UI5Element {
 		return [
 			{
 				text: this._ascendingLabel,
-				selected: true,
+				selected: !this.sortDescending,
 			},
 			{
 				text: this._descendingLabel,
-				selected: false,
+				selected: this.sortDescending,
 			},
 		];
 	}
@@ -548,11 +562,16 @@ class ViewSettingsDialog extends UI5Element {
 		const _currentSortOrderSelected = this._currentSettings.sortOrder.filter(item => item.selected)[0],
 			_currentSortBySelected = this._currentSettings.sortBy.filter(item => item.selected)[0],
 			sortOrder = _currentSortOrderSelected && _currentSortOrderSelected.text,
-			sortBy = _currentSortBySelected && _currentSortBySelected.text;
-
+			sortDescending = !this._currentSettings.sortOrder[0].selected,
+			sortBy = _currentSortBySelected && _currentSortBySelected.text,
+			sortByElementIndex = _currentSortBySelected && _currentSortBySelected.index,
+			initSortIByItem = this.initSortByItems.find((item, index) => index === sortByElementIndex),
+			sortByItem = initSortIByItem && initSortIByItem.associatedItem;
 		return {
 			sortOrder,
+			sortDescending,
 			sortBy,
+			sortByItem,
 			filters: this.selectedFilters,
 		};
 	}
@@ -628,12 +647,12 @@ class ViewSettingsDialog extends UI5Element {
 	 * Stores <code>Sort By</code> list as recently used control and its selected item in current state.
 	 */
 	 _onSortByChange(event) {
+		const selectedItemIndex = Number(event.detail.item.getAttribute("data-ui5-external-action-item-index"));
 		this._recentlyFocused = this._sortBy;
-		this._currentSettings.sortBy = this.initSortByItems.map(item => {
-			item.selected = item.text === event.detail.item.innerText;
+		this._currentSettings.sortBy = this.initSortByItems.map((item, index) => {
+			item.selected = index === selectedItemIndex;
 			return item;
 		});
-
 		// Invalidate
 		this._currentSettings = JSON.parse(JSON.stringify(this._currentSettings));
 	}

package/dist/Wizard.js

@@ -126,7 +126,7 @@ const metadata = {
 		 * @event sap.ui.webcomponents.fiori.Wizard#step-change
 		 * @param {HTMLElement} step The new step.
 		 * @param {HTMLElement} previousStep The previous step.
-		 * @param {Boolean} changeWithClick The step change occurs due to user's click or 'Enter'/'Space' key press on step within the navigation.
+		 * @param {boolean} changeWithClick The step change occurs due to user's click or 'Enter'/'Space' key press on step within the navigation.
 		 * @public
 		 */
 		"step-change": {
@@ -985,7 +985,7 @@ class Wizard extends UI5Element {
 	 * @param {HTMLElement} selectedStep the old step
 	 * @param {HTMLElement} stepToSelect the step to be selected
 	 * @param {Integer} stepToSelectIndex the index of the newly selected step
-	 * @param {Boolean} changeWithClick the selection changed due to user click in the step navigation
+	 * @param {boolean} changeWithClick the selection changed due to user click in the step navigation
 	 * @private
 	 */
 	switchSelectionFromOldToNewStep(selectedStep, stepToSelect, stepToSelectIndex, changeWithClick) {

package/dist/WizardStep.js

@@ -12,7 +12,7 @@ const metadata = {
 		 *
 		 * <b>Note:</b> The text is displayed in the <code>ui5-wizard</code> navigation header.
 		 *
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
 		 * @since 1.0.0-rc.15
@@ -27,7 +27,7 @@ const metadata = {
 		 *
 		 * <b>Note:</b> the text is displayed in the <code>ui5-wizard</code> navigation header.
 		 *
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
 		 * @since 1.0.0-rc.15
@@ -45,7 +45,7 @@ const metadata = {
 		 *
 		 * The SAP-icons font provides numerous options.
 		 * See all the available icons in the <ui5-link target="_blank" href="https://openui5.hana.ondemand.com/test-resources/sap/m/demokit/iconExplorer/webapp/index.html" class="api-table-content-cell-link">Icon Explorer</ui5-link>.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @public
 		 */

package/dist/WizardTab.js

@@ -11,7 +11,7 @@ const metadata = {
 	properties: /** @lends sap.ui.webcomponents.fiori.WizardTab.prototype */ {
 		/**
 		 * Defines the <code>icon</code> of the step.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @private
 		 */
@@ -21,7 +21,7 @@ const metadata = {
 
 		/**
 		 * Defines the <code>titleText</code> of the step.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @private
 		 * @since 1.0.0-rc.15
@@ -32,7 +32,7 @@ const metadata = {
 
 		/**
 		 * Defines the <code>subtitleText</code> of the step.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @private
 		 * @since 1.0.0-rc.15
@@ -43,7 +43,7 @@ const metadata = {
 
 		/**
 		 * Defines the number that will be displayed in place of the <code>icon</code>, when it's missing.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue ""
 		 * @private
 		 */
@@ -105,7 +105,7 @@ const metadata = {
 
 		/**
 		 * Defines the tabindex of the step.
-		 * @type {String}
+		 * @type {string}
 		 * @defaultvalue -1
 		 * @private
 		 */