Merge pull request #1220 from Bynder/debt/GC-1083_Fix_console_log_spa…

…m_in_item_editor GC-1083 - Fix console log spam in item editor
Bynder · Jun 21, 2023 · 212194c · 212194c
2 parents db99f81 + e860e35
commit 212194c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/Dropdown/DropdownAction.js b/lib/Dropdown/DropdownAction.js
@@ -17,12 +17,15 @@ const DropdownAction = ({
   overflow,
   disabled,
   value,
+  showContent: showContentProp,
+  toggleShowContent: toggleShowContentProp,
   ...props
 }) => {
   const {
-    toggleShowContent = props.toggleShowContent,
-    showContent = props.showContent
+    toggleShowContent = toggleShowContentProp,
+    showContent = showContentProp
   } = useContext(DropdownContext) || {};
+
   const classNames = cx(`dropdown__action ${className}`, {
     'dropdown__action--danger': danger,
     'dropdown__action--noBg': noBackground,

diff --git a/lib/src/modules/Button/ButtonBase.js b/lib/src/modules/Button/ButtonBase.js
@@ -1,9 +1,9 @@
 /* eslint-disable react/button-has-type */
 import React from 'react';
 import cx from 'classnames';
-import { string, arrayOf, bool, oneOfType } from 'prop-types';
+import { arrayOf, bool, oneOfType, string } from 'prop-types';
 import Icon from 'lib/Icon';
-import { propTypes, defaultProps, sizes } from './common';
+import { defaultProps, propTypes, sizes } from './common';
 
 function ButtonBase({
   children,
@@ -16,6 +16,7 @@ function ButtonBase({
   connectedRight,
   disabled,
   buttonRef,
+  defaultFillColor,
   ...rest
 }) {
   const classes = cx('button-base', className, {
@@ -32,7 +33,6 @@ function ButtonBase({
   }
 
   const loaderTypesWithDisabled = disabled ? ['dark'] : loaderTypes;
-
   return (
     <button className={classes} disabled={disabled} ref={buttonRef} {...rest}>
       {loading && !loaderRight && (