@popmenu/common-ui 0.19.2 → 0.20.0

package/build/index.js

@@ -33,7 +33,6 @@ var FormControl = require('@material-ui/core/FormControl');
 var Grid = require('@material-ui/core/Grid');
 var InputAdornment = require('@material-ui/core/InputAdornment');
 var LinearProgress = require('@material-ui/core/LinearProgress');
-var MuiLink = require('@material-ui/core/Link');
 var List = require('@material-ui/core/List');
 var ListItem = require('@material-ui/core/ListItem');
 var ListItemIcon = require('@material-ui/core/ListItemIcon');
@@ -103,7 +102,6 @@ var FormControl__default = /*#__PURE__*/_interopDefaultLegacy(FormControl);
 var Grid__default = /*#__PURE__*/_interopDefaultLegacy(Grid);
 var InputAdornment__default = /*#__PURE__*/_interopDefaultLegacy(InputAdornment);
 var LinearProgress__default = /*#__PURE__*/_interopDefaultLegacy(LinearProgress);
-var MuiLink__default = /*#__PURE__*/_interopDefaultLegacy(MuiLink);
 var List__default = /*#__PURE__*/_interopDefaultLegacy(List);
 var ListItem__default = /*#__PURE__*/_interopDefaultLegacy(ListItem);
 var ListItemIcon__default = /*#__PURE__*/_interopDefaultLegacy(ListItemIcon);
@@ -159,6 +157,24 @@ function __rest(s, e) {
     return t;
 }
 
