beem-component 1.2.9 → 1.3.0

package/dist/components/Cards/cards.js

@@ -15,10 +15,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var BmCard = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  background: ", ";\n  border: 0.071rem solid ", ";\n  border-radius: 0.25rem;\n"])), _colors.BmPrimaryWhite, _colors.BmGrey400);
+var BmCard = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  background: ", ";\n  border: 0.071rem solid ", ";\n  border-radius: 0.25rem;\n  > * {\n    display: flex;\n    flex-direction: row;\n    align-items: center;\n    justify-content: space-between;\n  }\n"])), _colors.BmPrimaryWhite, _colors.BmGrey400);
 
-BmCard.Header = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  padding: 1rem 1rem 0rem 1rem;\n"])));
-BmCard.Body = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  margin-top: 0.5rem;\n  margin-bottom: 1rem;\n  padding: 0rem 1rem;\n"])));
-BmCard.Footer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  border-top: 0.071rem solid ", ";\n  padding: 1rem;\n  align-items: center;\n"])), _colors.BmGrey400);
+BmCard.Header = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 1rem 1rem 0rem 1rem;\n"])));
+BmCard.Body = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: 0rem 1rem;\n"])));
+BmCard.Footer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  border-top: 0.071rem solid ", ";\n  padding: 1rem;\n"])), _colors.BmGrey400);
 var _default = BmCard;
 exports.default = _default;

package/dist/components/NoteBar/noteBar.js

@@ -1,11 +1,13 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NoteBarWrapper = exports.BmNoteBar = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -17,30 +19,66 @@ var _colors = require("../colors");
 
 var _iconStyles = require("../iconStyles");
 
-var _excluded = ["type", "children", "color", "size"];
+var _excluded = ["type", "children", "color", "size", "closeButton"];
 
 var _templateObject;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 _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 _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); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+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 _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); }
+
+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; }
+
+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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var NoteBarWrapper = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  padding: 0.5rem 1rem;\n  border: 0.071rem solid ", ";\n  border-radius: 0.25rem;\n  > *:not(:last-child) {\n    margin-right: 0.5rem;\n  }\n"])), _colors.BmGrey400);
+var NoteBarWrapper = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: ", ";\n  flex-direction: row;\n  align-items: center;\n  padding: 0.5rem 1rem;\n  border: 0.071rem solid ", ";\n  border-radius: 0.25rem;\n  > *:not(:last-child) {\n    margin-right: 0.5rem;\n  }\n"])), function (_ref) {
+  var closeButton = _ref.closeButton,
+      isOpen = _ref.isOpen;
 
-exports.NoteBarWrapper = NoteBarWrapper;
+  if (!closeButton) {
+    return "flex";
+  }
+
+  return isOpen ? "flex" : "none";
+}, _colors.BmGrey400);
 
