@openui5/sap.ui.webc.common 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* 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/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 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/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	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
 Copyright: Google LLC
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 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
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

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

package/src/sap/ui/webc/common/.library

@@ -3,7 +3,7 @@
 
 	<name>sap.ui.webc.common</name>
 	<vendor>SAP SE</vendor>
-	<version>1.94.0</version>
+	<version>1.97.0</version>
 	<copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
@@ -31,10 +31,11 @@
 				<license url="https://github.com/SAP/ui5-webcomponents/blob/master/LICENSE.txt" type="Apache-2.0"></license>
 				<copyright>SAP</copyright>
 				<pattern>sap/ui/webc/common/thirdparty/base/*.*</pattern>
-				<pattern>sap/ui/webc/common/thirdparty/theme-base/*.*</pattern>
+				<pattern>sap/ui/webc/common/thirdparty/theming/*.*</pattern>
 				<pattern>sap/ui/webc/common/thirdparty/localization/*.*</pattern>
 				<pattern>sap/ui/webc/common/thirdparty/icons/*.*</pattern>
 				<pattern>sap/ui/webc/common/thirdparty/icons-tnt/*.*</pattern>
+				<pattern>sap/ui/webc/common/thirdparty/icons-business-suite/*.*</pattern>
 			</lib>
 			<lib name="lit-html" displayName="lit-html" version="1.4.1" homepage="https://lit-html.polymer-project.org">
 				<license url="https://github.com/lit/lit/blob/main/LICENSE" type="BSD-3-Clause"></license>

package/src/sap/ui/webc/common/Icons.js

@@ -2,7 +2,9 @@ sap.ui.define([
 	"./thirdparty/icons/Assets",
 	"./thirdparty/icons/AllIcons",
 	"./thirdparty/icons-tnt/Assets",
-	"./thirdparty/icons-tnt/AllIcons"
+	"./thirdparty/icons-tnt/AllIcons",
+	"./thirdparty/icons-business-suite/Assets",
+	"./thirdparty/icons-business-suite/AllIcons"
 ], function() {
 	"use strict";
 });

package/src/sap/ui/webc/common/WebComponent.js

@@ -47,9 +47,18 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @param obj
+		 * @param level
+		 * @param maxLevel
 		 * @returns {Object}
 		 */
