@occmundial/occ-atomic 3.0.0-beta.1 → 3.0.0-beta.10

package/build/Tip/Tip.js

@@ -1,39 +1,26 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _isString = _interopRequireDefault(require("lodash/isString"));
-
-var _flatten = _interopRequireDefault(require("lodash/flatten"));
-
 var _Flexbox = _interopRequireDefault(require("../Flexbox"));
 
-var _Text = _interopRequireDefault(require("../Text"));
-
 var _Icon = _interopRequireDefault(require("../Icon"));
 
-var _colors = _interopRequireDefault(require("../subatomic/colors"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _Button = _interopRequireDefault(require("../Button"));
 
-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); }
+var _TipText = _interopRequireDefault(require("./TipText"));
 
-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; }
+var _colors = _interopRequireDefault(require("../tokens/colors.json"));
 
-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 _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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var boldRegex = /\*(.*?)\*/g;
 var icons = {
   info: 'info-circle',
   warning: 'alert',
@@ -42,6 +29,13 @@ var icons = {
   promote: null
 };
 var PROMOTE = 'promote';
+var colorTextClasses = {
+  info: 'textInfo',
+  promote: 'textPromote',
+  warning: 'textWarning',
+  success: 'textSuccess',
+  error: 'textError'
+};
 /** Tip component with different themes (info, warning, success & error). You can pass a string or a react element as the children prop, but the bold regex will only work with strings. */
 
 var Tip = function Tip(_ref) {
@@ -54,62 +48,12 @@ var Tip = function Tip(_ref) {
       noBorderRadius = _ref.noBorderRadius,
       center = _ref.center,
       onClose = _ref.onClose,
-      spacedClose = _ref.spacedClose,
       children = _ref.children,
-      cta = _ref.cta;
-
-  var replaceStringToBold = function replaceStringToBold() {
-    if (children === '') return children;
-    var result = children.split(boldRegex);
-    if (result.length === 1) return children;
-
-    for (var i = 1, length = result.length; i < length; i += 2) {
-      result[i] = boldMatch(result[i], i, theme);
-    }
-
-    return result;
-  };
-
-  var getTheme = function getTheme() {
-    if (theme === PROMOTE) return {
-      white: true
-    };
-    return _defineProperty({}, theme, true);
-  };
-
-  var boldMatch = function boldMatch(match, i) {
-    return /*#__PURE__*/_react["default"].createElement(_Text["default"], _extends({
-      key: i,
-      strong: true,
-      tag: "b"
-    }, getTheme()), match);
-  };
-
-  var getIconName = function getIconName() {
-    return icons[theme];
-  };
-
-  var renderText = function renderText() {
-    var textArray;
-    if (!Array.isArray(children)) textArray = [children];
-    var text = (0, _flatten["default"])(textArray.map(function (x) {
-      return (0, _isString["default"])(x) ? replaceStringToBold(x, theme) : x;
-    }));
-
-    if (cta) {
-      text.push( /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, ' ', /*#__PURE__*/_react["default"].createElement("a", {
-        className: classes.cta,
-        href: cta.href,
-        target: cta.target,
-        onClick: cta.onClick
-      }, /*#__PURE__*/_react["default"].createElement(_Text["default"], _extends({
-        tag: "span"
-      }, getTheme()), cta.text))));
-    }
-
-    return text;
-  };
-
+      cta = _ref.cta,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? 'large' : _ref$size,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'alert' : _ref$type;
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: id,
     className: className,
@@ -117,26 +61,34 @@ var Tip = function Tip(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_Flexbox["default"], {
     justifyContent: "start",
     display: "flex",
-    className: "".concat(classes.container, " ").concat(classes[theme]).concat(noBorderRadius ? " ".concat(classes.noBorderRadius) : '')
+    className: "".concat(classes.container, " ").concat(classes[theme]).concat(noBorderRadius ? " ".concat(classes.noBorderRadius) : '').concat(size === 'small' ? " ".concat(classes.small) : '')
   }, /*#__PURE__*/_react["default"].createElement(_Flexbox["default"], {
     display: "flex",
     flex: "1",
     justifyContent: center ? 'center' : null,
-    alignItems: "center"
-  }, icon && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
-    iconName: getIconName(),
+    alignItems: "stretch",
+    className: type === 'banner' ? classes.bannerContent : ''
+  }, icon && theme !== PROMOTE && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    iconName: icons[theme],
     className: classes.icon,
-    colors: [_colors["default"]["".concat(theme, "Text")]]
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: icon ? classes.textWithIcon : classes.text
-  }, /*#__PURE__*/_react["default"].createElement(_Text["default"], _extends({
-    standard: true,
-    tag: "div"
-  }, getTheme()), renderText()))), onClose && /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
-    iconName: "cross",
+    colors: [theme === 'info' ? _colors["default"].icon.brand["default"] : _colors["default"].icon[theme]]
+  }), /*#__PURE__*/_react["default"].createElement(_Flexbox["default"], {
+    display: "flex",
+    direction: size === 'small' ? 'col' : 'row'
+  }, /*#__PURE__*/_react["default"].createElement(_TipText["default"], {
+    classes: "".concat(classes.normalText, " ").concat(classes[colorTextClasses[theme]]),
+    text: children
+  }), cta && /*#__PURE__*/_react["default"].createElement("a", {
+    className: "".concat(classes.cta, " ").concat(size === 'small' ? classes.ctaSmall : classes.ctaLarge, " ").concat(classes[colorTextClasses[theme]]),
+    href: cta.href,
+    target: cta.target,
+    onClick: cta.onClick
+  }, cta.text))), onClose && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     onClick: onClose,
-    colors: [theme === PROMOTE ? _colors["default"].bgWhite : _colors["default"]["".concat(theme, "Text")]],
-    className: spacedClose ? classes.spacedClose : null
+    className: classes.closeIcon,
+    size: type === 'banner' ? 'lg' : 'md',
+    icon: "x",
+    theme: theme === PROMOTE ? 'ghostWhite' : 'ghostGrey'
   })));
 };
 
