@universal-tennis/ui-shared 0.1.68 → 0.1.70

package/src/stories/organisms/Tables/SortableTable.tsx

@@ -1,112 +1,112 @@
-import React, { ComponentType, SyntheticEvent } from "react";
-
-import Table from "@mui/material/Table";
-import TableBody from "@mui/material/TableBody";
-import TableCell from "@mui/material/TableCell";
-import TableContainer from "@mui/material/TableContainer";
-import TableHead from "@mui/material/TableHead";
-import MuiTableRow from "@mui/material/TableRow";
-import TableSortLabel from "@mui/material/TableSortLabel";
-import Toolbar from "@mui/material/Toolbar";
-import Paper from "@mui/material/Paper";
-
-import { TableData } from "types/tableDataTypes";
-import Typography from '../../atoms/Typography/Typography';
-
-type Order = 'asc' | 'desc';
-type OrderProperty = string | number;
-
-interface HeadCell {
-  id: string;
-  label?: string;
-  isSortingDisabled: boolean
-}
-
-export type SortableTableProps = {
-    headCells: Array<HeadCell>;
-    tableData: Array<TableData>;
-    sortOrder: Order;
-    sortByProperty: OrderProperty;
-    rowComponent: ComponentType<{rowData: TableData, labelId: string}>;
-    title?: string;
-    onOrderPropertyChange?: (property: OrderProperty) => VoidFunction
-}
-
-function SortableTable({
-  headCells,
-  tableData,
-  rowComponent,
-  sortOrder,
-  sortByProperty,
-  title = '',
-  onOrderPropertyChange,
-}: SortableTableProps) {
-  const TableRow = rowComponent;
-
-  const handleRequestSort = (property: OrderProperty) => (event: SyntheticEvent) => {
-    event.preventDefault();
-    if (onOrderPropertyChange) {
-      onOrderPropertyChange(property);
-    }
-  };
-
-  return (
-      <Paper sx={{ width: "100%", mb: 2 }}>
-          {title && (
-          <Toolbar sx={{ pl: { sm: 2 }, pr: { xs: 1, sm: 1 } }}>
-              <Typography
-                  category="secondary"
-                  size="large-medium"
-                  id="tableTitle"
-              >
-                  {title}
-              </Typography>
-          </Toolbar>
-          )}
-          <TableContainer>
-              <Table
-                  sx={{ minWidth: 750 }}
-                  aria-labelledby="tableTitle"
-                  size="medium"
-              >
-                  <TableHead>
-                      <MuiTableRow>
-                          {headCells.map((headCell) => (
-                              <TableCell
-                                  key={headCell.id}
-                                  align="left"
-                                  padding="normal"
-                                  sortDirection={sortByProperty === headCell.id ? sortOrder : false}
-                              >
-                                  <TableSortLabel
-                                      disabled={headCell.isSortingDisabled}
-                                      hideSortIcon={!headCell?.label}
-                                      active={sortByProperty === headCell.id}
-                                      direction={sortByProperty === headCell.id ? sortOrder : 'asc'}
-                                      onClick={handleRequestSort(headCell.id)}
-                                  >
-                                      {headCell?.label}
-                                  </TableSortLabel>
-                              </TableCell>
-                          ))}
-                      </MuiTableRow>
-                  </TableHead>
-                  <TableBody>
-                      {tableData && tableData.map((data: TableData, index: number) => {
-                        const labelId = `table-${index}`;
-                        return (
-                            <TableRow
-                                key={data.id}
-                                rowData={data}
-                                labelId={labelId}
-                            />
-                        );
-                      })}
-                  </TableBody>
-              </Table>
-          </TableContainer>
-      </Paper>
-  );
-}
-
-export default SortableTable;
+import React, { ComponentType, SyntheticEvent } from "react";
+
+import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import TableCell from "@mui/material/TableCell";
+import TableContainer from "@mui/material/TableContainer";
+import TableHead from "@mui/material/TableHead";
+import MuiTableRow from "@mui/material/TableRow";
+import TableSortLabel from "@mui/material/TableSortLabel";
+import Toolbar from "@mui/material/Toolbar";
+import Paper from "@mui/material/Paper";
+
+import { TableData } from "types/tableDataTypes";
+import Typography from '../../atoms/Typography/Typography';
+
+type Order = 'asc' | 'desc';
+type OrderProperty = string | number;
+
+interface HeadCell {
+  id: string;
+  label?: string;
+  isSortingDisabled: boolean
+}
+
+export type SortableTableProps = {
+    headCells: Array<HeadCell>;
+    tableData: Array<TableData>;
+    sortOrder: Order;
+    sortByProperty: OrderProperty;
+    rowComponent: ComponentType<{rowData: TableData, labelId: string}>;
+    title?: string;
+    onOrderPropertyChange?: (property: OrderProperty) => VoidFunction
+}
+
+function SortableTable({
+  headCells,
+  tableData,
+  rowComponent,
+  sortOrder,
+  sortByProperty,
+  title = '',
+  onOrderPropertyChange,
+}: SortableTableProps) {
+  const TableRow = rowComponent;
+
+  const handleRequestSort = (property: OrderProperty) => (event: SyntheticEvent) => {
+    event.preventDefault();
+    if (onOrderPropertyChange) {
+      onOrderPropertyChange(property);
+    }
+  };
+
+  return (
+      <Paper sx={{ width: "100%", mb: 2 }}>
+          {title && (
+          <Toolbar sx={{ pl: { sm: 2 }, pr: { xs: 1, sm: 1 } }}>
+              <Typography
+                  category="secondary"
+                  size="large-medium"
+                  id="tableTitle"
+              >
+                  {title}
+              </Typography>
+          </Toolbar>
+          )}
+          <TableContainer>
+              <Table
+                  sx={{ minWidth: 750 }}
+                  aria-labelledby="tableTitle"
+                  size="medium"
+              >
+                  <TableHead>
+                      <MuiTableRow>
+                          {headCells.map((headCell) => (
+                              <TableCell
+                                  key={headCell.id}
+                                  align="left"
+                                  padding="normal"
+                                  sortDirection={sortByProperty === headCell.id ? sortOrder : false}
+                              >
+                                  <TableSortLabel
+                                      disabled={headCell.isSortingDisabled}
+                                      hideSortIcon={!headCell?.label}
+                                      active={sortByProperty === headCell.id}
+                                      direction={sortByProperty === headCell.id ? sortOrder : 'asc'}
+                                      onClick={handleRequestSort(headCell.id)}
+                                  >
+                                      {headCell?.label}
+                                  </TableSortLabel>
+                              </TableCell>
+                          ))}
+                      </MuiTableRow>
+                  </TableHead>
+                  <TableBody>
+                      {tableData && tableData.map((data: TableData, index: number) => {
+                        const labelId = `table-${index}`;
+                        return (
+                            <TableRow
+                                key={data.id}
+                                rowData={data}
+                                labelId={labelId}
+                            />
+                        );
+                      })}
+                  </TableBody>
+              </Table>
+          </TableContainer>
+      </Paper>
+  );
+}
+
+export default SortableTable;

