Merge branch 'main' of github.com:SAP/fundamental-styles into fix/icon-tabs-header-horizon-delta-theming

g-cheishvili · g-cheishvili · commit f349f2391752 · 2022-04-12T16:30:35.000+04:00
diff --git a/.storybook/custom/decorators/componentStylesProvider.js b/.storybook/custom/decorators/componentStylesProvider.js
@@ -3,7 +3,17 @@ import { componentsManager } from '../../environment';
 
 const defaultManagersKey = Symbol('Default manager');
 
-const components = componentsManager(defaultManagersKey.toString());
+const components = {
+    [defaultManagersKey.toString()]: componentsManager(defaultManagersKey.toString())
+};
+
+function getComponentsManager(managerKey) {
+    if (!components[managerKey]) {
+        components[managerKey] = componentsManager(managerKey);
+    }
+
+    return components[managerKey];
+}
 
 export const withComponentStylesProvider = makeDecorator({
     name: 'withComponentStyles',
@@ -12,7 +22,7 @@ export const withComponentStylesProvider = makeDecorator({
     wrapper: (storyFn, context) => {
         const forComponents = context?.parameters?.components || [];
         forComponents.indexOf('info-label') === -1 && forComponents.push('info-label');
-        components.use(forComponents);
+        getComponentsManager(context.id).use(forComponents);
         return storyFn(context);
     }
 });
diff --git a/.storybook/custom/decorators/themeProvider.js b/.storybook/custom/decorators/themeProvider.js
@@ -3,7 +3,16 @@ import { themeManager } from '../../environment';
 
 const defaultManagersKey = Symbol('Default manager');
 
-const themes = themeManager(defaultManagersKey.toString());
+const themes = {
+    [defaultManagersKey.toString()]: themeManager(defaultManagersKey.toString())
+};
+
+function getThemeManager(managerKey) {
+    if (!themes.hasOwnProperty(managerKey)) {
+        themes[managerKey] = themeManager(managerKey);
+    }
+    return themes[managerKey];
+}
 
 // this is a story decorator, used to inject link style tags
 // into the HTML document, based on the current selected theme
@@ -13,7 +22,7 @@ export const withThemeProvider = makeDecorator({
     parameterName: 'themes',
     wrapper: (storyFn, context) => {
         const newTheme = context?.parameters?.theme || context?.globals?.theme || 'sap_fiori_3';
-        themes.use(newTheme);
+        getThemeManager(context.id).use(newTheme);
         return storyFn(context);
     }
 });
diff --git a/.storybook/custom/styleChangers/dev/componentStylesManager.js b/.storybook/custom/styleChangers/dev/componentStylesManager.js
@@ -34,10 +34,10 @@ export default (manager) => {
 
     return {
         use: (components) => {
-            currentComponents.forEach(unuseComponent);
             for (const componentName of components) {
                 useComponent(componentName);
             }
+            currentComponents.forEach(unuseComponent);
             currentComponents = [...components];
         }
     };
diff --git a/.storybook/custom/styleChangers/dev/themeVariablesManager.js b/.storybook/custom/styleChangers/dev/themeVariablesManager.js
@@ -34,13 +34,13 @@ export default (manager) => {
 
     return {
         use: (themeName) => {
+            baseVariables[themeName].use();
+            styleVariables[themeName].use();
             if (currentTheme && currentTheme !== themeName) {
                 baseVariables[currentTheme].unuse();
                 styleVariables[currentTheme].unuse();
             }
             currentTheme = themeName;
-            baseVariables[themeName].use();
-            styleVariables[themeName].use();
         }
     };
 };
diff --git a/.storybook/custom/styleChangers/prod/componentStylesManager.js b/.storybook/custom/styleChangers/prod/componentStylesManager.js
@@ -3,7 +3,6 @@ import getLazyLoader from '../utils/getLazyLoader';
 
 export default (managedBy) => {
     let loadedComponentStyles = {};
-    let currentComponents = [];
 
     const styleLinkTag = generateStyleLinkTagFn(managedBy);
     const lazyLoader = getLazyLoader(styleLinkTag);
@@ -16,17 +15,6 @@ export default (managedBy) => {
         return `${stylePath}.css`;
     };
 
-    const unuseComponent = (componentName) => {
-        if (
-            loadedComponentStyles.hasOwnProperty(componentName)
-        ) {
-            loadedComponentStyles[componentName].unuse();
-            delete loadedComponentStyles[componentName];
-        } else {
-            console.log('Component not loaded');
-        }
-    };
-
     const useComponent = (componentName) => {
         if (!loadedComponentStyles[componentName]) {
             loadedComponentStyles[componentName] = lazyLoader(
@@ -38,11 +26,9 @@ export default (managedBy) => {
 
     return {
         use: (components) => {
-            currentComponents.forEach((componentName) => unuseComponent(componentName));
             for (const componentName of components) {
                 useComponent(componentName);
             }
-            currentComponents = [...components];
         }
     };
 };
diff --git a/.storybook/custom/styleChangers/prod/themeVariablesManager.js b/.storybook/custom/styleChangers/prod/themeVariablesManager.js
@@ -19,13 +19,13 @@ export default (managedBy) => {
 
     return {
         use: (themeName) => {
+            baseVariables[themeName].use();
+            styleVariables[themeName].use();
             if (currentTheme && currentTheme !== themeName) {
                 baseVariables[currentTheme].unuse();
                 styleVariables[currentTheme].unuse();
             }
             currentTheme = themeName;
-            baseVariables[themeName].use();
-            styleVariables[themeName].use();
         }
     };
 };
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,15 @@
 
+## 0.24.0-rc.24 (2022-04-10)
+
+## 0.24.0-rc.23 (2022-04-10)
+
+## 0.24.0-rc.22 (2022-04-10)
+
+
+### Features
+
+* **common-css:** publish padding and margin classes ([#3306](https://github.com/SAP/fundamental-styles/issues/3306)) ([facb744](https://github.com/SAP/fundamental-styles/commit/facb744b36f7435d387c720fcda0d8cd53e37533))
+
 ## 0.24.0-rc.21 (2022-04-05)
 
 ## 0.24.0-rc.20 (2022-04-05)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fundamental-styles",
-  "version": "0.24.0-rc.21",
+  "version": "0.24.0-rc.24",
   "description": "Fundamental Library Styles is a Design System and HTML/CSS Component Library used to build modern Product User Experiences with SAP Fiori look and feel with any web technology. Learn more about this project at - http://sap.github.io/fundamental-styles/",
   "main": "dist/fundamental-styles.css",
   "scripts": {
@@ -70,18 +70,18 @@
     "@commitlint/config-conventional": "^16.0.0",
     "@commitlint/travis-cli": "^16.0.0",
     "@sap-theming/theming-base-content": "11.1.38",
-    "@storybook/addon-a11y": "6.4.20",
-    "@storybook/addon-actions": "6.4.20",
-    "@storybook/addon-controls": "6.4.20",
+    "@storybook/addon-a11y": "6.4.21",
+    "@storybook/addon-actions": "6.4.21",
+    "@storybook/addon-controls": "6.4.21",
     "@storybook/addon-cssresources": "6.2.9",
-    "@storybook/addon-docs": "6.4.20",
-    "@storybook/addon-links": "6.4.20",
-    "@storybook/addon-storyshots": "6.4.20",
-    "@storybook/addon-toolbars": "6.4.20",
-    "@storybook/addon-viewport": "6.4.20",
-    "@storybook/addons": "6.4.20",
+    "@storybook/addon-docs": "6.4.21",
+    "@storybook/addon-links": "6.4.21",
+    "@storybook/addon-storyshots": "6.4.21",
+    "@storybook/addon-toolbars": "6.4.21",
+    "@storybook/addon-viewport": "6.4.21",
+    "@storybook/addons": "6.4.21",
     "@storybook/builder-webpack5": "^6.5.0-alpha.16",
-    "@storybook/html": "6.4.20",
+    "@storybook/html": "6.4.21",
     "@storybook/manager-webpack5": "^6.5.0-alpha.16",
     "@storybook/preset-scss": "^1.0.3",
     "babel-eslint": "^10.1.0",
@@ -96,7 +96,7 @@
     "css-loader": "^5.2.4",
     "cssnano": "^4.1.11",
     "eslint": "^7.25.0",
-    "eslint-plugin-storybook": "^0.5.6",
+    "eslint-plugin-storybook": "^0.5.8",
     "fs-extra": "^10.0.0",
     "gh-pages": "^3.2.3",
     "github-assistant": "^0.3.3",
diff --git a/src/common-css/_common-mixins.scss b/src/common-css/_common-mixins.scss
diff --git a/src/common-css/common-css.scss b/src/common-css/common-css.scss

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ export default (manager) => {`
`34`	`34`
`35`	`35`	`return {`
`36`	`36`	`use: (components) => {`
`37`		`- currentComponents.forEach(unuseComponent);`
`38`	`37`	`for (const componentName of components) {`
`39`	`38`	`useComponent(componentName);`
`40`	`39`	`}`
	`40`	`+ currentComponents.forEach(unuseComponent);`
`41`	`41`	`currentComponents = [...components];`
`42`	`42`	`}`
`43`	`43`	`};`