@sapui5/sap.suite.ui.generic.template 1.108.18 → 1.108.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.108.18",
+  "version": "1.108.19",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.108.18</version>
+	<version>1.108.19</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -634,13 +634,19 @@ sap.ui.define([
 					});
 				}
 			}
-
-			function fnOnSmartTablePaste(oEvent) {
-				var aParsedData;
-				var oSmartTable = oEvent.getSource();
+			
+			// returns the Create button for the given SmartTable if it exists (otherwise a faulty value is returned)
+			function getCreateButtonForTable(oSmartTable){
 				var sSmartTableId = oSmartTable.getId();
 				var sAddEntryId = sSmartTableId.split("::Table")[0] + "::addEntry";
 				var oAddEntry = oController.byId(sAddEntryId); //Instance of the Create button
+				return oAddEntry;
+			}
+			
+			function fnOnSmartTablePaste(oEvent) {
+				var aParsedData;
+				var oSmartTable = oEvent.getSource();
+				var oAddEntry = getCreateButtonForTable(oSmartTable);
 				var bIsInlineCreationRowsEnabled = fnIsInlineCreationRowsEnabled(oSmartTable);
 				//Paste is allowed when an add button is present in the table (or) inline creation rows feature is enabled
 				var bIsPasteAllowed = oAddEntry || bIsInlineCreationRowsEnabled;
@@ -1410,7 +1416,6 @@ sap.ui.define([
 							return false;
 						}
 						oSelectedSection = oControl;
-						oObjectPage.setSelectedSection(oSelectedSection);
 						return null;
 					}
 					if (controlHelper.isObjectPageSubSection(oControl)){
@@ -1421,32 +1426,33 @@ sap.ui.define([
 							return false;
 						}
 						// Scroll to thwe given subsection and make sure that controls and bindings for this subsection are initialized (necessary because of lazy loading) 
-						oSelectedSection.setSelectedSubSection(oControl);
 						fnSubSectionEntered(oControl);
-						// Maybe we can already make the decision on the subsection level
-						var oSubSectionDomRef = oControl.getDomRef();
-						var oFirstFocusableInput = getFirstEditableInput(oSubSectionDomRef);
-						if (oFirstFocusableInput && oFirstFocusableInput.type !== "checkbox"){
-							var oUI5Control = controlHelper.getUI5ControlForDomElement(oFirstFocusableInput);
-							if (!oUI5Control){
-								return null;
-							}
-							var oSmartField;
-							var bIsVisible = controlHelper.isElementVisibleOnView(oUI5Control.getId(), oController.getView(), function(oParent){
-								if (controlHelper.isSmartField(oParent)){
-									oSmartField = oParent;
-								}
-							});
-							if (!bIsVisible){
-								return null;
-							}
-							return oSmartField ? fnFocusSmartFieldForInput(oSmartField, null) : oUI5Control;
-						}
+						oObjectPage.setSelectedSection(oSelectedSection);
+						oSelectedSection.setSelectedSubSection(oControl);
 						return null;
 					}
 					if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
 						return fnFocusSmartFieldForInput(oControl, false);
 					}
+					if (controlHelper.isSmartTable(oControl)){
+						var oPresentationControl = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oControl);
+						var oFirstEditableCellPromise = oPresentationControl.getFirstFocussableEditableCellPromise();
+						return oFirstEditableCellPromise.then(function(oEditableCell){
+							if (oEditableCell){
+								return oEditableCell;
+							}
+							if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
+								var oCreateButton = getCreateButtonForTable(oControl);
+								if (oCreateButton){
+									if (oCreateButton.isFocusable()){
+										return oCreateButton;
+									} // If the Create button is not focussable it still could be part of the Overflow button still open what to do then
+								}
+							}
+							return false;
+						});
+							
+					}					
 					return null;
 				});
 				return Promise.resolve(oRet).then(function(oTargetControl){

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -1,4 +1,4 @@
-sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], function(FeLogger) {
+sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/template/genericUtilities/FeLogger"], function(getFirstEditableInput, FeLogger) {
 		"use strict";
 		
 	var oFeLogger = new FeLogger("genericUtilities.controlHelper");
@@ -46,6 +46,17 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 		focusUI5Control(oTarget, oFocusInfo);
 	}
 	
+	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
+	function getSmartFieldIsFocussableForInputPromise(oSmartField){
+		var oSmartFieldMetadataAvailablePromise = oSmartField._getComputedMetadata();
+		return oSmartFieldMetadataAvailablePromise.then(function(){
+			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve()).then(function(){
+				var oFirstFocusableInput = getFirstEditableInput(oSmartField.getDomRef());
+				return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+			});
+		});
+	}		
+	
 	// returns the UI5 control which currently has the focus, if there is one. Otherwise returns a faulty value.
 	// Implementation as recommended by UI5 until the provide an own abstraction.
 	function getControlWithFocus(){
@@ -91,7 +102,10 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 		}
 		if (oControlHelper.isObjectPageSubSection(oControl)){
 			return oControl.getBlocks().concat(oControl.getMoreBlocks());
-		}		
+		}
+		if (oControlHelper.isColumnListItem(oControl)){
+			return oControl.getCells();
+		}
 		return [];
 	}
 	
@@ -117,7 +131,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 					return -1;
 				}				
 			}
