u

src/components/brand/ArtikelMarke.jsx

@@ -0,0 +1,124 @@
+import { PureComponent } from 'react';
+import IconButton from '@mui/material/IconButton';
+import ListItem from '@mui/material/ListItem';
+import Tooltip from '@mui/material/Tooltip';
+import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
+import CopyrightIcon from '@mui/icons-material/Copyright';
+import ImageSearchIcon from '@mui/icons-material/ImageSearch';
+import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
+import BrandThumb from './BrandThumb';
+
+class ArtikelMarke extends PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      draft: props.brand?.name ?? '',
+    };
+  }
+
+  componentDidUpdate(prevProps) {
+    if (prevProps.brand?.name !== this.props.brand?.name) {
+      this.setState({ draft: this.props.brand?.name ?? '' });
+    } else if (prevProps.disabled && !this.props.disabled) {
+      if (this.state.draft !== this.props.brand?.name) {
+        this.setState({ draft: this.props.brand?.name ?? '' });
+      }
+    }
+  }
+
+  handleChange = (next) => {
+    this.setState({ draft: next });
+    this.props.onChange?.(next, this.props.brand);
+  };
+
+  handleBlur = () => {
+    const { onRename, brand } = this.props;
+    const draft = this.state.draft.trim();
+    if (!draft) {
+      this.setState({ draft: brand?.name ?? '' });
+      return;
+    }
+    if (draft !== brand?.name) {
+      onRename?.(brand, draft);
+    }
+  };
+
+  handleKeyDown = (event) => {
+    const { brand } = this.props;
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      event.target.blur();
+    }
+    if (event.key === 'Escape') {
+      event.preventDefault();
+      this.setState({ draft: brand?.name ?? '' });
+      event.target.blur();
+    }
+  };
+
+  handleSearchLogo = () => {
+    const { onSearchLogo, brand } = this.props;
+    onSearchLogo?.(brand);
+  };
+
+  handleDelete = () => {
+    const { onDelete, brand } = this.props;
+    onDelete?.(brand);
+  };
+
+  render() {
+    const { brand, disabled, sx } = this.props;
+    const { draft } = this.state;
+    const name = brand?.name ?? '';
+
+    return (
+      <ListItem
+        disableGutters
+        sx={{ gap: 1, py: 0.75, alignItems: 'center', ...sx }}
+      >
+        <BrandThumb
+          brand={brand}
+          size={22}
+          fallback={<CopyrightIcon sx={{ color: 'text.secondary', fontSize: 20, flexShrink: 0 }} />}
+        />
+        <SingleLineTextEdit
+          size="small"
+          label=""
+          value={draft}
+          disabled={disabled}
+          onChange={this.handleChange}
+          onBlur={this.handleBlur}
+          onKeyDown={this.handleKeyDown}
+          sx={{ flex: 1 }}
+        />
+        <Tooltip title="Logo suchen">
+          <span>
+            <IconButton
+              size="small"
+              aria-label={`Logo für „${name}" suchen`}
+              disabled={disabled}
+              onClick={this.handleSearchLogo}
+            >
+              <ImageSearchIcon fontSize="small" />
+            </IconButton>
+          </span>
+        </Tooltip>
+        <Tooltip title="Löschen">
+          <span>
+            <IconButton
+              edge="end"
+              size="small"
+              aria-label={`„${name}" löschen`}
+              disabled={disabled}
+              onClick={this.handleDelete}
+            >
+              <DeleteOutlinedIcon fontSize="small" />
+            </IconButton>
+          </span>
+        </Tooltip>
+      </ListItem>
+    );
+  }
+}
+
+export default ArtikelMarke;

src/components/brand/ArtikelMarkenTable.jsx

@@ -0,0 +1,44 @@
+import { PureComponent } from 'react';
+import List from '@mui/material/List';
+import Typography from '@mui/material/Typography';
+import ArtikelMarke from './ArtikelMarke';
+
+class ArtikelMarkenTable extends PureComponent {
+  render() {
+    const {
+      brands = [],
+      busyKey,
+      disabled,
+      onRename,
+      onSearchLogo,
+      onDelete,
+      emptyMessage = 'Noch keine Marken angelegt.',
+      sx,
+    } = this.props;
+
+    const isBusy = disabled || busyKey != null;
+
+    return (
+      <List dense disablePadding sx={sx}>
+        {brands.length === 0 ? (
+          <Typography variant="body2" color="text.secondary" sx={{ py: 1 }}>
+            {emptyMessage}
+          </Typography>
+        ) : (
+          brands.map((b) => (
+            <ArtikelMarke
+              key={b.id}
+              brand={b}
+              disabled={isBusy}
+              onRename={onRename}
+              onSearchLogo={onSearchLogo}
+              onDelete={onDelete}
+            />
+          ))
+        )}
+      </List>
+    );
+  }
+}
+
+export default ArtikelMarkenTable;

