Skip to content

Commit

Permalink
Merge branch 'daniel/floorSwitcher' into stag
Browse files Browse the repository at this point in the history
  • Loading branch information
danji90 committed Feb 12, 2025
2 parents d5fcd5b + 7f06b40 commit 0e6bbac
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/components/FloorSwitcher/FloorSwitcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const propTypes = {
zoom: PropTypes.number.isRequired,
map: PropTypes.object.isRequired,
layers: PropTypes.arrayOf(PropTypes.instanceOf(Layer)).isRequired,
activeTopic: PropTypes.string.isRequired,
screenWidth: PropTypes.string.isRequired,
activeTopic: PropTypes.object.isRequired,
screenWidth: PropTypes.string,
};

class FloorSwitcher extends PureComponent {
Expand Down Expand Up @@ -252,7 +252,7 @@ class FloorSwitcher extends PureComponent {
>
{floors.length > 5 && screenWidth === "xs" ? (
<>
<ListItem key="up" disablePadding sx={listItemStyle}>
<ListItem disablePadding sx={listItemStyle}>
<IconButton
data-testid="floor-switcher-up-btn"
disabled={floors.indexOf(activeFloor) === 0}
Expand All @@ -269,7 +269,6 @@ class FloorSwitcher extends PureComponent {
</IconButton>
</ListItem>
<ListItem
key="up"
disablePadding
sx={(theme) => ({
...listItemStyle(theme),
Expand All @@ -293,7 +292,7 @@ class FloorSwitcher extends PureComponent {
<span className="current-floor">{activeFloor}</span>
</IconButton>
</ListItem>
<ListItem key="down" disablePadding sx={listItemStyle}>
<ListItem disablePadding sx={listItemStyle}>
<IconButton
data-testid="floor-switcher-down-btn"
disabled={floors.indexOf(activeFloor) === floors.length - 1}
Expand Down

0 comments on commit 0e6bbac

Please sign in to comment.