@dxc-technology/halstack-react 0.0.0-67a8cc5 → 0.0.0-6bc7b92

package/dist/chip/Chip.js

@@ -23,14 +23,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-require("../common/OpenSans.css");
-
 var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: ", ";\n  ", "\n  ", "\n  max-width: 24px;\n  max-height: 24px;\n  overflow: hidden;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  ", "\n  width: ", ";\n  height: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n  &:focus {\n    outline-color: ", ";\n    outline-width: 2px;\n    ", "\n  }\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -40,7 +38,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  margin-right: ", ";\n  max-width: 24px;\n  max-height: 24px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-right: ", ";\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -50,7 +48,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  margin-left: ", ";\n  max-width: 24px;\n  max-height: 24px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-left: ", ";\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -60,7 +58,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  line-height: 24px;\n  color: ", ";\n  cursor: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  color: ", ";\n  cursor: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -70,7 +68,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  border-radius: 50px;\n  margin: 2px;\n  max-width: ", ";\n  background-color: ", ";\n  ", ";\n  height: ", ";\n  padding: 10px 20px;\n  cursor: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  min-height: 40px;\n  max-width: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -101,6 +99,7 @@ var DxcChip = function DxcChip(_ref) {
     disabled: disabled,
     prefixIcon: true,
     label: label,
+    mode: "prefix",
     tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
     onClick: function onClick() {
       return onClickPrefix && !disabled && onClickPrefix(label);
@@ -111,7 +110,9 @@ var DxcChip = function DxcChip(_ref) {
     src: prefixIconSrc,
     label: label,
     tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
-    onClick: onClickPrefix && !disabled && onClickPrefix(label),
+    onClick: function onClick() {
+      return onClickPrefix && !disabled && onClickPrefix(label);
+    },
     interactuable: typeof onClickPrefix === "function" && !disabled
   }), label && _react["default"].createElement(ChipTextContainer, {
     disabled: disabled,
@@ -120,16 +121,21 @@ var DxcChip = function DxcChip(_ref) {
   }, label), suffixIcon ? _react["default"].createElement(IconContainer, {
     disabled: disabled,
     suffixIcon: true,
+    mode: "suffix",
     label: label,
     tabIndex: typeof onClickSuffix === "function" && !disabled ? tabIndex : -1,
-    onClick: onClickSuffix && !disabled && onClickSuffix(label),
+    onClick: function onClick() {
+      return onClickSuffix && !disabled && onClickSuffix(label);
+    },
     interactuable: typeof onClickSuffix === "function" && !disabled
   }, (0, _typeof2["default"])(suffixIcon) === "object" ? suffixIcon : _react["default"].createElement(suffixIcon)) : suffixIconSrc && _react["default"].createElement(SuffixIconContainer, {
     disabled: disabled,
     src: suffixIconSrc,
     label: label,
     tabIndex: typeof onClickSuffix === "function" && !disabled ? tabIndex : -1,
-    onClick: onClickSuffix && !disabled && onClickSuffix(label),
+    onClick: function onClick() {
+      return onClickSuffix && !disabled && onClickSuffix(label);
+    },
     interactuable: typeof onClickSuffix === "function" && !disabled
   })));
 };
@@ -152,12 +158,21 @@ var StyledDxcChip = _styledComponents["default"].div(_templateObject(), function
 }, function (props) {
   return props.disabled && props.theme.disabledBackgroundColor || props.theme.backgroundColor;
 }, function (props) {
-  return props.theme.outlinedColor !== "" ? "border: 2px solid ".concat(props.theme.outlinedColor) : "";
+  return props.theme.borderRadius;
 }, function (props) {
-  return props.theme.outlinedColor !== "" ? "18px" : "22px";
-}, function (_ref3) {
-  var disabled = _ref3.disabled;
-  return disabled && "not-allowed";
+  return props.theme.borderThickness;
+}, function (props) {
+  return props.theme.borderStyle;
+}, function (props) {
+  return props.theme.borderColor;
+}, function (props) {
+  return props.theme.contentPaddingTop;
+}, function (props) {
+  return props.theme.contentPaddingBottom;
+}, function (props) {
+  return props.theme.contentPaddingLeft;
+}, function (props) {
+  return props.theme.contentPaddingRight;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -168,6 +183,9 @@ var StyledDxcChip = _styledComponents["default"].div(_templateObject(), function
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
+}, function (_ref3) {
+  var disabled = _ref3.disabled;
+  return disabled && "not-allowed";
 });
 
 var ChipTextContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
@@ -175,30 +193,54 @@ var ChipTextContainer = _styledComponents["default"].span(_templateObject2(), fu
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
-  return props.disabled && props.theme.disabledFontColor || props.theme.fontColor;
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.disabled ? props.theme.disabledFontColor : props.theme.fontColor;
 }, function (_ref4) {
   var disabled = _ref4.disabled;
   return disabled && "not-allowed" || "default";
 });
 
 var SuffixIconContainer = _styledComponents["default"].img(_templateObject3(), function (props) {
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (props) {
   return getCursor(props.interactuable, props.disabled);
 }, function (props) {
-  return (props.label || props.suffixIconSrc) && "10px" || props.prefixIconSrc && "5px";
+  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
 });
 
 var PrefixIconContainer = _styledComponents["default"].img(_templateObject4(), function (props) {
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (props) {
   return getCursor(props.interactuable, props.disabled);
 }, function (props) {
-  return (props.label || props.suffixIconSrc) && "10px" || props.prefixIconSrc && "5px";
+  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
 });
 
 var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
-  return props.disabled && 0.34;
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
 }, function (props) {
-  return props.prefixIcon ? "margin-right: ".concat((props.label || props.suffixIcon || props.suffixIconSrc) && "10px" || (props.prefixIcon || props.prefixIconSrc) && "0", ";") : "margin-left: ".concat((props.label || props.prefixIcon || props.prefixIconSrc) && "10px" || (props.prefixIcon || props.prefixIconSrc) && "0", ";");
+  return props.prefixIcon ? "margin-right: ".concat((props.label || props.suffixIcon || props.suffixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";") : "margin-left: ".concat((props.label || props.prefixIcon || props.prefixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";");
 }, function (props) {
   return getCursor(props.interactuable, props.disabled);
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.focusColor;
+}, function (props) {
+  return props.disabled && "outline: none;";
 });
 
 DxcChip.propTypes = {

package/dist/common/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCustomTheme = exports.getMargin = void 0;
+exports.getMargin = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -19,24 +19,4 @@ var getMargin = function getMargin(marginProp, side) {
   }
 };
 
-exports.getMargin = getMargin;
-
-var getCustomTheme = function getCustomTheme(defaultTheme, customTheme) {
-  var newTheme = JSON.parse(JSON.stringify(defaultTheme));
-
-  if (customTheme) {
-    Object.keys(newTheme).map(function (component) {
-      if (customTheme[component]) {
-        Object.keys(newTheme[component]).map(function (objectKey) {
-          if (customTheme[component][objectKey]) {
-            newTheme[component][objectKey] = customTheme[component][objectKey];
-          }
-        });
-      }
-    });
-  }
-
-  return newTheme;
-};
-
-exports.getCustomTheme = getCustomTheme;
+exports.getMargin = getMargin;