pebble-web 2.26.1 → 2.26.2

package/dist/pebble-web.umd.js

@@ -1768,7 +1768,7 @@
       color: violet.lighter
     }
   };
-  var getStyleByType = function getStyleByType(type, filled) {
+  var getStyleByType = function getStyleByType(type, outline) {
     if (type === "link") return linkStyle;
     var _color = mappingColorByType[type];
     var colorBase = _color.base,
@@ -1776,11 +1776,11 @@
         hover = _color.hover,
         active = _color.active,
         textColor = _color.textColor;
-    var defaultFontColor = filled ? textColor || white.base : colorBase;
+    var defaultFontColor = outline ? colorBase : textColor || white.base;
     return {
       color: defaultFontColor,
-      backgroundColor: filled ? colorBase : white.base,
-      border: filled ? "none" : "1px solid ".concat(colorBase),
+      backgroundColor: outline ? white.base : colorBase,
+      border: outline ? "1px solid ".concat(colorBase) : "none",
       "&:not([disabled]):hover": {
         color: textColor || white.base,
         backgroundColor: hover,
@@ -1812,8 +1812,8 @@
       minWidth: 140
     }, typography.normal.regular)
   };
-  var getButtonStyle = function getButtonStyle(size, type, showShadow, filled) {
-    return /*#__PURE__*/css([commonButtonStyle, _objectSpread$2(_objectSpread$2(_objectSpread$2({}, styleBasedOnSize[size]), getStyleByType(type, filled)), {}, {
+  var getButtonStyle = function getButtonStyle(size, type, showShadow, outline) {
+    return /*#__PURE__*/css([commonButtonStyle, _objectSpread$2(_objectSpread$2(_objectSpread$2({}, styleBasedOnSize[size]), getStyleByType(type, outline)), {}, {
       boxShadow: showShadow ? constants.boxShadow.base : "none"
     })],  "" );
   };
@@ -1921,8 +1921,7 @@
         buttonProps = _ref.buttonProps,
         testId = _ref.testId;
     var disableAction = disabled || loading;
-    var _outline = size === "x-small" || !!outline;
-    var _className = cx(getButtonStyle(size, type, !!showShadow, !_outline), className);
+    var _className = cx(getButtonStyle(size, type, !!showShadow, !!outline), className);
     return /*#__PURE__*/React.createElement("button", Object.assign({
       className: _className,
       onClick: !disableAction ? onClick : undefined,
@@ -1932,7 +1931,7 @@
       disabled: disabled,
       "data-testid": testId
     }, buttonProps), loading ? /*#__PURE__*/React.createElement(Loader, {
-      color: colors.white.base,
+      color: "currentColor",
       scale: 0.4
     }) : children, !disableAction && showRipple && type !== "link" && /*#__PURE__*/React.createElement(Ink, null));
   };