Merge branch 'widget-sdk/fix-classname-problem' into 'development'

Classnames will properly be appended

See merge request !35

lib/package-lock.json

 {
   "name": "@tecnojest/widget-base",
-  "version": "1.4.32",
+  "version": "1.4.37",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

lib/package.json

 {
   "name": "@tecnojest/widget-base",
   "author": "Tecnojest srl https://www.invidea.it",
-  "version": "1.4.32",
+  "version": "1.4.37",
   "publishConfig": {
     "registry": "https://npm.invidea.it"
   },

lib/src/embeddable-widget.tsx

@@ -75,7 +75,7 @@ export default class EmbeddableWidget {
   static packageJson: PackageJson = require('../package.json');
 
   private static setClassName({ props }: { props: Props }): void {
-    const { className } = props.options;
+    const { className } = props;
 
     EmbeddableWidget.options.className = parseClassName(className);
   }
@@ -185,8 +185,8 @@ export default class EmbeddableWidget {
 
     const options: Options = {
       ...EmbeddableWidget.INITIAL_OPTIONS,
-      ...EmbeddableWidget.options,
       ...defaultOptionsFromProps,
+      ...EmbeddableWidget.options,
       ...this.Widget.options,
       ...newOptions,
     };

lib/test/embeddable-widget/rendering.test.jsx

@@ -42,7 +42,6 @@ describe('React rendering', () => {
       static options = {
         appendFooter: false,
         appendTooltip: false,
-        className: 'custom',
       };
 
       render() {
@@ -52,11 +51,7 @@ describe('React rendering', () => {
 
     render(Widget, UID);
 
-    const widget = document.getElementById('widget');
-
-    expect(widget.parentElement.className).toEqual('custom');
-
     expect(document.querySelector('footer')).toBeFalsy();
-    expect(document.querySelector('#widget-base-tooltip__container')).toBeFalsy();
+    expect(document.querySelector('.widget-base-tooltip__container')).toBeFalsy();
   });
 });

lib/test/util/render.jsx

@@ -14,7 +14,7 @@ function render(Widget, uid) {
 
   EmbeddableWidget.Engine = {
     createElement: (props) => {
-      return <Widget {...props} />;
+      return <Widget {...props} className={process.env.WIDGET_MAIN_CSS_CLASS} />;
     },
     render: (component, el) => ReactDOM.render(component, el),
     unmountComponentAtNode: (node) => ReactDOM.unmountComponentAtNode(node),