carbon-react 102.4.5 → 102.4.6

package/lib/__internal__/popover/popover.component.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _core = require("@popperjs/core");
 
+var _styledComponents = require("styled-components");
+
 var _useResizeObserver = _interopRequireDefault(require("../../hooks/__internal__/useResizeObserver"));
 
 var _carbonScopedTokensProvider = require("../../style/design-tokens/carbon-scoped-tokens-provider/carbon-scoped-tokens-provider.component");
@@ -32,10 +34,11 @@ const Popover = ({
   modifiers
 }) => {
   const elementDOM = (0, _react.useRef)();
+  const theme = (0, _react.useContext)(_styledComponents.ThemeContext);
 
   if (!elementDOM.current && !disablePortal) {
     elementDOM.current = document.createElement("div");
-    elementDOM.current.classList.add(_carbonScopedTokensProvider.tokensClassName);
+    elementDOM.current.classList.add((0, _carbonScopedTokensProvider.tokensClassName)(theme === null || theme === void 0 ? void 0 : theme.name));
     document.body.appendChild(elementDOM.current);
   }
 

package/lib/components/portal/portal.js

@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
+var _styledComponents = require("styled-components");
+
 var _guid = _interopRequireDefault(require("../../__internal__/utils/helpers/guid"));
 
 var _browser = _interopRequireDefault(require("../../__internal__/utils/helpers/browser"));
@@ -31,6 +33,7 @@ const Portal = ({
 }) => {
   const [portalNode, setPortalNode] = (0, _react.useState)(null);
   const uniqueId = (0, _react.useMemo)(() => (0, _guid.default)(), []);
+  const theme = (0, _react.useContext)(_styledComponents.ThemeContext);
   (0, _react.useEffect)(() => {
     if (onReposition) {
       onReposition();
@@ -65,7 +68,7 @@ const Portal = ({
       setPortalNode(node);
     } else if (!node) {
       node = document.createElement("div");
-      node.classList.add(portalClassName, _carbonScopedTokensProvider.tokensClassName);
+      node.classList.add(portalClassName, (0, _carbonScopedTokensProvider.tokensClassName)((theme === null || theme === void 0 ? void 0 : theme.name) || ""));
       node.setAttribute("data-portal-exit", uniqueId);
 
       if (id !== undefined) {

package/lib/style/design-tokens/carbon-scoped-tokens-provider/carbon-scoped-tokens-provider.component.js

@@ -19,25 +19,34 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 /**
  *
  * Converts theme properties to css variables form and set them locally for
  * given scope
  *
  */
-const tokensClassName = `sageDesignTokens-${(0, _guid.default)()}`;
+const activeThemes = {};
+const carbonInstanceId = (0, _guid.default)();
+
+const kebabCase = input => input && input.toString().toLowerCase().match(/\w*/gm).filter(Boolean).join("-");
+
+const tokensClassName = theme => `sage-design-tokens-${kebabCase(theme)}-${carbonInstanceId}`;
+
 exports.tokensClassName = tokensClassName;
 const GlobalTokens = (0, _styledComponents.createGlobalStyle)`
-  .${tokensClassName} {
-    ${({
+  ${({
   theme
-}) => (0, _generateCssVariables.default)(theme.compatibility)}
-  }
-`;
+}) => {
+  const className = tokensClassName(theme.name);
+  activeThemes[className] = activeThemes[className] || (0, _generateCssVariables.default)(theme.compatibility);
+  return Object.entries(activeThemes).reduce((acc, [name, definitions]) => `${acc} .${name} { ${definitions} }`, "");
+}}`;
 exports.GlobalTokens = GlobalTokens;
-const TokensProviderWrapper = _styledComponents.default.div`
+const TokensProviderWrapper = _styledComponents.default.div.attrs(({
+  theme
+}) => ({
+  className: tokensClassName(theme.name)
+}))`
   margin: 0;
   padding: 0;
   width: auto;
@@ -45,14 +54,8 @@ const TokensProviderWrapper = _styledComponents.default.div`
 `;
 
 const CarbonScopedTokensProvider = ({
-  children,
-  theme,
-  ...props
-}) => /*#__PURE__*/_react.default.createElement(TokensProviderWrapper, _extends({}, props, {
-  className: tokensClassName
-}), /*#__PURE__*/_react.default.createElement(GlobalTokens, {
-  theme: theme
-}), children);
+  children
+}) => /*#__PURE__*/_react.default.createElement(TokensProviderWrapper, null, /*#__PURE__*/_react.default.createElement(GlobalTokens, null), children);
 
 var _default = CarbonScopedTokensProvider;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "102.4.5",
+  "version": "102.4.6",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {