Refactor #2397

src/components/confirmpopup/ConfirmPopup.js

@@ -1,14 +1,7 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-import {
-    DomHandler,
-    ObjectUtils,
-    classNames,
-    ZIndexUtils,
-    ConnectedOverlayScrollHandler,
-    IconUtils
-} from '../utils/Utils';
+import { DomHandler, ObjectUtils, classNames, ZIndexUtils, ConnectedOverlayScrollHandler, IconUtils } from '../utils/Utils';
 import { Button } from '../button/Button';
 import { CSSTransition } from '../csstransition/CSSTransition';
 import { localeOption } from '../api/Api';

src/components/utils/ClassNames.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 export function classNames(...args) {
     if (args) {
         let classes = [];
@@ -14,7 +12,7 @@ export function classNames(...args) {
             if (type === 'string' || type === 'number') {
                 classes.push(className);
             }
-            else if (type === 'object' && !React.isValidElement(className)) {
+            else if (type === 'object') {
                 const _classes = Array.isArray(className) ? className : Object.entries(className).map(([key, value]) => !!value ? key : null);
 
                 classes = _classes.length ? classes.concat(_classes.filter(c => !!c)) : classes;

src/components/utils/IconUtils.js

@@ -2,8 +2,10 @@ import * as React from "react";
 import ObjectUtils from "./ObjectUtils";
 
 export default class IconUtils {
+
     static getJSXIcon(icon, iconProps, parentProps) {
         let content = null;
+
         if (icon) {
             let iconType = typeof icon;
             content = <span {...iconProps}></span>;
@@ -15,10 +17,10 @@ export default class IconUtils {
                     props: parentProps
                 };
 
-                content = <span {...iconProps}>{ObjectUtils.getJSXElement(icon, defaultContentOptions)}</span>;
+                return ObjectUtils.getJSXElement(icon, defaultContentOptions);
             }
-
         }
+
         return content;
     }
 }

src/components/utils/ObjectUtils.js

@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export default class ObjectUtils {
 
     static equals(obj1, obj2, field) {

src/components/utils/Utils.js

@@ -8,4 +8,4 @@ import IconUtils from './IconUtils';
 import UniqueComponentId from './UniqueComponentId';
 import { ZIndexUtils } from './ZIndexUtils';
 
-export { classNames, ConnectedOverlayScrollHandler, DomHandler, EventBus, FilterUtils, mask, ObjectUtils, IconUtils, UniqueComponentId, ZIndexUtils };
+export { classNames, ConnectedOverlayScrollHandler, DomHandler, EventBus, mask, ObjectUtils, IconUtils, UniqueComponentId, ZIndexUtils };