+var _path$3k;
+
+function _extends$3B() { _extends$3B = 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$3B.apply(this, arguments); }
+
+function SvgUser(props) {
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$3B({
+    viewBox: "0 0 16 16",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    stroke: "currentColor",
+    width: "1em",
+    height: "1em",
+    fill: "none"
+  }, props), _path$3k || (_path$3k = /*#__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"
+  })));
+}
+
 var _path$1f;
 
 function _extends$1p() { _extends$1p = 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$1p.apply(this, arguments); }
@@ -267,42 +283,6 @@ function SvgVolumeUp(props) {
   })));
 }
 
-var useIconStyles = core.makeStyles(function (_a) {
-    var spacing = _a.spacing, palette = _a.palette;
-    var getFontSize = function (_a) {
-        var size = _a.size;
-        var sizes = {
-            inherit: 'inherit',
-            small: spacing(1.5),
-            medium: spacing(2),
-            large: spacing(2.5),
-            'extra-large': spacing(3),
-        };
-        return size ? sizes[size] : 'inherit';
-    };
-    var getColor = function (props) {
-        var semanticColors = ['primary', 'secondary', 'info', 'success', 'warning', 'error'];
-        var value = 'inherit';
-        if (props.color) {
-            if (semanticColors.includes(props.color.split('.')[0])) {
-                var _a = props.color.split('.'), color = _a[0], _b = _a[1], variant = _b === void 0 ? 'main' : _b;
-                value = palette[color][variant];
-            }
-            else if (props.color.search(/^(rgb|hsla|#)/) !== -1) {
-                value = props.color;
-            }
-        }
-        return value;
-    };
-    return {
-        root: {
-            color: getColor,
-            fontSize: getFontSize,
-            strokeWidth: '1.3px',
-        },
-    };
-});
-
 var classnames = {exports: {}};
 
 /*!
@@ -363,6 +343,42 @@ var classnames = {exports: {}};
 
 var classNames = classnames.exports;
 
+var useIconStyles = core.makeStyles(function (_a) {
+    var spacing = _a.spacing, palette = _a.palette;
+    var getFontSize = function (_a) {
+        var size = _a.size;
+        var sizes = {
+            inherit: 'inherit',
+            small: spacing(1.5),
+            medium: spacing(2),
+            large: spacing(2.5),
+            'extra-large': spacing(3),
+        };
+        return size ? sizes[size] : 'inherit';
+    };
+    var getColor = function (props) {
+        var semanticColors = ['primary', 'secondary', 'info', 'success', 'warning', 'error'];
+        var value = 'inherit';
+        if (props.color) {
+            if (semanticColors.includes(props.color.split('.')[0])) {
+                var _a = props.color.split('.'), color = _a[0], _b = _a[1], variant = _b === void 0 ? 'main' : _b;
+                value = palette[color][variant];
+            }
+            else if (props.color.search(/^(rgb|hsla|#)/) !== -1) {
+                value = props.color;
+            }
+        }
+        return value;
+    };
+    return {
+        root: {
+            color: getColor,
+            fontSize: getFontSize,
+            strokeWidth: '1.3px',
+        },
+    };
+});
+
 var iconStaticClassName = 'pop-icon';
 var Icon = function (props) {
     var icon = props.icon, className = props.className, restProps = __rest(props, ["icon", "className"]);
@@ -634,12 +650,12 @@ var setupAudioRef = function (config) { return function () {
 
 var AudioPlayer = function (props) {
     var _a, _b, _c, _d, _f;
-    var src = props.src;
+    var src = props.src, _g = props.classes, classes = _g === void 0 ? {} : _g;
     var volumeRef = React.useRef(null);
     var audioRef = React.useRef(null);
     var spacing = core.useTheme().spacing;
-    var _g = React.useState(false), disableRipple = _g[0], setDisableRipple = _g[1];
-    var _h = React.useReducer(audioPlayerReducer, __assign(__assign({}, initialAudioPlayerState), { context: __assign(__assign({}, initialAudioPlayerState.context), { audioRef: audioRef }) })), state = _h[0], send = _h[1];
+    var _h = React.useState(false), disableRipple = _h[0], setDisableRipple = _h[1];
+    var _j = React.useReducer(audioPlayerReducer, __assign(__assign({}, initialAudioPlayerState), { context: __assign(__assign({}, initialAudioPlayerState.context), { audioRef: audioRef }) })), state = _j[0], send = _j[1];
     React.useEffect(setupAudioRef({ audioRef: audioRef, send: send }), [audioRef]);
     var PlaybackIcon = state.playback !== PLAYBACK_STATES.PAUSED ? SvgPause : SvgPlay;
     var VolumeIcon = React.useMemo(function () { return useVolumeIcon(state); }, [state.context.volume, (_a = state.context.audioRef.current) === null || _a === void 0 ? void 0 : _a.muted]);
@@ -648,14 +664,14 @@ var AudioPlayer = function (props) {
     var toggleMute = function () { return send({ type: AUDIO_PLAYER_EVENT_TYPES.TOGGLE_MUTE }); };
     var setTime = function (_e, time) { return send({ type: AUDIO_PLAYER_EVENT_TYPES.SET_TIME, context: { time: time } }); };
     var setVolume = function (_e, volume) { return send({ type: AUDIO_PLAYER_EVENT_TYPES.VOLUME_CHANGE, context: { volume: volume } }); };
-    return (React__default['default'].createElement(core.Box, { display: "flex", alignItems: "center", gridGap: spacing(1) },
+    return (React__default['default'].createElement(core.Box, { display: "flex", alignItems: "center", gridGap: spacing(1), className: classNames([classes.root]) },
         React__default['default'].createElement("audio", { ref: audioRef, src: src }),
         React__default['default'].createElement(core.Box, null,
-            React__default['default'].createElement(IconButton, { "aria-label": state.context.playbackButtonLabel, disabled: state.playback === PLAYBACK_STATES.NONE, onClick: togglePlayback },
+            React__default['default'].createElement(IconButton, { classes: { root: classes.playbackToggle }, "aria-label": state.context.playbackButtonLabel, disabled: state.playback === PLAYBACK_STATES.NONE, onClick: togglePlayback },
                 React__default['default'].createElement(Icon, { icon: PlaybackIcon })),
-            React__default['default'].createElement(IconButton, { "aria-label": state.context.volumeButtonLabel, ref: volumeRef, onClick: toggleMute, onMouseEnter: toggleVolumeControl, onMouseLeave: toggleVolumeControl, disableRipple: disableRipple },
+            React__default['default'].createElement(IconButton, { classes: { root: classes.volumeToggle }, "aria-label": state.context.volumeButtonLabel, ref: volumeRef, onClick: toggleMute, onMouseEnter: toggleVolumeControl, onMouseLeave: toggleVolumeControl, disableRipple: disableRipple },
                 React__default['default'].createElement(Icon, { icon: VolumeIcon }),
-                React__default['default'].createElement(core.Popper, { onClick: function (e) { return e.stopPropagation(); }, onMouseEnter: function () { return setDisableRipple(true); }, onMouseLeave: function () { return setDisableRipple(false); }, open: state.volumeControls === VOLUME_CONTROL_STATES.SHOW, anchorEl: function () { return volumeRef.current; }, transition: true, placement: "top" }, function (_a) {
+                React__default['default'].createElement(core.Popper, { onClick: function (e) { return e.stopPropagation(); }, onMouseEnter: function () { return setDisableRipple(true); }, onMouseLeave: function () { return setDisableRipple(false); }, open: state.volumeControls === VOLUME_CONTROL_STATES.SHOW, anchorEl: function () { return volumeRef.current; }, transition: true, placement: "top", className: classNames([classes.volumeSlider]) }, function (_a) {
                     var TransitionProps = _a.TransitionProps;
                     return (React__default['default'].createElement(core.Grow, __assign({}, TransitionProps),
                         React__default['default'].createElement(Paper, { elevation: 1 },
@@ -664,10 +680,10 @@ var AudioPlayer = function (props) {
                 }))),
         React__default['default'].createElement(core.Box, { display: "flex", flexGrow: 1, alignItems: "center", gridGap: spacing(1) },
             React__default['default'].createElement(core.Box, { flexBasis: 60, flexShrink: 0 },
-                React__default['default'].createElement(Typography, null, formatTime(((_b = state.context.audioRef.current) === null || _b === void 0 ? void 0 : _b.currentTime) || 0))),
-            React__default['default'].createElement(core.Slider, { color: "secondary", value: ((_c = state.context.audioRef.current) === null || _c === void 0 ? void 0 : _c.currentTime) || 0, max: ((_d = state.context.audioRef.current) === null || _d === void 0 ? void 0 : _d.duration) || 1, onChange: setTime, disabled: state.playback === PLAYBACK_STATES.NONE }),
+                React__default['default'].createElement(Typography, { classes: { root: classes.playbackText } }, formatTime(((_b = state.context.audioRef.current) === null || _b === void 0 ? void 0 : _b.currentTime) || 0))),
+            React__default['default'].createElement(core.Slider, { classes: { root: classes.playbackSlider }, color: "secondary", value: ((_c = state.context.audioRef.current) === null || _c === void 0 ? void 0 : _c.currentTime) || 0, max: ((_d = state.context.audioRef.current) === null || _d === void 0 ? void 0 : _d.duration) || 1, onChange: setTime, disabled: state.playback === PLAYBACK_STATES.NONE }),
             React__default['default'].createElement(core.Box, { flexBasis: 60, flexShrink: 0, textAlign: "end" },
-                React__default['default'].createElement(Typography, null, formatTime(((_f = state.context.audioRef.current) === null || _f === void 0 ? void 0 : _f.duration) || 0))))));
+                React__default['default'].createElement(Typography, { classes: { root: classes.lengthText } }, formatTime(((_f = state.context.audioRef.current) === null || _f === void 0 ? void 0 : _f.duration) || 0))))));
 };
 
 var LoadingStatus;
@@ -676,18 +692,9 @@ var LoadingStatus;
     LoadingStatus["LOADED"] = "LOADED";
     LoadingStatus["PENDING"] = "PENDING";
 })(LoadingStatus || (LoadingStatus = {}));
-/**
- * Hook returns [imgProps, loaded]
- * ref: Merged default and provided imgProp object. Includes load and error events for img tag. To be passed to MuiAvatar.
- * loaded: Indicates whether the src supplied to an img within Avatar results in loaded or error
- */
 var useImgProps = function (avatarProps) {
     var _a = React__default['default'].useState(LoadingStatus.PENDING), loaded = _a[0], setLoaded = _a[1];
-    var imgProps = __assign(__assign({}, avatarProps.imgProps), { onError: function (event) {
-            var _a, _b;
-            setLoaded(LoadingStatus.ERROR);
-            (_b = (_a = avatarProps.imgProps) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, event);
-        }, onLoad: function (event) {
+    var imgProps = __assign(__assign({}, avatarProps.imgProps), { onLoad: function (event) {
             var _a, _b;
             setLoaded(LoadingStatus.LOADED);
             (_b = (_a = avatarProps.imgProps) === null || _a === void 0 ? void 0 : _a.onLoad) === null || _b === void 0 ? void 0 : _b.call(_a, event);
@@ -714,97 +721,49 @@ var getAvatarFontSize = function (props) {
         large: '1.25rem',
         'extra-large': '3.5rem',
     };
-    return fontSizes[props.size || 'medium'];
-};
-var getAvatarBackground = function (props) {
-    var src = props.src, loaded = props.loaded;
-    var background = props.background;
-    if (src && loaded === LoadingStatus.LOADED) {
-        background = 'transparent';
-    }
-    return background;
+    return fontSizes[props.size];
 };
 var useAvatarStyles = styles.makeStyles(function (theme) { return ({
-    root: {
-        width: function (props) { return getAvatarDimensions(theme, props); },
-        height: function (props) { return getAvatarDimensions(theme, props); },
-        fontSize: function (props) { return getAvatarFontSize(props); },
-        backgroundColor: function (props) { return getAvatarBackground(props); },
-        color: function (props) { return theme.palette.getContrastText(props.background || '#E0E0E0'); },
-        objectFit: function (props) { return props.fit; },
-    },
-    silhouette: {
-        '& path': {
-            fill: function (props) { return theme.palette.getContrastText(props.background || '#E0E0E0'); },
-        },
-    },
+    root: function (props) { return ({
+        width: getAvatarDimensions(theme, props),
+        height: getAvatarDimensions(theme, props),
+        fontSize: getAvatarFontSize(props),
+        backgroundColor: props.loaded === LoadingStatus.LOADED ? 'transparent' : props.background,
+        color: theme.palette.getContrastText(props.background),
+        objectFit: props.fit,
+    }); },
+    fallback: function (props) { return ({
+        fontSize: getAvatarDimensions(theme, props),
+        strokeWidth: 1,
+    }); },
 }); });
 
-var _path$2;
-
-function _extends$2() { _extends$2 = 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$2.apply(this, arguments); }
-
-function SvgSilhouetteFemale(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$2({
-    viewBox: "0 0 300 300",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$2 || (_path$2 = /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M179.417 182.917a3.362 3.362 0 00-2.951 1.076 3.461 3.461 0 00-.875 3.021c1.916 10.069 8.368 23.889 28.173 32.493 2.347 1.014 5.972 1.805 10.57 2.799 17.208 3.722 45.986 9.958 53.055 36.333a3.488 3.488 0 001.622 2.11 3.491 3.491 0 002.639.345 3.488 3.488 0 002.109-1.622 3.473 3.473 0 00.345-2.639c-8.173-30.465-40.777-37.527-58.298-41.319-4.056-.882-7.563-1.639-9.278-2.389-11.903-5.167-19.59-12.833-22.924-22.819 33.07 2.458 48.042-10.716 48.702-11.313a3.469 3.469 0 001.121-2.951 3.478 3.478 0 00-1.732-2.639c-19.084-10.903-19.084-48.577-19.084-62.764 0-39.674-26.722-71.125-60.979-71.618-.326-.011-.652-.018-.979-.021h-.007c-34.757.194-63.035 31.68-63.035 70.194 0 14.188 0 51.868-19.083 62.764a3.5 3.5 0 00-1.73 2.769 3.494 3.494 0 001.313 2.988c.959.743 22.14 16.952 48.202 12.028-3.486 9.569-11.07 16.931-22.625 21.951-1.674.73-5.007 1.528-8.868 2.445-17.64 4.194-50.48 12.007-58.702 42.687a3.481 3.481 0 00.348 2.638 3.475 3.475 0 006.368-.839c7.145-26.694 36.229-33.604 53.597-37.743 4.354-1.035 7.791-1.854 10.028-2.82 19.805-8.604 26.25-22.423 28.173-32.493a3.45 3.45 0 00-1.104-3.243 3.457 3.457 0 00-3.347-.722c-18.799 5.917-36.167-2.222-43.757-6.736 18.132-15.181 18.132-50.118 18.132-65.674 0-34.7 25.18-63.076 56.389-63.263l.736.041c30.778.438 53.986 28.236 53.986 64.667 0 15.562 0 50.576 18.208 65.757-6.271 3.583-20.569 9.382-44.458 6.521z",
-    fill: "#2E3042"
-  })));
-}
-
-var _path$1;
-
-function _extends$1() { _extends$1 = 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$1.apply(this, arguments); }
-
-function SvgSilhouetteMale(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
-    viewBox: "0 0 300 300",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$1 || (_path$1 = /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M27.594 261.886a3.513 3.513 0 004.281-2.478c7.204-26.904 36.484-33.877 53.984-38.05 4.386-1.043 7.848-1.869 10.1-2.842 19.935-8.66 26.433-22.592 28.377-32.757a3.493 3.493 0 00-.133-1.81 3.492 3.492 0 00-1.021-1.501c-10.38-8.968-19.137-22.431-24.663-37.917a3.447 3.447 0 00-.72-1.197c-7.31-7.953-11.506-16.361-11.506-23.06 0-3.914 1.475-6.539 4.798-8.52a3.5 3.5 0 001.7-2.857c1.545-35.662 26.922-63.735 58.047-63.917l.749.049c31.279.434 56.495 29.11 57.397 65.275a3.487 3.487 0 001.245 2.584c2.189 1.855 3.211 4.207 3.211 7.4 0 5.607-2.987 12.503-8.401 19.406a3.633 3.633 0 00-.587 1.106c-5.596 17.754-15.64 33.429-27.545 43.02a3.517 3.517 0 00-1.245 3.381c1.945 10.159 8.442 24.083 28.377 32.757 2.357 1.022 6.015 1.821 10.653 2.822 17.325 3.752 46.318 10.046 53.431 36.628a3.503 3.503 0 002.926 2.562 3.494 3.494 0 003.922-3.019 3.52 3.52 0 00-.091-1.363c-8.219-30.713-41.065-37.833-58.705-41.655-4.092-.889-7.625-1.652-9.345-2.408-13.01-5.657-21.026-14.275-23.859-25.658 12.08-10.383 22.187-26.401 27.965-44.365 6.134-7.981 9.505-16.2 9.505-23.221 0-4.684-1.511-8.59-4.504-11.643-1.665-39.232-29.636-70.127-64.35-70.624L150.545 38c-34.085.182-62.175 30.264-64.63 68.818-4.379 3.22-6.603 7.736-6.603 13.47 0 8.282 4.68 18.188 12.87 27.275 5.659 15.563 14.43 29.235 24.873 38.805-2.819 11.426-10.842 20.072-23.88 25.735-1.685.735-5.043 1.541-8.932 2.465-17.773 4.228-50.843 12.104-59.125 43.034a3.501 3.501 0 002.476 4.284z",
-    fill: "#2E3042"
-  })));
-}
-
-var _path;
-
-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 SvgSilhouetteNeutral(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    viewBox: "0 0 300 300",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
-    fillRule: "evenodd",
-    clipRule: "evenodd",
-    d: "M209 121c0 32.585-26.415 59-59 59s-59-26.415-59-59 26.415-59 59-59 59 26.415 59 59zm8 0c0 37.003-29.997 67-67 67s-67-29.997-67-67 29.997-67 67-67 67 29.997 67 67zm35 137.333V284h8v-25.667c0-13.614-5.821-26.671-16.182-36.298C233.456 212.408 219.403 207 204.75 207H94.25c-14.653 0-28.706 5.408-39.068 15.035C44.821 231.662 39 244.719 39 258.333V284h8v-25.667c0-11.295 4.824-22.257 13.628-30.437C69.45 219.698 81.537 215 94.25 215h110.5c12.714 0 24.799 4.698 33.622 12.896 8.804 8.18 13.628 19.142 13.628 30.437z",
-    fill: "#2E3042"
-  })));
-}
-
-var silhouettes = {
-    female: SvgSilhouetteFemale,
-    male: SvgSilhouetteMale,
-    neutral: SvgSilhouetteNeutral,
-};
 var Avatar = React.forwardRef(function (props, ref) {
-    var children = props.children, _a = props.silhouette, silhouette = _a === void 0 ? 'neutral' : _a, muiProps = __rest(props, ["children", "silhouette"]);
-    var _b = useImgProps(props), imgProps = _b.imgProps, loaded = _b.loaded;
+    var children = props.children, src = props.src, alt = props.alt, fallback = props.fallback, muiProps = __rest(props, ["children", "src", "alt", "fallback"]);
+    var _a = useImgProps(props), imgProps = _a.imgProps, loaded = _a.loaded;
     var classes = useAvatarStyles(__assign(__assign({}, props), { loaded: loaded }));
-    var Silhouette = silhouettes[silhouette];
-    var fallback = muiProps.src || silhouette === 'none' ? '' : React__default['default'].createElement(Silhouette, { className: classes.silhouette });
-    return (React__default['default'].createElement(MuiAvatar__default['default'], __assign({ ref: ref, classes: { root: classes.root } }, muiProps, imgProps), children || fallback));
+    var displayAltTextFallback = src && alt;
+    var displayNoFallback = fallback === 'none';
+    var displayCustomFallback = fallback !== 'none' && typeof fallback !== 'undefined';
+    var Fallback;
+    if (displayAltTextFallback) {
+        Fallback = null;
+    }
+    else if (displayNoFallback) {
+        Fallback = ' ';
+    }
+    else if (displayCustomFallback) {
+        Fallback = fallback;
+    }
+    else {
+        Fallback = React__default['default'].createElement(Icon, { icon: SvgUser, className: classes.fallback });
+    }
+    return (React__default['default'].createElement(MuiAvatar__default['default'], __assign({ ref: ref, classes: { root: classes.root }, src: src, alt: alt }, muiProps, { imgProps: imgProps }), children || Fallback));
 });
 Avatar.defaultProps = {
     size: 'medium',
     fit: 'cover',
     background: '#E0E0E0',
-    silhouette: 'neutral',
 };
 Avatar.displayName = 'Avatar';
 
