@popmenu/common-ui 0.28.1 → 0.31.0

package/build/index.js

@@ -155,55 +155,55 @@ function __rest(s, e) {
     return t;
 }
 
-var _path$2g;
+var _path$Q;
 
-function _extends$3t() { _extends$3t = 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$3t.apply(this, arguments); }
+function _extends$1n() { _extends$1n = 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$1n.apply(this, arguments); }
 
 function SvgMinusCircle(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$3t({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1n({
     viewBox: "0 0 16 16",
     fill: "none",
     strokeLinecap: "round",
     strokeLinejoin: "round",
     width: "1em",
     height: "1em"
-  }, props), _path$2g || (_path$2g = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$Q || (_path$Q = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M8 14.667A6.667 6.667 0 108 1.334a6.667 6.667 0 000 13.333zM5.333 8h5.334",
     stroke: "currentColor"
   })));
 }
 
-var _path$28;
+var _path$M;
 
-function _extends$3l() { _extends$3l = 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$3l.apply(this, arguments); }
+function _extends$1j() { _extends$1j = 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$1j.apply(this, arguments); }
 
 function SvgPlusCircle(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$3l({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1j({
     viewBox: "0 0 16 16",
     fill: "none",
     strokeLinecap: "round",
     strokeLinejoin: "round",
     width: "1em",
     height: "1em"
-  }, props), _path$28 || (_path$28 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$M || (_path$M = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M8 14.667A6.667 6.667 0 108 1.334a6.667 6.667 0 000 13.333zm0-9.334v5.334M5.333 8h5.334",
     stroke: "currentColor"
   })));
 }
 
-var _path$1W;
+var _path$D;
 
