@jetbrains/ring-ui 5.0.47 → 5.0.49

package/components/button-ng/button-ng.examples.js

@@ -6,7 +6,6 @@ import pencilIcon from '@jetbrains/icons/pencil';
 import angularDecorator, {APP_NAME} from '../../.storybook/angular-decorator';
 
 import IconNG from '../icon-ng/icon-ng';
-import ThemeNG from '../theme-ng/theme-ng';
 import CheckboxNG from '../checkbox-ng/checkbox-ng';
 import Theme from '../global/theme';
 import styles from '../global/variables_dark.css';
@@ -21,7 +20,7 @@ export default {
 
 export const basic = () => {
   angular.
-    module(APP_NAME, [IconNG, ThemeNG, CheckboxNG, ButtonNG]).
+    module(APP_NAME, [IconNG, CheckboxNG, ButtonNG]).
     controller('testCtrl', function controller($scope) {
       $scope.pencil = pencilIcon;
       $scope.Theme = Theme;

package/components/global/theme.js

@@ -26,9 +26,11 @@ export function applyTheme(theme, container) {
     if (theme === Theme.DARK) {
         container.classList.remove(defaultStyles.light);
         container.classList.add(styles.dark);
+        container.classList.add('ring-ui-theme-dark');
     }
     else {
         container.classList.remove(styles.dark);
+        container.classList.remove('ring-ui-theme-dark');
         container.classList.add(defaultStyles.light);
     }
 }
@@ -45,7 +47,7 @@ export const ThemeProvider = forwardRef(function ThemeProvider({ theme = Theme.A
             ? (<PopupTarget id={id}>
               {target => (<>
                   {children}
-                  {createPortal(target, parentTarget && getPopupContainer(parentTarget) || document.body)}
+                  {createPortal(<div className={themeClasses}>{target}</div>, parentTarget && getPopupContainer(parentTarget) || document.body)}
                 </>)}
             </PopupTarget>)
             : children}

package/dist/_helpers/theme.js

@@ -30,8 +30,10 @@ function applyTheme(theme, container) {
   if (theme === Theme.DARK) {
     container.classList.remove(modules_6381a4b3.light);
     container.classList.add(modules_59717246.dark);
+    container.classList.add('ring-ui-theme-dark');
   } else {
     container.classList.remove(modules_59717246.dark);
+    container.classList.remove('ring-ui-theme-dark');
     container.classList.add(modules_6381a4b3.light);
   }
 }
@@ -56,7 +58,9 @@ const ThemeProvider = /*#__PURE__*/forwardRef(function ThemeProvider(_ref, ref)
     className: classNames(className, themeClasses)
   }, restProps), passToPopups ? /*#__PURE__*/React.createElement(PopupTarget, {
     id: id
-  }, target => /*#__PURE__*/React.createElement(React.Fragment, null, children, /*#__PURE__*/createPortal(target, parentTarget && getPopupContainer(parentTarget) || document.body))) : children);
+  }, target => /*#__PURE__*/React.createElement(React.Fragment, null, children, /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
+    className: themeClasses
+  }, target), parentTarget && getPopupContainer(parentTarget) || document.body))) : children);
 });
 var Theme$1 = Theme;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "5.0.47",
+  "version": "5.0.49",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -259,5 +259,5 @@
     "node": ">=14.0",
     "npm": ">=6.0.0"
   },
-  "gitHead": "65ef137395f15313b66bc3e9de6eb25a1bef0234"
+  "gitHead": "393f795d7a6fcfadcbf4dbc6d64131c3ff35cf33"
 }

package/components/theme-ng/theme-ng.js

@@ -1,40 +0,0 @@
-import angular from 'angular';
-
-import RingAngularComponent from '../global/ring-angular-component';
-
-
-const angularModule = angular.module('Ring.theme', []);
-
-class RingThemeComponent extends RingAngularComponent {
-  static $inject = ['$scope', '$element'];
-
-  static bindings = {
-    theme: '<'
-  };
-
-  constructor(...args) {
-    super(...args);
-  }
-
-  on = this.$inject.$scope.$on.bind(this.$inject.$scope);
-
-  $onInit() {
-    const {$element} = this.$inject;
-    $element[0].setAttribute('data-test', 'ring-theme');
-  }
-
-  $onChanges(changes) {
-    if (changes.theme && changes.theme.currentValue) {
-      const {$scope} = this.$inject;
-      $scope.$emit('change', {
-        prevTheme: typeof changes.theme.previousValue === 'string' && changes.theme.previousValue,
-        currentTheme: changes.theme.currentValue
-      });
-    }
-  }
-}
-
-angularModule.component('rgTheme', RingThemeComponent);
-
-
-export default angularModule.name;

package/components/theme-ng/theme-ng.test.js

@@ -1,36 +0,0 @@
-/*global inject*/
-import 'angular';
-import 'angular-mocks';
-
-import Theme from './theme-ng';
-
-describe('Theme', () => {
-  beforeEach(window.module(Theme));
-
-  let $scope;
-  let $compile;
-  let element;
-  let ctrl;
-
-  beforeEach(inject(($rootScope, _$compile_, $componentController) => {
-    $scope = $rootScope.$new();
-    $compile = _$compile_;
-
-    ctrl = $componentController('rgTheme', {
-      $element: {0: {}}
-    });
-  }));
-
-  it('should render a component', () => {
-    $scope.theme = 'foo';
-    element = $compile('<rg-theme theme="theme"></rg-theme>')($scope)[0];
-    $scope.$digest();
-
-    element.getAttribute('data-test').should.be.equal('ring-theme');
-  });
-
-  it('should have a method to subscribe on change a theme', () => {
-    ctrl.on.should.exist;
-  });
-
-});

package/dist/theme-ng/theme-ng.js

@@ -1,36 +0,0 @@
-import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import angular from 'angular';
-import RingAngularComponent from '../global/ring-angular-component.js';
-
-const angularModule = angular.module('Ring.theme', []);
-class RingThemeComponent extends RingAngularComponent {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "on", this.$inject.$scope.$on.bind(this.$inject.$scope));
-  }
-  $onInit() {
-    const {
-      $element
-    } = this.$inject;
-    $element[0].setAttribute('data-test', 'ring-theme');
-  }
-  $onChanges(changes) {
-    if (changes.theme && changes.theme.currentValue) {
-      const {
-        $scope
-      } = this.$inject;
-      $scope.$emit('change', {
-        prevTheme: typeof changes.theme.previousValue === 'string' && changes.theme.previousValue,
-        currentTheme: changes.theme.currentValue
-      });
-    }
-  }
-}
-_defineProperty(RingThemeComponent, "$inject", ['$scope', '$element']);
-_defineProperty(RingThemeComponent, "bindings", {
-  theme: '<'
-});
-angularModule.component('rgTheme', RingThemeComponent);
-var themeNg = angularModule.name;
-
-export { themeNg as default };