-var BmNoteBar = function BmNoteBar(_ref) {
-  var type = _ref.type,
-      children = _ref.children,
-      color = _ref.color,
-      size = _ref.size,
-      rest = _objectWithoutProperties(_ref, _excluded);
+exports.NoteBarWrapper = NoteBarWrapper;
 
-  return /*#__PURE__*/_react.default.createElement(NoteBarWrapper, rest, type === "info" && /*#__PURE__*/_react.default.createElement(_iconStyles.BmIcons, {
+var BmNoteBar = function BmNoteBar(_ref2) {
+  var type = _ref2.type,
+      children = _ref2.children,
+      color = _ref2.color,
+      size = _ref2.size,
+      closeButton = _ref2.closeButton,
+      rest = _objectWithoutProperties(_ref2, _excluded);
+
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      isOpen = _useState2[0],
+      setIsOpen = _useState2[1];
+
+  return /*#__PURE__*/_react.default.createElement(NoteBarWrapper, _extends({
+    closeButton: closeButton,
+    isOpen: isOpen
+  }, rest), type === "info" && /*#__PURE__*/_react.default.createElement(_iconStyles.BmIcons, {
     icon: /*#__PURE__*/_react.default.createElement(_icons.Info, null),
     color: color ? color : "".concat(_colors.BmPrimaryBlue),
     size: size ? size : "large"
@@ -52,7 +90,17 @@ var BmNoteBar = function BmNoteBar(_ref) {
     icon: /*#__PURE__*/_react.default.createElement(_icons.Warning, null),
     color: color ? color : "".concat(_colors.BmPrimaryGold),
     size: size ? size : "large"
-  }), children);
+  }), children, closeButton && /*#__PURE__*/_react.default.createElement(_iconStyles.BmIcons, {
+    icon: /*#__PURE__*/_react.default.createElement(_icons.Clear, null),
+    color: color ? color : "".concat(_colors.BmSecondaryGrey),
+    size: size ? size : "small",
+    style: {
+      marginLeft: "auto"
+    },
+    onClick: function onClick() {
+      return setIsOpen(false);
+    }
+  }));
 };
 
 exports.BmNoteBar = BmNoteBar;
@@ -60,5 +108,6 @@ BmNoteBar.propTypes = {
   children: _propTypes.default.object,
   color: _propTypes.default.string,
   size: _propTypes.default.string,
-  type: _propTypes.default.string
+  type: _propTypes.default.string,
+  closeButton: _propTypes.default.bool
 };

package/dist/components/NoteBar/noteBar.stories.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.NoteBar = void 0;
+exports.default = exports.NoteBarWithCloseButton = exports.NoteBar = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -47,6 +47,9 @@ var _default = {
       defaultValue: {
         summary: undefined
       }
+    },
+    closeButton: {
+      description: "If present will allow to close the notebar, default size of the icon is small"
     }
   }
 };
@@ -63,4 +66,13 @@ NoteBar.args = {
   size: "large",
   children: /*#__PURE__*/_react.default.createElement("p", null, "NoteBar"),
   color: undefined
+};
+var NoteBarWithCloseButton = MainNoteBar.bind({});
+exports.NoteBarWithCloseButton = NoteBarWithCloseButton;
+NoteBarWithCloseButton.args = {
+  type: "warning",
+  size: "large",
+  children: /*#__PURE__*/_react.default.createElement("p", null, "NoteBar"),
+  color: undefined,
+  closeButton: true
 };

package/dist/components/ProgressRing/progressRing.js

@@ -37,11 +37,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var xsmall = 1.143;
 var small = 1.429;
 var medium = 1.714;
-var large = 1.714;
-var xlarge = 2.286;
+var large = 2.286;
 var center;
 var radius;
 var circumference;
