@occmundial/occ-atomic 3.0.0-beta.15 → 3.0.0-beta.17

package/build/Pill/Choice/styles.js

@@ -44,12 +44,11 @@ var _default = {
     '&:hover': {
       background: _colors["default"].pill.unselected.bg.hover
     },
-    '&:active, &:focus': {
+    '&:active': {
       background: _colors["default"].pill.unselected.bg.active
     },
-    '&:not(:active):focus-visible': {
-      boxShadow: _shadows["default"]['focus-indigo'],
-      background: _colors["default"].pill.unselected.bg["default"]
+    '&:focus-visible': {
+      boxShadow: _shadows["default"]['focus-indigo']
     }
   },
   disabled: {
@@ -57,16 +56,16 @@ var _default = {
     pointerEvents: 'none'
   },
   selected: {
-    background: "".concat(_colors["default"].pill.selected.bg["default"], " !important"),
+    background: _colors["default"].pill.selected.bg["default"],
     zIndex: 1,
     color: _colors["default"].text.white.primary,
     '&:hover': {
       background: _colors["default"].pill.selected.bg.hover
     },
-    '&:active, &:focus': {
+    '&:active': {
       background: _colors["default"].pill.selected.bg.active
     },
-    '&:not(:active):focus-visible': {
+    '&:focus-visible': {
       boxShadow: _shadows["default"]['focus-indigo']
     }
   },
@@ -80,9 +79,7 @@ var _default = {
     font: (0, _styles.parseFontValue)(_fonts["default"]['body-regular']),
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
-    padding: [0, _spacing["default"]['size-1']],
-    marginLeft: _spacing["default"]['size-1'],
-    marginRight: _spacing["default"]['size-1']
+    padding: [0, _spacing["default"]['size-1']]
   },
   textSelectedDisabled: {
     color: _colors["default"].text.white.secondary
@@ -95,6 +92,12 @@ var _default = {
   },
   textEnabled: {
     color: _colors["default"].text.indigo.primary
+  },
+  leftIcon: {
+    marginRight: _spacing["default"]['size-1']
+  },
+  rightIcon: {
+    marginLeft: _spacing["default"]['size-1']
   }
 };
 exports["default"] = _default;

package/build/Pill/Group/styles.js

@@ -43,15 +43,15 @@ var _default = {
     whiteSpace: 'nowrap',
     transition: '0.3s all',
     cursor: 'pointer',
-    '&:not(:active):focus-visible': {
-      boxShadow: _shadows["default"]['focus-indigo'],
-      background: 'none'
-    },
     '&:hover': {
       background: _colors["default"].pill.unselected.bg.hover
     },
-    '&:active, &:focus': {
+    '&:active': {
       background: _colors["default"].pill.unselected.bg.active
+    },
+    '&:focus-visible': {
+      boxShadow: _shadows["default"]['focus-indigo'],
+      background: 'none'
     }
   },
   selected: {

package/build/Pill/Stack/Stack.js

@@ -52,8 +52,8 @@ var Stack = function Stack(_ref) {
     className: classes.close,
     iconName: "cross",
     colors: [disabled ? _colors["default"].icon.brand.disabled : _colors["default"].icon.brand["default"]],
-    width: 18,
-    height: 18
+    width: 16,
+    height: 16
   })));
 };
 

package/build/Pill/Stack/styles.js

@@ -42,12 +42,11 @@ var _default = {
     '&:hover': {
       background: _colors["default"].pill.unselected.bg.hover
     },
-    '&:active, &:focus': {
+    '&:active': {
       background: _colors["default"].pill.unselected.bg.active
     },
-    '&:not(:active):focus-visible': {
-      boxShadow: _shadows["default"]['focus-indigo'],
-      background: _colors["default"].pill.unselected.bg["default"]
+    '&:focus-visible': {
+      boxShadow: _shadows["default"]['focus-indigo']
     }
   },
   disabled: {
@@ -61,8 +60,7 @@ var _default = {
     color: _colors["default"].text.indigo.primary,
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
-    padding: [0, _spacing["default"]['size-1']],
-    marginRight: _spacing["default"]['size-1']
+    padding: [0, _spacing["default"]['size-1']]
   },
   textDisabled: {
     color: _colors["default"].text.indigo.secondary
@@ -73,8 +71,7 @@ var _default = {
     display: 'inline-flex',
     justifyContent: 'center',
     alignItems: 'center',
-    marginRight: -_spacing["default"]['size-1'],
-    marginLeft: -_spacing["default"]['size-1']
+    marginLeft: _spacing["default"]['size-1']
   }
 };
 exports["default"] = _default;

package/build/Radio/Radio.js

@@ -119,9 +119,16 @@ var Radio = /*#__PURE__*/function (_React$Component) {
           },
           style: style
         }), /*#__PURE__*/_react["default"].createElement("div", {
-          className: classes.radio,
-          id: option.trk
-        }), option.label && /*#__PURE__*/_react["default"].createElement(_Text["default"], {
+          className: classes.radioWrap
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.radio
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.radioOuter
+        }), /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.radioInner
+        }))), !!(option.label || option.right || option.tag) && /*#__PURE__*/_react["default"].createElement("div", {
+          className: classes.labelWrap
+        }, option.label && /*#__PURE__*/_react["default"].createElement(_Text["default"], {
           tag: "label",
           className: "".concat(classes.label).concat(textOverflow ? " ".concat(classes.overflow) : '').concat(alignLeft ? " ".concat(classes.alignLeft) : '')
         }, option.label), option.right && /*#__PURE__*/_react["default"].createElement(_Text["default"], {
@@ -131,7 +138,7 @@ var Radio = /*#__PURE__*/function (_React$Component) {
         }, option.right), option.tag && /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
           theme: "link",
           className: classes.tag
-        }, option.tag));
+        }, option.tag)));
       }));
     }
   }]);