-			return (oChild1.getId() < oChild2.getId()) ? -1 : 1; // if we cannot determine a reasonable order we still want to have a reproducable order
+			return 1 - 2 * (!oDomRef1 === !oDomRef2 ? oChild1.getId() < oChild2.getId() : !oDomRef2); // if we cannot determine a reasonable order we still want to have a reproducable order. Note that elements with DomRef must clearly be separated from those without.
 		}
 		return (iPos1 >= 0 && iPos2 >= 0) ? (iPos1 - iPos2) : (iPos2 - iPos1); // if only one child has been identified in the list of children it takes precedence.
 	}
@@ -164,8 +178,8 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 			var aChildren = getChildren(oElement);
 			if (aChildren.length === 0){
 				aChildren = oElement.findElements(false);
+				aChildren.sort(fnSortChildControls.bind(null, oElement));
 			}		
-			aChildren.sort(fnSortChildControls.bind(null, oElement));
 			aChildren.some(function(oChild){
 				vResult = fnSearchInTree(mAlreadyAnalyzed, oChild, fnHandleElement);
 				return vResult; // If vResult is truthy it is either a Promise (which makes the processing asynchronous) or the result of fnSearchInTree. In both cases we should stop now.
@@ -209,6 +223,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 		isOverflowToolbar:			isControlOfType.bind(null, "sap/m/OverflowToolbar"),
 		isMultiInputField:			isControlOfType.bind(null, "sap/m/MultiInput"),
 		isLink:						isControlOfType.bind(null, "sap/m/Link"),
+		isColumnListItem:           isControlOfType.bind(null, "sap/m/ColumnListItem"),
 		isDynamicPage:	   			isControlOfType.bind(null, "sap/f/DynamicPage"),
 		isObjectPageSection:		isControlOfType.bind(null, "sap/uxap/ObjectPageSection"),
 		isObjectPageSubSection:		isControlOfType.bind(null, "sap/uxap/ObjectPageSubSection"),
@@ -218,6 +233,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeLogger"], funct
 		focusUI5Control: focusUI5Control,
 		focusDom: focusDom,
 		getControlWithFocus: getControlWithFocus,
+		getSmartFieldIsFocussableForInputPromise: getSmartFieldIsFocussableForInputPromise,
 		isElementVisibleOnView: isElementVisibleOnView,
 		sortChildControls: fnSortChildControls,
 		searchInTree: fnSearchInTree.bind(null, null)

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -854,7 +854,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.19
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -2942,7 +2942,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.108.18
+	 * @version 1.108.19
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js

@@ -1,10 +1,11 @@
 sap.ui.define([
     "sap/ui/base/Object",
     "sap/base/util/extend",
+    "sap/ui/model/base/ManagedObjectModel",
     "sap/ui/dom/getFirstEditableInput",
     "sap/suite/ui/generic/template/genericUtilities/controlHelper",
     "sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function(BaseObject, extend, getFirstEditableInput, controlHelper, testableHelper) {
+], function(BaseObject, extend, ManagedObjectModel, getFirstEditableInput, controlHelper, testableHelper) {
     "use strict";
     
 	function getMethods(oController, oCommonUtils, oComponentUtils, oSmartTable) {
@@ -265,7 +266,21 @@ sap.ui.define([
 					}, 0);
 				}
 			}
-		}   
+		}
+		
+		function getFirstFocussableEditableCellPromise(){
+			return new Promise(function(fnResolve, fnReject){
+				fnExecuteWhenUnbusy(function(){
+					Promise.resolve(controlHelper.searchInTree(oInnerTable, function(oControl){
+						if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
+							return controlHelper.getSmartFieldIsFocussableForInputPromise(oControl).then(function(bIsFocussable){
+								return bIsFocussable && oControl; // If the SmartField has turned out to be focussable take it. Otherwise no need to investigate the subtree below it. 
+							});
+						}
+					})).then(fnResolve);
+				});
+			});
+		}
         
         function getThreshold(){
 			return bIsMTable ? oInnerTable.getGrowingThreshold() : oInnerTable.getThreshold();
@@ -282,6 +297,21 @@ sap.ui.define([
 		function getToolbar(){
 			return oSmartTable.getToolbar();
 		}
+		
+		function fnExecuteWhenUnbusy(fnExecute){
+			if (!oInnerTable.getBusy()){
+				fnExecute();
+				return;
+			}
+			var oMOM = new ManagedObjectModel(oInnerTable);
+			var oBusyBinding = oMOM.bindProperty("/busy");
+			var fnChangeHandler = function(){
+				oMOM.destroy();
+				fnExecuteWhenUnbusy(fnExecute);
+			};
+			oBusyBinding.attachChange(fnChangeHandler);
+		}
+		
 		// public instance methods
 		return {
             getBinding: fnGetBinding,
@@ -301,6 +331,7 @@ sap.ui.define([
             rebind: fnRebind,
             applyNavigationSortOrder: fnApplyNavigationSortOrder,
             scrollToSelectedItemAsPerChildContext: fnScrollToSelectedItemAsPerChildContext,
+            getFirstFocussableEditableCellPromise: getFirstFocussableEditableCellPromise,
             setFocusOnFirstEditableFieldInTableRow: fnSetFocusOnFirstEditableFieldInTableRow,
             getThreshold: getThreshold,
             getDataStateIndicator: getDataStateIndicator,

package/src/sap/suite/ui/generic/template/library.js

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/core/library','sap/fe/placeholder/lib
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.108.18",
+		version: "1.108.19",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {