Skip to content

Commit 5d9577c

Browse files
authored
Merge pull request #201 from Edgeryders-Participio/separate-selected-in-list
Separate the selection highlight in the lists from the rest of the lists
2 parents 82f5b26 + 87e393f commit 5d9577c

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

ui/src/scenes/Home/components/NeedsContainer/components/NeedsList/NeedsList.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ const NeedsListGroup = styled(ListGroup)`
1111
margin-bottom: 1rem;
1212
`;
1313

14+
const SelectedNeedGroup = styled(ListGroup)`
15+
margin-bottom: 0.5rem;
16+
`;
17+
1418
const NeedsListGroupHeader = styled(ListGroupItem)`
1519
display: flex;
1620
justify-content: space-between;
@@ -74,16 +78,17 @@ const NeedsList = ({ selectedNeedId, needs, subscribeToNeedsEvents }) => {
7478
}], ['asc']);
7579
return (
7680
<div>
77-
<NeedsListGroup>
78-
{sortedNeeds.filter((need) => need.nodeId === selectedNeedId).map((need) => (
81+
{sortedNeeds.filter((need) => need.nodeId === selectedNeedId).map((need) => (
82+
<SelectedNeedGroup key={1}>
7983
<NeedsListGroupHeader
80-
key={selectedNeedId}
8184
active
8285
>
8386
{need.title}
8487
{renderMissingRealizersAmount(need)}
8588
</NeedsListGroupHeader>
86-
))}
89+
</SelectedNeedGroup>
90+
))}
91+
<NeedsListGroup>
8792
{sortedNeeds.map((need) => (
8893
<NeedsListGroupItem
8994
key={need.nodeId}

ui/src/scenes/Home/components/ResponsibilitiesContainer/components/ResponsibilitiesList/ResponsibilitiesList.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ const ResponsibilitiesListGroup = styled(ListGroup)`
1111
margin-bottom: 1rem;
1212
`;
1313

14+
const SelectedResponsibilitiesListGroup = styled(ListGroup)`
15+
margin-bottom: 0.5rem;
16+
`;
17+
1418
const ResponsibilitiesListGroupHeader = styled(ListGroupItem)`
1519
display: flex;
1620
justify-content: space-between;
@@ -60,18 +64,19 @@ const ResponsibilitiesList = ({
6064
}], ['asc']);
6165
return (
6266
<div>
63-
<ResponsibilitiesListGroup>
64-
{sortedResponsibilities
65-
.filter((responsibility) => responsibility.nodeId === selectedResponsibilityId)
66-
.map((responsibility) => (
67+
{sortedResponsibilities
68+
.filter((responsibility) => responsibility.nodeId === selectedResponsibilityId)
69+
.map((responsibility) => (
70+
<SelectedResponsibilitiesListGroup key={1}>
6771
<ResponsibilitiesListGroupHeader
68-
key={selectedResponsibilityId}
6972
active
7073
>
7174
{responsibility.title}
7275
{renderMissingRealizerIcon(responsibility)}
7376
</ResponsibilitiesListGroupHeader>
74-
))}
77+
</SelectedResponsibilitiesListGroup>
78+
))}
79+
<ResponsibilitiesListGroup>
7580
{sortedResponsibilities.map((responsibility) => (
7681
<ResponsibilitiesListGroupItem
7782
key={responsibility.nodeId}

0 commit comments

Comments
 (0)