@openui5/sap.ui.codeeditor 1.125.0 → 1.126.0

package/.reuse/dep5

@@ -384,13 +384,13 @@ Copyright: 2017 Wei Song and Oliver Nightingale
 License: MIT
 Comment: these files belong to: Elasticlunr
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
-Copyright: 2008-2017 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: DataTables
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
-Copyright: 2016 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: Buttons extension for DataTables
 

package/THIRDPARTY.txt

@@ -363,17 +363,17 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/elasticlunr.js
 
-Component: DataTables, version: 1.10.15
-Copyright: 2008-2017 SpryMedia Ltd
+Component: DataTables, version: 2.0.1
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
 
-Component: Buttons extension for DataTables, version: 1.4.0
-Copyright: 2016 SpryMedia Ltd
+Component: Buttons extension for DataTables, version: 3.0.0
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
 
 
 Library: sap.ui.integration:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.codeeditor",
-  "version": "1.125.0",
+  "version": "1.126.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.125.0"
+    "@openui5/sap.ui.core": "1.126.0"
   }
 }

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

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.125.0</version>
+	<version>1.126.0</version>
 
 	<documentation>UI5 library: sap.ui.codeeditor</documentation>
 
@@ -33,7 +33,7 @@
 		</packaging>
 		<!-- Thirdparty references -->
 		<thirdparty xmlns="http://www.sap.com/ui5/buildext/thirdparty" >
