refactor: cleanup

xidedix · xidedix · commit 25347f453992 · 2020-03-25T16:57:40.000+01:00
diff --git a/src/CIcon.js b/src/CIcon.js
@@ -1,9 +1,7 @@
-import 'react-app-polyfill/ie11'; // For IE 11 support
-import 'react-app-polyfill/stable';
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { mapToCssModules } from '@coreui/react';
+import { mapToCssModules } from './Shared/helper';
 import CIconRaw from './CIconRaw';
 import style from './CIcon.module.css';
 
@@ -34,24 +32,24 @@ const CIcon = props=>{
     }
   }
 
-  if (type=='svg'){
+  if (type==='svg'){
     return (
       <CIconRaw {...attributes} name={name} size={size} className={className} />
     );
   }
 
   const classes = (classNames(
     mapToCssModules(className, Object.assign(style, cssModule)),
-    type=='name' ? name :
-      type=='class' ? name.className : null,
+    type==='name' ? name :
+      type==='class' ? name.className : null,
     size ? 'c-icon-'+size : null
   ));
 
   return (
     <Tag {...attributes} className={classes} />
   );
 
-}
+};
 
 CIcon.propTypes = {
   tag: PropTypes.string,
diff --git a/src/CIconRaw.js b/src/CIconRaw.js
@@ -1,9 +1,7 @@
-import 'react-app-polyfill/ie11'; // For IE 11 support
-import 'react-app-polyfill/stable';
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {mapToCssModules, colog} from '@coreui/react';
+import {mapToCssModules, colog} from './Shared/helper';
 import style from './CIcon.module.css';
 
 //component - CoreUI / CIconRaw
@@ -29,12 +27,12 @@ const CIconRaw = props=>{
     return str.replace(/([-_][a-z0-9])/ig, ($1) => {
       return $1.toUpperCase().replace('-', '')
     })
-  }
+  };
 
   //vars
 
   const iconName = (()=>{
-    const iconNameIsKebabCase = name && name.includes('-')
+    const iconNameIsKebabCase = name && name.includes('-');
     return iconNameIsKebabCase ? toCamelCase(name) : name
   })();
   const titleCode = (()=>{
@@ -62,7 +60,7 @@ const CIconRaw = props=>{
     return attributes.viewBox || `0 0 ${scale}`
   })();
   const computedSize = (()=>{
-    const addCustom = !size && (attributes.width || attributes.height)
+    const addCustom = !size && (attributes.width || attributes.height);
     return size === 'custom' || addCustom ? 'custom-size' : size
   })();
   //console.log(iconName, computedSize)
@@ -86,7 +84,7 @@ const CIconRaw = props=>{
     computedSize ? `c-icon-${computedSize}` : ''
   ), style);
 
-  const classes = customClasses || (class1 + ' ' + class2)
+  const classes = customClasses || (class1 + ' ' + class2);
 
   //console.log(code, viewBox, classes, titleCode+' - '+iconCode);
   //v-html={titleCode+iconCode}
@@ -118,7 +116,7 @@ const CIconRaw = props=>{
     </React.Fragment>
   );
 
-}
+};
 
 CIconRaw.propTypes = {
   tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
diff --git a/src/Shared/helper.js b/src/Shared/helper.js
@@ -0,0 +1,19 @@
+// helper functions
+
+let globalCssModule;
+
+const mapToCssModules = (className = '', cssModule = globalCssModule) => {
+  if (!cssModule) return className;
+  return className
+    .split(' ')
+    .map(c => cssModule[c] || c)
+    .join(' ');
+};
+export {mapToCssModules};
+
+export function colog() {
+  if (process.env.NODE_ENV === 'development')
+    console.log.apply(this, arguments);
+}
+
+
