Commit14cc9d8

committed

Changed div to a generic container with prop "as" that can use a custom tag instead of default "div"

* Div exists now, but may be removed in the future in favour of the new Html component* Html component should be used from now on

1 parentf0de89a commit14cc9d8Copy full SHA for 14cc9d8

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,28 @@ import Element from '../Element';`
`4`	`4`	`importPropTypesfrom'prop-types';`
`5`	`5`	`import{joinNames}from'../utils';`
`6`	`6`
`7`		`-constDiv=({`
`8`		`-config:{name:containerName='', elements, htmlClass, comment, commentClass='text-muted d-block mb-3'}`
	`7`	`+constHtmlTag=({`
	`8`	`+config:{`
	`9`	`+name:containerName='',`
	`10`	`+as:Component='div',`
	`11`	`+ elements,`
	`12`	`+ htmlClass,`
	`13`	`+ comment,`
	`14`	`+ commentClass='text-muted d-block mb-3'`
	`15`	`+}`
`9`	`16`	`})=>(`
`10`		`-<divclassName={htmlClass}>`
	`17`	`+<ComponentclassName={htmlClass}>`
`11`	`18`	`{comment&&<smallclassName={commentClass}>{comment}</small>}`
`12`	`19`	`{_.map(elements,({ name, ...rest},key)=>(`
`13`	`20`	`<Element`
`14`	`21`	`key={key}`
`15`	`22`	`config={{ ...rest,name:joinNames(containerName,name)}}`
`16`	`23`	`/>`
`17`	`24`	`))}`
`18`		`-</div>`
	`25`	`+</Component>`
`19`	`26`	`);`
`20`	`27`
`21`		`-Div.propTypes={`
	`28`	`+HtmlTag.propTypes={`
`22`	`29`	`config:PropTypes.shape({`
`23`	`30`	`name:PropTypes.string,`
`24`	`31`	`elements:PropTypes.object.isRequired,`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`import{registerContainer}from'../registry';`
`2`	`2`
`3`		`-importDivfrom'./Div';`
	`3`	`+importHtmlTagfrom'./HtmlTag';`
`4`	`4`	`importFormfrom'./Form';`
`5`	`5`	`importTabsfrom'./Tabs';`
`6`	`6`	`importFieldsetfrom'./Fieldset';`
`7`	`7`	`importButtonGroupfrom'./ButtonGroup';`
`8`	`8`	`importEditableGridfrom'./EditableGrid';`
`9`	`9`
`10`		`-registerContainer('div',Div);`
	`10`	`+registerContainer('div',HtmlTag);`
	`11`	`+registerContainer('html-tag',HtmlTag);`
`11`	`12`	`registerContainer('form',Form);`
`12`	`13`	`registerContainer('tabs',Tabs);`
`13`	`14`	`registerContainer('fieldset',Fieldset);`

Comments

(0)