@@ -51,10 +49,6 @@ var initialSize;
 var measurement = function measurement(size) {
   var initialSize = size || large * 14;
 
-  if (size === "xsmall") {
-    initialSize = xsmall * 14;
-  }
-
   if (size === "small") {
     initialSize = small * 14;
   }
@@ -67,10 +61,6 @@ var measurement = function measurement(size) {
     initialSize = large * 14;
   }
 
-  if (size === "xlarge") {
-    initialSize = xlarge * 14;
-  }
-
   center = initialSize / 2;
   radius = initialSize / 2 - strokeWidth / 2;
   circumference = 2 * Math.PI * radius;
@@ -84,22 +74,18 @@ var measurement = function measurement(size) {
 
 var ProgressRingWrapper = _styledComponents.default.svg(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: ", ";\n  height: ", ";\n"])), function (_ref) {
   var size = _ref.size;
-  if (size === "xsmall") return "1.143rem";
   if (size === "small") return "1.429rem";
   if (size === "medium") return "1.714rem";
-  if (size === "large") return "1.714rem";
-  if (size === "xlarge") return "2.286rem";
-  if (!size) return "1.714rem";
-  return size;
+  if (size === "large") return "2.286rem";
+  if (!size) return "2.286rem";
+  return "".concat(size, "px");
 }, function (_ref2) {
   var size = _ref2.size;
-  if (size === "xsmall") return "1.143rem";
   if (size === "small") return "1.429rem";
   if (size === "medium") return "1.714rem";
-  if (size === "large") return "1.714rem";
-  if (size === "xlarge") return "2.286rem";
-  if (!size) return "1.714rem";
-  return size;
+  if (size === "large") return "2.286rem";
+  if (!size) return "2.286rem";
+  return "".concat(size, "px");
 });
 
 var ProgressRingCircle1 = _styledComponents.default.circle(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  fill: none;\n"])));
@@ -119,7 +105,7 @@ var ProgressRingCircle2 = _styledComponents.default.circle(_templateObject3 || (
   if (!progress) return "".concat(_colors.BmGrey100);
 });
 
-var Text = _styledComponents.default.text(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-size: ", ";\n  text-anchor: middle;\n  fill: black;\n  position: absolute;\n"])), function () {
+var Text = _styledComponents.default.text(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-size: ", ";\n  text-anchor: middle;\n  fill: black;\n"])), function () {
   if (initialSize >= 50 && initialSize < 100) {
     return "1rem";
   }
@@ -140,7 +126,11 @@ var BmProgressRing = function BmProgressRing(props) {
   var circleRef = (0, _react.useRef)(null);
   var size = props.size,
       progress = props.progress,
-      variant = props.variant;
+      variant = props.variant,
+      children = props.children;
+  console.log({
+    children: children
+  });
   var initialMeasure = measurement(size);
   circumference = initialMeasure.circumference;
   radius = initialMeasure.radius;
@@ -159,7 +149,11 @@ var BmProgressRing = function BmProgressRing(props) {
     cy: center,
     r: radius,
     strokeWidth: strokeWidth
-  }), /*#__PURE__*/_react.default.createElement(ProgressRingCircle2, {
+  }), /*#__PURE__*/_react.default.createElement(Text, {
+    x: "".concat(center),
+    y: "".concat(center),
+    size: size
+  }, progress), /*#__PURE__*/_react.default.createElement(ProgressRingCircle2, {
     progress: progress,
     ref: circleRef,
     variant: variant,
@@ -170,11 +164,7 @@ var BmProgressRing = function BmProgressRing(props) {
     strokeDasharray: circumference,
     strokeDashoffset: offset,
     "data-testid": "progress-bar-bar"
-  }), /*#__PURE__*/_react.default.createElement(Text, {
-    x: "".concat(center),
-    y: "".concat(center),
-    size: size
-  }, progress, "%")));
+  })));
 };
 
 BmProgressRing.propTypes = {

package/dist/components/ProgressRing/progressRing.stories.js

@@ -17,7 +17,7 @@ var _default = {
   title: "components/ProgressRing",
   argTypes: {
     size: {
-      options: ["xsmall", "small", "medium", "large", "xlarge"],
+      options: ["small", "medium", "large"],
       control: {
         type: "select"
       },

package/dist/components/Tabs/tabs.js

@@ -29,34 +29,39 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var BmTabWrapper = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n  align-items: center;\n  padding: 0.714rem 1.714rem;\n  background: ", ";\n  box-shadow: ", ";\n  > *:not(:last-child) {\n    margin-right: 0.5rem;\n  }\n  ", "\n"])), _colors.BmPrimaryWhite, function (_ref) {
-  var state = _ref.state;
+var BmTabWrapper = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n  align-items: center;\n  padding: 1rem;\n  background: ", ";\n  box-shadow: ", ";\n  > *:not(:last-child) {\n    margin-right: 0.5rem;\n  }\n  ", "\n\n  &:hover {\n    box-shadow: ", ";\n  }\n"])), _colors.BmPrimaryWhite, function (_ref) {
+  var state = _ref.state,
+      disabled = _ref.disabled;
 
-  if (state === "active") {
+  if (state === "active" && !disabled) {
     return "inset 0px -3px 0px ".concat(_colors.BmPrimaryBlue);
   }
 
-  if (state === "inactive") {
-    return "inset 0px -3px 0px ".concat(_colors.BmGrey400);
-  }
-
   return "none";
 }, function (_ref2) {
   var color = _ref2.color,
       children = _ref2.children,
       disabled = _ref2.disabled;
   return children && disabled ? "\n    > * {\n     color: ".concat(_colors.BmGrey400, ";\n  }\n  ") : "\n    > * {\n     color: ".concat(color, ";\n  }\n  ");
+}, function (_ref3) {
+  var disabled = _ref3.disabled;
+
+  if (!disabled) {
+    return "inset 0px -3px 0px ".concat(_colors.BmGrey400);
+  }
+
+  return "none";
 });
 
-var BmTab = function BmTab(_ref3) {
-  var leadingIcon = _ref3.leadingIcon,
-      trailingIcon = _ref3.trailingIcon,
-      children = _ref3.children,
-      size = _ref3.size,
-      color = _ref3.color,
-      icon = _ref3.icon,
-      disabled = _ref3.disabled,
-      rest = _objectWithoutProperties(_ref3, _excluded);
+var BmTab = function BmTab(_ref4) {
+  var leadingIcon = _ref4.leadingIcon,
+      trailingIcon = _ref4.trailingIcon,
+      children = _ref4.children,
+      size = _ref4.size,
+      color = _ref4.color,
+      icon = _ref4.icon,
+      disabled = _ref4.disabled,
+      rest = _objectWithoutProperties(_ref4, _excluded);
 
   return /*#__PURE__*/_react.default.createElement(BmTabWrapper, _extends({
     leadingIcon: leadingIcon,
@@ -65,11 +70,11 @@ var BmTab = function BmTab(_ref3) {
     disabled: disabled
   }, rest), leadingIcon && /*#__PURE__*/_react.default.createElement(_iconStyles.BmIcons, {
     icon: leadingIcon,
-    size: size || 'large',
+    size: size || "large",
     color: disabled ? "".concat(_colors.BmGrey400) : color
   }), children, trailingIcon && /*#__PURE__*/_react.default.createElement(_iconStyles.BmIcons, {
     icon: trailingIcon,
-    size: size || 'large',
+    size: size || "large",
     color: disabled ? "".concat(_colors.BmGrey400) : color
   }));
 };
@@ -81,5 +86,6 @@ BmTab.propTypes = {
   leadingIcon: _propTypes.default.node,
   state: _propTypes.default.string,
   color: _propTypes.default.string,
-  size: _propTypes.default.string
+  size: _propTypes.default.string,
+  disabled: _propTypes.default.bool
 };

package/dist/components/Tabs/tabs.stories.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.Tabs = void 0;
+exports.default = exports.DisabledTab = exports.BasicTab = void 0;
 
 var _icons = require("@material-ui/icons");
 
@@ -25,7 +25,7 @@ var _default = {
       description: "Color of the Icons and Text"
     },
     state: {
-      options: ["active", "inactive"],
+      options: ["active"],
       control: {
         type: "select"
       },
@@ -40,6 +40,9 @@ var _default = {
       defaultValue: {
         summary: "large"
       }
+    },
+    disabled: {
+      description: "Disabled tab"
     }
   }
 };
@@ -49,12 +52,20 @@ var MainTab = function MainTab(args) {
   return /*#__PURE__*/_react.default.createElement(_tabs.BmTab, args);
 };
 
-var Tabs = MainTab.bind({});
-exports.Tabs = Tabs;
-Tabs.args = {
+var BasicTab = MainTab.bind({});
+exports.BasicTab = BasicTab;
+BasicTab.args = {
   children: /*#__PURE__*/_react.default.createElement("h3", null, "Tabs"),
   leadingIcon: /*#__PURE__*/_react.default.createElement(_icons.Favorite, null),
   trailingIcon: /*#__PURE__*/_react.default.createElement(_icons.KeyboardArrowDown, null),
   disabled: false,
   state: 'active'
+};
+var DisabledTab = MainTab.bind({});
+exports.DisabledTab = DisabledTab;
+DisabledTab.args = {
+  children: /*#__PURE__*/_react.default.createElement("h3", null, "Disabled Tabs"),
+  leadingIcon: /*#__PURE__*/_react.default.createElement(_icons.Favorite, null),
+  trailingIcon: /*#__PURE__*/_react.default.createElement(_icons.KeyboardArrowDown, null),
+  disabled: true
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "beem-component",
-    "version": "1.2.9",
+    "version": "1.3.0",
     "private": false,
     "main": "dist/components/index.js",
     "scripts": {

package/src/App.js

@@ -1,11 +1,18 @@
 import React from "react";
 import "../src/main.scss";
-import { BmButton, BmCard, BmIcons, MainWrapper } from "./lib/components";
+import {
+  BmButton,
+  BmCard,
+  BmIcons,
+  BmNoteBar,
+  BmTab,
+  MainWrapper,
+} from "./lib/components";
 import { GlobalStyle } from "./lib/components/globalStyles";
 import "./lib/assets/css/sidebar.scss";
 import BmBanner from "./lib/components/BannerCard/bannerCards";
 import { FileCopyOutlined } from "@material-ui/icons";
-import ProgressBar from "./lib/components/ProgressRing/progressRing";
+import BmProgressRing from "./lib/components/ProgressRing/progressRing";
 
 export const App = () => {
   return (
@@ -26,10 +33,19 @@ export const App = () => {
         <BmCard.Header>
           <h3>Card Header</h3>
         </BmCard.Header>
-        <BmCard.Body></BmCard.Body>
+        <BmCard.Body>
+          <p>Hello</p>
+          <BmProgressRing progress="70" size="50" />
+        </BmCard.Body>
         <BmCard.Footer>Card Footer</BmCard.Footer>
       </BmCard>
-        <ProgressBar progress="70" size="40" />
+      <BmProgressRing progress="70" size="45" />
+      <BmTab state="active">
+        <h3>Tabs</h3>
+      </BmTab>
+      <BmNoteBar closeButton>
+        <p>Hello</p>
+      </BmNoteBar>
       {/* </MainWrapper> */}
     </>
   );

package/src/lib/components/Cards/cards.js

@@ -7,31 +7,25 @@ const BmCard = styled.div`
   background: ${BmPrimaryWhite};
   border: 0.071rem solid ${BmGrey400};
   border-radius: 0.25rem;
+  > * {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
 `;
 
 BmCard.Header = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
   padding: 1rem 1rem 0rem 1rem;
 `;
 
 BmCard.Body = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin-top: 0.5rem;
-  margin-bottom: 1rem;
   padding: 0rem 1rem;
 `;
 
 BmCard.Footer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
   border-top: 0.071rem solid ${BmGrey400};
   padding: 1rem;
-  align-items: center;
 `;
 
 export default BmCard;

package/src/lib/components/NoteBar/noteBar.js

@@ -1,17 +1,23 @@
-import React from "react";
+import React, { useState } from "react";
 import Proptypes from "prop-types";
-import { Error, Info, Warning } from "@material-ui/icons";
+import { Clear, Error, Info, Warning } from "@material-ui/icons";
 import styled from "styled-components";
 import {
   BmGrey400,
   BmPrimaryBlue,
   BmSecondaryRed,
   BmPrimaryGold,
+  BmSecondaryGrey,
 } from "../colors";
 import { BmIcons } from "../iconStyles";
 
 export const NoteBarWrapper = styled.div`
-  display: flex;
+  display: ${({ closeButton, isOpen }) => {
+    if (!closeButton) {
+      return "flex";
+    }
+    return isOpen ? "flex" : "none";
+  }};
   flex-direction: row;
   align-items: center;
   padding: 0.5rem 1rem;
@@ -22,9 +28,17 @@ export const NoteBarWrapper = styled.div`
   }
 `;
 
-export const BmNoteBar = ({ type, children, color, size, ...rest }) => {
+export const BmNoteBar = ({
+  type,
+  children,
+  color,
+  size,
+  closeButton,
+  ...rest
+}) => {
+  const [isOpen, setIsOpen] = useState(true);
   return (
-    <NoteBarWrapper {...rest}>
+    <NoteBarWrapper closeButton={closeButton} isOpen={isOpen} {...rest}>
       {type === "info" && (
         <BmIcons
           icon={<Info />}
@@ -47,6 +61,15 @@ export const BmNoteBar = ({ type, children, color, size, ...rest }) => {
         />
       )}
       {children}
+      {closeButton && (
+        <BmIcons
+          icon={<Clear />}
+          color={color ? color : `${BmSecondaryGrey}`}
+          size={size ? size : "small"}
+          style={{ marginLeft: "auto" }}
+          onClick={() => setIsOpen(false)}
+        />
+      )}
     </NoteBarWrapper>
   );
 };
@@ -56,4 +79,5 @@ BmNoteBar.propTypes = {
   color: Proptypes.string,
   size: Proptypes.string,
   type: Proptypes.string,
+  closeButton: Proptypes.bool,
 };

package/src/lib/components/NoteBar/noteBar.stories.js

@@ -26,6 +26,9 @@ export default {
       description: "Color of the icon ",
       defaultValue: { summary: undefined },
     },
+    closeButton: {
+      description: "If present will allow to close the notebar, default size of the icon is small",
+    },
   },
 };
 
@@ -38,3 +41,12 @@ NoteBar.args = {
   children: <p>NoteBar</p>,
   color: undefined,
 };
+
+export const NoteBarWithCloseButton = MainNoteBar.bind({});
+NoteBarWithCloseButton.args = {
+  type: "warning",
+  size: "large",
+  children: <p>NoteBar</p>,
+  color: undefined,
+  closeButton: true,
+};

package/src/lib/components/ProgressRing/progressRing.js

@@ -9,11 +9,9 @@ import {
   BmSecondaryRed,
 } from "../colors";
 
-const xsmall = 1.143;
 const small = 1.429;
 const medium = 1.714;
-const large = 1.714;
-const xlarge = 2.286;
+const large = 2.286;
 
 let center;
 let radius;
@@ -23,9 +21,6 @@ let initialSize;
 
 const measurement = (size) => {
   let initialSize = size || large * 14;
-  if (size === "xsmall") {
-    initialSize = xsmall * 14;
-  }
   if (size === "small") {
     initialSize = small * 14;
   }
@@ -35,9 +30,6 @@ const measurement = (size) => {
   if (size === "large") {
     initialSize = large * 14;
   }
-  if (size === "xlarge") {
-    initialSize = xlarge * 14;
-  }
   center = initialSize / 2;
   radius = initialSize / 2 - strokeWidth / 2;
   circumference = 2 * Math.PI * radius;
@@ -46,22 +38,18 @@ const measurement = (size) => {
 const ProgressRingWrapper = styled.svg`
   display: flex;
   width: ${({ size }) => {
-    if (size === "xsmall") return "1.143rem";
     if (size === "small") return "1.429rem";
     if (size === "medium") return "1.714rem";
-    if (size === "large") return "1.714rem";
-    if (size === "xlarge") return "2.286rem";
-    if (!size) return "1.714rem";
-    return size;
+    if (size === "large") return "2.286rem";
+    if (!size) return "2.286rem";
+    return `${size}px`;
   }};
   height: ${({ size }) => {
-    if (size === "xsmall") return "1.143rem";
     if (size === "small") return "1.429rem";
     if (size === "medium") return "1.714rem";
-    if (size === "large") return "1.714rem";
-    if (size === "xlarge") return "2.286rem";
-    if (!size) return "1.714rem";
-    return size;
+    if (size === "large") return "2.286rem";
+    if (!size) return "2.286rem";
+    return `${size}px`;
   }};
 `;
 
@@ -95,14 +83,14 @@ const Text = styled.text`
   }};
   text-anchor: middle;
   fill: black;
-  position: absolute;
 `;
 
 const BmProgressRing = (props) => {
   const [offset, setOffset] = useState(0);
   const circleRef = useRef(null);
-  const { size, progress, variant } = props;
+  const { size, progress, variant, children } = props;
 
+  console.log({ children });
   const initialMeasure = measurement(size);
 
   circumference = initialMeasure.circumference;
@@ -127,6 +115,10 @@ const BmProgressRing = (props) => {
           r={radius}
           strokeWidth={strokeWidth}
         />
+
+        <Text x={`${center}`} y={`${center}`} size={size}>
+          {progress}
+        </Text>
         <ProgressRingCircle2
           progress={progress}
           ref={circleRef}
@@ -139,9 +131,6 @@ const BmProgressRing = (props) => {
           strokeDashoffset={offset}
           data-testid="progress-bar-bar"
         />
-        <Text x={`${center}`} y={`${center}`} size={size}>
-          {progress}%
-        </Text>
       </ProgressRingWrapper>
     </>
   );

package/src/lib/components/ProgressRing/progressRing.stories.js

@@ -7,7 +7,7 @@ export default {
   title: "components/ProgressRing",
   argTypes: {
     size: {
-      options: ["xsmall", "small", "medium", "large", "xlarge"],
+      options: ["small", "medium", "large"],
       control: { type: "select" },
       description: "Size of the Progress Ring (Can also be predefined e.g. 50)",
       defaultValue: { summary: "large" },

package/src/lib/components/Tabs/tabs.js

@@ -9,15 +9,12 @@ const BmTabWrapper = styled.div`
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  padding: 0.714rem 1.714rem;
+  padding: 1rem;
   background: ${BmPrimaryWhite};
-  box-shadow: ${({ state }) => {
-    if (state === "active") {
+  box-shadow: ${({ state, disabled }) => {
+    if (state === "active" && !disabled) {
       return `inset 0px -3px 0px ${BmPrimaryBlue}`;
     }
-    if (state === "inactive") {
-      return `inset 0px -3px 0px ${BmGrey400}`;
-    }
     return "none";
   }};
   > *:not(:last-child) {
@@ -35,6 +32,15 @@ const BmTabWrapper = styled.div`
      color: ${color};
   }
   `}
+
+  &:hover {
+    box-shadow: ${({ disabled }) => {
+      if (!disabled) {
+        return `inset 0px -3px 0px ${BmGrey400}`;
+      }
+      return "none";
+    }};
+  }
 `;
 
 export const BmTab = ({
@@ -58,7 +64,7 @@ export const BmTab = ({
       {leadingIcon && (
         <BmIcons
           icon={leadingIcon}
-          size={size || 'large'}
+          size={size || "large"}
           color={disabled ? `${BmGrey400}` : color}
         />
       )}
@@ -66,7 +72,7 @@ export const BmTab = ({
       {trailingIcon && (
         <BmIcons
           icon={trailingIcon}
-          size={size || 'large'}
+          size={size || "large"}
           color={disabled ? `${BmGrey400}` : color}
         />
       )}
@@ -81,4 +87,5 @@ BmTab.propTypes = {
   state: PropTypes.string,
   color: PropTypes.string,
   size: PropTypes.string,
-};
+  disabled: PropTypes.bool,
+};

package/src/lib/components/Tabs/tabs.stories.js

@@ -12,7 +12,7 @@ export default {
       description: "Color of the Icons and Text",
     },
     state: {
-      options: ["active", "inactive"],
+      options: ["active"],
       control: { type: "select" },
       description: "State of the Tabs (optional)",
     },
@@ -22,16 +22,28 @@ export default {
       description: "Size of the icons",
       defaultValue: { summary: "large" },
     },
+    disabled: {
+      description:
+        "Disabled tab",
+    },
   },
 };
 
 const MainTab = (args) => <BmTab {...args} />;
 
-export const Tabs = MainTab.bind({});
-Tabs.args = {
+export const BasicTab = MainTab.bind({});
+BasicTab.args = {
   children: <h3>Tabs</h3>,
   leadingIcon: <Favorite />,
   trailingIcon: <KeyboardArrowDown />,
   disabled: false,
   state: 'active',
 };
+
+export const DisabledTab = MainTab.bind({});
+DisabledTab.args = {
+  children: <h3>Disabled Tabs</h3>,
+  leadingIcon: <Favorite />,
+  trailingIcon: <KeyboardArrowDown />,
+  disabled: true,
+};