-		var fnConvert = function(obj) {
+		var fnConvert = function(obj, level, maxLevel) {
+			if (level === undefined) {
+				level = 0;
+			}
+			if (maxLevel === undefined) {
+				maxLevel = 2;
+			}
+
 			// Null
 			if (obj == null) {
 				return obj;
@@ -61,20 +70,22 @@ sap.ui.define([
 				return oControl ? oControl : obj;
 			}
 
-			// Array
-			if (Array.isArray(obj)) {
-				return obj.map(fnConvert);
-			}
+			if (level < maxLevel) {
+				// Array
+				if (Array.isArray(obj)) {
+					return obj.map(fnConvert, level + 1, maxLevel);
+				}
 
-			// Object
-			if (typeof obj === "object") {
-				var oResult = {};
-				for (var i in obj) {
-					if (obj.hasOwnProperty(i)) {
-						oResult[i] = fnConvert(obj[i]);
+				// Object
+				if (typeof obj === "object") {
+					var oResult = {};
+					for (var i in obj) {
+						if (obj.hasOwnProperty(i)) {
+							oResult[i] = fnConvert(obj[i], level + 1, maxLevel);
+						}
 					}
+					return oResult;
 				}
-				return oResult;
 			}
 
 			// Anything else
@@ -93,7 +104,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 * @public
 		 * @since 1.92.0
 		 * @alias sap.ui.webc.common.WebComponent
@@ -111,14 +122,14 @@ sap.ui.define([
 			constructor : function(sId, mSettings) {
 				Control.apply(this, arguments);
 
-				// After the DOM element is rendered for the first time, attach the invalidation callback (in __onAfterRenderingDelegate)
+				this.__onInvalidationBound = this.__onInvalidation.bind(this);
+				this.__handleCustomEventBound = this.__handleCustomEvent.bind(this);
+
 				this.__delegates = {
+					onBeforeRendering: this.__onBeforeRenderingDelegate,
 					onAfterRendering: this.__onAfterRenderingDelegate
 				};
 				this.addDelegate(this.__delegates, true, this, false);
-
-				// Listen for all DOM events, described in the Component Wrapper's metadata
-				this.__attachCustomEventsListeners();
 			},
 
 			renderer: WebComponentRenderer
@@ -230,16 +241,27 @@ sap.ui.define([
 		};
 
 		/**
-		 * Implement the onInvalidation hook for each UI5 Web Component, and update __slot, if the component has an individual slot
+		 * @private
+		 */
+		WebComponent.prototype.__onBeforeRenderingDelegate = function() {
+			this.__detachCustomEventsListeners();
+		};
+
+		/**
 		 * @private
 		 */
 		WebComponent.prototype.__onAfterRenderingDelegate = function() {
+			this.__attachCustomEventsListeners();
+
 			var oDomRef = this.getDomRef();
-			oDomRef.onInvalidation = this.__onInvalidation.bind(this);
-			if (oDomRef._individualSlot) {
-				this.__slot = oDomRef._individualSlot; // If the component creates individual slots for children, f.e. columns-3 or default-1, update the __slot property, otherwise RenderManager will set the normal slot name, f.e. columns or ""
-			}
-			this.__updateObjectProperties(oDomRef);
+			window.customElements.whenDefined(oDomRef.localName).then(function() {
+				oDomRef.attachInvalidate(this.__onInvalidationBound);
+
+				if (oDomRef._individualSlot) {
+					this.__slot = oDomRef._individualSlot; // If the component creates individual slots for children, f.e. columns-3 or default-1, update the __slot property, otherwise RenderManager will set the normal slot name, f.e. columns or ""
+				}
+				this.__updateObjectProperties(oDomRef);
+			}.bind(this));
 		};
 
 		/**
@@ -251,10 +273,10 @@ sap.ui.define([
 			var oAttrProperties = this.getMetadata().getPropertiesByMapping("attribute");
 			for (var sPropName in oAttrProperties) {
 				var oPropData = oAttrProperties[sPropName];
+				var vPropValue = oPropData.get(this);
 
-				if (oPropData.type === "object") {
+				if (oPropData.type === "object" || typeof vPropValue === "object") {
 					var sWebComponentPropName = oPropData._sMapTo ? oPropData._sMapTo : sPropName;
-					var vPropValue = oPropData.get(this);
 					oDomRef[sWebComponentPropName] = vPropValue;
 				}
 			}
@@ -280,16 +302,21 @@ sap.ui.define([
 			var oEvents = this.getMetadata().getEvents();
 			for (var sEventName in oEvents) {
 				var sCustomEventName = hyphenate(sEventName);
-				this.attachBrowserEvent(sCustomEventName, this.__handleCustomEvent, this);
+				this.getDomRef().addEventListener(sCustomEventName, this.__handleCustomEventBound);
 			}
 		};
 
 		WebComponent.prototype.__detachCustomEventsListeners = function() {
+			var oDomRef = this.getDomRef();
+			if (!oDomRef) {
+				return;
+			}
+
 			var oEvents = this.getMetadata().getEvents();
 			for (var sEventName in oEvents) {
 				if (oEvents.hasOwnProperty(sEventName)) {
 					var sCustomEventName = hyphenate(sEventName);
-					this.detachBrowserEvent(sCustomEventName, this.__handleCustomEvent, this);
+					oDomRef.removeEventListener(sCustomEventName, this.__handleCustomEventBound);
 				}
 			}
 		};
@@ -342,10 +369,13 @@ sap.ui.define([
 			return this.getDomRef()[name];
 		};
 
-
 		WebComponent.prototype.destroy = function() {
+			var oDomRef = this.getDomRef();
 			this.__detachCustomEventsListeners();
-			this.detachBrowserEvent("_property-change", this.__onPropertyChange, this);
+			if (oDomRef && typeof oDomRef.detachInvalidate === "function") {
+				oDomRef.detachInvalidate(this.__onInvalidationBound);
+			}
+
 			return Control.prototype.destroy.call(this, arguments);
 		};
 

package/src/sap/ui/webc/common/WebComponentMetadata.js

@@ -22,7 +22,7 @@ sap.ui.define([
 		 *
 		 * @class
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 * @since 1.92.0
 		 * @experimental Since 1.92.0 The API might change. It is not intended for productive usage yet!
 		 * @alias sap.ui.webc.common.WebComponentMetadata

package/src/sap/ui/webc/common/WebComponentRenderer.js

@@ -72,12 +72,12 @@ sap.ui.define([
 			var oAttrProperties = oWebComponent.getMetadata().getPropertiesByMapping("attribute");
 			for (var sPropName in oAttrProperties) {
 				var oPropData = oAttrProperties[sPropName];
-				if (oPropData.type === "object") {
-					continue; // Properties of type "object" are set during onAfterRendering
+				var vPropValue = oPropData.get(oWebComponent);
+				if (oPropData.type === "object" || typeof vPropValue === "object") {
+					continue; // Properties of type "object" and custom-type properties with object values are set during onAfterRendering
 				}
 
 				var sAttrName = oPropData._sMapTo ? oPropData._sMapTo : hyphenate(sPropName);
-				var vPropValue = oPropData.get(oWebComponent);
 				if (oPropData._fnMappingFormatter) {
 					vPropValue = oWebComponent[oPropData._fnMappingFormatter].call(oWebComponent, vPropValue);
 				}

package/src/sap/ui/webc/common/library.js

@@ -13,16 +13,17 @@ sap.ui.define([
 		"./Icons",
 		"./thirdparty/base/features/OpenUI5Support",
 		"./thirdparty/base/AssetRegistry",
-		"./thirdparty/base/CustomElementsScope"
+		"./thirdparty/base/CustomElementsScope",
+		"./thirdparty/base/CSP"
 	],
-	function(coreLibrary, DataType, Icons, OpenUI5Support, AssetRegistry, CustomElementsScope) {
+	function(coreLibrary, DataType, Icons, OpenUI5Support, AssetRegistry, CustomElementsScope, CSP) {
 
 	"use strict";
 
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : "sap.ui.webc.common",
-		version: "1.94.0",
+		version: "1.97.0",
 		dependencies : ["sap.ui.core"],
 		noLibraryCSS: true,
 		designtime: "sap/ui/webc/common/designtime/library.designtime",
@@ -45,7 +46,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.webc
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @public
 	 * @since 1.92.0
 	 * @experimental Since 1.92.0
@@ -57,7 +58,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.webc.common
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @public
 	 * @since 1.92.0
 	 * @experimental Since 1.92.0
@@ -66,5 +67,10 @@ sap.ui.define([
 
 	CustomElementsScope.setCustomElementsScopingSuffix("ui5");
 
+	CSP.setUseLinks(!document.adoptedStyleSheets);
+	CSP.setPreloadLinks(false);
+	CSP.setPackageCSSRoot("@ui5/webcomponents-base", sap.ui.require.toUrl("sap/ui/webc/common/thirdparty/base/css/"));
+	CSP.setPackageCSSRoot("@ui5/webcomponents-theming", sap.ui.require.toUrl("sap/ui/webc/common/thirdparty/theming/css/"));
+
 	return thisLib;
 });

package/src/sap/ui/webc/common/thirdparty/base/CSP.js

@@ -0,0 +1,34 @@
+sap.ui.define(['exports'], function (exports) { 'use strict';
+
+	const roots = new Map();
+	let useLinks = false;
+	let preloadLinks = true;
+	const setPackageCSSRoot = (packageName, root) => {
+		roots.set(packageName, root);
+	};
+	const getUrl = (packageName, path) => {
+		return `${roots.get(packageName)}${path}`;
+	};
+	const setUseLinks = use => {
+		useLinks = use;
+	};
+	const setPreloadLinks = preload => {
+		preloadLinks = preload;
+	};
+	const shouldUseLinks = () => {
+		return useLinks;
+	};
+	const shouldPreloadLinks = () => {
+		return preloadLinks;
+	};
+
+	exports.getUrl = getUrl;
+	exports.setPackageCSSRoot = setPackageCSSRoot;
+	exports.setPreloadLinks = setPreloadLinks;
+	exports.setUseLinks = setUseLinks;
+	exports.shouldPreloadLinks = shouldPreloadLinks;
+	exports.shouldUseLinks = shouldUseLinks;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

package/src/sap/ui/webc/common/thirdparty/base/Device.js

@@ -62,6 +62,7 @@ sap.ui.define(['exports'], function (exports) { 'use strict';
 	const supportsTouch = () => touch;
 	const isIE = () => ie;
 	const isSafari = () => safari;
+	const isChrome = () => chrome;
 	const isTablet = () => {
 		detectTablet();
 		return (touch || isWindows8OrAbove()) && tablet;
@@ -73,7 +74,12 @@ sap.ui.define(['exports'], function (exports) { 'use strict';
 	const isDesktop = () => {
 		return (!isTablet() && !isPhone()) || isWindows8OrAbove();
 	};
+	const isCombi = () => {
+		return isTablet() && isDesktop();
+	};
 
+	exports.isChrome = isChrome;
+	exports.isCombi = isCombi;
 	exports.isDesktop = isDesktop;
 	exports.isIE = isIE;
 	exports.isPhone = isPhone;

package/src/sap/ui/webc/common/thirdparty/base/EventProvider.js

@@ -2,40 +2,41 @@ sap.ui.define(function () { 'use strict';
 
 	class EventProvider {
 		constructor() {
-			this._eventRegistry = {};
+			this._eventRegistry = new Map();
 		}
 		attachEvent(eventName, fnFunction) {
 			const eventRegistry = this._eventRegistry;
-			let eventListeners = eventRegistry[eventName];
+			const eventListeners = eventRegistry.get(eventName);
 			if (!Array.isArray(eventListeners)) {
-				eventRegistry[eventName] = [];
-				eventListeners = eventRegistry[eventName];
+				eventRegistry.set(eventName, [fnFunction]);
+				return;
+			}
+			if (!eventListeners.includes(fnFunction)) {
+				eventListeners.push(fnFunction);
 			}
-			eventListeners.push({
-				"function": fnFunction,
-			});
 		}
 		detachEvent(eventName, fnFunction) {
 			const eventRegistry = this._eventRegistry;
-			let eventListeners = eventRegistry[eventName];
+			const eventListeners = eventRegistry.get(eventName);
 			if (!eventListeners) {
 				return;
 			}
-			eventListeners = eventListeners.filter(event => {
-				return event["function"] !== fnFunction;
-			});
+			const indexOfFnToDetach = eventListeners.indexOf(fnFunction);
+			if (indexOfFnToDetach !== -1) {
+				eventListeners.splice(indexOfFnToDetach, 1);
+			}
 			if (eventListeners.length === 0) {
-				delete eventRegistry[eventName];
+				eventRegistry.delete(eventName);
 			}
 		}
 		fireEvent(eventName, data) {
 			const eventRegistry = this._eventRegistry;
-			const eventListeners = eventRegistry[eventName];
+			const eventListeners = eventRegistry.get(eventName);
 			if (!eventListeners) {
 				return [];
 			}
-			return eventListeners.map(event => {
-				return event["function"].call(this, data);
+			return eventListeners.map(fn => {
+				return fn.call(this, data);
 			});
 		}
 		fireEventAsync(eventName, data) {
@@ -43,20 +44,14 @@ sap.ui.define(function () { 'use strict';
 		}
 		isHandlerAttached(eventName, fnFunction) {
 			const eventRegistry = this._eventRegistry;
-			const eventListeners = eventRegistry[eventName];
+			const eventListeners = eventRegistry.get(eventName);
 			if (!eventListeners) {
 				return false;
 			}
-			for (let i = 0; i < eventListeners.length; i++) {
-				const event = eventListeners[i];
-				if (event["function"] === fnFunction) {
-					return true;
-				}
-			}
-			return false;
+			return eventListeners.includes(fnFunction);
 		}
 		hasListeners(eventName) {
-			return !!this._eventRegistry[eventName];
+			return !!this._eventRegistry.get(eventName);
 		}
 	}
 

package/src/sap/ui/webc/common/thirdparty/base/FontFace.js

@@ -1,58 +1,5 @@
-sap.ui.define(['./util/createStyleInHead', './FeaturesRegistry'], function (createStyleInHead, FeaturesRegistry) { 'use strict';
+sap.ui.define(['./ManagedStyles', './FeaturesRegistry', './generated/css/FontFace.css', './generated/css/OverrideFontFace.css'], function (ManagedStyles, FeaturesRegistry, FontFace_css, OverrideFontFace_css) { 'use strict';
 
-	const font72RegularWoff = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff?ui5-webcomponents`;
-	const font72RegularWoff2 = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2?ui5-webcomponents`;
-	const font72RegularFullWoff = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff?ui5-webcomponents`;
-	const font72RegularFullWoff2 = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff2?ui5-webcomponents`;
-	const font72BoldWoff = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff?ui5-webcomponents`;
-	const font72BoldWoff2 = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2?ui5-webcomponents`;
-	const font72BoldFullWoff = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff?ui5-webcomponents`;
-	const font72BoldFullWoff2 = `https://ui5.sap.com/sdk/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2?ui5-webcomponents`;
-	const fontFaceCSS = `
-	@font-face {
-		font-family: "72";
-		font-style: normal;
-		font-weight: 400;
-		src: local("72"),
-			url(${font72RegularWoff2}) format("woff2"),
-			url(${font72RegularWoff}) format("woff");
-	}
-
-	@font-face {
-		font-family: "72full";
-		font-style: normal;
-		font-weight: 400;
-		src: local('72-full'),
-			url(${font72RegularFullWoff2}) format("woff2"),
-			url(${font72RegularFullWoff}) format("woff");
-
-	}
-
-	@font-face {
-		font-family: "72";
-		font-style: normal;
-		font-weight: 700;
-		src: local('72-Bold'),
-			url(${font72BoldWoff2}) format("woff2"),
-			url(${font72BoldWoff}) format("woff");
-	}
-
-	@font-face {
-		font-family: "72full";
-		font-style: normal;
-		font-weight: 700;
-		src: local('72-Bold-full'),
-			url(${font72BoldFullWoff2}) format("woff2"),
-			url(${font72BoldFullWoff}) format("woff");
-	}
-`;
-	const overrideFontFaceCSS = `
-	@font-face {
-		font-family: '72override';
-		unicode-range: U+0102-0103, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EB7, U+1EB8-1EC7, U+1EC8-1ECB, U+1ECC-1EE3, U+1EE4-1EF1, U+1EF4-1EF7;
-		src: local('Arial'), local('Helvetica'), local('sans-serif');
-	}
-`;
 	const insertFontFace = () => {
 		const OpenUI5Support = FeaturesRegistry.getFeature("OpenUI5Support");
 		if (!OpenUI5Support || !OpenUI5Support.isLoaded()) {
@@ -61,13 +8,13 @@ sap.ui.define(['./util/createStyleInHead', './FeaturesRegistry'], function (crea
 		insertOverrideFontFace();
 	};
 	const insertMainFontFace = () => {
-		if (!document.querySelector(`head>style[data-ui5-font-face]`)) {
-			createStyleInHead(fontFaceCSS, { "data-ui5-font-face": "" });
+		if (!ManagedStyles.hasStyle("data-ui5-font-face")) {
+			ManagedStyles.createStyle(FontFace_css, "data-ui5-font-face");
 		}
 	};
 	const insertOverrideFontFace = () => {
-		if (!document.querySelector(`head>style[data-ui5-font-face-override]`)) {
-			createStyleInHead(overrideFontFaceCSS, { "data-ui5-font-face-override": "" });
+		if (!ManagedStyles.hasStyle("data-ui5-font-face-override")) {
+			ManagedStyles.createStyle(OverrideFontFace_css, "data-ui5-font-face-override");
 		}
 	};