-function _extends$31() { _extends$31 = 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$31.apply(this, arguments); }
+function _extends$16() { _extends$16 = 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$16.apply(this, arguments); }
 
 function SvgUser(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$31({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$16({
     viewBox: "0 0 16 16",
     fill: "none",
     strokeLinecap: "round",
     strokeLinejoin: "round",
     width: "1em",
     height: "1em"
-  }, props), _path$1W || (_path$1W = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$D || (_path$D = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M13.333 14v-1.333A2.667 2.667 0 0010.667 10H5.333a2.667 2.667 0 00-2.666 2.667V14M8 7.333A2.667 2.667 0 108 2a2.667 2.667 0 000 5.333z",
     stroke: "currentColor"
   })));
@@ -436,48 +436,35 @@ var Checkbox = React.forwardRef(function (props, ref) {
 });
 Checkbox.displayName = 'Checkbox';
 
+var defaultTypographyProps = {
+    variant: 'body1',
+};
+
 var weights = {
     regular: 400,
+    medium: 500,
     'semi-bold': 600,
     bold: 700,
 };
-var getColor = function (theme, props) {
-    var color = props.color;
-    if (color === undefined) {
-        return undefined;
-    }
-    if (['white', 'black'].includes(color)) {
-        return theme.palette.common[color];
-    }
-    if (color.match(/^grey\.\d{3}/)) {
-        var scale = color.split('.')[1];
-        return theme.palette.grey[scale] || theme.palette.grey[900];
-    }
-    if ([
-        'primary.light',
-        'primary.dark',
-        'secondary.light',
-        'secondary',
-        'secondary.dark',
-        'info.light',
-        'info.dark',
-        'success.light',
-        'success.dark',
-        'error.light',
-        'error.dark',
-        'warning.light',
-        'warning.dark',
-    ].includes(color)) {
-        var _a = color.split('.'), paletteKey = _a[0], variant = _a[1];
-        return theme.palette[paletteKey][variant];
+var getCustomColor = function (theme, color) {
+    var isCommonColor = color && ['white', 'black'].includes(color);
+    var isGreyColor = color && color.match(/^grey\.\d{3}/);
+    var isSemanticColor = color && color.match(/(primary|secondary|info|success|error|warning).?(light|dark)?/);
+    var isTextColor = color && ['textPrimary', 'textSecondary'].includes(color);
+    switch (true) {
+        case isCommonColor:
+            return theme.palette.common[color];
+        case Boolean(isGreyColor):
+            var scale = color.split('.')[1];
+            return theme.palette.grey[scale] || theme.palette.grey[900];
+        case Boolean(isSemanticColor):
+            var _a = color.split('.'), paletteKey = _a[0], _b = _a[1], variant = _b === void 0 ? 'main' : _b;
+            return theme.palette[paletteKey][variant];
+        case isTextColor:
+            return theme.palette.text[color.slice(4).toLowerCase()];
+        default:
+            return undefined;
     }
-    if (['success', 'info', 'error', 'warning', 'primary', 'secondary'].includes(color)) {
-        return theme.palette[color].main;
-    }
-    if (['textPrimary', 'textSecondary'].includes(color)) {
-        return theme.palette.text[color.slice(4).toLowerCase()];
-    }
-    return undefined;
 };
 var useTypographyStyles = styles.makeStyles(function (theme) {
     var _a;
@@ -492,21 +479,24 @@ var useTypographyStyles = styles.makeStyles(function (theme) {
             _a.fontFamily = theme.typography.fontFamily,
             _a.fontWeight = function (_a) {
                 var variant = _a.variant, weight = _a.weight;
-                return (weight ? weights[weight] : theme.typography[variant || 'body1'].fontWeight);
+                return (weight ? weights[weight] : theme.typography[variant].fontWeight);
             },
             _a.fontSize = function (_a) {
                 var variant = _a.variant;
-                return theme.typography[variant || 'body1'].fontSize;
+                return theme.typography[variant].fontSize;
             },
             _a.lineHeight = function (_a) {
                 var variant = _a.variant;
-                return theme.typography[variant || 'body1'].lineHeight;
+                return theme.typography[variant].lineHeight;
             },
             _a.textTransform = function (_a) {
                 var variant = _a.variant;
-                return theme.typography[variant || 'body1'].textTransform;
+                return theme.typography[variant].textTransform;
+            },
+            _a.color = function (_a) {
+                var color = _a.color, variant = _a.variant;
+                return (color && getCustomColor(theme, color)) || theme.typography[variant].color;
             },
-            _a.color = function (props) { return getColor(theme, props); },
             _a),
         caption: {
             display: 'inline',
@@ -517,30 +507,14 @@ var useTypographyStyles = styles.makeStyles(function (theme) {
     });
 });
 
-var variantMap = {
-    h1: 'h1',
-    h2: 'h2',
-    h3: 'h3',
-    h4: 'h4',
-    h5: 'h5',
-    h6: 'h6',
-    h7: 'h6',
-    body1: 'p',
-    body2: 'p',
-    subtitle1: 'h6',
-    subtitle2: 'h6',
-    caption: 'span',
-    overline: 'span',
-};
-
 var Typography = React.forwardRef(function (props, ref) {
-    props.weight; var _a = props.variant, variant = _a === void 0 ? 'body1' : _a; props.color; var restProps = __rest(props, ["weight", "variant", "color"]);
-    var validatedVariant = Object.keys(variantMap).includes(variant) ? variant : 'body1';
-    var classes = useTypographyStyles(__assign(__assign({}, props), { variant: validatedVariant }));
-    var component = variantMap[validatedVariant];
-    return React__default['default'].createElement(core.Typography, __assign({ component: component, ref: ref, classes: classes }, restProps, { variant: "inherit" }));
+    props.weight; props.color; var restProps = __rest(props, ["weight", "color"]);
+    var classes = useTypographyStyles(__assign({}, props));
+    var variantMapping = { subtitle1: 'p' };
+    return React__default['default'].createElement(core.Typography, __assign({ ref: ref, classes: classes, variantMapping: variantMapping }, restProps));
 });
-Typography.displayName = 'Typography';
+Typography.displayName = 'Typography';
+Typography.defaultProps = defaultTypographyProps;
 
 var getFadeStop = function (_a, typographyVariant) {
     var typography = _a.typography;