Merge branch 'develop' of github.com:Espressive/cascara into feature/…

…FDS-151-eslint-some-react # Conflicts: # .eslintrc.js
Espressive · Mar 3, 2021 · f7a62a1 · f7a62a1
2 parents bbe31e7 + e60fdc1
commit f7a62a1
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 25 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -24,9 +24,6 @@ module.exports = {
     'no-extra-boolean-cast': 0,
     'no-prototype-builtins': 0,
     'no-useless-return': 0,
-    'prefer-destructuring': 0,
-    'prefer-spread': 0,
-    'prefer-template': 0,
     'react/forbid-prop-types': 0,
     'react/jsx-key': 0,
     'react/jsx-no-bind': 0,

diff --git a/docs/src/components/Asciagram/Asciagram.js b/docs/src/components/Asciagram/Asciagram.js
@@ -21,7 +21,7 @@ const Asciagram = ({
   <details
     {...rest}
     className={
-      rest?.className ? styles.Details + ' ' + rest.className : styles.Details
+      rest?.className ? `${styles.Details} ${rest.className}` : styles.Details
     }
     open={isInitialOpen}
   >

diff --git a/packages/cascara/src/animations/utils/getKeyframesMap.js b/packages/cascara/src/animations/utils/getKeyframesMap.js
@@ -2,7 +2,7 @@ const getKeyframesMap = (frames) =>
   Object.assign(
     {},
     ...frames.map((frame, i) => {
-      const keyframePercent = Math.floor((i / (frames.length - 1)) * 100) + '%';
+      const keyframePercent = `${Math.floor((i / (frames.length - 1)) * 100)}%`;
 
       return { [keyframePercent]: frame };
     })

diff --git a/packages/cascara/src/animations/utils/getTransformKeyframesMap.js b/packages/cascara/src/animations/utils/getTransformKeyframesMap.js
@@ -2,8 +2,9 @@ const getTransformKeyframesMap = (transforms) =>
   Object.assign(
     {},
     ...transforms.map((movement, i) => {
-      const keyframePercent =
-        Math.floor((i / (transforms.length - 1)) * 100) + '%';
+      const keyframePercent = `${Math.floor(
+        (i / (transforms.length - 1)) * 100
+      )}%`;
 
       return { [keyframePercent]: { transform: movement } };
     })

diff --git a/packages/cascara/src/lib/customPropTypes/json.js b/packages/cascara/src/lib/customPropTypes/json.js
@@ -5,11 +5,7 @@ const json = (props, propName, componentName) => {
     JSON.parse(props[propName]);
   } catch (e) {
     return new Error(
-      'Invalid prop `' +
-        propName +
-        '` supplied to `' +
-        componentName +
-        '`. Validation failed.'
+      `Invalid prop \`${propName}\` supplied to \`${componentName}\`. Validation failed.`
     );
   }
 };

diff --git a/packages/cascara/src/placeholders/JsonPlaceholder/JsonPlaceholder.js b/packages/cascara/src/placeholders/JsonPlaceholder/JsonPlaceholder.js
@@ -20,7 +20,7 @@ const JsonPlaceholder = ({
   <details
     {...rest}
     className={
-      rest?.className ? styles.Details + ' ' + rest.className : styles.Details
+      rest?.className ? `${styles.Details} ${rest.className}` : styles.Details
     }
     open={isInitialOpen}
   >

diff --git a/packages/cascara/src/ui/ActionsMenu/ActionsMenu.js b/packages/cascara/src/ui/ActionsMenu/ActionsMenu.js
@@ -49,7 +49,7 @@ const ActionsMenu = ({ trigger = DEFAULT_TRIGGER, actions }) => {
       <Menu
         {...menu}
         aria-label='Actions Menu'
-        className={'ui dropdown active visible ' + styles.ActionsMenu}
+        className={`ui dropdown active visible ${styles.ActionsMenu}`}
         tabIndex={0}
       >
         <div
@@ -67,7 +67,7 @@ const ActionsMenu = ({ trigger = DEFAULT_TRIGGER, actions }) => {
                   {...menu}
                   {...rest}
                   as='div'
-                  className={'item ' + styles.ActionsMenuItem}
+                  className={`item ${styles.ActionsMenuItem}`}
                   key={key}
                   onClick={() => handleMenuItemClick(rest)}
                 >

diff --git a/packages/cascara/src/ui/Chat/ChatOptions.js b/packages/cascara/src/ui/Chat/ChatOptions.js
@@ -81,7 +81,7 @@ const getChatOptionsObj = (obj) => {
     getChatMessageObj(obj),
     {
       ...getSharedMessageKeys(obj),
-      key: message.id + '_buttons',
+      key: `${message.id}_buttons`,
       message: (
         <Ref id={message.id} innerRef={ref}>
           <ChatOptions

diff --git a/packages/cascara/src/ui/Chat/utils/bytesToSize.js b/packages/cascara/src/ui/Chat/utils/bytesToSize.js
@@ -2,7 +2,7 @@ const bytesToSize = (bytes) => {
   const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
   const int = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
   return bytes
-    ? Math.round(bytes / Math.pow(1024, int), 2) + ' ' + sizes[int]
+    ? `${Math.round(bytes / Math.pow(1024, int), 2)} ${sizes[int]}`
     : null;
 };
 

diff --git a/packages/cascara/src/ui/Dashboard/widgets/WidgetGeoMap.js b/packages/cascara/src/ui/Dashboard/widgets/WidgetGeoMap.js
@@ -15,10 +15,7 @@ const propTypes = {
  * Widget for @nivo/geo (Chloropleth).
  */
 const WidgetGeoMap = ({ data, ...rest }) => {
-  const largestValue = Math.max.apply(
-    Math,
-    data.map((object) => object.value)
-  );
+  const largestValue = Math.max(...data.map((object) => object.value));
 
   const CHART_CONFIG = {
     ...CHART_DEFAULTS,

diff --git a/packages/cascara/src/ui/Form/poc/FormPublicAPI.fixture.js b/packages/cascara/src/ui/Form/poc/FormPublicAPI.fixture.js
@@ -105,7 +105,7 @@ const prepareFormData = (data, config) => {
     }
   });
 
-  const actions = dataConfig.actions;
+  const { actions } = dataConfig;
 
   return {
     actions,

diff --git a/packages/cascara/src/ui/InfoPopover/InfoPopover.js b/packages/cascara/src/ui/InfoPopover/InfoPopover.js
@@ -18,7 +18,7 @@ const InfoPopover = ({ message, style }) => {
     <>
       <PopoverDisclosure
         {...popover}
-        className={styles.Disclosure + ' ui small basic circular icon button'}
+        className={`${styles.Disclosure} ui small basic circular icon button`}
         style={style}
       >
         <i aria-hidden='true' className='info icon' />

diff --git a/rollup.config.js b/rollup.config.js
@@ -27,12 +27,12 @@ const getPostCSSOptions = () => ({
   modules: {
     generateScopedName: function (name, filename, css) {
       const path = require('path');
-      const file = path.basename(filename).split('.')[0];
+      const [file] = path.basename(filename).split('.');
       const hash = isDevelopment(process)
         ? 'DEV_MODE'
         : stringHash(css).toString(36).substr(0, 5);
 
-      return '☕️_' + file + '_' + name + '__' + hash;
+      return `☕️_${file}_${name}__${hash}`;
     },
   },
   use: ['sass'],