diff --git a/src/components/article/boxes/ArticleViewPrice.jsx b/src/components/article/boxes/ArticleViewPrice.jsx index 17947b4..0da2659 100644 --- a/src/components/article/boxes/ArticleViewPrice.jsx +++ b/src/components/article/boxes/ArticleViewPrice.jsx @@ -1,6 +1,5 @@ import { Component, PureComponent } from 'react'; import Box from '@mui/material/Box'; -import InputAdornment from '@mui/material/InputAdornment'; import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; import { EditablePanelTile, PanelTile } from 'dashgui/panels'; @@ -45,12 +44,12 @@ const articlePriceTextSx = { }; const articlePriceFieldSx = { - flexShrink: 0, - width: 'auto', - mr: 11, + flexShrink: 1, + width: '100%', '& .MuiOutlinedInput-root': { alignItems: 'baseline', - flexShrink: 0, + width: '100%', + flexShrink: 1, }, '& .MuiInputBase-input': { fontSize: '3.5rem', @@ -58,17 +57,6 @@ const articlePriceFieldSx = { height: 'auto', ...articlePriceTextSx, }, - '& .MuiInputAdornment-root': { - marginRight: 0.75, - height: 'auto', - maxHeight: 'none', - alignItems: 'baseline', - }, - '& .MuiInputAdornment-root .MuiTypography-root': { - fontSize: '2rem', - fontWeight: 700, - lineHeight: 1.1, - }, '& .MuiOutlinedInput-notchedOutline': { borderWidth: '1px !important', }, @@ -96,6 +84,7 @@ const priceBodySx = { display: 'flex', flexDirection: 'column', gap: 0.75, + pt: 0, }; function articleHasPackUnit(art) { @@ -198,11 +187,6 @@ class PriceAmountField extends Component { slotProps={{ input: { readOnly, - startAdornment: ( - - € - - ), }, htmlInput: { inputMode: 'decimal', @@ -524,8 +508,8 @@ export default class ArticleViewPrice extends PureComponent { const max = Math.max(...prices); priceText = min === max - ? `€ ${formatPriceAmount(min)}` - : `€ ${formatPriceAmount(min)} bis € ${formatPriceAmount(max)}`; + ? formatPriceAmount(min) + : `${formatPriceAmount(min)} bis ${formatPriceAmount(max)}`; } return ( @@ -533,24 +517,19 @@ export default class ArticleViewPrice extends PureComponent { wide={1} minHeight={SECOND_ROW_MIN_HEIGHT} color={BLUE_PANEL} + title={ + + € + + } contentAlignItems="flex-start" > - - Preis auf Variantenebene pflegen - - + ({ eventPulse: state.eventPulse + 1 })); + } + } + handleKeyDown(event) { if (!event.altKey || !event.shiftKey || event.key?.toLowerCase() !== 's') return; event.preventDefault(); @@ -148,30 +168,29 @@ class SseMonitor extends PureComponent { } render() { - const { open, position, status, companyId, events } = this.state; + const { open, position, status, companyId, events, eventPulse } = this.state; const statusColor = status === 'connected' ? 'success' : status === 'error' ? 'error' : status === 'connecting' ? 'warning' : 'default'; return ( <> {!open ? ( - - theme.zIndex.tooltip, - }} - > - - - + theme.zIndex.tooltip, + animation: `${eventPulse % 2 === 0 ? pulseAnimationA : pulseAnimationB} 650ms ease-out`, + }} + > + + ) : (