@orfium/ictinus 4.30.1 → 4.30.2

package/dist/components/Button/Button.style.d.ts

@@ -9,7 +9,7 @@ export declare const buttonSpanStyle: () => () => {
 export declare const iconStyle: () => () => {
     display: string;
 };
-export declare const childrenWrapperStyle: ({ iconLeft, iconRight, hasChildren, }: RequiredProperties<Omit<Props, "onClick" | "dataTestId" | "block" | "buttonType" | "isIconButton"> & {
+export declare const childrenWrapperStyle: ({ iconLeft, iconRight, hasChildren, }: RequiredProperties<Omit<Props, "onClick" | "dataTestId" | "block" | "isIconButton" | "buttonType"> & {
     hasChildren: boolean;
 }>) => (theme: Theme) => {
     marginLeft: number | "8";

package/dist/components/ButtonBase/ButtonBase.style.js

@@ -38,27 +38,20 @@ var buttonBaseStyle = function buttonBaseStyle(_ref) {
   return function (theme) {
     var backGroundColor = (0, _utils2.defineBackgroundColor)(theme, calculatedColor, type, childrenCount > 0);
     var isOutlined = !filled && !transparent;
-
-    var calculateButtonColor = function calculateButtonColor() {
-      if (type === 'link') {
-        var color = _config.buttonConfig.types.link.color;
-        return theme.utils.getColor(color.name, color.shade);
-      }
-
-      if (isOutlined || transparent) {
-        return backGroundColor;
-      }
-
-      return theme.utils.getAAColorFromSwatches(calculatedColor.color, calculatedColor.shade);
-    };
-
+    var isBackgroundTransparent = isOutlined || transparent;
     var borderWidth = isOutlined ? _config.buttonConfig.types.outlined.border.width : 0;
     var baseButtonStyles = {
       fontSize: fontSizeBasedOnSize(theme, size),
       fontWeight: theme.typography.weights.medium,
-      color: calculateButtonColor(),
+      color: (0, _utils2.calculateButtonColor)({
+        type: type,
+        isBackgroundTransparent: isBackgroundTransparent,
+        backGroundColor: backGroundColor,
+        calculatedColor: calculatedColor,
+        theme: theme
+      }),
       width: block ? '100%' : undefined,
-      backgroundColor: isOutlined || transparent ? 'transparent' : backGroundColor,
+      backgroundColor: isBackgroundTransparent ? 'transparent' : backGroundColor,
       padding: size === 'lg' ? theme.spacing.md : "0 " + theme.spacing.md,
       height: heightBasedOnSize(size),
       borderRadius: theme.spacing.xsm,
@@ -75,14 +68,14 @@ var buttonBaseStyle = function buttonBaseStyle(_ref) {
         backgroundColor: (0, _states.getHover)({
           theme: theme,
           color: calculatedColor.color,
-          shade: isOutlined || transparent ? 0 : calculatedColor.shade
+          shade: isBackgroundTransparent ? 0 : calculatedColor.shade
         }).backgroundColor
       },
       ':active:not(:disabled)': {
         backgroundColor: (0, _states.getPressed)({
           theme: theme,
           color: calculatedColor.color,
-          shade: isOutlined || transparent ? 0 : calculatedColor.shade
+          shade: isBackgroundTransparent ? 0 : calculatedColor.shade
         }).backgroundColor
       },
       ':disabled': (0, _states.getDisabled)()

package/dist/components/ButtonBase/utils.d.ts

@@ -1,8 +1,21 @@
 import { Theme } from 'theme';
 import { ColorShapeFromComponent } from '../../utils/themeFunctions';
+import { Props } from './ButtonBase';
 /**
  * This function defines what background-color to show based on type or color passed
  * if color it retrieves the color directly from the palette
  * if type it gets the specific type color from the palette
  */
 export declare const defineBackgroundColor: (theme: Theme, color: ColorShapeFromComponent | undefined, type?: "primary" | "secondary" | "success" | "error" | "warning" | "info" | "light" | "link" | undefined, childrenExists?: boolean | undefined) => string;
+/**
+ * This function defines what color to show based on type or color passed
+ * if type is link uses the link color
+ * if it's background is transparent ( transparent or Outlined ) then it uses the background color
+ * else it uses the calculated color
+ */
+export declare const calculateButtonColor: ({ type, isBackgroundTransparent, backGroundColor, calculatedColor, theme, }: Pick<Props, "type"> & {
+    calculatedColor: ColorShapeFromComponent;
+    isBackgroundTransparent: boolean;
+    backGroundColor: string;
+    theme: Theme;
+}) => string;

package/dist/components/ButtonBase/utils.js

@@ -1,12 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.defineBackgroundColor = void 0;
+exports.calculateButtonColor = exports.defineBackgroundColor = void 0;
 
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
 var _themeFunctions = require("../../utils/themeFunctions");
 
+var _config = require("./config");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
@@ -29,5 +31,33 @@ var defineBackgroundColor = function defineBackgroundColor(theme, color, type, c
 
   return 'transparent';
 };
+/**
+ * This function defines what color to show based on type or color passed
+ * if type is link uses the link color
+ * if it's background is transparent ( transparent or Outlined ) then it uses the background color
+ * else it uses the calculated color
+ */
+
+
+exports.defineBackgroundColor = defineBackgroundColor;
+
+var calculateButtonColor = function calculateButtonColor(_ref) {
+  var type = _ref.type,
+      isBackgroundTransparent = _ref.isBackgroundTransparent,
+      backGroundColor = _ref.backGroundColor,
+      calculatedColor = _ref.calculatedColor,
+      theme = _ref.theme;
+
+  if (type === 'link') {
+    var color = _config.buttonConfig.types.link.color;
+    return theme.utils.getColor(color.name, color.shade);
+  }
+
+  if (isBackgroundTransparent) {
+    return backGroundColor;
+  }
+
+  return theme.utils.getAAColorFromSwatches(calculatedColor.color, calculatedColor.shade);
+};
 
-exports.defineBackgroundColor = defineBackgroundColor;
+exports.calculateButtonColor = calculateButtonColor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orfium/ictinus",
-  "version": "4.30.1",
+  "version": "4.30.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",