[Table, TableRow] Add support for CSS variables (#32614)

mui · May 4, 2022 · 8944bfc · 8944bfc
1 parent e0b1e57
commit 8944bfc
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 7 deletions.
diff --git a/docs/pages/experiments/material-ui/table.tsx b/docs/pages/experiments/material-ui/table.tsx
@@ -0,0 +1,96 @@
+import * as React from 'react';
+import {
+  Experimental_CssVarsProvider as CssVarsProvider,
+  useColorScheme,
+} from '@mui/material/styles';
+import CssBaseline from '@mui/material/CssBaseline';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import Container from '@mui/material/Container';
+import Moon from '@mui/icons-material/DarkMode';
+import Sun from '@mui/icons-material/LightMode';
+import Table from '@mui/material/Table';
+import { TableBody, TableHead, TableRow } from '@mui/material';
+
+const ColorSchemePicker = () => {
+  const { mode, setMode } = useColorScheme();
+  const [mounted, setMounted] = React.useState(false);
+  React.useEffect(() => {
+    setMounted(true);
+  }, []);
+  if (!mounted) {
+    return null;
+  }
+
+  return (
+    <Button
+      variant="outlined"
+      onClick={() => {
+        if (mode === 'light') {
+          setMode('dark');
+        } else {
+          setMode('light');
+        }
+      }}
+    >
+      {mode === 'light' ? <Moon /> : <Sun />}
+    </Button>
+  );
+};
+
+export default function CssVarsTemplate() {
+  return (
+    <CssVarsProvider>
+      <CssBaseline />
+      <Container sx={{ my: 5 }}>
+        <Box sx={{ pb: 2 }}>
+          <ColorSchemePicker />
+        </Box>
+        <Box
+          sx={{
+            display: 'grid',
+            gridTemplateColumns: 'repeat(auto-fill, minmax(256px, 1fr))',
+            gridAutoRows: 'minmax(160px, auto)',
+            gap: 2,
+            '& > div': {
+              placeSelf: 'center',
+            },
+          }}
+        >
+          <Box sx={{ width: '100%' }}>
+            <Table aria-label="simple table">
+              <TableHead>
+                <TableRow>Hi, I am a row</TableRow>
+              </TableHead>
+              <TableBody>
+                <TableRow>Hi, I am a row</TableRow>
+              </TableBody>
+            </Table>
+          </Box>
+          <Box sx={{ width: '100%' }}>
+            <Table aria-label="simple table">
+              <TableHead>
+                <TableRow>Hello, I am row</TableRow>
+              </TableHead>
+              <TableBody>
+                <TableRow selected>Hello, I am a selected row</TableRow>
+              </TableBody>
+            </Table>
+          </Box>
+          <Box sx={{ width: '100%' }}>
+            <Table aria-label="simple table">
+              <TableHead>
+                <TableRow>Hello, I am a row</TableRow>
+              </TableHead>
+              <TableBody>
+                <TableRow selected hover>
+                  Hello, I am a selected and hover row
+                </TableRow>
+              </TableBody>
+            </Table>
+          </Box>
+        </Box>
+      </Container>
+    </CssVarsProvider>
+  );
+}
diff --git a/packages/mui-material/src/Table/Table.js b/packages/mui-material/src/Table/Table.js
@@ -33,7 +33,7 @@ const TableRoot = styled('table', {
   '& caption': {
     ...theme.typography.body2,
     padding: theme.spacing(2),
-    color: theme.palette.text.secondary,
+    color: (theme.vars || theme).palette.text.secondary,
     textAlign: 'left',
     captionSide: 'bottom',
   },

diff --git a/packages/mui-material/src/TableRow/TableRow.js b/packages/mui-material/src/TableRow/TableRow.js
@@ -33,15 +33,19 @@ const TableRowRoot = styled('tr', {
   // We disable the focus ring for mouse, touch and keyboard users.
   outline: 0,
   [`&.${tableRowClasses.hover}:hover`]: {
-    backgroundColor: theme.palette.action.hover,
+    backgroundColor: (theme.vars || theme).palette.action.hover,
   },
   [`&.${tableRowClasses.selected}`]: {
-    backgroundColor: alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity),
+    backgroundColor: theme.vars
+      ? `rgba(${theme.vars.palette.primary.mainChannel} / ${theme.vars.palette.action.selectedOpacity})`
+      : alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity),
     '&:hover': {
-      backgroundColor: alpha(
-        theme.palette.primary.main,
-        theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
-      ),
+      backgroundColor: theme.vars
+        ? `rgba(${theme.vars.palette.primary.mainChannel} / calc(${theme.vars.palette.action.selectedOpacity} + ${theme.vars.palette.action.hoverOpacity}))`
+        : alpha(
+            theme.palette.primary.main,
+            theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
+          ),
     },
   },
 }));