@@ -858,33 +817,35 @@ var useCollapsibleTextStyles = core.makeStyles(function (theme) { return ({
 }); });
 
 var CollapsibleText = function (props) {
-    var _a = props, text = _a.text, open = _a.open, previewLines = _a.previewLines, _b = _a.typographyVariant, typographyVariant = _b === void 0 ? 'body1' : _b, collapsible = _a.collapsible, setCollapsible = _a.setCollapsible;
-    var classes = useCollapsibleTextStyles(props);
+    var text = props.text, open = props.open, _a = props.previewLines, previewLines = _a === void 0 ? 2 : _a, _b = props.typographyVariant, typographyVariant = _b === void 0 ? 'body1' : _b; props.collapseState; var restProps = __rest(props, ["text", "open", "previewLines", "typographyVariant", "collapseState"]);
+    var collapseState = React.useState(false);
     var typographyRef = React.useRef(null);
-    var typography = core.useTheme().typography;
-    var collapsedSize = previewLines * parseFloat(typography[typographyVariant].lineHeight);
+    var classes = useCollapsibleTextStyles(__assign(__assign({}, props), { previewLines: previewLines, typographyVariant: typographyVariant }));
+    var theme = core.useTheme();
+    var _c = props.collapseState ? props.collapseState : collapseState, collapsible = _c[0], setCollapsible = _c[1];
+    var typographyEntryLineHeightRem = parseFloat(theme.typography[typographyVariant].lineHeight);
+    var collapsedSizeRem = previewLines * typographyEntryLineHeightRem;
+    var documentFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
+    var collapsedSizePx = collapsedSizeRem * documentFontSize;
     React.useEffect(function () {
         var typographyNode = typographyRef.current;
         var observer = new ResizeObserver(function (entries) {
-            var typographyHeight = entries[0].contentRect.height;
-            var collapsedPxSize = collapsedSize * 16;
-            var collapsible = typographyHeight > collapsedPxSize;
-            setCollapsible(collapsible);
+            var typographyEntry = entries.find(function (entry) { return entry.target === typographyNode; });
+            if (typographyEntry) {
+                var typographyEntryHeight = typographyEntry.contentRect.height;
+                var isCollapsible = typographyEntryHeight > collapsedSizePx;
+                setCollapsible(isCollapsible);
+            }
         });
         observer.observe(typographyNode);
         return function () {
             observer.unobserve(typographyNode);
         };
     }, []);
-    return (React__default['default'].createElement(React.Fragment, null,
-        React__default['default'].createElement(core.Box, { position: "relative", overflow: "hidden" },
-            React__default['default'].createElement(Collapse__default['default'], { in: open, collapsedSize: collapsedSize + 'rem' },
-                React__default['default'].createElement(Typography, { ref: typographyRef, variant: typographyVariant }, text)),
-            collapsible && !open && React__default['default'].createElement(core.Box, { className: classes.overlay }))));
-};
-CollapsibleText.defaultProps = {
-    previewLines: 2,
-    typographyVariant: 'body1',
+    return (React__default['default'].createElement(core.Box, __assign({ position: "relative", overflow: "hidden" }, restProps),
+        React__default['default'].createElement(Collapse__default['default'], { in: open, collapsedSize: collapsedSizePx + 'px' },
+            React__default['default'].createElement(Typography, { ref: typographyRef, variant: typographyVariant }, text)),
+        collapsible && !open && React__default['default'].createElement(core.Box, { className: classes.overlay })));
 };
 
 var SemanticColors;