-			<lib name="ace" displayName="Ace (Ajax.org Cloud9 Editor)" npmName="ace-builds" version="1.31.1" hash="1fb1ddc16d88085acc01180f1f86a647" homepage="https://ace.c9.io/" id="73554900106100278574">
+			<lib name="ace" displayName="Ace (Ajax.org Cloud9 Editor)" npmName="ace-builds" version="1.31.1" hash="3ad935f25f3d28a896c05d95d81b1e1b" homepage="https://ace.c9.io/" id="73554900106100278574">
 				<license url="https://github.com/ajaxorg/ace/blob/master/LICENSE" type="BSD-3-Clause" />
 				<copyright>2010, Ajax.org B.V.</copyright>
 				<pattern>sap/ui/codeeditor/js/ace/*</pattern>

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

@@ -30,10 +30,10 @@ sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/core/RenderManager",
 	"sap/ui/core/ResizeHandler",
-	"sap/ui/core/Theming",
 	"sap/ui/dom/includeStylesheet",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/codeeditor/js/ace/ace",
+	"sap/base/strings/capitalize",
 	"sap/ui/codeeditor/js/ace/ext-language_tools",
 	"sap/ui/codeeditor/js/ace/ext-beautify",
 	"sap/ui/codeeditor/js/ace/mode-javascript",
@@ -44,10 +44,10 @@ sap.ui.define([
 	Library,
 	RenderManager,
 	ResizeHandler,
-	Theming,
 	includeStylesheet,
 	jQuery,
-	ace
+	ace,
+	capitalize
 ) {
 	"use strict";
 
@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @public
@@ -182,8 +182,13 @@ sap.ui.define([
 		renderer: {
 			apiVersion: 2,
 			render: function (oRM, oControl) {
-				oRM.openStart("div", oControl).class("sapCEd")
-					.style("width", oControl.getWidth())
+				const sColorTheme = oControl.getColorTheme();
+
+				oRM.openStart("div", oControl).class("sapCEd");
+				if (sColorTheme === "default") {
+					oRM.class("sapCEdTheme" + capitalize(sColorTheme));
+				}
+				oRM.style("width", oControl.getWidth())
 					.style("height", oControl.getHeight())
 					.attr("data-sap-ui-syntaxhints", oControl.getSyntaxHints())
 					.attr("role", "application")
@@ -220,6 +225,13 @@ sap.ui.define([
 		this._oEditorDomRef.style.width = "100%";
 
 		this._oEditor = ace.edit(this._oEditorDomRef);
+		this._oDefaultTheme = {
+			cssClass: "ace-default",
+			isDark: false,
+			cssText: ""
+		};
+		this._oEditor.setTheme(this._oDefaultTheme);
+
 		var oSession = this._oEditor.getSession();
 
 		// Ensure worker is used only when the CodeEditor has focus.
@@ -236,8 +248,6 @@ sap.ui.define([
 			"sap-ui-codeeditor-ace"
 		);
 
-		this._applyTheme();
-
 		this._oEditor.setOptions({
 			enableBasicAutocompletion: true,
 			enableSnippets: true,
@@ -300,33 +310,6 @@ sap.ui.define([
 		this._oEditor = null;
 	};
 
-	/**
-	 * @private
-	 */
-	CodeEditor.prototype.onThemeChanged = function() {
-		this._applyTheme();
-	};
-
-	/**
-	 * @private
-	 */
-	CodeEditor.prototype._applyTheme = function() {
-		var sUiTheme = Theming.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
 	 */
@@ -340,13 +323,13 @@ sap.ui.define([
 		}
 
 		this._deregisterResizeListener();
+
 	};
 
 	/**
 	 * @private
 	 */
 	CodeEditor.prototype.onAfterRendering = function() {
-
 		this._bIsRenderingPhase = false;
 
 		var oDomRef = this.getDomRef(),
@@ -421,11 +404,15 @@ sap.ui.define([
 	 * @public
 	 */
 	CodeEditor.prototype.setColorTheme = function(sTheme) {
-		this.setProperty("colorTheme", sTheme, true);
+		this.setProperty("colorTheme", sTheme);
 
 		if (sTheme === "default") {
-			sTheme = "tomorrow";
-		} else if (sTheme === "hcb") {
+			this._oEditor.setTheme(this._oDefaultTheme);
+
+			return this;
+		}
+
+		if (sTheme === "hcb") {
 			sTheme = "tomorrow_night";
 		} else if (sTheme === "hcb_bright") {
 			sTheme = "tomorrow_night_bright";
@@ -434,6 +421,7 @@ sap.ui.define([
 		}
 
 		this._oEditor.setTheme("ace/theme/" + sTheme);
+
 		includeStylesheet(
 			sap.ui.require.toUrl("sap/ui/codeeditor/js/ace/css/theme/" + sTheme + ".css"),
 			"sap-ui-codeeditor-theme-" + sTheme

package/src/sap/ui/codeeditor/js/ace/ext-themelist.js

@@ -68,4 +68,3 @@ exports.themes = themeData.map(function (data) {
                         }
                     });
                 })();
-            

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.codeeditor
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 * @since 1.48
 	 * @public
 	 */
@@ -34,7 +34,7 @@ sap.ui.define([
 		],
 		elements: [],
 		noLibraryCSS: false,
-		version: "1.125.0"
+		version: "1.126.0"
 	});
 
 	return thisLib;

package/src/sap/ui/codeeditor/themes/base/CodeEditor.less

@@ -0,0 +1,119 @@
+/*
+/ ============================================ /
+/ CSS for control sap.ui.codeeditor/CodeEditor /
+/ Base theme /
+/ ============================================ /
+*/
+
+.sapCEdThemeDefault .ace_editor {
+	background-color: @sapField_Background;
+	color: @sapField_TextColor;
+	font-family: "72 Mono", 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'Source Code Pro', 'source-code-pro', monospace;
+
+	.ace_gutter {
+		background: @sapField_ReadOnly_Background;
+		color: @sapField_TextColor;
+	}
+
+	.ace_print-margin {
+		width: 1px;
+		background: @sapField_ReadOnly_Background;
+	}
+
+	.ace_cursor {
+		color: @sapField_TextColor;
+	}
+
+	.ace_marker-layer .ace_selection {
+		background: @sapField_ReadOnly_Background;
+	}
+
+	.ace_marker-layer .ace_bracket {
+		margin: -1px 0 0 -1px;
+		border: 1px solid @sapField_SuccessColor;
+	}
+
+	.ace_marker-layer .ace_active-line {
+		background: transparent;
+		/* no indication for better contrast */
+	}
+
+	.ace_gutter-active-line {
+		background-color: @sapField_SuccessBackground;
+	}
+
+	.ace_keyword,
+	.ace_meta,
+	.ace_storage,
+	.ace_storage.ace_type,
+	.ace_support.ace_type {
+		color: @sapUiLegend10;
+	}
+
+	.ace_keyword.ace_operator {
+		color: @sapUiLegend7;
+	}
+
+	.ace_constant.ace_character,
+	.ace_constant.ace_language,
+	.ace_constant.ace_numeric,
+	.ace_keyword.ace_other.ace_unit,
+	.ace_support.ace_constant,
+	.ace_variable.ace_parameter {
+		color: @sapUiLegend12;
+	}
+
+	.ace_constant.ace_other {
+		color: @sapUiLegend4;
+	}
+
+	.ace_fold {
+		background-color: @sapUiLegend20;
+		border-color: @sapUiLegend20;
+	}
+
+	.ace_entity.ace_name.ace_function,
+	.ace_support.ace_function {
+		color: @sapUiLegend6;
+	}
+
+	.ace_support.ace_class,
+	.ace_support.ace_type {
+		color: @sapUiLegend3;
+	}
+
+	.ace_heading,
+	.ace_markup.ace_heading,
+	.ace_string {
+		color: @sapUiLegend18;
+	}
+
+	.ace_entity.ace_name.ace_tag,
+	.ace_entity.ace_other.ace_attribute-name,
+	.ace_meta.ace_tag,
+	.ace_string.ace_regexp,
+	.ace_variable {
+		color: @sapUiLegend2;
+	}
+
+	.ace_comment {
+		color: @sapUiLegend9;
+	}
+
+	.ace_marker-layer .ace_error_bracket {
+		border-color: @sapField_InvalidColor;
+	}
+
+	.ace_fold-widget {
+		background-color: @sapField_SuccessBackground;
+	}
+
+	.ace_fold-widget:hover {
+		border-color: @sapField_SuccessColor;
+	}
+
+	.ace_indent-guide {
+		border-inline-end: 0.0625rem dotted @sapField_SuccessColor;
+		margin-inline-end: -0.0625rem;
+	}
+}

package/src/sap/ui/codeeditor/themes/base/library.source.less

@@ -6,6 +6,7 @@
 
 @import "../../../../../sap/ui/core/themes/base/base.less";
 @import "../../../../../sap/ui/core/themes/base/global.less";
+@import "./CodeEditor.less";
 
 .sapCEd[data-sap-ui-syntaxhints='false'] .ace_gutter-cell {
 	background-image: none !important;

package/src/sap/ui/codeeditor/themes/sap_hcb/base_CodeEditor.less

@@ -0,0 +1,114 @@
+/*
+/ ============================================ /
+/ CSS for control sap.ui.codeeditor/CodeEditor /
+/ Base theme /
+/ ============================================ /
+*/
+
+.sapCEdThemeDefault .ace_editor {
+	background-color: @sapField_Background;
+	color: @sapField_TextColor;
+	font-family: "72 Mono", 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'Source Code Pro', 'source-code-pro', monospace;
+
+	.ace_gutter {
+		background: @sapField_ReadOnly_Background;
+		color: @sapField_TextColor;
+	}
+
+	.ace_print-margin {
+		width: 1px;
+		background: @sapField_ReadOnly_Background;
+	}
+
+	.ace_cursor {
+		color: @sapField_TextColor;
+	}
+
+	.ace_marker-layer .ace_selection {
+		background: @sapField_ReadOnly_Background;
+	}
+
+	.ace_marker-layer .ace_bracket {
+		margin: -1px 0 0 -1px;
+		border: 1px solid @sapField_SuccessColor;
+	}
+
+	.ace_marker-layer .ace_active-line {
+		background: transparent;
+		/* no indication for better contrast */
+	}
+
+	.ace_gutter-active-line {
+		background-color: @sapField_SuccessBackground;
+	}
+
+	.ace_keyword,
+	.ace_meta,
+	.ace_storage,
+	.ace_storage.ace_type,
+	.ace_support.ace_type {
+		color: @sapUiLegend10;
+	}
+
+	.ace_keyword.ace_operator {
+		color: @sapUiLegend7;
+	}
+
+	.ace_constant.ace_character,
+	.ace_constant.ace_language,
+	.ace_constant.ace_numeric,
+	.ace_keyword.ace_other.ace_unit,
+	.ace_support.ace_constant,
+	.ace_variable.ace_parameter {
+		color: @sapUiLegend12;
+	}
+
+	.ace_constant.ace_other {
+		color: @sapUiLegend4;
+	}
+
+	.ace_fold {
+		background-color: @sapUiLegend20;
+		border-color: @sapUiLegend20;
+	}
+
+	.ace_entity.ace_name.ace_function,
+	.ace_support.ace_function {
+		color: @sapUiLegend6;
+	}
+
+	.ace_support.ace_class,
+	.ace_support.ace_type {
+		color: @sapUiLegend3;
+	}
+
+	.ace_heading,
+	.ace_markup.ace_heading,
+	.ace_string {
+		color: @sapUiLegend18;
+	}
+
+	.ace_entity.ace_name.ace_tag,
+	.ace_entity.ace_other.ace_attribute-name,
+	.ace_meta.ace_tag,
+	.ace_string.ace_regexp,
+	.ace_variable {
+		color: @sapUiLegend2;
+	}
+
+	.ace_comment {
+		color: @sapUiLegend9;
+	}
+
+	.ace_marker-layer .ace_error_bracket {
+		border-color: @sapField_InvalidColor;
+	}
+
+	.ace_fold-widget {
+		background-color: @sapField_SuccessBackground;
+	}
+
+	.ace_fold-widget:hover {
+		border-color: @sapField_SuccessColor;
+	}
+}

package/src/sap/ui/codeeditor/themes/sap_hcb/library.source.less

@@ -4,5 +4,17 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-@import "../base/library.source.less";
+/* ============================================================================== */
+/* Due to deprecation of sap_hcb with SAPUI5 version 1.46 the library.source.less */
+/* file of base is resolved: Imports to base.less and global.less of              */
+/* base are added to this library.source.less file (sap_hcb) and the              */
+/* respective control css files of base are added to the sap_hcb theme folder.    */
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.126.     */
+/* ============================================================================== */
+
+@import "../../../core/themes/base/base.less";
+@import "../../../core/themes/base/global.less";
+
+@import "base_CodeEditor.less";
+
 @import "../../../../../sap/ui/core/themes/sap_hcb/global.less";