@ui5/webcomponents-theming 1.3.0 → 1.5.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.5.0](https://github.com/SAP/ui5-webcomponents/compare/v1.4.0...v1.5.0) (2022-07-03)
+
+
+
+
+
+
+# [1.4.0](https://github.com/SAP/ui5-webcomponents/compare/v1.3.1...v1.4.0) (2022-05-25)
+
+
+### Bug Fixes
+
+* **framework:** fix fallback to default theme ([#5185](https://github.com/SAP/ui5-webcomponents/issues/5185)) ([0fc2f0d](https://github.com/SAP/ui5-webcomponents/commit/0fc2f0d)), closes [#5136](https://github.com/SAP/ui5-webcomponents/issues/5136) [#5136](https://github.com/SAP/ui5-webcomponents/issues/5136)
+
+
+
+
+
+## [1.3.1](https://github.com/SAP/ui5-webcomponents/compare/v1.3.0...v1.3.1) (2022-04-27)
+
+**Note:** Version bump only for package @ui5/webcomponents-theming
+
+
+
+
+
 # [1.3.0](https://github.com/SAP/ui5-webcomponents/compare/v1.2.4...v1.3.0) (2022-04-19)
 
 

package/README.md

@@ -1,8 +1,7 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/master/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/main/docs/images/UI5_logo_wide.png)
 
 # UI5 Web Components - Theming
 
-[![Travis CI Build Status](https://travis-ci.org/SAP/ui5-webcomponents.svg?branch=master)](https://travis-ci.org/SAP/ui5-webcomponents)
 [![npm Package Version](https://badge.fury.io/js/%40ui5%2Fwebcomponents.svg)](https://www.npmjs.com/package/@ui5/webcomponents)
 
 Provides common theming assets, used by other UI5 Web Components packages, such as `main` and `fiori`.
@@ -18,16 +17,16 @@ The assets, provided by this package, are additional themes:
 *Note:* These assets are already imported by the UI5 Web Components packages that need them.
 
 ## Resources
-- [UI5 Web Components - README.md](https://github.com/SAP/ui5-webcomponents/blob/master/README.md)
+- [UI5 Web Components - README.md](https://github.com/SAP/ui5-webcomponents/blob/main/README.md)
 - [UI5 Web Components - Home Page](https://sap.github.io/ui5-webcomponents)
 - [UI5 Web Components - Playground and API Reference](https://sap.github.io/ui5-webcomponents/playground/)
 
 ## Support
-We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/master/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://join-ui5-slack.herokuapp.com/).
+We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://join-ui5-slack.herokuapp.com/).
 
 ## Contribute
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-webcomponents/blob/master/docs/6-contributing/02-conventions-and-guidelines.md).
+Please check our [Contribution Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/docs/6-contributing/02-conventions-and-guidelines.md).
 
 ## License
 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
-This file is licensed under the Apache Software License, Version 2.0 except as noted otherwise in the [LICENSE](https://github.com/SAP/ui5-webcomponents/blob/master/LICENSE.txt) file.
+This file is licensed under the Apache Software License, Version 2.0 except as noted otherwise in the [LICENSE](https://github.com/SAP/ui5-webcomponents/blob/main/LICENSE.txt) file.

package/css-vars-usage.json

@@ -87,6 +87,26 @@
   "--sapButton_Emphasized_Hover_BorderColor",
   "--sapButton_Emphasized_Hover_TextColor",
   "--sapButton_Emphasized_TextColor",
+  "--sapButton_Handle_Background",
+  "--sapButton_Handle_BorderColor",
+  "--sapButton_Handle_Hover_Background",
+  "--sapButton_Handle_Hover_BorderColor",
+  "--sapButton_Handle_Negative_Background",
+  "--sapButton_Handle_Negative_BorderColor",
+  "--sapButton_Handle_Negative_Hover_Background",
+  "--sapButton_Handle_Negative_Hover_BorderColor",
+  "--sapButton_Handle_Negative_TextColor",
+  "--sapButton_Handle_Positive_Background",
+  "--sapButton_Handle_Positive_BorderColor",
+  "--sapButton_Handle_Positive_Hover_Background",
+  "--sapButton_Handle_Positive_Hover_BorderColor",
+  "--sapButton_Handle_Positive_TextColor",
+  "--sapButton_Handle_Selected_Background",
+  "--sapButton_Handle_Selected_BorderColor",
+  "--sapButton_Handle_Selected_Hover_Background",
+  "--sapButton_Handle_Selected_Hover_BorderColor",
+  "--sapButton_Handle_Selected_TextColor",
+  "--sapButton_Handle_TextColor",
   "--sapButton_Hover_Background",
   "--sapButton_Hover_BorderColor",
   "--sapButton_Hover_TextColor",
@@ -123,9 +143,22 @@
   "--sapButton_TokenBackground",
   "--sapButton_TokenBorderColor",
   "--sapButton_Track_Background",
+  "--sapButton_Track_BorderColor",
+  "--sapButton_Track_Hover_Background",
+  "--sapButton_Track_Hover_BorderColor",
+  "--sapButton_Track_Negative_Background",
+  "--sapButton_Track_Negative_BorderColor",
+  "--sapButton_Track_Negative_Hover_Background",
+  "--sapButton_Track_Negative_Hover_BorderColor",
+  "--sapButton_Track_Positive_Background",
+  "--sapButton_Track_Positive_BorderColor",
+  "--sapButton_Track_Positive_Hover_Background",
+  "--sapButton_Track_Positive_Hover_BorderColor",
   "--sapButton_Track_Selected_Background",
+  "--sapButton_Track_Selected_BorderColor",
+  "--sapButton_Track_Selected_Hover_Background",
+  "--sapButton_Track_Selected_Hover_BorderColor",
   "--sapButton_Track_Selected_TextColor",
-  "--sapButton_Track_TextColor",
   "--sapChart_Good",
   "--sapChart_Sequence_6",
   "--sapContent_BadgeBackground",
@@ -133,6 +166,7 @@
   "--sapContent_BusyColor",
   "--sapContent_ContrastFocusColor",
   "--sapContent_ContrastIconColor",
+  "--sapContent_ContrastShadowColor",
   "--sapContent_ContrastTextColor",
   "--sapContent_Critical_Shadow",
   "--sapContent_DisabledOpacity",
@@ -147,6 +181,7 @@
   "--sapContent_HeaderShadow",
   "--sapContent_HelpColor",
   "--sapContent_IconColor",
+  "--sapContent_IconFontFamily",
   "--sapContent_Illustrative_Color1",
   "--sapContent_Illustrative_Color2",
   "--sapContent_Illustrative_Color3",
@@ -160,6 +195,7 @@
   "--sapContent_Informative_Shadow",
   "--sapContent_Interaction_Shadow",
   "--sapContent_LabelColor",
+  "--sapContent_MeasureIndicatorColor",
   "--sapContent_Negative_Shadow",
   "--sapContent_NonInteractiveIconColor",
   "--sapContent_Positive_Shadow",
@@ -167,6 +203,7 @@
   "--sapContent_Selected_Background",
   "--sapContent_Selected_ForegroundColor",
   "--sapContent_Selected_Hover_Background",
+  "--sapContent_Selected_MeasureIndicatorColor",
   "--sapContent_Selected_Shadow",
   "--sapContent_Selected_TextColor",
   "--sapContent_Shadow0",
@@ -233,11 +270,10 @@
   "--sapFontSmallSize",
   "--sapGroup_ContentBackground",
   "--sapGroup_ContentBorderColor",
+  "--sapGroup_Title_FontSize",
   "--sapGroup_TitleBackground",
   "--sapGroup_TitleBorderColor",
-  "--sapGroup_TitleFontSize",
   "--sapGroup_TitleTextColor",
-  "--sapHC_ReducedAltForeground",
   "--sapHC_ReducedBackground",
   "--sapHC_ReducedForeground",
   "--sapHighlightColor",
@@ -274,7 +310,6 @@
   "--sapLink_Active_Color",
   "--sapLink_Hover_Color",
   "--sapLink_SubtleColor",
-  "--sapLink_Visited_Color",
   "--sapLinkColor",
   "--sapList_Active_Background",
   "--sapList_Active_TextColor",
@@ -304,7 +339,6 @@
   "--sapNegativeElementColor",
   "--sapNegativeTextColor",
   "--sapNeutralBackground",
-  "--sapNeutralBorderColor",
   "--sapNeutralColor",
   "--sapNeutralElementColor",
   "--sapNeutralTextColor",
@@ -320,6 +354,27 @@
   "--sapPositiveColor",
   "--sapPositiveElementColor",
   "--sapPositiveTextColor",
+  "--sapProgress_Background",
+  "--sapProgress_CriticalBackground",
+  "--sapProgress_FontSize",
+  "--sapProgress_InformationBackground",
+  "--sapProgress_NegativeBackground",
+  "--sapProgress_PositiveBackground",
+  "--sapProgress_TextColor",
+  "--sapProgress_Value_Background",
+  "--sapProgress_Value_BorderColor",
+  "--sapProgress_Value_CriticalBackground",
+  "--sapProgress_Value_CriticalBorderColor",
+  "--sapProgress_Value_CriticalTextColor",
+  "--sapProgress_Value_InformationBackground",
+  "--sapProgress_Value_InformationBorderColor",
+  "--sapProgress_Value_InformationTextColor",
+  "--sapProgress_Value_NegativeBackground",
+  "--sapProgress_Value_NegativeBorderColor",
+  "--sapProgress_Value_NegativeTextColor",
+  "--sapProgress_Value_PositiveBackground",
+  "--sapProgress_Value_PositiveBorderColor",
+  "--sapProgress_Value_PositiveTextColor",
   "--sapScrollBar_Dimension",
   "--sapScrollBar_FaceColor",
   "--sapScrollBar_Hover_FaceColor",
@@ -329,10 +384,21 @@
   "--sapShell_Active_TextColor",
   "--sapShell_Background",
   "--sapShell_Hover_Background",
+  "--sapShell_InteractiveBackground",
   "--sapShell_InteractiveBorderColor",
   "--sapShell_InteractiveTextColor",
   "--sapShell_TextColor",
   "--sapShellColor",
+  "--sapSlider_Active_HandleBackground",
+  "--sapSlider_Active_RangeHandleBackground",
+  "--sapSlider_Background",
+  "--sapSlider_HandleBackground",
+  "--sapSlider_HandleBorderColor",
+  "--sapSlider_Hover_HandleBackground",
+  "--sapSlider_Hover_HandleBorderColor",
+  "--sapSlider_RangeHandleBackground",
+  "--sapSlider_Selected_Background",
+  "--sapSlider_Selected_BorderColor",
   "--sapSuccessBackground",
   "--sapSuccessBorderColor",
   "--sapTextColor",

package/dist/generated/json-imports/Themes-static.js

@@ -35,7 +35,7 @@ const loadThemeProperties = async (themeName) => {
 		throw new Error("[themes] Inlined JSON not supported with static imports of assets. Use dynamic imports of assets or configure JSON imports as URLs");
 	}
 	return (await fetch(themeUrlsByName[themeName])).json();
-}
+};
 
 ["sap_belize", "sap_belize_hcb", "sap_belize_hcw", "sap_fiori_3", "sap_fiori_3_dark", "sap_fiori_3_hcb", "sap_fiori_3_hcw", "sap_horizon", "sap_horizon_dark", "sap_horizon_exp", "sap_horizon_hcb", "sap_horizon_hcw"]
   .forEach(themeName => registerThemePropertiesLoader("@ui5/webcomponents-theming", themeName, loadThemeProperties));

package/dist/generated/json-imports/Themes.js

@@ -16,7 +16,7 @@ const loadThemeProperties = async (themeName) => {
 		case "sap_horizon_hcw": return (await import("../assets/themes/sap_horizon_hcw/parameters-bundle.css.json")).default;
 		default: throw "unknown theme"
 	}
-}
+};
 
 const loadAndCheck = async (themeName) => {
 	const data = await loadThemeProperties(themeName);
@@ -24,7 +24,7 @@ const loadAndCheck = async (themeName) => {
 		throw new Error(`[themes] Invalid bundling detected - dynamic JSON imports bundled as URLs. Switch to inlining JSON files from the build or use 'import ".../Assets-static.js"'. Check the "Assets" documentation for more information.`);
 	}
 	return data;
-}
+};
 
 ["sap_belize", "sap_belize_hcb", "sap_belize_hcw", "sap_fiori_3", "sap_fiori_3_dark", "sap_fiori_3_hcb", "sap_fiori_3_hcw", "sap_horizon", "sap_horizon_dark", "sap_horizon_exp", "sap_horizon_hcb", "sap_horizon_hcw"]
   .forEach(themeName => registerThemePropertiesLoader("@ui5/webcomponents-theming", themeName, loadAndCheck));

package/lib/generate-css-vars-usage-report/index.js

@@ -1,12 +1,11 @@
-const fs = require('fs');
+const fs = require('fs').promises;
 const path = require("path");
-const glob = require("glob");
 const beautify = require("json-beautify");
 
 const vars = new Set();
 
-const processFile = file => {
-	const content = fs.readFileSync(file);
+const processFile = async file => {
+	const content = await fs.readFile(file);
 	const matches = `${content}`.match(/var\(--sap[\-_A-Za-z0-9]+\)/g);
 	matches && matches.forEach(match => {
 		const cssVar = match.match(/--sap[\-_A-Za-z0-9]+/)[0];
@@ -14,14 +13,20 @@ const processFile = file => {
 	});
 };
 
-// Main
-glob.sync(path.join(__dirname, "../../../main/src/themes/**/*.css")).forEach(file => processFile(file));
+const generate = async () => {
+	const { globby } = await import("globby");
 
-// Fiori
-glob.sync(path.join(__dirname, "../../../fiori/src/themes/**/*.css")).forEach(file => processFile(file));
+	const mainFiles = await globby(path.join(__dirname, "../../../main/src/themes/**/*.css").replace(/\\/g, "/"));
+	const fioriFiles = await globby(path.join(__dirname, "../../../fiori/src/themes/**/*.css").replace(/\\/g, "/"));
 
-const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
-const result = Array.from(vars).sort(collator.compare); // natural sort
+	await Promise.all([...mainFiles.map(processFile), ...fioriFiles.map(processFile)]);
 
-fs.writeFileSync(path.join(__dirname, "../../css-vars-usage.json"), beautify(result, null, 2, 100));
-console.log("CSS Vars usage report generated.");
+	const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+	const result = Array.from(vars).sort(collator.compare); // natural sort
+
+	return fs.writeFile(path.join(__dirname, "../../css-vars-usage.json"), beautify(result, null, 2, 100));
+}
+
+generate().then(() => {
+	console.log("CSS Vars usage report generated.");
+});

package/package-scripts.js

@@ -15,15 +15,11 @@ allThemes.forEach(theme => {
 	buildThemesCommands[`copy_${theme}_bundle`] = `copy-and-watch "src/themes/${theme}/parameters-bundle.css" dist/themes/${theme}/`;
 });
 
-const generateHash = resolve.sync("@ui5/webcomponents-tools/lib/hash/generate.js");
-const hashIsUpToDate = resolve.sync("@ui5/webcomponents-tools/lib/hash/upToDate.js");
-const UP_TO_DATE = `node "${hashIsUpToDate}" dist/ hash.txt && echo "Up to date."`;
-
 module.exports = {
 	scripts: {
 		clean: "rimraf dist",
 		build: {
-			default: `${UP_TO_DATE} || nps clean build.src build.themes build.postcss build.jsonImports generateReport hash`,
+			default: `nps clean build.src build.themes build.postcss build.jsonImports generateReport`,
 			src: `copy-and-watch "src/**/*.js" dist/`,
 			themes: {
 				default: `nps build.themes.prepare ${buildThemesCommandsNames}`,
@@ -33,6 +29,5 @@ module.exports = {
 			jsonImports: `node "${jsonImportsScript}" dist/generated/assets/themes dist/generated/json-imports`,
 		},
 		generateReport: `node "${generateReportScript}"`,
-		hash: `node ${generateHash} dist/ hash.txt`,
 	},
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-theming",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "UI5 Web Components: webcomponents.theming",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -20,7 +20,6 @@
     "build": "nps build",
     "start": "nps start",
     "verify": "node ./lib/verify-vars/index.js",
-    "hash": "nps hash",
     "prepublishOnly": "npm run clean && npm run build"
   },
   "repository": {
@@ -30,13 +29,13 @@
   },
   "dependencies": {
     "@sap-theming/theming-base-content": "11.1.38",
-    "@ui5/webcomponents-base": "1.3.0"
+    "@ui5/webcomponents-base": "1.5.0"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "1.3.0",
-    "chromedriver": "100.0.0",
+    "@ui5/webcomponents-tools": "1.5.0",
+    "chromedriver": "102.0.0",
     "cssnano": "^4.1.11",
-    "glob": "^7.1.6",
+    "globby": "^13.1.1",
     "json-beautify": "^1.1.1",
     "nps": "^5.10.0",
     "postcss": "^8.4.5",

package/hash.txt

@@ -1 +0,0 @@
-jTxjP4q8ZYzq4ZcbwLrh2rt5ZuI=