Merge pull request #818 from intellihr/release/368

Release 368

Author: intellibot-access[bot]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intellihr/ui-components",
   "description": "A common React components library that is used in our company",
-  "version": "47.0.2",
+  "version": "47.0.3",
   "main": "./dist/",
   "types": "./types/index.d.ts",
   "files": [

src/domain/Lists/DraggableList/DraggableList.tsx

@@ -7,7 +7,7 @@ import {
 } from 'react-beautiful-dnd'
 
 import { Props } from '../../../common'
-import { StyledListArea, StyledListItem } from './style'
+import { StyledDraggableList, StyledListArea, StyledListItem } from './style'
 
 interface IDraggableListProps<T> {
   /** Droppable area id - this allows us to have more than one per page */
@@ -16,11 +16,13 @@ interface IDraggableListProps<T> {
   setItems: React.Dispatch<React.SetStateAction<T[]>>
   /** An array of ReactElements that should represent the array of items */
   children: React.ReactElement[]
+  /** The margins around the component */
+  margins?: Props.IMargins
   /** The data-component-context */
   componentContext?: string
 }
 
-const DraggableList = <T extends {}> ({ droppableId, setItems, children, componentContext }: IDraggableListProps<T>) => {
+const DraggableList = <T extends {}> ({ droppableId, setItems, children, margins, componentContext }: IDraggableListProps<T>) => {
   const onDragEnd = (result: DropResult) => {
     if (!result.destination) {
       return
@@ -36,7 +38,8 @@ const DraggableList = <T extends {}> ({ droppableId, setItems, children, compone
   }
 
   return (
-    <span
+    <StyledDraggableList
+      margins={margins}
       data-component-type={Props.ComponentType.DraggableList}
       data-component-context={componentContext}
     >
@@ -83,7 +86,7 @@ const DraggableList = <T extends {}> ({ droppableId, setItems, children, compone
           )}
         </Droppable>
       </DragDropContext>
-    </span>
+    </StyledDraggableList>
   )
 }
 

src/domain/Lists/DraggableList/style.ts

@@ -1,12 +1,17 @@
 import styled, { css } from 'styled-components'
 
-import { Variables } from '../../../common'
+import { Props, Variables } from '../../../common'
+import { styleForMargins } from '../../Spacers/services/margins'
 
 interface IListItemProps {
   isDragging: boolean
   children: React.ReactNode
 }
 
+interface IStyledDraggableListProps {
+  margins?: Props.IMargins
+}
+
 const StyledListItem = styled.div<IListItemProps>`
   border: 1px solid ${Variables.Color.n250};
   background-color: ${Variables.Color.n100};
@@ -29,7 +34,11 @@ const StyledListArea = styled.div`
   }
 `
 
+const StyledDraggableList = styled.div`
+  ${(props: IStyledDraggableListProps) => styleForMargins(props.margins)}
+`
 export {
   StyledListArea,
-  StyledListItem
+  StyledListItem,
+  StyledDraggableList
 }