@occmundial/occ-atomic 2.0.0-beta.6 → 2.0.0-beta.8

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [2.0.0-beta.8](https://github.com/occmundial/occ-atomic/compare/v2.0.0-beta.7...v2.0.0-beta.8) (2024-04-25)
+
+
+### Features
+
+* Validate render icon in button logic ([c445f00](https://github.com/occmundial/occ-atomic/commit/c445f00b7f89b94c102b0e113b503d0e1a5193d4))
+* Validate render icon in button logic ([91dbc46](https://github.com/occmundial/occ-atomic/commit/91dbc464acceec6b1c7c9d2dde28976d04a5bf30))
+
+# [2.0.0-beta.7](https://github.com/occmundial/occ-atomic/compare/v2.0.0-beta.6...v2.0.0-beta.7) (2024-04-24)
+
+
+### Bug Fixes
+
+* Add missed icons ([a5527c5](https://github.com/occmundial/occ-atomic/commit/a5527c5eff5afb23c142c0b412756ee8f6a11b02))
+* Adjust styles for ghostPink theme and button icons ([942a2c9](https://github.com/occmundial/occ-atomic/commit/942a2c967cea88479154a65a98f2961bfbd406ce))
+* Adjust styles for ghostPink theme and button icons ([9e2576e](https://github.com/occmundial/occ-atomic/commit/9e2576efb42856f1a91ab271ea4b823fbbfbf45d))
+* Change logic to fallback legacy icons ([60f37f4](https://github.com/occmundial/occ-atomic/commit/60f37f48391713faba97f6d4f93e60519d79b348))
+
+
+### Features
+
+* Add logic to use atomic icons and static icons ([6fe277e](https://github.com/occmundial/occ-atomic/commit/6fe277ed83927d29af3cf06573cb6d08a0f399ab))
+* Add logic to use atomic icons and static icons ([0b9a9e4](https://github.com/occmundial/occ-atomic/commit/0b9a9e41c37a4fcff6c14c8e79da4885662ccba1))
+* Add to mapped icons stars solid icon ([5c96982](https://github.com/occmundial/occ-atomic/commit/5c9698235dc690bb8e1c913cc140854fc64c530b))
+* Adds testing icon to legacy icons ([a0bca6c](https://github.com/occmundial/occ-atomic/commit/a0bca6c33f54e731b645a953499dbc5b96d03d90))
+* Change occ logo blue color to blue token ([4b7d63d](https://github.com/occmundial/occ-atomic/commit/4b7d63d0743a8caecc019f8326733c4cf2017b2f))
+* Update atomic icons ([cdaa9bd](https://github.com/occmundial/occ-atomic/commit/cdaa9bda879f0d8aabe44a79cd16a0eedd3a7e8d))
+
 # [2.0.0-beta.6](https://github.com/occmundial/occ-atomic/compare/v2.0.0-beta.5...v2.0.0-beta.6) (2024-04-22)
 
 

package/build/Button/Button.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _Loading = _interopRequireDefault(require("./Loading"));
 
+var _Icon = _interopRequireDefault(require("../Icon"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -87,15 +89,22 @@ var Button = /*#__PURE__*/function (_React$Component) {
         if (round) classNames += " ".concat(classes.round);
       }
 
+      var iconSize = size === 'sm' ? 16 : 24;
+
       var content = /*#__PURE__*/_react["default"].createElement("span", {
         className: classes.cont
-      }, icon ? /*#__PURE__*/_react["default"].createElement("i", {
-        className: classes.icon
-      }) : '', children, iconRight ? /*#__PURE__*/_react["default"].createElement("i", {
-        className: classes.iconRight
+      }, icon ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+        className: classes.icon,
+        iconName: icon,
+        width: iconSize,
+        height: iconSize
+      }) : '', children, iconRight ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+        className: classes.iconRight,
+        iconName: iconRight,
+        width: iconSize,
+        height: iconSize
       }) : '');
 
-      var iconSize = size === 'sm' ? 16 : 24;
       var loadingLayer = loading ? /*#__PURE__*/_react["default"].createElement("span", {
         className: classes.loadCont
       }, /*#__PURE__*/_react["default"].createElement(_Loading["default"], {

package/build/Button/Button.test.js

@@ -107,14 +107,14 @@ describe("Button", function () {
       classes: classes,
       icon: "plus"
     }, "Button"));
-    expect(wrapper.find('button span i').prop('className').indexOf('icon')).not.toBe(-1);
+    expect(wrapper.find('button span Jss(Icon)').prop('className').indexOf('icon')).not.toBe(-1);
   });
   it('has an icon on the right', function () {
     var wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       classes: classes,
       iconRight: "plus"
     }, "Button"));
-    expect(wrapper.find('button span i').prop('className').indexOf('iconRight')).not.toBe(-1);
+    expect(wrapper.find('button span Jss(Icon)').prop('className').indexOf('iconRight')).not.toBe(-1);
   });
   it('has a loading icon', function () {
     var wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
@@ -138,11 +138,11 @@ describe("Button styles", function () {
     var props = {
       icon: 'testing'
     };
-    expect(_styles["default"].primary['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmZmY=)');
-    expect(_styles["default"].secondary['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICMwODNDQUU=)');
-    expect(_styles["default"].tertiary['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICMwODNDQUU=)');
-    expect(_styles["default"].ghostPink['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmMTM0NjU=)');
-    expect(_styles["default"].ghostGrey['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICM1QTVEN0I=)');
-    expect(_styles["default"].ghostWhite['& i'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmZmY=)');
+    expect(_styles["default"].primary['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmZmY=)');
+    expect(_styles["default"].secondary['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICMwODNDQUU=)');
+    expect(_styles["default"].tertiary['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICMwODNDQUU=)');
+    expect(_styles["default"].ghostPink['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmMTM0NjU=)');
+    expect(_styles["default"].ghostGrey['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICM1QTVEN0I=)');
+    expect(_styles["default"].ghostWhite['& span span'].background(props)).toBe('url(data:image/svg+xml;base64,dGVzdGluZyAtICNmZmY=)');
   });
 });

package/build/Button/Loading.js

@@ -77,6 +77,6 @@ function Loading(props) {
 ;
 Loading.propTypes = {
   fill: _propTypes["default"].string,
-  width: _propTypes["default"].string,
-  height: _propTypes["default"].string
+  width: _propTypes["default"].number,
+  height: _propTypes["default"].number
 };

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

@@ -51,14 +51,14 @@ Object {
     "& $loadIcon": Object {
       "background": "url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgogICAgICAgICAgICAJIHZpZXdCb3g9IjAgMCAyNCAyNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMjQgMjQ7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KICAgICAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICAgICAgCS5zdDB7ZmlsbDp1cmwoI1NWR0lEXzFfKTt9CiAgICAgICAgICAgIDwvc3R5bGU+CiAgICAgICAgICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iU1ZHSURfMV8iIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMjEiIHkxPSIxMiIgeDI9IjMiIHkyPSIxMiI+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjE3NzgiIHN0eWxlPSJzdG9wLWNvbG9yOiM1QTVEN0I7c3RvcC1vcGFjaXR5OjAiLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuMjI3MSIgc3R5bGU9InN0b3AtY29sb3I6IzVBNUQ3QjtzdG9wLW9wYWNpdHk6MC4xIi8+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjMxNTciIHN0eWxlPSJzdG9wLWNvbG9yOiM1QTVEN0I7c3RvcC1vcGFjaXR5OjAuNCIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC40NTI1IiBzdHlsZT0ic3RvcC1jb2xvcjojNUE1RDdCO3N0b3Atb3BhY2l0eTowLjciLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuNTU0NiIgc3R5bGU9InN0b3AtY29sb3I6IzVBNUQ3QiIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC45Mjc4IiBzdHlsZT0ic3RvcC1jb2xvcjojNUE1RDdCIi8+CiAgICAgICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICAgICAgICAgIDxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOS4xLDEyYzAuMSw0LTMuMSw3LjItNy4xLDcuMlM0LjgsMTYsNC44LDEyUzgsNC44LDEyLDQuOFYzYy01LDAtOSw0LTksOXM0LDksOSw5czktNCw5LTlIMTkuMXoiLz4KICAgICAgICAgICAgPC9zdmc+)",
     },
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
       "background": "transparent",
       "color": "#878A9F",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {
@@ -77,19 +77,19 @@ Object {
     "& $loadIcon": Object {
       "background": "url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgogICAgICAgICAgICAJIHZpZXdCb3g9IjAgMCAyNCAyNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMjQgMjQ7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KICAgICAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICAgICAgCS5zdDB7ZmlsbDp1cmwoI1NWR0lEXzFfKTt9CiAgICAgICAgICAgIDwvc3R5bGU+CiAgICAgICAgICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iU1ZHSURfMV8iIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMjEiIHkxPSIxMiIgeDI9IjMiIHkyPSIxMiI+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjE3NzgiIHN0eWxlPSJzdG9wLWNvbG9yOiNmMTM0NjU7c3RvcC1vcGFjaXR5OjAiLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuMjI3MSIgc3R5bGU9InN0b3AtY29sb3I6I2YxMzQ2NTtzdG9wLW9wYWNpdHk6MC4xIi8+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjMxNTciIHN0eWxlPSJzdG9wLWNvbG9yOiNmMTM0NjU7c3RvcC1vcGFjaXR5OjAuNCIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC40NTI1IiBzdHlsZT0ic3RvcC1jb2xvcjojZjEzNDY1O3N0b3Atb3BhY2l0eTowLjciLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuNTU0NiIgc3R5bGU9InN0b3AtY29sb3I6I2YxMzQ2NSIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC45Mjc4IiBzdHlsZT0ic3RvcC1jb2xvcjojZjEzNDY1Ii8+CiAgICAgICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICAgICAgICAgIDxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOS4xLDEyYzAuMSw0LTMuMSw3LjItNy4xLDcuMlM0LjgsMTYsNC44LDEyUzgsNC44LDEyLDQuOFYzYy01LDAtOSw0LTksOXM0LDksOSw5czktNCw5LTlIMTkuMXoiLz4KICAgICAgICAgICAgPC9zdmc+)",
     },
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
-      "& i": Object {
+      "& span span": Object {
         "background": [Function],
       },
       "background": "transparent !important",
       "border": "none !important",
-      "color": "#f13465 !important",
+      "color": "#fa90ac !important",
     },
     "&:hover, &:active": Object {
-      "& i": Object {
+      "& span span": Object {
         "background": [Function],
       },
       "color": "#cc1b4a",
@@ -107,14 +107,14 @@ Object {
     ],
   },
   "ghostWhite": Object {
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
       "background": "transparent",
       "color": "rgba(255,255,255,0.7)",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {
@@ -131,13 +131,11 @@ Object {
   },
   "icon": Object {
     "display": "inline-block",
-    "height": 16,
     "marginRight": "8px",
     "transition": "0.3s all",
-    "width": 16,
   },
   "iconOnly": Object {
-    "& i": Object {
+    "& span span, & svg": Object {
       "marginRight": 0,
     },
     "padding": Array [
@@ -153,10 +151,6 @@ Object {
     "width": 16,
   },
   "lg": Object {
-    "& i": Object {
-      "height": 24,
-      "width": 24,
-    },
     "&$iconOnly": Object {
       "padding": Array [
         "12px",
@@ -192,10 +186,6 @@ Object {
     "pointerEvents": "none",
   },
   "md": Object {
-    "& i": Object {
-      "height": 24,
-      "width": 24,
-    },
     "&$iconOnly": Object {
       "padding": Array [
         "8px",
@@ -209,7 +199,7 @@ Object {
     ],
   },
   "primary": Object {
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
@@ -217,7 +207,7 @@ Object {
       "color": "rgba(255,255,255,0.7)",
       "cursor": "not-allowed",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {
@@ -244,14 +234,14 @@ Object {
     "& $loadIcon": Object {
       "background": "url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgogICAgICAgICAgICAJIHZpZXdCb3g9IjAgMCAyNCAyNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMjQgMjQ7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KICAgICAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICAgICAgCS5zdDB7ZmlsbDp1cmwoI1NWR0lEXzFfKTt9CiAgICAgICAgICAgIDwvc3R5bGU+CiAgICAgICAgICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iU1ZHSURfMV8iIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMjEiIHkxPSIxMiIgeDI9IjMiIHkyPSIxMiI+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjE3NzgiIHN0eWxlPSJzdG9wLWNvbG9yOiMwODNDQUU7c3RvcC1vcGFjaXR5OjAiLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuMjI3MSIgc3R5bGU9InN0b3AtY29sb3I6IzA4M0NBRTtzdG9wLW9wYWNpdHk6MC4xIi8+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjMxNTciIHN0eWxlPSJzdG9wLWNvbG9yOiMwODNDQUU7c3RvcC1vcGFjaXR5OjAuNCIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC40NTI1IiBzdHlsZT0ic3RvcC1jb2xvcjojMDgzQ0FFO3N0b3Atb3BhY2l0eTowLjciLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuNTU0NiIgc3R5bGU9InN0b3AtY29sb3I6IzA4M0NBRSIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC45Mjc4IiBzdHlsZT0ic3RvcC1jb2xvcjojMDgzQ0FFIi8+CiAgICAgICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICAgICAgICAgIDxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOS4xLDEyYzAuMSw0LTMuMSw3LjItNy4xLDcuMlM0LjgsMTYsNC44LDEyUzgsNC44LDEyLDQuOFYzYy01LDAtOSw0LTksOXM0LDksOSw5czktNCw5LTlIMTkuMXoiLz4KICAgICAgICAgICAgPC9zdmc+)",
     },
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
       "background": "hsl(221 91.2% 35.7% / 0.1)",
       "color": "#486EC3",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {
@@ -270,7 +260,7 @@ Object {
     "& $loadIcon": Object {
       "background": "url(data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgogICAgICAgICAgICAJIHZpZXdCb3g9IjAgMCAyNCAyNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMjQgMjQ7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KICAgICAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICAgICAgCS5zdDB7ZmlsbDp1cmwoI1NWR0lEXzFfKTt9CiAgICAgICAgICAgIDwvc3R5bGU+CiAgICAgICAgICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iU1ZHSURfMV8iIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMjEiIHkxPSIxMiIgeDI9IjMiIHkyPSIxMiI+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjE3NzgiIHN0eWxlPSJzdG9wLWNvbG9yOiMwODNDQUU7c3RvcC1vcGFjaXR5OjAiLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuMjI3MSIgc3R5bGU9InN0b3AtY29sb3I6IzA4M0NBRTtzdG9wLW9wYWNpdHk6MC4xIi8+CiAgICAgICAgICAgIAk8c3RvcCAgb2Zmc2V0PSIwLjMxNTciIHN0eWxlPSJzdG9wLWNvbG9yOiMwODNDQUU7c3RvcC1vcGFjaXR5OjAuNCIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC40NTI1IiBzdHlsZT0ic3RvcC1jb2xvcjojMDgzQ0FFO3N0b3Atb3BhY2l0eTowLjciLz4KICAgICAgICAgICAgCTxzdG9wICBvZmZzZXQ9IjAuNTU0NiIgc3R5bGU9InN0b3AtY29sb3I6IzA4M0NBRSIvPgogICAgICAgICAgICAJPHN0b3AgIG9mZnNldD0iMC45Mjc4IiBzdHlsZT0ic3RvcC1jb2xvcjojMDgzQ0FFIi8+CiAgICAgICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICAgICAgICAgIDxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOS4xLDEyYzAuMSw0LTMuMSw3LjItNy4xLDcuMlM0LjgsMTYsNC44LDEyUzgsNC44LDEyLDQuOFYzYy01LDAtOSw0LTksOXM0LDksOSw5czktNCw5LTlIMTkuMXoiLz4KICAgICAgICAgICAgPC9zdmc+)",
     },
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
@@ -278,7 +268,7 @@ Object {
       "color": "#486EC3",
       "outline": "2px solid #8DA5DA",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {
@@ -299,14 +289,14 @@ Object {
     "outlineOffset": "-2px",
   },
   "tertiaryWhite": Object {
-    "& i": Object {
+    "& span span": Object {
       "background": [Function],
     },
     "&$disabled": Object {
       "background": "transparent",
       "color": "rgba(255,255,255,0.7)",
     },
-    "&$disabled i": Object {
+    "&$disabled span span": Object {
       "background": [Function],
     },
     "&:active": Object {

package/build/Button/styles.js

@@ -21,20 +21,23 @@ var _fonts2 = _interopRequireDefault(require("../tokens/fonts.json"));
 
 var _shadows = _interopRequireDefault(require("../tokens/shadows.json"));
 
+var _mappedIcons = require("../subatomic/mappedIcons");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var sec = _colors["default"].sec,
     secDark = _colors["default"].secDark,
-    grey900 = _colors["default"].grey900;
+    grey500 = _colors["default"].grey500,
+    secLight = _colors["default"].secLight;
 var sm = _fonts2["default"]['button-small'];
 var md = _fonts2["default"]['button-medium'];
 var lg = _fonts2["default"]['button-large'];
 
 var renderIcon = function renderIcon(props, color) {
   if (props.icon) {
-    return _icons["default"].base(_icons["default"][props.icon].icon(color));
+    return _mappedIcons.legacyIcons[props.icon] ? _icons["default"].base(_icons["default"][props.icon].icon(color)) : '';
   } else if (props.iconRight) {
-    return _icons["default"].base(_icons["default"][props.iconRight].icon(color));
+    return _mappedIcons.legacyIcons[props.iconRight] ? _icons["default"].base(_icons["default"][props.iconRight].icon(color)) : '';
   }
 
   return '';
@@ -107,12 +110,12 @@ var _default = {
       color: _colors2["default"].text.white.secondary,
       cursor: 'not-allowed'
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse["default"]]);
       }
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse.disabled]);
       }
@@ -134,12 +137,12 @@ var _default = {
       background: _colors2["default"].button.secondary.bg.disabled,
       color: _colors2["default"].text.indigo.secondary
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.brand["default"]]);
       }
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.brand.disabled]);
       }
@@ -165,7 +168,7 @@ var _default = {
     '&:not(:active):focus-visible': {
       boxShadow: _shadows["default"]['focus-indigo']
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.brand["default"]]);
       }
@@ -175,7 +178,7 @@ var _default = {
       color: _colors2["default"].text.indigo.secondary,
       outline: "2px solid ".concat(_colors2["default"].button.tertiary.border.disabled)
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.brand.disabled]);
       }
@@ -201,7 +204,7 @@ var _default = {
     '&:not(:active):focus-visible': {
       boxShadow: _shadows["default"]['focus-white']
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse["default"]]);
       }
@@ -210,7 +213,7 @@ var _default = {
       background: 'transparent',
       color: _colors2["default"].text.white.secondary
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse.disabled]);
       }
@@ -224,24 +227,24 @@ var _default = {
     paddingRight: [0, '!important'],
     '&:hover, &:active': {
       color: secDark,
-      '& i': {
+      '& span span': {
         background: function background(props) {
           return renderIcon(props, [secDark]);
         }
       }
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [sec]);
       }
     },
     '&$disabled': {
       background: "transparent !important",
-      color: "".concat(sec, " !important"),
+      color: "".concat(secLight, " !important"),
       border: "none !important",
-      '& i': {
+      '& span span': {
         background: function background(props) {
-          return renderIcon(props, [grey900]);
+          return renderIcon(props, [grey500]);
         }
       }
     },
@@ -261,7 +264,7 @@ var _default = {
     '&:not(:active):focus-visible': {
       boxShadow: _shadows["default"]['focus-corp']
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon["default"]["default"]]);
       }
@@ -270,7 +273,7 @@ var _default = {
       background: 'transparent',
       color: _colors2["default"].text.corp.disabled
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon["default"].disabled]);
       }
@@ -291,7 +294,7 @@ var _default = {
     '&:not(:active):focus-visible': {
       boxShadow: _shadows["default"]['focus-white']
     },
-    '& i': {
+    '& span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse["default"]]);
       }
@@ -300,7 +303,7 @@ var _default = {
       background: 'transparent',
       color: _colors2["default"].text.white.secondary
     },
-    '&$disabled i': {
+    '&$disabled span span': {
       background: function background(props) {
         return renderIcon(props, [_colors2["default"].icon.inverse.disabled]);
       }
@@ -320,10 +323,6 @@ var _default = {
   md: {
     font: "".concat(md.fontWeight, " ").concat(md.fontSize, "/").concat(md.lineHeight, " ").concat(_fonts["default"].body),
     padding: [_spacing["default"]['size-3'], _spacing["default"]['size-5']],
-    '& i': {
-      width: 24,
-      height: 24
-    },
     '&$iconOnly': {
       padding: [_spacing["default"]['size-2'], _spacing["default"]['size-2']]
     }
@@ -331,10 +330,6 @@ var _default = {
   lg: {
     font: "".concat(lg.fontWeight, " ").concat(lg.fontSize, "/").concat(lg.lineHeight, " ").concat(_fonts["default"].body),
     padding: [_spacing["default"]['size-3'], _spacing["default"]['size-6']],
-    '& i': {
-      width: 24,
-      height: 24
-    },
     '&$iconOnly': {
       padding: [_spacing["default"]['size-3'], _spacing["default"]['size-3']]
     }
@@ -346,8 +341,6 @@ var _default = {
   },
   // Icon
   icon: {
-    width: 16,
-    height: 16,
     marginRight: _spacing["default"]['size-2'],
     display: 'inline-block',
     transition: '0.3s all'
@@ -361,7 +354,7 @@ var _default = {
   },
   iconOnly: {
     padding: [_spacing["default"]['size-2'], _spacing["default"]['size-2']],
-    '& i': {
+    '& span span, & svg': {
       marginRight: 0
     }
   },

package/build/Icon/Icon.js

@@ -7,71 +7,102 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _useAtomic = _interopRequireDefault(require("../Provider/useAtomic"));
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _mappedIcons = require("../subatomic/mappedIcons");
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-/** Component to display any of the icons on the library. */
-var Icon = /*#__PURE__*/function (_React$Component) {
-  _inherits(Icon, _React$Component);
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-  var _super = _createSuper(Icon);
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
-  function Icon() {
-    _classCallCheck(this, Icon);
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-    return _super.apply(this, arguments);
+/** Component to display any of the icons on the library. */
+function Icon(props) {
+  var classes = props.classes,
+      className = props.className,
+      style = props.style,
+      id = props.id,
+      iconName = props.iconName,
+      ariaLabel = props.ariaLabel,
+      alt = props.alt,
+      onClick = props.onClick,
+      colors = props.colors,
+      testId = props.testId,
+      width = props.width,
+      height = props.height,
+      hoverColor = props.hover,
+      transition = props.transition;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      hover = _useState2[0],
+      setHover = _useState2[1];
+
+  var atomic = (0, _useAtomic["default"])();
+  var iconColor = (0, _react.useMemo)(function () {
+    if (hover && hoverColor && hoverColor.length) return hoverColor[0];
+    if (colors && colors.length) return colors[0];
+    return 'currentcolor';
+  }, [colors, hoverColor, hover]);
+  var mappedIconName = _mappedIcons.oldToNewIcon[iconName] || iconName;
+
+  if (_mappedIcons.legacyIcons[iconName]) {
+    var IconType = onClick ? 'button' : 'span';
+    return /*#__PURE__*/_react["default"].createElement(IconType, {
+      id: id,
+      className: "".concat(classes.oldIcon).concat(onClick ? " ".concat(classes.click) : '').concat(className ? " ".concat(className) : ''),
+      "aria-label": ariaLabel,
+      style: style,
+      onClick: onClick,
+      alt: alt,
+      "data-testid": testId
+    });
   }
 
-  _createClass(Icon, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          classes = _this$props.classes,
-          className = _this$props.className,
-          style = _this$props.style,
-          id = _this$props.id,
-          ariaLabel = _this$props.ariaLabel,
-          onClick = _this$props.onClick,
-          alt = _this$props.alt,
-          testId = _this$props.testId;
-      var IconType = onClick ? 'button' : 'span';
-      return /*#__PURE__*/_react["default"].createElement(IconType, {
-        id: id,
-        className: "".concat(classes.icon).concat(onClick ? " ".concat(classes.click) : '').concat(className ? " ".concat(className) : ''),
-        "aria-label": ariaLabel,
-        style: style,
-        onClick: onClick,
-        alt: alt,
-        "data-testid": testId
-      });
-    }
-  }]);
-
-  return Icon;
-}(_react["default"].Component);
+  return /*#__PURE__*/_react["default"].createElement("svg", {
+    className: "".concat(classes.icon, " ").concat(atomic.iconsPrefix, "__").concat(mappedIconName).concat(onClick ? ' ' + classes.click : '', " ").concat(className),
+    width: width ? width : 24,
+    height: height ? height : 24,
+    fill: iconColor,
+    id: id,
+    style: _objectSpread(_objectSpread({}, style), {}, {
+      transition: transition ? transition : '0.3s all'
+    }),
+    onClick: onClick,
+    onMouseEnter: function onMouseEnter() {
+      return setHover(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setHover(false);
+    },
+    "data-testid": testId
+  }, /*#__PURE__*/_react["default"].createElement("use", {
+    xlinkHref: "".concat(atomic.iconsPath, "#").concat(atomic.iconsPrefix, "__").concat(mappedIconName)
+  }));
+}
 
 Icon.defaultProps = {
   transition: '0.3s all'