@@ -60,12 +60,13 @@ function extractMarginValues(style: ModalStyleType) {
6060 const regex = / \d + p x | \d + e m | \d + % | \d + v h | \d + v w / g;
6161 // Extract the values using the regular expression
6262 let values = style . padding . match ( regex ) ;
63+ let valuesarray : number [ ] = [ ] ;
6364 // If only one value is found, duplicate it to simulate uniform margin
6465 if ( values && values . length === 1 ) {
65- values = [ values [ 0 ] , values [ 0 ] ] ;
66+ valuesarray = [ parseInt ( values [ 0 ] ) , parseInt ( values [ 0 ] ) ] ;
6667 }
6768 // Return the array of values
68- return values ;
69+ return valuesarray ;
6970}
7071
7172const ModalStyled = styled . div < { $style : ModalStyleType } > `
@@ -124,7 +125,13 @@ let TmpModalComp = (function () {
124125 } ,
125126 [ dispatch ]
126127 ) ;
127- let paddingValues = extractMarginValues ( props . style ) ;
128+ let paddingValues = [ 10 , 10 ] ;
129+ if ( props . style . padding != undefined ) {
130+ const extractedValues = extractMarginValues ( props . style ) ;
131+ if ( extractedValues !== null ) {
132+ paddingValues = extractedValues ;
133+ }
134+ }
128135 return (
129136 < BackgroundColorContext . Provider value = { props . style . background } >
130137 < ModalWrapper >
@@ -153,8 +160,8 @@ let TmpModalComp = (function () {
153160 { ...otherContainerProps }
154161 items = { gridItemCompToGridItems ( items ) }
155162 autoHeight = { props . autoHeight }
156- minHeight = { paddingValues ? DEFAULT_HEIGHT - parseInt ( paddingValues [ 0 ] ) * 2 + "px" : "" }
157- containerPadding = { paddingValues ? [ parseInt ( paddingValues [ 0 ] ) , parseInt ( paddingValues [ 1 ] ) ] : [ 24 , 24 ] }
163+ minHeight = { paddingValues ? DEFAULT_HEIGHT - paddingValues [ 0 ] * 2 + "px" : "" }
164+ containerPadding = { paddingValues ? [ paddingValues [ 0 ] , paddingValues [ 1 ] ] : [ 24 , 24 ] }
158165 hintPlaceholder = { HintPlaceHolder }
159166 />
160167 </ Modal >
0 commit comments