@@ -947,42 +908,21 @@ Divider.defaultProps = {
     textTransform: 'lowercase',
 };
 
-var getLinkColor = function (_a, _b) {
-    var palette = _a.palette;
-    var _c = _b.color, color = _c === void 0 ? 'info' : _c;
-    var resolved;
-    if (['primary', 'secondary', 'info', 'error'].includes(color)) {
-        resolved = palette[color].main;
-    }
-    else if (['textPrimary', 'textSecondary'].includes(color)) {
-        resolved = palette.text[color.substring(4).toLowerCase()];
-    }
-    else if (color === 'inherit') {
-        resolved = color;
-    }
-    return resolved;
-};
-var useLinkStyles = styles.makeStyles(function (theme) {
-    var _a;
-    return ({
-        root: (_a = {
-                display: 'flex',
-                color: function (props) { return getLinkColor(theme, props); }
-            },
-            _a["& ." + iconStaticClassName] = {
-                alignSelf: 'center',
-            },
-            _a),
-    });
-});
+var useLinkStyles = styles.makeStyles(function (theme) { return ({
+    root: function (props) {
+        var _a;
+        return (__assign(__assign({ display: 'flex' }, (props.color === undefined && { color: theme.palette.info.main })), (_a = {}, _a["& ." + iconStaticClassName] = {
+            alignSelf: 'center',
+        }, _a)));
+    },
+}); });
 
 var Link = React.forwardRef(function (props, ref) {
-    var children = props.children; props.color; var muiProps = __rest(props, ["children", "color"]);
+    var children = props.children, muiProps = __rest(props, ["children"]);
     var classes = useLinkStyles(props);
-    return (React__default['default'].createElement(MuiLink__default['default'], __assign({ ref: ref, classes: { root: classes.root } }, muiProps), children));
+    return (React__default['default'].createElement(core.Link, __assign({ ref: ref, classes: { root: classes.root } }, muiProps), children));
 });
 Link.defaultProps = {
-    color: 'info',
     variant: 'body1',
 };
 Link.displayName = 'Link';
@@ -1124,13 +1064,12 @@ Tooltip.displayName = 'Tooltip';
 
 var useCollapsibleText = function () {
     var _a = React.useState(false), open = _a[0], setOpen = _a[1];
-    var _b = React.useState(false), collapsible = _b[0], setCollapsible = _b[1];
-    var toggle = function () { return collapsible && setOpen(!open); };
+    var collapseState = React.useState(false);
+    var toggle = function () { return collapseState[0] && setOpen(!open); };
     return {
         collapsibleText: {
             open: open,
-            collapsible: collapsible,
-            setCollapsible: setCollapsible,
+            collapseState: collapseState,
         },
         toggle: toggle,
     };