fix: The last ItemRow must not have a Divider

cozy · Sep 11, 2023 · 0525a4c · 0525a4c
1 parent ad5cc6b
commit 0525a4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/react/NestedSelect/ItemRow.jsx b/react/NestedSelect/ItemRow.jsx
@@ -12,7 +12,7 @@ import Typography from '../Typography'
 
 const infoStyle = { color: 'var(--secondaryTextColor)' }
 
-const ItemRow = ({ item, onClick, isSelected, radioPosition }) => {
+const ItemRow = ({ item, onClick, isSelected, radioPosition, isLast }) => {
   const { isDesktop } = useBreakpoints()
 
   return (
@@ -68,7 +68,7 @@ const ItemRow = ({ item, onClick, isSelected, radioPosition }) => {
           ? item.action.Component({ item, ...item.action.props })
           : null}
       </ListItem>
-      <Divider />
+      {!isLast && <Divider />}
     </>
   )
 }

diff --git a/react/NestedSelect/NestedSelect.jsx b/react/NestedSelect/NestedSelect.jsx
@@ -138,24 +138,26 @@ class NestedSelect extends Component {
                 {searchOptions.noDataLabel}
               </Typography>
             ) : (
-              searchResult.map(item => (
+              searchResult.map((item, index) => (
                 <ItemRow
                   radioPosition={radioPosition}
                   key={item.key || item.title}
                   item={item}
                   onClick={this.handleClickItem}
                   isSelected={isSelectedWithLevel(item)}
+                  isLast={index === searchResult.length - 1}
                 />
               ))
             )
           ) : (
-            children.map(item => (
+            children.map((item, index) => (
               <ItemRow
                 radioPosition={radioPosition}
                 key={item.key || item.title}
                 item={item}
                 onClick={this.handleClickItem}
                 isSelected={isSelectedWithLevel(item)}
+                isLast={index === children.length - 1}
               />
             ))
           )}