src/components/brand/index.js

@@ -1,3 +1,5 @@
 export { default as BrandThumb, extractBrandThumbInfo } from './BrandThumb';
 export { default as BrandLabel } from './BrandLabel';
 export { default as BrandImageSearchDialog } from './BrandImageSearchDialog';
+export { default as ArtikelMarke } from './ArtikelMarke';
+export { default as ArtikelMarkenTable } from './ArtikelMarkenTable';

src/components/tiles/ArticleTile.jsx

@@ -22,7 +22,7 @@ import {
   SCRIM_LABEL,
   SCRIM_TILE,
   TEXT_GLOW_DARK,
-  VEIL_MUTED,
+  VEIL_SUBTLE,
   WHITE,
 } from '../../colors';
 
@@ -447,21 +447,19 @@ export class ArticleTile extends Tile {
               px: 1,
               py: '2px',
               my: 0.25,
-              bgcolor: VEIL_MUTED,
+              bgcolor: VEIL_SUBTLE,
-              backdropFilter: 'blur(4px)',
+              backdropFilter: 'blur(2px)',
-              WebkitBackdropFilter: 'blur(4px)',
+              WebkitBackdropFilter: 'blur(2px)',
             }}
           >
             <Typography
               variant="body2"
               fontWeight={650}
               sx={{
-                color: INK_STRONG,
                 lineHeight: 1.2,
                 height: '2.4em',
                 px: '4px',
                 mx: '-4px',
-                textShadow: '0 0 3px rgba(255, 255, 255, 0.9), 0 0 6px rgba(255, 255, 255, 0.7)',
                 display: '-webkit-box',
                 WebkitLineClamp: 2,
                 WebkitBoxOrient: 'vertical',

src/routes/artikel/marken.jsx

@@ -2,14 +2,6 @@ import { PureComponent } from 'react';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import CircularProgress from '@mui/material/CircularProgress';
-import IconButton from '@mui/material/IconButton';
-import List from '@mui/material/List';
-import ListItem from '@mui/material/ListItem';
-import Tooltip from '@mui/material/Tooltip';
-import Typography from '@mui/material/Typography';
-import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
-import CopyrightIcon from '@mui/icons-material/Copyright';
-import ImageSearchIcon from '@mui/icons-material/ImageSearch';
 import BackendError from '../../components/BackendError';
 import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
 import { PanelTile, PanelTileGrid } from 'dashgui/panels';
@@ -18,24 +10,22 @@ import { notifyError } from '../../utils/notify';
 import { setLastArticleSku } from '../../automats';
 import brandAutomat from '../../automats/brandAutomat';
 import { enqueueSnackbar } from 'notistack';
-import { BrandThumb, BrandImageSearchDialog } from '../../components/brand';
+import {
+  BrandImageSearchDialog,
+  ArtikelMarke,
+  ArtikelMarkenTable,
+} from '../../components/brand';
 import {
   PURPLE_PANEL,
 } from '../../colors';
 
-function draftsFrom(brands) {
-  return Object.fromEntries(brands.map((b) => [b.id, b.name]));
-}
-
 class ArtikelMarkenPage extends PureComponent {
   constructor(props) {
     super(props);
-    const initialBrands = brandAutomat.state.brands || [];
     this.state = {
       status: brandAutomat.state.status === 'succeeded' ? 'ready' : 'loading',
       error: brandAutomat.state.error ? backendErrorFrom({ message: brandAutomat.state.error }) : null,
-      brands: initialBrands,
+      brands: brandAutomat.state.brands || [],
-      drafts: draftsFrom(initialBrands),
       newName: '',
       busyKey: null,
       searchBrand: null,
@@ -44,6 +34,9 @@ class ArtikelMarkenPage extends PureComponent {
     this.handleCreate = this.handleCreate.bind(this);
     this.handleRetry = this.handleRetry.bind(this);
     this.loadBrands = this.loadBrands.bind(this);
+    this.handleRename = this.handleRename.bind(this);
+    this.handleDelete = this.handleDelete.bind(this);
+    this.handleSearchLogo = this.handleSearchLogo.bind(this);
   }
 
   componentDidMount() {
@@ -70,20 +63,10 @@ class ArtikelMarkenPage extends PureComponent {
   }
 
   applyBrands(brands) {
-    this.setState((prev) => {
+    this.setState({
-      const currentDrafts = prev.drafts || {};
+      status: 'ready',
-      const nextDrafts = { ...draftsFrom(brands) };
+      error: null,
-      for (const b of brands) {
+      brands,
-        if (prev.busyKey !== b.id && currentDrafts[b.id] !== undefined) {
-          nextDrafts[b.id] = currentDrafts[b.id];
-        }
-      }
-      return {
-        status: 'ready',
-        error: null,
-        brands,
-        drafts: nextDrafts,
-      };
     });
   }
 
@@ -105,6 +88,10 @@ class ArtikelMarkenPage extends PureComponent {
     void this.loadBrands();
   }
 
+  handleSearchLogo(brand) {
+    this.setState({ searchBrand: brand });
+  }
+
   async handleCreate() {
     const name = this.state.newName.trim();
     if (!name || this.state.busyKey != null) return;
@@ -122,29 +109,20 @@ class ArtikelMarkenPage extends PureComponent {
     }
   }
 
-  async handleRename(brand) {
+  async handleRename(brand, draft) {
-    const draft = String(this.state.drafts[brand.id] ?? '').trim();
+    const nextName = String(draft ?? '').trim();
-    if (!draft) {
+    if (!nextName || nextName === brand.name || this.state.busyKey != null) return;
-      this.setState((prev) => ({
-        drafts: { ...prev.drafts, [brand.id]: brand.name },
-      }));
-      return;
-    }
-    if (draft === brand.name || this.state.busyKey != null) return;
 
     this.setState({ busyKey: brand.id });
     try {
-      await brandAutomat.actions.upsert({ name: draft });
+      await brandAutomat.actions.upsert({ name: nextName });
       if (this._cancelled) return;
       this.setState({ busyKey: null });
       enqueueSnackbar('Marke gespeichert.', { variant: 'success' });
     } catch (err) {
       if (this._cancelled) return;
       notifyError(err);
-      this.setState((prev) => ({
+      this.setState({ busyKey: null });
-        busyKey: null,
-        drafts: { ...prev.drafts, [brand.id]: brand.name },
-      }));
     }
   }
 
@@ -166,7 +144,7 @@ class ArtikelMarkenPage extends PureComponent {
   }
 
   render() {
-    const { status, error, brands, drafts, newName, busyKey } = this.state;
+    const { status, error, brands, newName, busyKey } = this.state;
     const busy = busyKey != null;
 
     if (status === 'loading') {
@@ -184,78 +162,13 @@ class ArtikelMarkenPage extends PureComponent {
     return (
       <PanelTileGrid>
         <PanelTile wide={2} minHeight={280} color={PURPLE_PANEL}>
-          <List dense disablePadding>
+          <ArtikelMarkenTable
-            {brands.length === 0 ? (
+            brands={brands}
-              <Typography variant="body2" color="text.secondary" sx={{ py: 1 }}>
+            busyKey={busyKey}
-                Noch keine Marken angelegt.
+            onRename={this.handleRename}
-              </Typography>
+            onSearchLogo={this.handleSearchLogo}
-            ) : (
+            onDelete={this.handleDelete}
-              brands.map((b) => (
+          />
-                <ListItem
-                  key={b.id}
-                  disableGutters
-                  sx={{ gap: 1, py: 0.75, alignItems: 'center' }}
-                >
-                  <BrandThumb
-                    brand={b}
-                    size={22}
-                    fallback={<CopyrightIcon sx={{ color: 'text.secondary', fontSize: 20, flexShrink: 0 }} />}
-                  />
-                  <SingleLineTextEdit
-                    size="small"
-                    label=""
-                    value={drafts[b.id] ?? ''}
-                    disabled={busy}
-                    onChange={(next) =>
-                      this.setState((prev) => ({
-                        drafts: { ...prev.drafts, [b.id]: next },
-                      }))
-                    }
-                    onBlur={() => void this.handleRename(b)}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault();
-                        event.target.blur();
-                      }
-                      if (event.key === 'Escape') {
-                        event.preventDefault();
-                        this.setState((prev) => ({
-                          drafts: { ...prev.drafts, [b.id]: b.name },
-                        }));
-                        event.target.blur();
-                      }
-                    }}
-                    sx={{ flex: 1 }}
-                  />
-                  <Tooltip title="Logo suchen">
-                    <span>
-                      <IconButton
-                        size="small"
-                        aria-label={`Logo für „${b.name}" suchen`}
-                        disabled={busy}
-                        onClick={() => this.setState({ searchBrand: b })}
-                      >
-                        <ImageSearchIcon fontSize="small" />
-                      </IconButton>
-                    </span>
-                  </Tooltip>
-                  <Tooltip title="Löschen">
-                    <span>
-                      <IconButton
-                        edge="end"
-                        size="small"
-                        aria-label={`„${b.name}" löschen`}
-                        disabled={busy}
-                        onClick={() => void this.handleDelete(b)}
-                      >
-                        <DeleteOutlinedIcon fontSize="small" />
-                      </IconButton>
-                    </span>
-                  </Tooltip>
-                </ListItem>
-              ))
-            )}
-          </List>
 
           <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 2 }}>
             <SingleLineTextEdit
@@ -293,4 +206,5 @@ class ArtikelMarkenPage extends PureComponent {
   }
 }
 
+export { ArtikelMarke, ArtikelMarkenTable };
 export default ArtikelMarkenPage;