Merge pull request #112 from ooni/fix/modal

Fix usage of props passed to Modal
ooni · Mar 29, 2021 · 52686a2 · 52686a2
2 parents 5fd6d4e + 610026c
commit 52686a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## ooni-components 0.4.4 [2021-03-29]
+Fixes:
+* Fixed how props are passed down from Modal to Box with content (#112)
+
 ## ooni-components 0.4.3 [2021-03-26]
 * No-op version bump to trigger CI
 

diff --git a/components/organisms/Modal.js b/components/organisms/Modal.js
@@ -20,7 +20,7 @@ const ModalCloseButton = ({ position, ...props}) => (
   />
 )
 
-export const Modal = ({show, closeButton, onHideClick, ...props}) => {
+export const Modal = ({show, closeButton, onHideClick, children, ...props}) => {
   return (
     <Box sx={{
       position: 'relative',
@@ -36,10 +36,11 @@ export const Modal = ({show, closeButton, onHideClick, ...props}) => {
         overflow: 'auto',
         zIndex: 1050,
         bg: 'white',
-        borderRadius: 'radius'
+        borderRadius: 'radius',
+        ...props
       }}>
         {closeButton && <ModalCloseButton onClick={onHideClick} icon={<MdClose/>} position={closeButton} />}
-        {props.children}
+        {children}
       </Box>
       {show && (
         <Box

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ooni-components",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "main": "dist/index.js",
   "repository": "https://github.com/ooni/design-system.git",
   "author": "Arturo Filastò <arturo@filasto.net>",