@ui5/webcomponents-base 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/resources/bundle.esm.js +8 -8
  3. package/dist/resources/bundle.esm.js.map +1 -1
  4. package/dist/theming/applyTheme.js +8 -4
  5. package/dist/theming/getThemeDesignerTheme.js +24 -5
  6. package/hash.txt +1 -1
  7. package/package.json +2 -2
  8. package/src/theming/applyTheme.js +8 -4
  9. package/src/theming/getThemeDesignerTheme.js +24 -5
package/dist/theming/applyTheme.js CHANGED
@@ -16,8 +16,10 @@ const loadThemeBase = async theme => {
16
16
  return;
17
17
  }
18
18
 
19
- const cssText = await getThemeProperties(BASE_THEME_PACKAGE, theme);
20
- createOrUpdateStyle(cssText, "data-ui5-theme-properties", BASE_THEME_PACKAGE);
19
+ const cssData = await getThemeProperties(BASE_THEME_PACKAGE, theme);
20
+ if (cssData) {
21
+ createOrUpdateStyle(cssData, "data-ui5-theme-properties", BASE_THEME_PACKAGE);
22
+ }
21
23
  };
22
24
 
23
25
  const deleteThemeBase = () => {
@@ -31,8 +33,10 @@ const loadComponentPackages = async theme => {
31
33
  return;
32
34
  }
33
35
 
34
- const cssText = await getThemeProperties(packageName, theme);
35
- createOrUpdateStyle(cssText, "data-ui5-theme-properties", packageName);
36
+ const cssData = await getThemeProperties(packageName, theme);
37
+ if (cssData) {
38
+ createOrUpdateStyle(cssData, "data-ui5-theme-properties", packageName);
39
+ }
36
40
  });
37
41
  };
38
42
 
package/dist/theming/getThemeDesignerTheme.js CHANGED
@@ -1,3 +1,5 @@
1
+ const warnings = new Set();
2
+
1
3
  const getThemeMetadata = () => {
2
4
  // Check if the class was already applied, most commonly to the link/style tag with the CSS Variables
3
5
  let el = document.querySelector(".sapThemeMetaData-Base-baseLib") || document.querySelector(".sapThemeMetaData-UI5-sap-ui-core");
@@ -7,10 +9,18 @@ const getThemeMetadata = () => {
7
9
 
8
10
  el = document.createElement("span");
9
11
  el.style.display = "none";
12
+
13
+ // Try with sapThemeMetaData-Base-baseLib first
10
14
  el.classList.add("sapThemeMetaData-Base-baseLib");
11
- el.classList.add("sapThemeMetaData-UI5-sap-ui-core");
12
15
  document.body.appendChild(el);
13
- const metadata = getComputedStyle(el).backgroundImage;
16
+ let metadata = getComputedStyle(el).backgroundImage;
17
+
18
+ // Try with sapThemeMetaData-UI5-sap-ui-core only if the previous selector was not found
19
+ if (metadata === "none") {
20
+ el.classList.add("sapThemeMetaData-UI5-sap-ui-core");
21
+ metadata = getComputedStyle(el).backgroundImage;
22
+ }
23
+
14
24
  document.body.removeChild(el);
15
25
 
16
26
  return metadata;
@@ -25,14 +35,20 @@ const parseThemeMetadata = metadataString => {
25
35
  try {
26
36
  paramsString = decodeURIComponent(paramsString);
27
37
  } catch (ex) {
28
- console.warn("Malformed theme metadata string, unable to decodeURIComponent"); // eslint-disable-line
38
+ if (!warnings.has("decode")) {
39
+ console.warn("Malformed theme metadata string, unable to decodeURIComponent"); // eslint-disable-line
40
+ warnings.add("decode");
41
+ }
29
42
  return;
30
43
  }
31
44
  }
32
45
  try {
33
46
  return JSON.parse(paramsString);
34
47
  } catch (ex) {
35
- console.warn("Malformed theme metadata string, unable to parse JSON"); // eslint-disable-line
48
+ if (!warnings.has("parse")) {
49
+ console.warn("Malformed theme metadata string, unable to parse JSON"); // eslint-disable-line
50
+ warnings.add("parse");
51
+ }
36
52
  }
37
53
  }
38
54
  };
@@ -45,7 +61,10 @@ const processThemeMetadata = metadata => {
45
61
  themeName = metadata.Path.match(/\.([^.]+)\.css_variables$/)[1];
46
62
  baseThemeName = metadata.Extends[0];
47
63
  } catch (ex) {
48
- console.warn("Malformed theme metadata Object", metadata); // eslint-disable-line
64
+ if (!warnings.has("object")) {
65
+ console.warn("Malformed theme metadata Object", metadata); // eslint-disable-line
66
+ warnings.add("object");
67
+ }
49
68
  return;
50
69
  }
51
70
 
package/hash.txt CHANGED
@@ -1 +1 @@
1
- lG/1T57aPULqB5ErWOkk2B0Pejk=
1
+ rlmfrJXzI+eXqm/SPYBuYkS+TqM=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ui5/webcomponents-base",
3
- "version": "1.0.1",
3
+ "version": "1.0.2",
4
4
  "description": "UI5 Web Components: webcomponents.base",