package/src/stories/organisms/Tables/Tables.stories.tsx

@@ -1,104 +1,104 @@
-import React from 'react';
-import TeamDrawCard from 'stories/molecules/Cards/TeamDrawCard';
-import DrawCard from '../../molecules/Cards/DrawCard';
-import DrawCardTable from './DrawCardTable';
-import TeamDrawCardTable from './TeamDrawCardTable/TeamDrawCardTable';
-import { DrawCardTableProps } from './sharedTypes';
-import {
-  MOCK_HEAD_CELLS, mockRowComponent, MOCK_TABLE_DATA, SAMPLE_CARD_DATA, SAMPLE_TEAM_PAGE_CARD_DATA
-} from './mockData';
-
-const onOrderPropertyChange = () => {};
-
-// Default
-export default {
-  title: 'Organisms/Tables',
-};
-
-// Templates
-function DrawCardTableTemplate(args: DrawCardTableProps) {
-  return <DrawCardTable {...args} />;
-}
-
-function TeamDrawCardTableTemplate(args: DrawCardTableProps) {
-  return <TeamDrawCardTable {...args} />;
-}
-
-const headerRows = [
-  { name: 'Round 1' },
-  { name: 'Quarterfinal' },
-  { name: 'SemiFinal' },
-];
-
-const tableRows = [
-  [      
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
-      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-  ],
-  [      
-      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} onViewClick={() => {}} />,
-      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isScorelessMatch emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard isScorelessMatch emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-  ],
-  [      
-      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-  ],
-  [      
-      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
-  ],
-];
-
-const teamTableRows = [
-  [      
-      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-      <TeamDrawCard isScorelessMatch {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-      <TeamDrawCard isScorelessMatch {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-  ],
-  [      
-      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-  ],
-  [      
-      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
-  ],
-];
-
-// Stories
-export const DrawTable = DrawCardTableTemplate.bind({});
-DrawTable.args = {
-  headerRows,
-  tableRows,
-};
-
-export const TeamDrawTable = TeamDrawCardTableTemplate.bind({});
-TeamDrawTable.args = {
-  headerRows,
-  tableRows: teamTableRows,
-};
-
-export const MobileTeamDrawTable = TeamDrawCardTableTemplate.bind({});
-MobileTeamDrawTable.args = {
-  headerRows,
-  tableRows: teamTableRows,
-  isMobile: true
-};
-
-export const SortableTable = DrawCardTableTemplate.bind({});
-SortableTable.args = {
-  headCells: MOCK_HEAD_CELLS,
-  sortOrder: 'asc',
-  sortByProperty: 'player',
-  title: 'Player Table',
-  tableData: MOCK_TABLE_DATA,
-  rowComponent: mockRowComponent,
-  onOrderPropertyChange,
-};
+import React from 'react';
+import TeamDrawCard from '../../molecules/Cards/TeamDrawCard';
+import DrawCard from '../../molecules/Cards/DrawCard';
+import DrawCardTable from './DrawCardTable';
+import TeamDrawCardTable from './TeamDrawCardTable/TeamDrawCardTable';
+import { DrawCardTableProps } from './sharedTypes';
+import {
+  MOCK_HEAD_CELLS, mockRowComponent, MOCK_TABLE_DATA, SAMPLE_CARD_DATA, SAMPLE_TEAM_PAGE_CARD_DATA
+} from './mockData';
+
+const onOrderPropertyChange = () => {};
+
+// Default
+export default {
+  title: 'Organisms/Tables',
+};
+
+// Templates
+function DrawCardTableTemplate(args: DrawCardTableProps) {
+  return <DrawCardTable {...args} />;
+}
+
+function TeamDrawCardTableTemplate(args: DrawCardTableProps) {
+  return <TeamDrawCardTable {...args} />;
+}
+
+const headerRows = [
+  { name: 'Round 1' },
+  { name: 'Quarterfinal' },
+  { name: 'SemiFinal' },
+];
+
+const tableRows = [
+  [      
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} locationLabel="hi" />,
+      <DrawCard isSelectActive isFlexWidth emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+  ],
+  [      
+      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} onViewClick={() => {}} />,
+      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isScorelessMatch emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard isScorelessMatch emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+  ],
+  [      
+      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+  ],
+  [      
+      <DrawCard emptyLabel="Select a team" {...SAMPLE_CARD_DATA} />,
+  ],
+];
+
+const teamTableRows = [
+  [      
+      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+      <TeamDrawCard isScorelessMatch {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+      <TeamDrawCard isScorelessMatch {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+  ],
+  [      
+      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+  ],
+  [      
+      <TeamDrawCard {...SAMPLE_TEAM_PAGE_CARD_DATA} />,
+  ],
+];
+
+// Stories
+export const DrawTable = DrawCardTableTemplate.bind({});
+DrawTable.args = {
+  headerRows,
+  tableRows,
+};
+
+export const TeamDrawTable = TeamDrawCardTableTemplate.bind({});
+TeamDrawTable.args = {
+  headerRows,
+  tableRows: teamTableRows,
+};
+
+export const MobileTeamDrawTable = TeamDrawCardTableTemplate.bind({});
+MobileTeamDrawTable.args = {
+  headerRows,
+  tableRows: teamTableRows,
+  isMobile: true
+};
+
+export const SortableTable = DrawCardTableTemplate.bind({});
+SortableTable.args = {
+  headCells: MOCK_HEAD_CELLS,
+  sortOrder: 'asc',
+  sortByProperty: 'player',
+  title: 'Player Table',
+  tableData: MOCK_TABLE_DATA,
+  rowComponent: mockRowComponent,
+  onOrderPropertyChange,
+};

package/src/stories/organisms/Tables/TeamDrawCardTable/DesktopTableRows.tsx

@@ -1,102 +1,111 @@
-import React from "react";
-import { styled } from "@mui/material/styles";
-import Grid from "@mui/material/Grid";
-import Box from "@mui/material/Box";
-
-import { TableRowProps } from '../sharedTypes';
-import Typography from "../../../atoms/Typography/Typography";
-import { teamDrawCardSideMargin, standardSideMargin } from "../../../utils/constants";
-
-const StyledHeader = styled(Grid)({
-  alignItems: "center",
-  justifyContent: "center",
-  display: "flex"
-});
-
-const gridCommonStyles = {
-  content: "''",
-  position: "absolute",
-  backgroundColor: "var(--cool-grey-600)",
-};
-
-const horizontalLineCommonStyles = {
-  height: "1px",
-  top: "50%",
-};
-
-const StyledGrid = styled(Grid)({
-  position: "relative",
-
-  "&:nth-last-child(-n+2) .team-draw-card": {
-    "&:before": {
-      ...gridCommonStyles,
-      ...horizontalLineCommonStyles,
-      width: `${teamDrawCardSideMargin}`,
-      left: 0,
-      transform: "translateX(-100%)"
-    }
-  },
-  "&:nth-of-type(-n+2) .team-draw-card": {
-    "&:after": {
-      ...gridCommonStyles,
-      ...horizontalLineCommonStyles,
-      width: `calc(${standardSideMargin + 1}px)`,
-      right: 0,
-      transform: "translateX(100%)"
-    }
-  }
-});
-
-const GridSections = styled(Box)({
-  display: "flex",
-  alignItems: "center",
-  position: 'relative',
-});
-
-export default function DesktopTableRows({
-  headerRows, totalColumns, tableRows
-}: TableRowProps) {
-  const formatTableRows = tableRows.map((row, index) => {
-    if (index > 2) return; // Table can only support 3 columns
-    const rowSectionsHeight = `${100 / tableRows[index].length}%`;
-    const sectionAmount = tableRows[index].length;
-    const isFirstRow = index === 0;
-
-    return (
-        <StyledGrid key={index} xs={totalColumns}>
-            {[...Array(sectionAmount)].map((section, idx) => (
-                <GridSections 
-                    key={idx} 
-                    sx={{ 
-                      height: rowSectionsHeight,
-                      '&:before': {
-                        display: isFirstRow ? 'none' : 'block',
-                        ...gridCommonStyles,
-                        height: `calc(50% + 1px)`,
-                        width: "1px",
-                        top: `calc(25% - 4px)`
-                      }, 
-                    }}
-                >
-                    {row[idx]}
-                </GridSections>
-            ))}
-        </StyledGrid>
-    );
-  });
-
-  return (
-      <>
-          <Grid container sx={{ height: "60px" }}>
-              {headerRows.map((row) => (
-                  <StyledHeader key={row.name} xs={totalColumns}>
-                      <Typography category="secondary" size="small-medium-cap">
-                          {row.name}
-                      </Typography>
-                  </StyledHeader>
-              ))}
-          </Grid>
-          <Grid container>{formatTableRows}</Grid>
-      </>
-  );
-}
+import React from "react";
+import { styled } from "@mui/material/styles";
+import Grid from "@mui/material/Grid";
+import Box from "@mui/material/Box";
+
+import { TableRowProps } from '../sharedTypes';
+import Typography from "../../../atoms/Typography/Typography";
+import { teamDrawCardSideMargin, standardSideMargin } from "../../../utils/constants";
+
+const StyledHeader = styled(Grid)({
+  alignItems: "center",
+  justifyContent: "center",
+  display: "flex"
+});
+
+const gridCommonStyles = {
+  content: "''",
+  position: "absolute",
+  backgroundColor: "var(--cool-grey-600)",
+};
+
+const horizontalLineCommonStyles = {
+  height: "1px",
+  top: "50%",
+};
+
+const StyledGrid = styled(Grid)({
+  position: "relative",
+  '&:first-child .team-draw-card': {
+    '&:before': {
+      display: 'none'
+    }
+  },
+  '&:last-child .team-draw-card': {
+    '&:after': {
+      display: 'none'
+    }
+  },
+  "&:nth-last-child(-n+2) .team-draw-card": {
+    "&:before": {
+      ...gridCommonStyles,
+      ...horizontalLineCommonStyles,
+      width: `${teamDrawCardSideMargin}`,
+      left: 0,
+      transform: "translateX(-100%)"
+    }
+  },
+  "&:nth-of-type(-n+2) .team-draw-card": {
+    "&:after": {
+      ...gridCommonStyles,
+      ...horizontalLineCommonStyles,
+      width: `calc(${standardSideMargin + 1}px)`,
+      right: 0,
+      transform: "translateX(100%)"
+    }
+  }
+});
+
+const GridSections = styled(Box)({
+  display: "flex",
+  alignItems: "center",
+  position: 'relative',
+});
+
+export default function DesktopTableRows({
+  headerRows, totalColumns, tableRows
+}: TableRowProps) {
+  const formatTableRows = tableRows.map((row, index) => {
+    if (index > 2) return; // Table can only support 3 columns
+    const rowSectionsHeight = `${100 / tableRows[index].length}%`;
+    const sectionAmount = tableRows[index].length;
+    const isFirstRow = index === 0;
+
+    return (
+        <StyledGrid key={index} xs={totalColumns}>
+            {[...Array(sectionAmount)].map((section, idx) => (
+                <GridSections 
+                    key={idx} 
+                    sx={{ 
+                      height: rowSectionsHeight,
+                      '&:before': {
+                        display: isFirstRow ? 'none' : 'block',
+                        ...gridCommonStyles,
+                        height: `calc(50% + 1px)`,
+                        width: "1px",
+                        top: `calc(25% - 4px)`
+                      }, 
+                    }}
+                >
+                    {row[idx]}
+                </GridSections>
+            ))}
+        </StyledGrid>
+    );
+  });
+
+  return (
+      <>
+          <Grid container sx={{ height: "60px" }}>
+              {headerRows.map((row) => (
+                  <StyledHeader key={row.name} xs={totalColumns}>
+                      <Typography category="secondary" size="small-medium-cap">
+                          {row.name}
+                      </Typography>
+                  </StyledHeader>
+              ))}
+          </Grid>
+          <Grid container>{formatTableRows}</Grid>
+      </>
+  );
+}