@openui5/sap.ui.documentation 1.84.28 → 1.84.30-SNAPSHOT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.84.28",
+  "version": "1.84.30-SNAPSHOT",
   "description": "OpenUI5 UI Library sap.ui.documentation",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.84.28",
-    "@openui5/sap.ui.core": "1.84.28",
-    "@openui5/sap.ui.layout": "1.84.28",
-    "@openui5/themelib_sap_belize": "1.84.28",
-    "@openui5/themelib_sap_fiori_3": "1.84.28"
+    "@openui5/sap.m": "1.84.30-SNAPSHOT",
+    "@openui5/sap.ui.core": "1.84.30-SNAPSHOT",
+    "@openui5/sap.ui.layout": "1.84.30-SNAPSHOT",
+    "@openui5/themelib_sap_belize": "1.84.30-SNAPSHOT",
+    "@openui5/themelib_sap_fiori_3": "1.84.30-SNAPSHOT"
   }
 }

package/src/sap/ui/documentation/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.84.28</version>
+  <version>1.84.30-SNAPSHOT</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 

package/src/sap/ui/documentation/library.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.84.28',
+		version: '1.84.30-SNAPSHOT',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],
@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.84.28
+	 * @version 1.84.30-SNAPSHOT
 	 * @public
 	 */
 	var thisLibrary = sap.ui.documentation;

package/src/sap/ui/documentation/sdk/controller/util/Highlighter.js

@@ -131,7 +131,8 @@ function() {
 
 	Highlighter.prototype._processNode = function (oNode) {
 		var sText, oRegEx, i, j, oMatches, sCurrentMatch,
-			oCurrentMatch, aBlockedIndices, iCurrMatchIndex;
+			oCurrentMatch, aBlockedIndices, iCurrMatchIndex,
+			oHighligtedNode;
 
 		if (oNode.nodeName === "IFRAME") {
 			this._highlightSubTree(oNode.contentDocument.body);
@@ -168,8 +169,8 @@ function() {
 			}
 
 			if (Object.keys(oMatches).length !== 0) {
-				sText = this._highlightTerms(oMatches, sText);
-				this._replaceNode(oNode, sText);
+				oHighligtedNode = this._createHighlightedNode(oMatches, sText);
+				this._replaceNode(oNode, oHighligtedNode);
 			}
 		}
 	};
@@ -195,17 +196,13 @@ function() {
 		});
 	};
 
-	Highlighter.prototype._replaceNode = function (oNode, sHtml) {
-		var oWrapper;
+	Highlighter.prototype._replaceNode = function (oNode, oHighligtedNode) {
 
 		if (oNode.parentNode) {
-			oWrapper = document.createElement('span');
-			oWrapper.innerHTML = sHtml;
-
-			oNode.parentNode.replaceChild(oWrapper, oNode);
+			oNode.parentNode.replaceChild(oHighligtedNode, oNode);
 
 			// we cache which nodes are replaced with such as highlighted spans
-			this._aPreviouslyHighlightedNodes.push(oWrapper); // Highlighted Node with span
+			this._aPreviouslyHighlightedNodes.push(oHighligtedNode); // Highlighted Node with span
 			this._aPreviouslyOriginalNodes.push(oNode); // Original Node
 		}
 	};
@@ -230,27 +227,50 @@ function() {
 		this._toggleMutationObserver(true);
 	};
 
-	Highlighter.prototype._highlightTerms = function (oMatches, sText) {
-		var sOpeningTag = this._bUseExternalStyles ? '<span class="highlightedText">'
-			: '<span class="defaultHighlightedText">',
-			sClosingTag = '</span>',
-			sCurrMatch,
-			iUpdatedIndex,
-			iCounter = 0,
-			iIndex;
+	Highlighter.prototype._createHighlightedNode = function (oTokensToHighlight, sText) {
+		var oRootNode = document.createElement("span"),
+			aAllTokens = [],
+			fnSort = function(a, b) {return a > b;},
+			aIndices = Object.keys(oTokensToHighlight).sort(fnSort),
+			iIndex,
+			iStartIndex = 0;
+
+		// split the <code>sText</code> into tokens,
+		// including both the tokens to highlight
+		// and the remaing parts of the <code>sText</code> string
+		for (var i = 0; i < aIndices.length; i++) {
+			var iTokenIndex = Number(aIndices[i]),
+				sToken = oTokensToHighlight[iTokenIndex],
+				iTokenLength = sToken.length,
+				sBeforeToken = sText.substring(iStartIndex, iTokenIndex);
+
+			if (sBeforeToken.length) {
+				aAllTokens.push(sBeforeToken);
+			}
+			aAllTokens.push(sToken);
+
+			// shift the <code>iStartIndex</code> to the
+			// remaining part of the <code>sText</code> string
+			iStartIndex = iTokenIndex + iTokenLength;
+		}
 
-		for (iIndex in oMatches) {
-			iUpdatedIndex = +iIndex + (iCounter * (sOpeningTag.length + sClosingTag.length));
+		if (iStartIndex < sText.length) {
+			aAllTokens.push(sText.substring(iStartIndex));
+		}
 
-			sCurrMatch = oMatches[iIndex];
-			sText = sText.substring(0, iUpdatedIndex)
-					+ sOpeningTag + sCurrMatch + sClosingTag
-					+ sText.substring(iUpdatedIndex + sCurrMatch.length);
+		// wrap each token in a span
+		// and append to the root span
+		for (iIndex in aAllTokens) {
+			var oNextNode = document.createElement("span");
+			oNextNode.innerText = aAllTokens[iIndex];
+			if (Object.values(oTokensToHighlight).indexOf(aAllTokens[iIndex]) > -1) {
+				oNextNode.classList.add("defaultHighlightedText");
+			}
 
-			iCounter++;
+			oRootNode.appendChild(oNextNode);
 		}
 
-		return sText;
+		return oRootNode;
 	};
 
 	Highlighter.prototype._addMutationObserver = function () {