fix: ellipse should use exponent (#2086)

* fix: prevent app from blowing up when snapshot modal is opened

* fix: use superscript tag to indicate ellipse is mm squared

* fix: update measurement item to allow us to specify html in MeasurementItem display text
This commit is contained in:
Danny Brown authored and GitHub committed 2020-10-05 21:45:43 -04:00
1 parent 285a188064
commit 0b80f19bfd
5 files changed
+27 -17

No files matched your search

@@ -3,7 +3,15 @@ import PropTypes from 'prop-types';
import classnames from 'classnames';
import { Icon } from '../';
const MeasurementItem = ({ id, index, label, displayText, isActive, onClick, onEdit }) => {
const MeasurementItem = ({
id,
index,
label,
displayText,
isActive,
onClick,
onEdit,
}) => {
const [isHovering, setIsHovering] = useState(false);
const onEditHandler = event => {
@@ -41,14 +49,14 @@ const MeasurementItem = ({ id, index, label, displayText, isActive, onClick, onE
>
{index}
</div>
<div className="px-2 py-1 flex flex-1 flex-col relative">
<span className="text-base text-primary-light mb-1">
{label}
</span>
<div className="relative flex flex-col flex-1 px-2 py-1">
<span className="mb-1 text-base text-primary-light">{label}</span>
{displayText.map(line => (
<span key={line} className="pl-2 border-l border-primary-light text-base text-white">
{line}
</span>
<span
key={line}
className="pl-2 text-base text-white border-l border-primary-light"
dangerouslySetInnerHTML={{ __html: line }}
></span>
))}
<Icon
className={classnames(
@@ -70,13 +78,16 @@ const MeasurementItem = ({ id, index, label, displayText, isActive, onClick, onE
};
MeasurementItem.propTypes = {
id: PropTypes.oneOfType([PropTypes.number.isRequired, PropTypes.string.isRequired]),
id: PropTypes.oneOfType([
PropTypes.number.isRequired,
PropTypes.string.isRequired,
]),
index: PropTypes.number.isRequired,
label: PropTypes.string,
displayText: PropTypes.array.isRequired,
isActive: PropTypes.bool,
onClick: PropTypes.func,
onEdit: PropTypes.func
onEdit: PropTypes.func,
};
MeasurementItem.defaultProps = {