@@ -151,6 +103,7 @@ Tip.propTypes = {
 
   /** Text of the tip. If you put text between two * characters that text will be displayed as bold. */
   children: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]).isRequired,
+  size: _propTypes["default"].oneOf(['large', 'small']),
 
   /** Call to action. Appended after the children's text. */
   cta: _propTypes["default"].shape({
@@ -176,7 +129,8 @@ Tip.propTypes = {
   spacedClose: _propTypes["default"].bool,
   id: _propTypes["default"].string,
   className: _propTypes["default"].string,
-  style: _propTypes["default"].object
+  style: _propTypes["default"].object,
+  type: _propTypes["default"].oneOf(['alert', 'banner'])
 };
 var _default = Tip;
 exports["default"] = _default;

package/build/Tip/Tip.test.js

@@ -46,12 +46,6 @@ describe("Tip", function () {
     }));
     expect(wrapper.find('.icon').length).toBe(1);
   });
-  it('has bold text', function () {
-    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react["default"].createElement(_Tip["default"], {
-      classes: classes
-    }, "Text with *bold* text"));
-    expect(wrapper.find('b').length).toBe(1);
-  });
 });
 describe("TipJSS", function () {
   it('matches the snapshot', function () {

package/build/Tip/TipText/index.js

@@ -0,0 +1,41 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+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; }
+
+var boldRegex = /\*(.*?)\*/g;
+
+var TipText = function TipText(_ref) {
+  var classes = _ref.classes,
+      text = _ref.text;
+  var result = (0, _react.useMemo)(function () {
+    return text.replace(boldRegex, function (_, txt) {
+      return txt;
+    });
+  }, [text]);
+  if (text === '' || typeof text !== 'string') return text;
+  return /*#__PURE__*/_react["default"].createElement("p", {
+    className: classes
+  }, result);
+};
+
+TipText.propTypes = {
+  classes: _propTypes["default"].string.isRequired,
+  text: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]).isRequired
+};
+var _default = TipText;
+exports["default"] = _default;

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

@@ -4,44 +4,111 @@ exports[`Tip matches the snapshot 1`] = `ShallowWrapper {}`;
 
 exports[`Tip styles matches the snapshot 1`] = `
 Object {
+  "bannerContent": Object {
+    "margin": "auto",
+    "maxWidth": "1200px",
+  },
+  "closeIcon": Object {
+    "marginLeft": "16px",
+  },
   "container": Object {
     "alignItems": "center",
-    "borderRadius": 6,
-    "padding": 16,
+    "borderRadius": "4px",
+    "minHeight": "56px",
+    "outlineOffset": "-1px",
+    "padding": Array [
+      "8px",
+      "16px",
+    ],
   },
   "cta": Object {
     "cursor": "pointer",
+    "font": "400 14px/1.5 'OccText', sans-serif",
     "textDecoration": "underline",
+    "textWrap": "nowrap",
+  },
+  "ctaLarge": Object {
+    "alignSelf": "center",
+    "marginLeft": "16px",
+  },
+  "ctaSmall": Object {
+    "alignSelf": "start",
+    "margin": Array [
+      "8px",
+      0,
+      0,
+    ],
   },
   "error": Object {
-    "backgroundColor": "#fcebeb",
+    "backgroundColor": "#fce8e8",
+    "outline": "1px solid #FBDFDF",
   },
   "icon": Object {
-    "marginRight": 8,
+    "flexShrink": 0,
+    "marginRight": "8px",
   },
   "info": Object {
-    "backgroundColor": "#efebf7",
+    "backgroundColor": "#e3efff",
+    "outline": "1px solid #b9d7ff",
+  },
+  "largePadding": Object {
+    "padding": "12px",
   },
   "noBorderRadius": Object {
     "borderRadius": 0,
   },
+  "normalText": Object {
+    "display": "inline-block",
+    "font": "400 14px/1.5 'OccText', sans-serif",
+    "margin": 0,
+  },
   "promote": Object {
-    "backgroundColor": "#222222",
+    "backgroundColor": "#000",
+    "outline": "1px solid rgba(255,255,255,0.2)",
   },
-  "spacedClose": Object {
-    "marginRight": 48,
+  "small": Object {
+    "maxWidth": 360,
+    "padding": "12px",
+  },
+  "smallPadding": Object {
+    "padding": "8px",
   },
   "success": Object {
-    "backgroundColor": "#e6f5eb",
+    "backgroundColor": "#ebfbf1",
+    "outline": "1px solid #d7f6e3",
   },
   "text": Object {
     "maxWidth": "100%",
   },
-  "textWithIcon": Object {
-    "maxWidth": "calc(100% - 32px)",
+  "textContainer": Object {
+    "padding": Array [
+      "12px",
+      0,
+    ],
+  },
+  "textError": Object {
+    "color": "#8b1313",
+    "textDecorationColor": "#8b1313",
+  },
+  "textInfo": Object {
+    "color": "#083CAE",
+    "textDecorationColor": "#083CAE",
+  },
+  "textPromote": Object {
+    "color": "#fff",
+    "textDecorationColor": "#fff",
+  },
+  "textSuccess": Object {
+    "color": "#16542e",
+    "textDecorationColor": "#16542e",
+  },
+  "textWarning": Object {
+    "color": "#664a0e",
+    "textDecorationColor": "#664a0e",
   },
   "warning": Object {
-    "backgroundColor": "#fffaed",
+    "backgroundColor": "#fff8e9",
+    "outline": "1px solid #fff1d3",
   },
 }
 `;

package/build/Tip/styles.js

@@ -5,61 +5,114 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _spacing = _interopRequireDefault(require("../subatomic/spacing"));
+var _colors = _interopRequireDefault(require("../tokens/colors.json"));
 
-var _colors = _interopRequireDefault(require("../subatomic/colors"));
+var _fonts = _interopRequireDefault(require("../tokens/fonts.json"));
+
+var _spacing = _interopRequireDefault(require("../tokens/spacing.json"));
+
+var _borderRadius = _interopRequireDefault(require("../tokens/borderRadius.json"));
+
+var _styles = require("../Text/styles");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var infoLight = _colors["default"].infoLight,
-    warningLight = _colors["default"].warningLight,
-    successLight = _colors["default"].successLight,
-    errorLight = _colors["default"].errorLight,
-    grey900 = _colors["default"].grey900;
-var radius = _spacing["default"].radius,
-    large = _spacing["default"].large,
-    medium = _spacing["default"].medium,
-    small = _spacing["default"].small,
-    tiny = _spacing["default"].tiny;
 var _default = {
   container: {
-    padding: small,
-    borderRadius: radius,
-    alignItems: 'center'
+    padding: [_spacing["default"]['size-2'], _spacing["default"]['size-4']],
+    borderRadius: _borderRadius["default"]['br-xs'],
+    minHeight: '56px',
+    alignItems: 'center',
+    outlineOffset: '-1px'
   },
   noBorderRadius: {
     borderRadius: 0
   },
   info: {
-    backgroundColor: infoLight
+    backgroundColor: _colors["default"].alert.info.bg,
+    outline: "1px solid ".concat(_colors["default"].alert.info.border)
   },
   warning: {
-    backgroundColor: warningLight
+    backgroundColor: _colors["default"].alert.warning.bg,
+    outline: "1px solid ".concat(_colors["default"].alert.warning.border)
   },
   success: {
-    backgroundColor: successLight
+    backgroundColor: _colors["default"].alert.success.bg,
+    outline: "1px solid ".concat(_colors["default"].alert.success.border)
   },
   error: {
-    backgroundColor: errorLight
+    backgroundColor: _colors["default"].alert.error.bg,
+    outline: "1px solid ".concat(_colors["default"].alert.error.border)
   },
   promote: {
-    backgroundColor: grey900
+    backgroundColor: _colors["default"].alert.neutral.bg,
+    outline: "1px solid ".concat(_colors["default"].alert.neutral.border)
+  },
+  textInfo: {
+    color: _colors["default"].text.indigo.primary,
+    textDecorationColor: _colors["default"].text.indigo.primary
+  },
+  textWarning: {
+    color: _colors["default"].text.warning,
+    textDecorationColor: _colors["default"].text.warning
+  },
+  textSuccess: {
+    color: _colors["default"].text.success,
+    textDecorationColor: _colors["default"].text.success
+  },
+  textError: {
+    color: _colors["default"].text.error,
+    textDecorationColor: _colors["default"].text.error
+  },
+  textPromote: {
+    color: _colors["default"].text.white.primary,
+    textDecorationColor: _colors["default"].text.white.primary
   },
   icon: {
-    marginRight: tiny
+    marginRight: _spacing["default"]['size-2'],
+    flexShrink: 0
   },
   text: {
     maxWidth: '100%'
   },
-  textWithIcon: {
-    maxWidth: "calc(100% - ".concat(medium, "px)")
+  closeIcon: {
+    marginLeft: _spacing["default"]['size-4']
   },
-  spacedClose: {
-    marginRight: large
+  smallPadding: {
+    padding: _spacing["default"]['size-2']
+  },
+  largePadding: {
+    padding: _spacing["default"]['size-3']
   },
   cta: {
     textDecoration: 'underline',
-    cursor: 'pointer'
+    font: (0, _styles.parseFontValue)(_fonts["default"]['alert-default']),
+    cursor: 'pointer',
+    textWrap: 'nowrap'
+  },
+  ctaLarge: {
+    marginLeft: _spacing["default"]['size-4'],
+    alignSelf: 'center'
+  },
+  ctaSmall: {
+    margin: [_spacing["default"]['size-2'], 0, 0],
+    alignSelf: 'start'
+  },
+  normalText: {
+    font: (0, _styles.parseFontValue)(_fonts["default"]['alert-default']),
+    display: 'inline-block',
+    margin: 0
+  },
+  textContainer: {
+    padding: [_spacing["default"]['size-3'], 0]
+  },
+  small: {
+    maxWidth: 360,
+    padding: _spacing["default"]['size-3']
+  },
+  bannerContent: {
+    maxWidth: '1200px',
+    margin: 'auto'
   }
 };
 exports["default"] = _default;

package/build/tokens/colors.json

@@ -343,7 +343,7 @@
     },
     "info": {
       "bg": "#e3efff",
-      "border": "#e3efff"
+      "border": "#b9d7ff"
     },
     "neutral": {
       "bg": "#000",
@@ -402,7 +402,7 @@
     },
     "info": {
       "bg": "#e3efff",
-      "border": "#e3efff"
+      "border": "#b9d7ff"
     },
     "featured": {
       "border": "rgba(255,255,255,0.2)",
@@ -567,7 +567,7 @@
       "subtle": "#d7f6e3"
     },
     "info": {
-      "subtle": "#e3efff"
+      "subtle": "#b9d7ff"
     }
   },
   "text": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occmundial/occ-atomic",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.10",
   "description": "Collection of shareable styled React components for OCC applications.",
   "homepage": "http://occmundial.github.io/occ-atomic",
   "main": "build/index.js",