Siklos/svg-layout-designer-react
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' of https://techformsa.visualstudio.com/SmartConfigurator/_git/SVGLayoutDesignerReact into dev

Browse source
This commit is contained in:
Guillaume Tauzin 2022-11-04 15:44:41 +01:00
commit acc99a1f56
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Components/Editor/Actions/AddContainer.ts
View file

@ -121,7 +121,7 @@ function AddNewContainerToParent(
throw new Error(`[AddContainer] Object type not found among default config. Found: ${type}`); throw new Error(`[AddContainer] Object type not found among default config. Found: ${type}`);
} }
const containerConfig = Object.assign(defaultConfig, availableContainer); const containerConfig = Object.assign(structuredClone(defaultConfig), availableContainer);
// Default margin // Default margin
const left: number = containerConfig.Margin?.left ?? 0; const left: number = containerConfig.Margin?.left ?? 0;

11
src/Components/ElementsList/ElementsList.tsx
View file

@ -202,6 +202,7 @@ function ElementsListRow(
for (let i = 0; i < depth; i++) { for (let i = 0; i < depth; i++) {
verticalBars.push( verticalBars.push(
<span <span
key={`${key}-${i}`}
className={`h-full border-l-2 pr-2 ${verticalBarSelectedClass}`} className={`h-full border-l-2 pr-2 ${verticalBarSelectedClass}`}
></span> ></span>
); );
@ -213,7 +214,7 @@ function ElementsListRow(
return <button type="button" return <button type="button"
className={`transition-all border-blue-500 hover:shadow-lg elements-sidebar-row whitespace-pre className={`transition-all border-blue-500 hover:shadow-lg elements-sidebar-row whitespace-pre
text-left text-sm font-medium inline-flex group ${container.properties.type} ${buttonSelectedClass}`} text-left text-sm font-medium flex items-center align-middle group ${container.properties.type} ${buttonSelectedClass}`}
id={key} id={key}
key={key} key={key}
style={style} style={style}
@ -224,10 +225,8 @@ function ElementsListRow(
onDragLeave={(event) => HandleDragLeave(event)} onDragLeave={(event) => HandleDragLeave(event)}
> >
{verticalBars} {verticalBars}
<div className='pt-2 pb-2 inline-flex'> {text}
{text} {container.properties.warning.length > 0 &&
{container.properties.warning.length > 0 && <ExclamationTriangleIcon className='pl-2 w-7' />}
<ExclamationTriangleIcon className='pl-2 w-7' />}
</div>
</button>; </button>;
} }