@openui5/sap.ui.codeeditor 1.99.1 → 1.102.0

package/THIRDPARTY.txt

@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.39
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.codeeditor",
-  "version": "1.99.1",
+  "version": "1.102.0",
   "description": "OpenUI5 UI Library sap.ui.codeeditor",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.99.1"
+    "@openui5/sap.ui.core": "1.102.0"
   }
 }

package/src/sap/ui/codeeditor/.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.99.1</version>
+	<version>1.102.0</version>
 
 	<documentation>UI5 library: sap.ui.codeeditor</documentation>
 

package/src/sap/ui/codeeditor/CodeEditor.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -234,18 +234,7 @@ sap.ui.define([
 			"sap-ui-codeeditor-ace"
 		);
 
-		var sUiTheme = Core.getConfiguration().getTheme().toLowerCase();
-		var sEditorTheme = "tomorrow";
-		if (sUiTheme.indexOf("hcb") > -1) {
-			sEditorTheme = "chaos";
-		} else if (sUiTheme.indexOf("hcw") > -1) {
-			sEditorTheme = "github";
-		} else if (sUiTheme === "sap_fiori_3") {
-			sEditorTheme = "crimson_editor";
-		} else if (sUiTheme === "sap_fiori_3_dark") {
-			sEditorTheme = "clouds_midnight";
-		}
-		this.setColorTheme(sEditorTheme);
+		this._applyTheme();
 
 		this._oEditor.setOptions({
 			enableBasicAutocompletion: true,
@@ -301,11 +290,39 @@ sap.ui.define([
 	CodeEditor.prototype.exit = function() {
 		this._deregisterResizeListener();
 		this._oEditor.destroy(); // clear ace intervals
+		this._oEditor.getSession().setUseWorker(false); // explicitly disable worker usage, in case the ace mode is still loading, to avoid worker initialization after destroy
 		jQuery(this._oEditorDomRef).remove(); // remove DOM node together with all event listeners
 		this._oEditorDomRef = null;
 		this._oEditor = null;
 	};
 
+	/**
+	 * @private
+	 */
+	CodeEditor.prototype.onThemeChanged = function() {
+		this._applyTheme();
+	};
+
+	/**
+	 * @private
+	 */
+	CodeEditor.prototype._applyTheme = function() {
+		var sUiTheme = Core.getConfiguration().getTheme().toLowerCase();
+		var sEditorTheme = "tomorrow";
+		if (sUiTheme.indexOf("hcb") > -1) {
+			sEditorTheme = "chaos";
+		} else if (sUiTheme.indexOf("hcw") > -1) {
+			sEditorTheme = "github";
+		} else if (sUiTheme === "sap_fiori_3") {
+			sEditorTheme = "crimson_editor";
+		} else if (sUiTheme === "sap_fiori_3_dark") {
+			sEditorTheme = "clouds_midnight";
+		} else if (sUiTheme === "sap_horizon_dark") {
+			sEditorTheme = "nord_dark";
+		}
+		this.setColorTheme(sEditorTheme);
+	};
+
 	/**
 	 * @private
 	 */
@@ -486,11 +503,6 @@ sap.ui.define([
 		ace.require("ace/ext/beautify").beautify(this._oEditor.session);
 	};
 
-	CodeEditor.prototype.destroy = function (bSuppressInvalidate) {
-		this._oEditor.destroy(bSuppressInvalidate);
-		Control.prototype.destroy.call(this, bSuppressInvalidate);
-	};
-
 	CodeEditor.prototype.onfocusout = function () {
 		this._oEditor.getSession().setUseWorker(false);
 	};

package/src/sap/ui/codeeditor/aceWorkerProxy.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title>Wrapper for Ace Worker</title>
+		<script src="aceWorkerProxy.js"></script>
+	</head>
+	<body>
+	</body>
+</html>

package/src/sap/ui/codeeditor/aceWorkerProxy.js

@@ -0,0 +1,57 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+window.addEventListener("load", function () {
+	"use strict";
+
+	var ACE_BASE_PATH = new URL("./js/ace/", document.baseURI).href;
+	var workers = new Map();
+
+	// listen for messages from ace
+	window.addEventListener("message", function (event) {
+		var message = event.data.message;
+		var workerId = event.data.workerId;
+		var senderOrigin = event.origin;
+
+		if (message.createWorker) {
+			var workerEntry = createWorkerEntry(message.workerUrl, senderOrigin, workerId);
+
+			if (workerEntry) {
+				workers.set(workerId, workerEntry);
+			}
+		} else if (message.terminateWorker) {
+			workers.get(workerId).worker.terminate();
+			workers.delete(workerId);
+		} else if (senderOrigin === workers.get(workerId).creatorOrigin) { // send message to the worker only from the origin that created it
+			workers.get(workerId).worker.postMessage(message);
+		}
+	});
+
+	function createWorkerEntry(url, origin, workerId) {
+		if (!url || typeof url !== "string") {
+			return null;
+		}
+
+		var absoluteWorkerUrl = new URL(url, document.baseURI).href;
+
+		// create worker only if it's located on the same origin and is in the "./js/ace/" folder
+		if (!absoluteWorkerUrl.startsWith(ACE_BASE_PATH)) {
+			return null;
+		}
+
+		var worker = new Worker(absoluteWorkerUrl);
+		// forward messages from worker to ace
+		worker.addEventListener("message", function(event) {
+			event.data.workerId = workerId;
+			window.parent.postMessage(event.data, origin);
+		});
+
+		return {
+			creatorOrigin: origin,
+			worker: worker
+		};
+	}
+});

package/src/sap/ui/codeeditor/js/ace/ace.js

@@ -12518,6 +12518,9 @@ var TokenIterator = require("./token_iterator").TokenIterator;
 
 var clipboard = require("./clipboard");
 var Editor = function(renderer, session, options) {
+     // #### BEGIN MODIFIED BY SAP
+     Editor._instancesCnt ++;
+     // #### END MODIFIED BY SAP
     this.$toDestroy = [];
     var container = renderer.getContainerElement();
     this.container = container;
@@ -12559,6 +12562,9 @@ var Editor = function(renderer, session, options) {
         this.setOptions(options);
     config._signal("editor", this);
 };
+// ##### BEGIN MODIFIED BY SAP
+Editor._instancesCnt = 0;
+// ##### END MODIFIED BY SAP
 
 Editor.$uid = 0;
 
@@ -14419,6 +14425,14 @@ Editor.$uid = 0;
         if (this._$emitInputEvent)
             this._$emitInputEvent.cancel();
         this.removeAllListeners();
+
+        // ##### BEGIN MODIFIED BY SAP
+        Editor._instancesCnt--;
+        var iframe = document.getElementById("sap-ui-codeeditor-ace-worker-proxy");
+        if (Editor._instancesCnt === 0 && iframe) {
+            iframe.remove();
+        }
+        // ##### END MODIFIED BY SAP
     };
     this.setAutoScrollEditorIntoView = function(enable) {
         if (!enable)
@@ -19090,16 +19104,85 @@ function $workerBlob(workerUrl) {
     }
 }
 
+// ##### BEGIN MODIFIED BY SAP
+var workersCnt = 0;
+
 function createWorker(workerUrl) {
     if (typeof Worker == "undefined")
         return { postMessage: function() {}, terminate: function() {} };
-    if (config.get("loadWorkerFromBlob")) {
-        var blob = $workerBlob(workerUrl);
-        var URL = window.URL || window.webkitURL;
-        var blobURL = URL.createObjectURL(blob);
-        return new Worker(blobURL);
+
+    var iframe = document.getElementById("sap-ui-codeeditor-ace-worker-proxy");
+    var iframeLoaded = true;
+    if (!iframe) {
+        iframeLoaded = false;
+        iframe = document.createElement("iframe");
+        iframe.id = "sap-ui-codeeditor-ace-worker-proxy";
+        iframe.src = sap.ui.require.toUrl("sap/ui/codeeditor/aceWorkerProxy.html");
+        iframe.hidden = true;
+        iframe.sandbox = "allow-scripts allow-same-origin";
+        document.body.appendChild(iframe);
+
+        // await for the iframe to load and then send to it the pending messages
+        iframe.onload = function () {
+            iframeLoaded = true;
+            messageQueue.forEach(function (entry) {
+                entry.workerProxy.postMessage(entry.message)
+            });
+        }
+    }
+
+    var iframeOrigin = new URL(iframe.src).origin;
+    var messageQueue = [];
+    var workerProxy = {
+        postMessage: function (message) {
+            if (!iframeLoaded) {
+                // enqueue the messages until the iframe is loaded
+                messageQueue.push({
+                    workerProxy: this,
+                    message: message
+                });
+                return;
+            }
+
+            var wrappedMessage = {
+                workerId: this._id,
+                message: message
+            }
+            // send message to worker
+            iframe.contentWindow.postMessage.call(iframe.contentWindow, wrappedMessage, iframeOrigin);
+        },
+        terminate: function () {
+            this.postMessage({
+                terminateWorker: true
+            });
+
+            window.removeEventListener("message", this._messageFromFrameListener);
+        },
+        set onmessage(cb) {
+            this._messageCb = cb;
+        },
+        _id: workersCnt++,
+        _listenForMessageFromFrame: function () {
+            this._messageFromFrameListener = function (event) {
+                if (!iframe || event.origin !== iframeOrigin || event.source !== iframe.contentWindow || event.data.workerId !== this._id) {
+                    return;
+                }
+    
+                this._messageCb.call(this._messageCb, event);
+            }.bind(this)
+            window.addEventListener("message", this._messageFromFrameListener);
+        }
     }
-    return new Worker(workerUrl);
+
+    workerProxy.postMessage({
+        createWorker: true,
+        workerUrl: workerUrl
+    });
+
+    workerProxy._listenForMessageFromFrame();
+
+    return workerProxy;
+    // ##### END MODIFIED BY SAP
 }
 
 var WorkerClient = function(worker) {

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

@@ -17,17 +17,13 @@ sap.ui.define([
 	 * UI5 library: sap.ui.codeeditor.
 	 *
 	 * @namespace
-	 * @name sap.ui.codeeditor
+	 * @alias sap.ui.codeeditor
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @since 1.48
 	 * @public
 	 */
-
-	// library dependencies
-
-	// delegate further initialization of this library to the Core
-	sap.ui.getCore().initLibrary({
+	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.codeeditor",
 		dependencies : ["sap.ui.core"],
 		types: [],
@@ -37,8 +33,8 @@ sap.ui.define([
 		],
 		elements: [],
 		noLibraryCSS: false,
-		version: "1.99.1"
+		version: "1.102.0"
 	});
 
-	return sap.ui.codeeditor;
+	return thisLib;
 });