Skip to content

fix(OrganizationChart): prevent duplicate child rows when chunking #8541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaibavdk-pieq wants to merge 1 commit into
base: master
Choose a base branch
from
+93 −107
Open

fix(OrganizationChart): prevent duplicate child rows when chunking #8541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 93 additions & 107 deletions components/lib/organizationchart/OrganizationChartNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,135 +72,121 @@ export const OrganizationChartNode = React.memo((props) => {
return null;
}

const rows = chunkArray(node.children, MAX_CHILDREN_PER_ROW);

return rows.map((row, rowIndex) => {
const colspan = row.length * 2;

const nodesProps = mergeProps(
{
className: cx('nodes'),
style: { visibility }
},
_ptm('nodes')
);
const nodesProps = mergeProps(
{
className: cx('nodes'),
style: { visibility }
},
_ptm('nodes')
);

const nodeCellProps = mergeProps(
{
colSpan: '2'
},
_ptm('nodeCell')
);
const nodeCellProps = mergeProps(
{
colSpan: '2'
},
_ptm('nodeCell')
);

return (
<tr {...nodesProps} key={rowIndex}>
{row.map((child, index) => (
<td key={index} {...nodeCellProps}>
<OrganizationChartNode
node={child}
nodeTemplate={props.nodeTemplate}
selectionMode={props.selectionMode}
onNodeClick={props.onNodeClick}
isSelected={props.isSelected}
togglerIcon={props.togglerIcon}
ptm={ptm}
cx={cx}
sx={sx}
/>
</td>
))}
</tr>
);
});
return (
<tr {...nodesProps}>
{row.map((child, index) => (
<td key={index} {...nodeCellProps}>
<OrganizationChartNode
node={child}
nodeTemplate={props.nodeTemplate}
selectionMode={props.selectionMode}
onNodeClick={props.onNodeClick}
isSelected={props.isSelected}
togglerIcon={props.togglerIcon}
ptm={ptm}
cx={cx}
sx={sx}
/>
</td>
))}
</tr>
);
};

const createLinesMiddle = (row) => {
if (!node.children || node.expanded === false) {
return null;
}

const rows = chunkArray(node.children, MAX_CHILDREN_PER_ROW);

return rows.map((row, rowIndex) => {
const nodeChildLength = row.length;
const nodeChildLength = row.length;

const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);
const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);

return (
<tr {...linesProps} key={rowIndex}>
{row.map((_, index) => {
const lineLeftProps = mergeProps(
{
className: cx('lineLeft', { index })
},
getNodePTOptions(index !== 0, 'lineLeft')
);

const lineRightProps = mergeProps(
{
className: cx('lineRight', { index, nodeChildLength })
},
getNodePTOptions(index !== nodeChildLength - 1, 'lineRight')
);

return (
<React.Fragment key={index}>
<td {...lineLeftProps}>&nbsp;</td>
<td {...lineRightProps}>&nbsp;</td>
</React.Fragment>
);
})}
</tr>
);
});
return (
<tr {...linesProps}>
{row.map((_, index) => {
const lineLeftProps = mergeProps(
{
className: cx('lineLeft', { index })
},
getNodePTOptions(index !== 0, 'lineLeft')
);

const lineRightProps = mergeProps(
{
className: cx('lineRight', { index, nodeChildLength })
},
getNodePTOptions(index !== nodeChildLength - 1, 'lineRight')
);

return (
<React.Fragment key={index}>
<td {...lineLeftProps}>&nbsp;</td>
<td {...lineRightProps}>&nbsp;</td>
</React.Fragment>
);
})}
</tr>
);
};

const createLinesDown = (row) => {
if (!node.children || node.expanded === false) {
return null;
}

const rows = chunkArray(node.children, MAX_CHILDREN_PER_ROW);

return rows.map((row, rowIndex) => {
const colspan = row.length * 2;
const colspan = row.length * 2;

const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);
const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);

const lineCellProps = mergeProps(
{
colSpan: colspan
},
_ptm('lineCell')
);
const lineCellProps = mergeProps(
{
colSpan: colspan
},
_ptm('lineCell')
);

const lineDownProps = mergeProps(
{
className: cx('lineDown')
},
_ptm('lineDown')
);
const lineDownProps = mergeProps(
{
className: cx('lineDown')
},
_ptm('lineDown')
);

return (
<tr {...linesProps} key={rowIndex}>
<td {...lineCellProps}>
<div {...lineDownProps} />
</td>
</tr>
);
});
return (
<tr {...linesProps}>
<td {...lineCellProps}>
<div {...lineDownProps} />
</td>
</tr>
);
};

const createToggler = () => {
Expand Down