package/build/Radio/__snapshots__/Radio.test.js.snap

@@ -6,12 +6,11 @@ exports[`Radio styles matches the snapshot 1`] = `
 Object {
   "active": Object {
     "& $radio": Object {
-      "&:after": Object {
+      "& $radioInner": Object {
         "background": "#0059CD",
       },
-      "&:before": Object {
-        "borderColor": "#0059CD",
-        "borderWidth": 2,
+      "& $radioOuter": Object {
+        "boxShadow": "inset 0 0 0 2px #0059CD",
       },
     },
   },
@@ -21,77 +20,68 @@ Object {
   "cont": Object {
     "&$active": Object {
       "&:active": Object {
-        "& $radio:after": Object {
+        "& $radio $radioInner": Object {
           "background": "#083CAE",
         },
-        "& $radio:before": Object {
-          "borderColor": "#0047A5",
-          "borderWidth": "3px",
+        "& $radio $radioOuter": Object {
+          "boxShadow": "inset 0 0 0 3px #0047A5 !important",
         },
       },
-      "&:focus $radio:before": Object {
-        "borderColor": "#0059CD",
-        "boxShadow": "0 0 0 8px rgba(0,110,255,0.3)",
-      },
       "&:hover": Object {
-        "& $radio:after": Object {
+        "& $radio $radioInner": Object {
           "background": "#083CAE",
         },
-        "& $radio:before": Object {
-          "borderColor": "#0047A5",
+        "& $radio $radioOuter": Object {
+          "boxShadow": "inset 0 0 0 2px #0047A5",
         },
       },
     },
-    "&:not($active)": Object {
-      "&:active $radio:before": Object {
-        "borderColor": "#6C6F89",
-        "borderWidth": "2px",
-        "boxShadow": "initial",
-      },
-      "&:focus $radio:before": Object {
-        "borderColor": "#D3D4DC",
-        "boxShadow": "0 0 0 8px rgba(0,110,255,0.3)",
-      },
-      "&:hover $radio:before": Object {
-        "borderColor": "#6C6F89",
-        "boxShadow": "initial",
-      },
+    "&:active $radio $radioOuter": Object {
+      "boxShadow": "inset 0 0 0 2px #6C6F89",
     },
-    "alignItems": "center",
+    "&:focus-visible $radio": Object {
+      "boxShadow": "0 0 0 8px rgba(0,110,255,0.3)",
+    },
+    "&:hover $radio $radioOuter": Object {
+      "boxShadow": "inset 0 0 0 1px #6C6F89",
+    },
+    "alignItems": "flex-start",
     "boxSizing": "border-box",
     "cursor": "pointer",
     "display": "flex",
     "outline": "0",
-    "paddingBottom": "8px",
-    "paddingTop": "8px",
   },
   "disabled": Object {
-    "& :not($radio)": Object {
-      "opacity": 0.4,
+    "& $radio $radioInner": Object {
+      "background": "#EDEDF1",
+    },
+    "& $radio $radioOuter": Object {
+      "background": "#EDEDF1",
     },
     "&$active": Object {
-      "& $radio:after": Object {
+      "& $radio $radioInner": Object {
         "background": "#8DA5DA",
       },
-      "& $radio:before": Object {
-        "borderColor": "#8DA5DA",
-      },
-    },
-    "&:not($active)": Object {
-      "& $radio:after": Object {
-        "background": "#EDEDF1",
-      },
-      "& $radio:before": Object {
-        "background": "#EDEDF1",
+      "& $radio $radioOuter": Object {
+        "boxShadow": "inset 0 0 0 2px #8DA5DA",
       },
     },
     "pointerEvents": "none",
   },
   "label": Object {
     "cursor": "pointer",
-    "flex": "1",
-    "float": "left",
-    "marginLeft": "8px",
+    "flex": 1,
+    "marginLeft": "12px",
+    "pointerEvents": "none",
+  },
+  "labelWrap": Object {
+    "alignItems": "center",
+    "display": "flex",
+    "flex": 1,
+    "minHeight": 48,
+    "overflow": "hidden",
+    "paddingBottom": "4px",
+    "paddingTop": "4px",
   },
   "overflow": Object {
     "overflow": "hidden",
@@ -99,41 +89,43 @@ Object {
     "whiteSpace": "nowrap",
   },
   "radio": Object {
-    "&:after": Object {
-      "background": "#fff",
-      "borderRadius": "50%",
-      "boxSizing": "border-box",
-      "content": "\\"\\"",
-      "height": 10,
-      "left": "50%",
-      "position": "absolute",
-      "top": "50%",
-      "transform": "translate(-50%, -50%)",
-      "transition": "0.3s all",
-      "width": 10,
-    },
-    "&:before": Object {
-      "background": "#fff",
-      "border": "1px solid #D3D4DC",
-      "borderRadius": "50%",
-      "boxSizing": "border-box",
-      "content": "\\"\\"",
-      "height": 20,
-      "left": "50%",
-      "position": "absolute",
-      "top": "50%",
-      "transform": "translate(-50%, -50%)",
-      "transition": "0.3s all",
-      "width": 20,
-    },
+    "alignItems": "center",
+    "borderRadius": "9999px",
+    "display": "grid",
+    "height": 20,
+    "justifyContent": "center",
+    "transition": "all cubic-bezier(0.25,0.46,0.45,0.94) 0.2s",
+    "width": 20,
+  },
+  "radioInner": Object {
+    "background": "#fff",
+    "borderRadius": "9999px",
+    "gridColumnStart": 1,
+    "gridRowStart": 1,
+    "height": 10,
+    "margin": 5,
+    "transition": "all cubic-bezier(0.25,0.46,0.45,0.94) 0.2s",
+    "width": 10,
+  },
+  "radioOuter": Object {
+    "background": "#fff",
+    "borderRadius": "9999px",
+    "boxShadow": "inset 0 0 0 1px #D3D4DC",
+    "gridColumnStart": 1,
+    "gridRowStart": 1,
+    "height": 20,
+    "transition": "all cubic-bezier(0.25,0.46,0.45,0.94) 0.2s",
+    "width": 20,
+  },
+  "radioWrap": Object {
     "alignItems": "center",
     "display": "flex",
-    "height": "24px",
-    "position": "relative",
-    "width": "24px",
+    "flexShrink": 0,
+    "height": 48,
+    "justifyContent": "center",
+    "width": 52,
   },
   "right": Object {
-    "float": "right",
     "marginLeft": "8px",
     "pointerEvents": "none",
   },

package/build/Radio/styles.js

@@ -11,133 +11,132 @@ var _colors = _interopRequireDefault(require("../tokens/colors.json"));
 
 var _shadows = _interopRequireDefault(require("../tokens/shadows.json"));
 
+var _borderRadius = _interopRequireDefault(require("../tokens/borderRadius.json"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var radio = _colors["default"].radio;
+var transition = 'all cubic-bezier(0.25,0.46,0.45,0.94) 0.2s';
+var contentHeight = 48;
+var radioWidth = 52;
+var radioSize = 20;
+var radioInnerSize = 10;
 var _default = {
   cont: {
-    paddingTop: _spacing["default"]['size-2'],
-    paddingBottom: _spacing["default"]['size-2'],
     boxSizing: 'border-box',
     display: 'flex',
-    alignItems: 'center',
+    alignItems: 'flex-start',
     cursor: 'pointer',
     outline: '0',
+    '&:focus-visible $radio': {
+      boxShadow: _shadows["default"]['focus-bright-blue']
+    },
+    '&:hover $radio $radioOuter': {
+      boxShadow: "inset 0 0 0 1px ".concat(radio.unselected.border.hover)
+    },
+    '&:active $radio $radioOuter': {
+      boxShadow: "inset 0 0 0 2px ".concat(radio.unselected.border.hover)
+    },
     '&$active': {
-      '&:focus $radio:before': {
-        borderColor: radio['selected']['border']['default'],
-        boxShadow: _shadows["default"]['focus-bright-blue']
-      },
       '&:hover': {
-        '& $radio:before': {
-          borderColor: radio['selected']['border']['hover']
+        '& $radio $radioOuter': {
+          boxShadow: "inset 0 0 0 2px ".concat(radio.selected.border.hover)
         },
-        '& $radio:after': {
-          background: radio['selected']['bg']['hover']
+        '& $radio $radioInner': {
+          background: radio.selected.bg.hover
         }
       },
       '&:active': {
-        '& $radio:before': {
-          borderColor: radio['selected']['border']['hover'],
-          borderWidth: '3px'
+        '& $radio $radioOuter': {
+          boxShadow: "inset 0 0 0 3px ".concat(radio.selected.border.hover, " !important")
         },
-        '& $radio:after': {
-          background: radio['selected']['bg']['hover']
+        '& $radio $radioInner': {
+          background: radio.selected.bg.hover
         }
       }
-    },
-    '&:not($active)': {
-      '&:hover $radio:before': {
-        borderColor: radio['unselected']['border']['hover'],
-        boxShadow: 'initial'
-      },
-      '&:active $radio:before': {
-        borderColor: radio['unselected']['border']['hover'],
-        borderWidth: '2px',
-        boxShadow: 'initial'
-      },
-      '&:focus $radio:before': {
-        borderColor: radio['unselected']['border']['default'],
-        boxShadow: _shadows["default"]['focus-bright-blue']
-      }
     }
   },
-  radio: {
-    width: _spacing["default"]['size-5'],
-    height: _spacing["default"]['size-5'],
-    position: 'relative',
+  radioWrap: {
+    width: radioWidth,
+    height: contentHeight,
     display: 'flex',
     alignItems: 'center',
-    '&:before': {
-      content: '""',
-      boxSizing: 'border-box',
-      width: 20,
-      height: 20,
-      borderRadius: '50%',
-      position: 'absolute',
-      top: '50%',
-      left: '50%',
-      transform: 'translate(-50%, -50%)',
-      border: "1px solid ".concat(radio['unselected']['border']['default']),
-      background: radio['bg']['default'],
-      transition: '0.3s all'
-    },
-    '&:after': {
-      content: '""',
-      boxSizing: 'border-box',
-      width: 10,
-      height: 10,
-      borderRadius: '50%',
-      position: 'absolute',
-      top: '50%',
-      left: '50%',
-      transform: 'translate(-50%, -50%)',
-      transition: '0.3s all',
-      background: radio['bg']['default']
-    }
+    justifyContent: 'center',
+    flexShrink: 0
+  },
+  radio: {
+    width: radioSize,
+    height: radioSize,
+    borderRadius: _borderRadius["default"]['br-full'],
+    transition: transition,
+    display: 'grid',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  radioOuter: {
+    width: radioSize,
+    height: radioSize,
+    borderRadius: _borderRadius["default"]['br-full'],
+    boxShadow: "inset 0 0 0 1px ".concat(radio.unselected.border["default"]),
+    background: radio.bg["default"],
+    transition: transition,
+    gridRowStart: 1,
+    gridColumnStart: 1
+  },
+  radioInner: {
+    width: radioInnerSize,
+    height: radioInnerSize,
+    margin: 5,
+    borderRadius: _borderRadius["default"]['br-full'],
+    background: radio.bg["default"],
+    transition: transition,
+    gridRowStart: 1,
+    gridColumnStart: 1
   },
   active: {
     '& $radio': {
-      '&:before': {
-        borderWidth: 2,
-        borderColor: radio['selected']['border']['default']
+      '& $radioOuter': {
+        boxShadow: "inset 0 0 0 2px ".concat(radio.selected.border["default"])
       },
-      '&:after': {
-        background: radio['selected']['bg']['default']
+      '& $radioInner': {
+        background: radio.selected.bg["default"]
       }
     }
   },
   disabled: {
     pointerEvents: 'none',
-    '& :not($radio)': {
-      opacity: 0.4
+    '& $radio $radioOuter': {
+      background: radio.bg.disabled
     },
-    '&$active': {
-      '& $radio:before': {
-        borderColor: radio['selected']['border']['disabled']
-      },
-      '& $radio:after': {
-        background: radio['selected']['bg']['disabled']
-      }
+    '& $radio $radioInner': {
+      background: radio.bg.disabled
     },
-    '&:not($active)': {
-      '& $radio:before': {
-        background: radio['bg']['disabled']
+    '&$active': {
+      '& $radio $radioOuter': {
+        boxShadow: "inset 0 0 0 2px ".concat(radio.selected.border.disabled)
       },
-      '& $radio:after': {
-        background: radio['bg']['disabled']
+      '& $radio $radioInner': {
+        background: radio.selected.bg.disabled
       }
     }
   },
+  labelWrap: {
+    minHeight: contentHeight,
+    display: 'flex',
+    alignItems: 'center',
+    paddingTop: _spacing["default"]['size-1'],
+    paddingBottom: _spacing["default"]['size-1'],
+    overflow: 'hidden',
+    flex: 1
+  },
   label: {
-    marginLeft: _spacing["default"]['size-2'],
+    marginLeft: _spacing["default"]['size-3'],
+    pointerEvents: 'none',
     cursor: 'pointer',
-    "float": 'left',
-    flex: '1'
+    flex: 1
   },
   right: {
     marginLeft: _spacing["default"]['size-2'],
-    "float": 'right',
     pointerEvents: 'none'
   },
   overflow: {

package/build/SlideToggle/SlideToggle.js

@@ -13,6 +13,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _Text = _interopRequireDefault(require("../Text"));
 
+var _Icon = _interopRequireDefault(require("../Icon"));
+
+var _colors = _interopRequireDefault(require("../tokens/colors.json"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -103,6 +107,7 @@ var SlideToggle = /*#__PURE__*/function (_React$Component) {
           name = _this$props2.name,
           trk = _this$props2.trk,
           testId = _this$props2.testId;
+      var iconColor = disabled ? _colors["default"].icon["default"].disabled : value ? _colors["default"].icon.brand.bold : _colors["default"].icon.brand.disabled;
       return /*#__PURE__*/_react["default"].createElement("div", {
         id: id,
         tabIndex: disabled ? -1 : 0,
@@ -112,6 +117,8 @@ var SlideToggle = /*#__PURE__*/function (_React$Component) {
         onClick: this.toggle,
         className: "".concat(classes.cont).concat(disabled ? " ".concat(classes.disabled) : '').concat(className ? " ".concat(className) : ''),
         style: style
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.switchWrap
       }, /*#__PURE__*/_react["default"].createElement("div", _extends({
         id: trk,
         name: name,
@@ -119,14 +126,22 @@ var SlideToggle = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId
       }, testId && {
         'data-value': value ? 1 : 0
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        className: classes.slider
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.switchBg
       }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: classes.slider
+      }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+        iconName: value ? 'check' : 'x',
+        width: 16,
+        height: 16,
+        colors: [iconColor],
         className: classes.icon
-      }))), label && /*#__PURE__*/_react["default"].createElement(_Text["default"], {
+      }))))), label && /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.labelWrap
+      }, /*#__PURE__*/_react["default"].createElement(_Text["default"], {
         tag: "label",
         className: classes.label
-      }, label));
+      }, label)));
     }
   }]);