5
5
  "author": "SAP SE (https://www.sap.com)",
6
6
  "license": "Apache-2.0",
@@ -37,7 +37,7 @@
37
37
  "devDependencies": {
38
38
  "@buxlabs/amd-to-es6": "0.16.1",
39
39
  "@openui5/sap.ui.core": "1.94.0",
40
- "@ui5/webcomponents-tools": "1.0.1",
40
+ "@ui5/webcomponents-tools": "1.0.2",
41
41
  "chromedriver": "95.0.0",
42
42
  "clean-css": "^5.2.2",
43
43
  "copy-and-watch": "^0.1.5",
package/src/theming/applyTheme.js CHANGED
@@ -16,8 +16,10 @@ const loadThemeBase = async theme => {
16
16
  return;
17
17
  }
18
18
 
19
- const cssText = await getThemeProperties(BASE_THEME_PACKAGE, theme);
20
- createOrUpdateStyle(cssText, "data-ui5-theme-properties", BASE_THEME_PACKAGE);
19
+ const cssData = await getThemeProperties(BASE_THEME_PACKAGE, theme);
20
+ if (cssData) {
21
+ createOrUpdateStyle(cssData, "data-ui5-theme-properties", BASE_THEME_PACKAGE);
22
+ }
21
23
  };
22
24
 
23
25
  const deleteThemeBase = () => {
@@ -31,8 +33,10 @@ const loadComponentPackages = async theme => {
31
33
  return;
32
34
  }
33
35
 
34
- const cssText = await getThemeProperties(packageName, theme);
35
- createOrUpdateStyle(cssText, "data-ui5-theme-properties", packageName);
36
+ const cssData = await getThemeProperties(packageName, theme);
37
+ if (cssData) {
38
+ createOrUpdateStyle(cssData, "data-ui5-theme-properties", packageName);
39
+ }
36
40
  });
37
41
  };
38
42
 
package/src/theming/getThemeDesignerTheme.js CHANGED
@@ -1,3 +1,5 @@
1
+ const warnings = new Set();
2
+
1
3
  const getThemeMetadata = () => {
2
4
  // Check if the class was already applied, most commonly to the link/style tag with the CSS Variables
3
5
  let el = document.querySelector(".sapThemeMetaData-Base-baseLib") || document.querySelector(".sapThemeMetaData-UI5-sap-ui-core");
@@ -7,10 +9,18 @@ const getThemeMetadata = () => {
7
9
 
8
10
  el = document.createElement("span");
9
11
  el.style.display = "none";
12
+
13
+ // Try with sapThemeMetaData-Base-baseLib first
10
14
  el.classList.add("sapThemeMetaData-Base-baseLib");
11
- el.classList.add("sapThemeMetaData-UI5-sap-ui-core");
12
15
  document.body.appendChild(el);
13
- const metadata = getComputedStyle(el).backgroundImage;
16
+ let metadata = getComputedStyle(el).backgroundImage;
17
+
18
+ // Try with sapThemeMetaData-UI5-sap-ui-core only if the previous selector was not found
19
+ if (metadata === "none") {
20
+ el.classList.add("sapThemeMetaData-UI5-sap-ui-core");
21
+ metadata = getComputedStyle(el).backgroundImage;
22
+ }
23
+
14
24
  document.body.removeChild(el);
15
25
 
16
26
  return metadata;
@@ -25,14 +35,20 @@ const parseThemeMetadata = metadataString => {
25
35
  try {
26
36
  paramsString = decodeURIComponent(paramsString);
27
37
  } catch (ex) {
28
- console.warn("Malformed theme metadata string, unable to decodeURIComponent"); // eslint-disable-line
38
+ if (!warnings.has("decode")) {
39
+ console.warn("Malformed theme metadata string, unable to decodeURIComponent"); // eslint-disable-line
40
+ warnings.add("decode");
41
+ }
29
42
  return;
30
43
  }
31
44
  }
32
45
  try {
33
46
  return JSON.parse(paramsString);
34
47
  } catch (ex) {
35
- console.warn("Malformed theme metadata string, unable to parse JSON"); // eslint-disable-line
48
+ if (!warnings.has("parse")) {
49
+ console.warn("Malformed theme metadata string, unable to parse JSON"); // eslint-disable-line
50
+ warnings.add("parse");
51
+ }
36
52
  }
37
53
  }
38
54
  };
@@ -45,7 +61,10 @@ const processThemeMetadata = metadata => {
45
61
  themeName = metadata.Path.match(/\.([^.]+)\.css_variables$/)[1];
46
62
  baseThemeName = metadata.Extends[0];
47
63
  } catch (ex) {
48
- console.warn("Malformed theme metadata Object", metadata); // eslint-disable-line
64
+ if (!warnings.has("object")) {
65
+ console.warn("Malformed theme metadata Object", metadata); // eslint-disable-line
66
+ warnings.add("object");
67
+ }
49
68
  return;
50
69
  }
51
70