@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/p13n/panels/GroupPanel.js

@@ -17,7 +17,7 @@ sap.ui.define([
      * @extends sap.ui.mdc.p13n.panels.QueryPanel
      *
      * @author SAP SE
-     * @version 1.93.3
+     * @version 1.96.1
      *
      * @private
      * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/panels/GroupView.js

@@ -34,10 +34,9 @@ sap.ui.define([
 	 *
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
-	 * @class
+	 * @class The GroupView is a list based view to personalize selection and filter values of a Control that allows certain filter capabilities.
 	 * @extends sap.ui.mdc.p13n.panels.BasePanel
 	 * @author SAP SE
-	 * @constructor The GroupView is a list based view to personalize selection and filter values of a Control that allows certain filter capabilities.
 	 * @private
 	 * @experimental
 	 * @since 1.85
@@ -145,14 +144,6 @@ sap.ui.define([
 	GroupView.prototype._createGroupListTemplate = function() {
 		var oList = new List({
 			keyboardMode: ListKeyboardMode.Navigation,
-			updateStarted: function() {
-				this._removeFactoryControl();
-			}.bind(this),
-			updateFinished: function(oEvt) {
-				if (this.getShowFactory() && this._aInitializedLists.indexOf(oEvt.getSource().getId()) > -1) {
-					this._addFactoryControl(oEvt.getSource());
-				}
-			}.bind(this),
 			selectionChange: function(oBindingInfo) {
 				var sPath = oBindingInfo.getParameter("listItem").getBindingContext(this.P13N_MODEL).sPath;
 				var oItem = this.getP13nModel().getProperty(sPath);
@@ -346,6 +337,8 @@ sap.ui.define([
 			return;
 		}
 
+		var aInitializedGroups = this._removeFactoryControl();
+
 		this._oListControl.getItems().forEach(function(oOuterItem){
 			var oPanel = oOuterItem.getContent()[0];
 			var oInnerList = oPanel.getContent()[0];
@@ -355,6 +348,9 @@ sap.ui.define([
 				this._togglePanelVisibility(oPanel);
 			}
 
+			if (this.getShowFactory() && aInitializedGroups.indexOf(oInnerList.getId()) > -1) {
+				this._addFactoryControl(oInnerList);
+			}
 		}.bind(this));
 
 		this._aCurrentFilters = aFilter;
@@ -418,7 +414,7 @@ sap.ui.define([
 			){
 				this._bInitialized = true;
 				var oFirstList = this._oListControl.getItems()[0].getContent()[0].getContent()[0];
-				this._addFactoryControl(oFirstList); //TODO: remove this call
+				this._addFactoryControl(oFirstList);
 				this._addInitializedList(oFirstList);
 			}
 	};

package/src/sap/ui/mdc/p13n/panels/ListView.js

@@ -35,10 +35,9 @@ sap.ui.define([
 	 *
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
-	 * @class
+	 * @class The ListView is a list based view to personalize selection and ordering of a Control aggregation.
 	 * @extends sap.ui.mdc.p13n.panels.BasePanel
 	 * @author SAP SE
-	 * @constructor The ListView is a list based view to personalize selection and ordering of a Control aggregation.
 	 * @private
 	 * @experimental
 	 * @since 1.85
@@ -245,8 +244,11 @@ sap.ui.define([
     };
 
     ListView.prototype._removeFactoryControl = function() {
+        var aItems = this._oListControl.getItems().filter(function(oItem) {
+            return !oItem._bGroupHeader;
+        });
 
-        this._oListControl.getItems().forEach(function(oItem){
+        aItems.forEach(function(oItem){
             var oFirstCell = oItem.getCells()[0];
             if (oFirstCell.getItems().length > 1){
                 oFirstCell.removeItem(oFirstCell.getItems()[1]);

package/src/sap/ui/mdc/p13n/panels/QueryPanel.js

@@ -18,7 +18,7 @@ sap.ui.define([
      * @extends sap.ui.mdc.p13n.panels.BasePanel
      *
      * @author SAP SE
-     * @version 1.93.3
+     * @version 1.96.1
      *
      * @private
      * @ui5-restricted sap.ui.mdc
@@ -119,6 +119,7 @@ sap.ui.define([
         aItems.forEach(function (oNonPresent, iIndex) {
             aAvailableItems.push(new Item({
                 key: oNonPresent.name,
+                tooltip: oNonPresent.tooltip,
                 text: oNonPresent.label,
                 enabled: {
                     path: this.P13N_MODEL + ">/items/" + iIndex + "/" + this._getPresenceAttribute(),
@@ -208,14 +209,16 @@ sap.ui.define([
 
     QueryPanel.prototype._handleActivated = function(oHoveredItem) {
         var oQueryRow = oHoveredItem.getContent()[0];
-        var iItemLength = oQueryRow.getContent().length - 1;
-        var oButtonBox = oHoveredItem.getContent()[0].getContent()[iItemLength];
-
-        //Only add the buttons if 1) an hovered item is provided 2) the buttons are not already there
-        if (oHoveredItem && oButtonBox.getItems().length < 2) {
-            oButtonBox.insertItem(this._getMoveUpButton(), 0);
-            oButtonBox.insertItem(this._getMoveDownButton(), 1);
-            this._updateEnableOfMoveButtons(oHoveredItem, false);
+        if (oQueryRow) {
+            var iItemLength = oQueryRow.getContent().length - 1;
+            var oButtonBox = oHoveredItem.getContent()[0].getContent()[iItemLength];
+
+            //Only add the buttons if 1) an hovered item is provided 2) the buttons are not already there
+            if (oHoveredItem && oButtonBox.getItems().length < 2) {
+                oButtonBox.insertItem(this._getMoveUpButton(), 0);
+                oButtonBox.insertItem(this._getMoveDownButton(), 1);
+                this._updateEnableOfMoveButtons(oHoveredItem, false);
+            }
         }
     };
 
@@ -277,6 +280,10 @@ sap.ui.define([
                         this._updatePresence(oRow.getContent()[0].getContent()[0]._key, false);
                         if (this._oListControl.getItems().length === 0) {
                             this._addQueryRow();
+                        } else {
+                            //In case an item has been removed, focus the Select control of the new 'none' row
+                            var iLastIndex = this._oListControl.getItems().length - 1;
+                            this._oListControl.getItems()[iLastIndex].getContent()[0].getContent()[0].focus();
                         }
                     }.bind(this)
                 })

package/src/sap/ui/mdc/p13n/panels/SelectionPanel.js

@@ -18,7 +18,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.mdc.p13n.panels.BasePanel
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.66

package/src/sap/ui/mdc/p13n/panels/SortPanel.js

@@ -18,7 +18,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.mdc.p13n.panels.BasePanel
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.66

package/src/sap/ui/mdc/p13n/panels/SortQueryPanel.js

@@ -19,7 +19,7 @@ sap.ui.define([
      * @extends sap.ui.mdc.p13n.panels.QueryPanel
      *
      * @author SAP SE
-     * @version 1.93.3
+     * @version 1.96.1
      *
      * @private
      * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/panels/Wrapper.js

@@ -34,7 +34,7 @@ sap.ui.define([
      * @extends sap.ui.mdc.ui.Container
      *
      * @author SAP SE
-     * @version 1.93.3
+     * @version 1.96.1
      *
      * @private
      * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/subcontroller/ActionToolbarController.js

@@ -0,0 +1,89 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"./BaseController",
+    "sap/ui/mdc/p13n/panels/ActionToolbarPanel",
+    "sap/m/Column",
+    "sap/ui/mdc/p13n/P13nBuilder"
+], function (BaseController, ActionToolbarPanel, Column, P13nBuilder) {
+    "use strict";
+
+    var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+    var ActionToolbarController = BaseController.extend("saps.ui.mdc.p13n.subcontroller.ActionToolbarController");
+
+    ActionToolbarController.prototype.getUISettings = function() {
+        return {
+            title: oResourceBundle.getText("actiontoolbar.RTA_TITLE")
+        };
+    };
+
+    ActionToolbarController.prototype.getAdaptationUI = function(oPropertyHelper){
+
+        var oSelectionPanel = new ActionToolbarPanel({
+            showHeader: true
+        });
+        oSelectionPanel.setEnableReorder(false);
+        oSelectionPanel.setPanelColumns([oResourceBundle.getText("actiontoolbar.RTA_COLUMN_HEADER"), new Column({
+            width: "25%",
+            hAlign: "Center",
+            vAlign: "Middle"
+        })]);
+        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
+        oSelectionPanel.setP13nModel(oAdaptationModel);
+
+        return Promise.resolve(oSelectionPanel);
+    };
+
+    ActionToolbarController.prototype.getDelta = function(mPropertyBag) {
+        var aChanges = BaseController.prototype.getDelta.apply(this, arguments);
+        aChanges.forEach(function(oChange){
+            var sChangeType = oChange.changeSpecificData.changeType;
+            if (sChangeType === "hideControl" || sChangeType === "unhideControl") {
+                oChange.selectorElement = sap.ui.getCore().byId(oChange.changeSpecificData.content.name);
+                delete oChange.changeSpecificData.content;
+            }
+        });
+        return aChanges;
+    };
+
+    /**
+     * Initialized the inner model for the Personalization.
+     *
+     * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The propertyhelper that should be utilized for property determination.
+     */
+     ActionToolbarController.prototype.mixInfoAndState = function(oPropertyHelper) {
+        var aItemState = this.getCurrentState();
+        var mItemState = P13nBuilder.arrayToMap(aItemState);
+
+        var oP13nData = P13nBuilder.prepareAdaptationData(oPropertyHelper, function(mItem, oProperty){
+            var oExisting = mItemState[oProperty.name];
+            mItem.visible = !!oExisting;
+            mItem.position = oExisting ? oExisting.position : -1;
+            mItem.alignment = oProperty.alignment;
+            return oProperty.visible;
+        });
+
+        P13nBuilder.sortP13nData({
+            visible: "visible",
+            position: "position"
+        }, oP13nData.items);
+
+        oP13nData.items.forEach(function(oItem){delete oItem.position;});
+        return oP13nData;
+    };
+
+    ActionToolbarController.prototype.getChangeOperations = function() {
+        return {
+            add: "unhideControl",
+            remove: "hideControl",
+            move: "moveAction"
+        };
+    };
+
+	return ActionToolbarController;
+
+});

package/src/sap/ui/mdc/p13n/subcontroller/BaseController.js

@@ -11,7 +11,7 @@ sap.ui.define([
     'sap/base/util/merge',
     'sap/base/util/deepEqual',
     'sap/ui/model/json/JSONModel',
-    'sap/ui/mdc/p13n/panels/SelectionPanel'
+    'sap/m/p13n/SelectionPanel'
 ], function (BaseObject, FlexUtil, P13nBuilder, merge, deepEqual, JSONModel, SelectionPanel) {
 	"use strict";
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -106,8 +106,8 @@ sap.ui.define([
     BaseController.prototype.getAdaptationUI = function(oPropertyHelper){
 
         var oSelectionPanel = new SelectionPanel();
-        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-        oSelectionPanel.setP13nModel(oAdaptationModel);
+        var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+        oSelectionPanel.setP13nData(oAdaptationData.items);
         this._oPanel = oSelectionPanel;
         return Promise.resolve(oSelectionPanel);
     };
@@ -184,7 +184,7 @@ sap.ui.define([
      *
      */
     BaseController.prototype.getP13nData = function() {
-        return this._oPanel ? this._oPanel.getP13nState() : this._oAdaptationModel.getProperty("/items");
+        return this._oPanel ? this._oPanel.getP13nData() : this._oAdaptationModel.getProperty("/items");
     };
 
     BaseController.prototype.model2State = false;
@@ -193,7 +193,10 @@ sap.ui.define([
      * Can be used to trigger update after UI interactions such as "Ok" and "Reset"
      */
     BaseController.prototype.update = function(oPropertyHelper) {
-        if (this._oAdaptationModel) {
+        if (this._oPanel) {
+            var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+            this._oPanel.setP13nData(oAdaptationData.items);
+        } else if (this._oAdaptationModel){
             //'setData' causes unnecessary rerendering in some cases
             var oP13nData = this.mixInfoAndState(oPropertyHelper);
             this._oAdaptationModel.setProperty("/items", oP13nData.items);

package/src/sap/ui/mdc/p13n/subcontroller/ChartItemController.js

@@ -7,8 +7,9 @@
 sap.ui.define([
     "./BaseController",
     "sap/ui/mdc/p13n/P13nBuilder",
+    "sap/base/util/UriParameters",
     "sap/ui/mdc/p13n/panels/ChartItemPanel"
-], function (BaseController, P13nBuilder, ChartItemPanel) {
+], function (BaseController, P13nBuilder, UriParameters, ChartItemPanel) {
     "use strict";
 
     var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
@@ -16,9 +17,37 @@ sap.ui.define([
     var ChartItemController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.ChartItemController");
 
     ChartItemController.prototype.getAdaptationUI = function(oPropertyHelper) {
-        var oChartItemPanel = new ChartItemPanel();
-        oChartItemPanel.setP13nModel(this._getP13nModel(oPropertyHelper));
-        return Promise.resolve(oChartItemPanel);
+
+        if (UriParameters.fromQuery(window.location.search).get("newChartP13n") === "true"){
+
+            var fnResolve;
+
+            this._oAdaptationControl.getAdaptationUI().then(function(oPanel){
+                this._oPanel = oPanel;
+                this._oPropHelper = oPropertyHelper;
+                var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+                oPanel.setP13nData(oAdaptationData.items);
+                fnResolve(oPanel);
+            }.bind(this));
+
+            return new Promise(function (resolve, reject) {
+                fnResolve = resolve;
+            });
+
+        } else {
+            var oChartItemPanel = new ChartItemPanel();
+            oChartItemPanel.setP13nModel(this._getP13nModel(oPropertyHelper));
+            return Promise.resolve(oChartItemPanel);
+        }
+
+    };
+
+    ChartItemController.prototype.update = function(){
+        BaseController.prototype.update.apply(this, arguments);
+
+        if (UriParameters.fromQuery(window.location.search).get("newChartP13n") === "true"){
+            this._oPanel.setP13nData(this.mixInfoAndState(this._oPropHelper).items);
+        }
     };
 
     ChartItemController.prototype.getDelta = function(mPropertyBag) {

package/src/sap/ui/mdc/p13n/subcontroller/ColumnController.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	"./BaseController", "sap/ui/mdc/p13n/panels/ListView", "sap/ui/mdc/p13n/panels/SelectionPanel", "sap/m/Column"
-], function (BaseController, ListView, SelectionPanel, Column) {
+	"./BaseController", "sap/m/p13n/SelectionPanel"
+], function (BaseController, SelectionPanel) {
     "use strict";
 
     var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
@@ -25,7 +25,7 @@ sap.ui.define([
 
     ColumnController.prototype.model2State = function() {
         var aItems = [];
-        this._oAdaptationModel.getProperty("/items").forEach(function(oItem){
+        this._oPanel.getP13nData(true).forEach(function(oItem){
             if (oItem.visible){
                 aItems.push({
                     name: oItem.name
@@ -37,21 +37,15 @@ sap.ui.define([
 
     ColumnController.prototype.getAdaptationUI = function(oPropertyHelper){
 
-        var oSelectionPanel = new ListView({
+        var oSelectionPanel = new SelectionPanel({
             enableReorder: true,
             showHeader: true,
-            enableCount: true
+            enableCount: true,
+            fieldColumn: oResourceBundle.getText("fieldsui.COLUMNS")
         });
-
-        oSelectionPanel.setPanelColumns([oResourceBundle.getText("fieldsui.COLUMNS"), new Column({
-            width: "25%",
-            hAlign: "Center",
-            vAlign: "Middle"
-        })]);
-
-        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-        oSelectionPanel.setP13nModel(oAdaptationModel);
-
+        var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+        oSelectionPanel.setP13nData(oAdaptationData.items);
+        this._oPanel = oSelectionPanel;
         return Promise.resolve(oSelectionPanel);
     };
 

package/src/sap/ui/mdc/p13n/subcontroller/FilterController.js

@@ -111,6 +111,18 @@ sap.ui.define([
         return FlexUtil.getConditionDeltaChanges(mPropertyBag);
     };
 
+    FilterController.prototype.model2State = function() {
+        var oItems = {},
+            oFilter = this.getCurrentState();
+        this._oAdaptationModel.getProperty("/items").forEach(function(oItem) {
+            if (oItem.isFiltered && Object.keys(oFilter).includes(oItem.name)) {
+                oItems[oItem.name] = oFilter[oItem.name];
+            }
+        });
+
+        return oItems;
+    };
+
     FilterController.prototype.mixInfoAndState = function(oPropertyHelper) {
 
         var mExistingFilters = this.getCurrentState() || {};

package/src/sap/ui/mdc/p13n/subcontroller/GroupController.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    './BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/base/util/merge', 'sap/ui/mdc/p13n/panels/GroupPanel', 'sap/ui/mdc/p13n/panels/SelectionPanel'
-], function (BaseController, P13nBuilder, merge, GroupPanel, SelectionPanel) {
+    './BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/m/p13n/GroupPanel'
+], function (BaseController, P13nBuilder, GroupPanel) {
     "use strict";
 
     var GroupController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.GroupController");
@@ -26,18 +26,16 @@ sap.ui.define([
     };
 
     GroupController.prototype.getAdaptationUI = function(oPropertyHelper){
-
         var oGroupPanel = new GroupPanel();
+        var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+        oGroupPanel.setP13nData(oAdaptationData.items);
         this._oPanel = oGroupPanel;
-        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-        oGroupPanel.setP13nModel(oAdaptationModel);
-
         return Promise.resolve(oGroupPanel);
     };
 
     GroupController.prototype.model2State = function() {
         var aItems = [];
-        this._oAdaptationModel.getProperty("/items").forEach(function(oItem){
+        this._oPanel.getP13nData(true).forEach(function(oItem){
             if (oItem.grouped){
                 aItems.push({
                     name: oItem.name
@@ -59,11 +57,6 @@ sap.ui.define([
         return "grouped";
     };
 
-    GroupController.prototype.update = function(){
-        BaseController.prototype.update.apply(this, arguments);
-        this._oPanel.setP13nModel(this._oAdaptationModel);
-    };
-
     GroupController.prototype.mixInfoAndState = function(oPropertyHelper) {
 
         var aItemState = this.getCurrentState();

package/src/sap/ui/mdc/p13n/subcontroller/SortController.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	'./BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/ui/mdc/p13n/panels/SortPanel', 'sap/ui/mdc/p13n/panels/SortQueryPanel'
-], function (BaseController, P13nBuilder, SortPanel, SortQueryPanel) {
+	'./BaseController', 'sap/ui/mdc/p13n/P13nBuilder', 'sap/ui/mdc/p13n/panels/SortPanel', 'sap/m/p13n/SortPanel'
+], function (BaseController, P13nBuilder, SortPanelOld, SortPanel) {
 	"use strict";
 
     var SortController = BaseController.extend("sap.ui.mdc.p13n.subcontroller.SortController");
@@ -38,33 +38,31 @@ sap.ui.define([
 
         //TODO: remove this condition once 'ChartNew' migration has been merged
         if (oAdaptationControl.isA("sap.ui.mdc.Chart") && !oAdaptationControl._bNewP13n) {
-            oSortPanel = new SortPanel();
+            oSortPanel = new SortPanelOld();
+            var oAdaptationModel = this._getP13nModel(oPropertyHelper);
+            oSortPanel.setP13nModel(oAdaptationModel);
         } else {
-            oSortPanel = new SortQueryPanel();
+            oSortPanel = new SortPanel();
+            var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+            oSortPanel.setP13nData(oAdaptationData.items);
+            this._oPanel = oSortPanel;
         }
 
-        this._oPanel = oSortPanel;
-        var oAdaptationModel = this._getP13nModel(oPropertyHelper);
-        oSortPanel.setP13nModel(oAdaptationModel);
-
         return Promise.resolve(oSortPanel);
     };
 
-    SortController.prototype.update = function(){
-        BaseController.prototype.update.apply(this, arguments);
-        this._oPanel.setP13nModel(this._oAdaptationModel);
-    };
-
     SortController.prototype.model2State = function() {
         var aItems = [];
-        this._oAdaptationModel.getProperty("/items").forEach(function(oItem){
-            if (oItem.sorted){
-                aItems.push({
-                    name: oItem.name
-                });
-            }
-        });
-        return aItems;
+        if (this._oPanel) {
+            this._oPanel.getP13nData(true).forEach(function(oItem){
+                if (oItem.sorted){
+                    aItems.push({
+                        name: oItem.name
+                    });
+                }
+            });
+            return aItems;
+        }
     };
 
     SortController.prototype.getChangeOperations = function() {

package/src/sap/ui/mdc/table/Column.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Element", "sap/m/Label", "sap/ui/core/Core", "sap/base/Log"
-], function(Element, Label, Core, Log) {
+	"sap/ui/core/Element", "sap/m/Label", "sap/ui/core/Core"
+], function(Element, Label, Core) {
 	"use strict";
 
 	/**
@@ -19,7 +19,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.58
@@ -66,6 +65,7 @@ sap.ui.define([
 				/*
 				 * Only used during creation of table for initial/1st rendering, 0 based index
 				 */
+				// TODO: Delete!
 				initialIndex: {
 					type: "int",
 					defaultValue: -1
@@ -140,7 +140,7 @@ sap.ui.define([
 	Column.prototype.setHeader = function(sHeader) {
 		this.setProperty("header", sHeader, true);
 		this._updateColumnHeaderControl();
-		var oLabelElement = document.getElementById(this.getId());
+		var oLabelElement = this.getDomRef();
 		if (oLabelElement) {
 			oLabelElement.textContent = this.getHeader();
 		}
@@ -155,18 +155,43 @@ sap.ui.define([
 	};
 
 	/**
-	 * Updates the column header control based on the current column property seetings.
+	 * Updates the width of the column based on the auto column width calculation.
+	 * @private
+	 */
+	Column.prototype._updateColumnWidth = function(sWidth) {
+		var oInnerColumn = Core.byId(this.getId() + "-innerColumn");
+		if (!oInnerColumn || !this.getWidth()) {
+			this.setProperty("width", sWidth);
+		}
+
+		// set the inner column width only if there is no user(flex) changes has been applied
+		if (oInnerColumn && !oInnerColumn.getWidth()) {
+			oInnerColumn.setWidth(sWidth);
+		}
+	};
+
+	/**
+	 * Updates the column header control based on the current column property settings.
 	 * @private
 	 */
 	Column.prototype._updateColumnHeaderControl = function() {
 		if (this._oColumnHeaderLabel) {
 			this._oColumnHeaderLabel.setWidth(this.getHeaderVisible() ? null : "0px");
-			this._oColumnHeaderLabel.setWrapping(this._bMobileTable && this.getHeaderVisible());
+			this._oColumnHeaderLabel.setWrapping(this._bMobileTable && !this._bResizable && this.getHeaderVisible());
 			this._oColumnHeaderLabel.setText(this.getHeader());
 			this._oColumnHeaderLabel.setTextAlign(this.getHAlign());
 		}
 	};
 
+	/**
+	 * Updates the resizable state of the column.
+	 * @private
+	 */
+	Column.prototype.updateColumnResizing = function(bEnabled) {
+		this._bResizable = !!bEnabled;
+		this._updateColumnHeaderControl();
+	};
+
 	Column.prototype.setParent = function(oParent) {
 		var oPrevParent = this.getParent();
 		Element.prototype.setParent.apply(this, arguments);
@@ -192,10 +217,11 @@ sap.ui.define([
 	 * Creates and returns the column header control.
 	 * If <code>headerVisible=false</code> then, <code>width=0px</code> is applied to the sap.m.Label control for accessibility purpose.
 	 * @param {boolean} bMobileTable - indicates the type of the table
+	 * @param {boolean} bResizing - indicates whether the column is resizable
 	 * @returns {object} column header control
 	 * @private
 	 */
-	Column.prototype.getColumnHeaderControl = function(bMobileTable) {
+	Column.prototype.getColumnHeaderControl = function(bMobileTable, bResizing) {
 		if (this._oColumnHeaderLabel) {
 			this._oColumnHeaderLabel.destroy();
 		}
@@ -205,13 +231,13 @@ sap.ui.define([
 		});
 		this._bMobileTable = bMobileTable;
 
-		this._updateColumnHeaderControl();
+		this.updateColumnResizing(bResizing);
 
 		return this._oColumnHeaderLabel;
 	};
 
 	Column.prototype._removeAriaStaticDom = function() {
-		var oDomElement = document.getElementById(this.getId());
+		var oDomElement = this.getDomRef();
 
 		if (oDomElement) {
 			oDomElement.parentNode.removeChild(oDomElement);

package/src/sap/ui/mdc/table/CreationRow.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *        is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @constructor
 	 * @private
 	 * @experimental