Dont allow cards to be moved past start or end

timmo001 · Jun 27, 2020 · 423f046 · 423f046
1 parent 4b81fd4
commit 423f046
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/frontend/src/Components/Cards/Base.tsx b/frontend/src/Components/Cards/Base.tsx
@@ -71,6 +71,8 @@ export interface BaseProps extends HomeAssistantChangeProps {
  config: ConfigurationProps;
  editing: number;
  expandable: boolean;
+ maxPosition: number;
+ position: number;
  handleCloseExpand?: () => void;
  handleCopy?: () => void;
  handleDelete?: () => void;

diff --git a/frontend/src/Components/Cards/Overlay.tsx b/frontend/src/Components/Cards/Overlay.tsx
@@ -70,10 +70,16 @@ function Overlay(props: BaseProps): ReactElement {
  <IconButton color="primary" onClick={props.handleCopy}>
  <CopyIcon fontSize="small" />
  </IconButton>
- <IconButton color="primary" onClick={props.handleMoveUp}>
+ <IconButton
+ disabled={props.position === 0}
+ color="primary"
+ onClick={props.handleMoveUp}>
  <ArrowUpwardIcon fontSize="small" />
  </IconButton>
- <IconButton color="primary" onClick={props.handleMoveDown}>
+ <IconButton
+ disabled={props.position === props.maxPosition}
+ color="primary"
+ onClick={props.handleMoveDown}>
  <ArrowDownwardsIcon fontSize="small" />
  </IconButton>
  {deleteConfirm && (

diff --git a/frontend/src/Components/Configuration/EditCard/EditCard.tsx b/frontend/src/Components/Configuration/EditCard/EditCard.tsx
@@ -142,7 +142,14 @@ function EditCard(props: EditCardProps): ReactElement {
  container
  alignContent="center"
  justify="space-around">
- <CardBase {...props} card={card} editing={0} expandable={true} />
+ <CardBase
+ {...props}
+ card={card}
+ editing={0}
+ expandable={true}
+ maxPosition={0}
+ position={0}
+ />
  </Grid>
  </Grid>
  </DialogContent>

diff --git a/frontend/src/Components/Overview/Overview.tsx b/frontend/src/Components/Overview/Overview.tsx
@@ -363,6 +363,8 @@ function Overview(props: OverviewProps): ReactElement {
  card={card}
  editing={props.editing}
  expandable
+ maxPosition={cards.length - 1}
+ position={cardKey}
  handleCopy={handleCopy(card)}
  handleDelete={handleDelete(group, card)}
  handleMoveUp={handleMoveUp(group, card)}