@openui5/sap.ui.core 1.107.1 → 1.108.1

package/src/sap/ui/model/TreeBinding.js

@@ -118,6 +118,24 @@ sap.ui.define(['./Binding', './Filter', './Sorter'],
 		return this.getNodeContexts(oContext).length;
 	};
 
+	/**
+	 * Returns the count of entries in the tree, or <code>undefined</code> if it is unknown. If the
+	 * tree is filtered, the count of all entries matching the filter conditions is returned. The
+	 * entries required only for the tree structure are not counted.
+	 *
+	 * <b>Note:</b> The default implementation returns <code>undefined</code> and has to be
+	 * overwritten by subclasses.
+	 *
+	 * @returns {number|undefined} The count of entries in the tree, or <code>undefined</code> if it
+	 *   is unknown, for example because the binding is not resolved or because this feature is not
+	 *   supported.
+	 * @public
+	 * @since 1.108.0
+	 */
+	TreeBinding.prototype.getCount = function () {
+		return undefined;
+	};
+
 	/**
 	 * Filters the tree according to the filter definitions.
 	 *

package/src/sap/ui/model/TreeBindingCompatibilityAdapter.js

@@ -25,7 +25,7 @@ sap.ui.define(["sap/base/util/each"],
 		 * @class
 		 * @protected
 		 *
-		 * @deprecated use {@link sap.ui.model.TreeBindingAdapter} instead
+		 * @deprecated since 1.96.0; use {@link sap.ui.model.TreeBindingAdapter} instead
 		 */
 		var TreeBindingCompatibilityAdapter = function (oBinding, oControl) {
 			// Code necessary for ClientTreeBinding

package/src/sap/ui/model/Type.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @public
-	 * @version 1.107.1
+	 * @version 1.108.1
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {
 

package/src/sap/ui/model/analytics/AnalyticalTreeBindingAdapter.js

@@ -77,21 +77,10 @@ sap.ui.define([
 			return 0;
 		}
 
-		//in the autoExpand mode the length of the binding is defined by the watermark's position in the tree
-		if (this._oRootNode && this._oWatermark && this._isRunningInAutoExpand(TreeAutoExpandMode.Bundled)) {
-
-			//if the root length is not final -> we have to return the root node magnitude instead of the absolute index of the watermark
-			if (this._oWatermark.groupID === this._oRootNode.groupID) {
-				return this._oRootNode.magnitude + this._oRootNode.numberOfTotals;
-			}
-
-			// +1 because we have at least one node more after the watermark
-			// this is important for the table's scrollbar calculation
-			return this._oWatermark.absoluteNodeIndex + this._oRootNode.numberOfTotals + 1;
-		}
-
 		// The length is the sum of the trees magnitue + all sum rows (from expanded nodes)
-		return this._oRootNode.magnitude + this._oRootNode.numberOfTotals;
+		return this._oRootNode.magnitude + this._oRootNode.numberOfTotals
+			// with a watermark, there is missing data -> add 1 to be able to scroll into that area
+			+ (this._oWatermark ? 1 : 0);
 	};
 
 	AnalyticalTreeBindingAdapter.prototype.getContextByIndex = function (iIndex) {
@@ -157,8 +146,13 @@ sap.ui.define([
 	 */
 	AnalyticalTreeBindingAdapter.prototype._getContextsOrNodes = function (bReturnNodes,
 			iStartIndex, iLength, iThreshold) {
+		var i, mMissingSections, oNode, oParentNode,
+			aContexts = [],
+			aNodes = [],
+			that = this;
+
 		if (!this.isResolved()) {
-			return [];
+			return aNodes;
 		}
 
 		iStartIndex = iStartIndex || 0;
@@ -174,7 +168,6 @@ sap.ui.define([
 		this._buildTree(iStartIndex, iLength);
 
 		// retrieve the requested/visible section of nodes from the tree
-		var aNodes = [];
 		if (this._oRootNode) {
 			aNodes = this._retrieveNodeSection(this._oRootNode, iStartIndex, iLength);
 		}
@@ -182,26 +175,29 @@ sap.ui.define([
 		// keep a map between Table.RowIndex and tree nodes
 		this._updateRowIndexMap(aNodes, iStartIndex);
 
-		var aContexts = [];
-		//find missing spots in our visible section
-		var mMissingSections;
-		var oNode;
-		for (var i = 0; i < aNodes.length; i++) {
-			oNode = aNodes[i];
-
-			//user scrolled into the water mark node, which is the last of the guaranteed loaded page (length + threshold)
-			if (this._isRunningInAutoExpand(TreeAutoExpandMode.Bundled) && this._oWatermark) {
-				if (oNode.groupID === this._oWatermark.groupID ||
-						(this._oWatermark.groupID === this._oRootNode.groupID && (iStartIndex + i + 1) == this.getLength() - 1)) {
-					this._autoExpandPaging();
+		if (this._oWatermark) {
+			// check whether the user scrolled into the area of the watermark node, which is the
+			// last guaranteed node of the loaded page; remove nodes that are not under the
+			// watermark (that means their group IDs don't start with the watermark's group ID),
+			// because there are missing nodes in between -> avoids jumping rows
+			for (i = aNodes.length - 1; i >= 0; i -= 1) {
+				if (aNodes[i].groupID.startsWith(this._oWatermark.groupID)) {
+					aNodes.length = i + 1;
+					break;
 				}
 			}
-
+			if (aNodes.length < iLength) {
+				this._autoExpandPaging();
+			}
+		}
+		//find missing spots in our visible section
+		for (i = 0; i < aNodes.length; i++) {
+			oNode = aNodes[i];
 			// we found a gap because the node is empty (context is undefined)
 			if (!oNode.context) {
 				mMissingSections = mMissingSections || {};
 				// check if we already build a missing section
-				var oParentNode = oNode.parent;
+				oParentNode = oNode.parent;
 
 				mMissingSections[oParentNode.groupID] = oParentNode;
 
@@ -213,8 +209,6 @@ sap.ui.define([
 
 		// trigger load for nodes with missing sections
 		if (mMissingSections) {
-			var that = this;
-
 			//if we have a missing section inside a subtree, we need to reload this subtree
 			each(mMissingSections, function (sGroupID, oNode) {
 				// reset the root of the subtree
@@ -226,8 +220,8 @@ sap.ui.define([
 
 			// try to fill gaps in our return array if we already have new data (thanks to thresholding)
 			aContexts = [];
-			for (var j = 0; j < aNodes.length; j++) {
-				oNode = aNodes[j];
+			for (i = 0; i < aNodes.length; i += 1) {
+				oNode = aNodes[i];
 				aContexts.push(oNode.context);
 			}
 		}