@ui5/webcomponents-theming 1.3.1 → 1.4.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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

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",
@@ -304,7 +340,6 @@
   "--sapNegativeElementColor",
   "--sapNegativeTextColor",
   "--sapNeutralBackground",
-  "--sapNeutralBorderColor",
   "--sapNeutralColor",
   "--sapNeutralElementColor",
   "--sapNeutralTextColor",
@@ -320,6 +355,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 +385,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/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,19 @@ 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"));
+	const fioriFiles = await globby(path.join(__dirname, "../../../fiori/src/themes/**/*.css"));
+	await Promise.all([...mainFiles.map(processFile), ...fioriFiles.map(processFile)]);
 
-const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
-const result = Array.from(vars).sort(collator.compare); // natural sort
+	const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+	const result = Array.from(vars).sort(collator.compare); // natural sort
 
-fs.writeFileSync(path.join(__dirname, "../../css-vars-usage.json"), beautify(result, null, 2, 100));
-console.log("CSS Vars usage report generated.");
+	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.1",
+  "version": "1.4.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.1"
+    "@ui5/webcomponents-base": "1.4.0"
   },
   "devDependencies": {
-    "@ui5/webcomponents-tools": "1.3.1",
-    "chromedriver": "100.0.0",
+    "@ui5/webcomponents-tools": "1.4.0",
+    "chromedriver": "101.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=