Skip to content

Fix OrganizationChart connector layout for large child counts #8454

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

Merged
melloware merged 5 commits into from
Jan 1, 2026
+170 −115
Merged

Fix OrganizationChart connector layout for large child counts #8454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
789ec15
Docs: clarify locale precedence when using PrimeReactProvider
Coderxrohan Dec 31, 2025
2b51f7d
Docs: format locale setup documentation
Coderxrohan Dec 31, 2025
bc98b39
Fix OrganizationChart connector layout for large child counts
Coderxrohan Dec 31, 2025
ce8a02f
style: format OrganizationChartNode with Prettier
Coderxrohan Dec 31, 2025
e8586d0
style: fix ESLint padding rules in OrganizationChartNode
Coderxrohan Dec 31, 2025
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
32 changes: 29 additions & 3 deletions components/doc/configuration/locale/setuplocaledoc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DocSectionText } from '@/components/doc/common/docsectiontext';
export function SetupLocaleDoc(props) {
const code = {
basic: `
//_app.js
// _app.js
import { PrimeReactProvider } from 'primereact/api';

export default function MyApp({ Component }) {
Expand All @@ -15,7 +15,7 @@ export default function MyApp({ Component }) {

return (
<PrimeReactProvider value={value}>
<App />
<Component />
</PrimeReactProvider>
);
}
Expand All @@ -26,9 +26,35 @@ export default function MyApp({ Component }) {
<>
<DocSectionText {...props}>
<p>
To establish the default locale for your entire application, you can utilize the <i>PrimeReactProvider</i>.
To establish the default locale for your entire application, you can utilize the
<i> PrimeReactProvider</i>.
</p>

<p>
When <b>PrimeReactProvider</b> is used, it becomes the primary source of locale configuration for all PrimeReact components.
</p>

<h5>Locale Precedence</h5>
<p>Locale resolution follows the order below:</p>
<ul>
<li>
<code>locale</code> prop defined on a component
</li>
<li>
<code>PrimeReactProvider</code> (<code>context.locale</code>)
</li>
<li>
Global <code>PrimeReact.locale</code> set via <code>locale()</code>
</li>
<li>Browser locale</li>
</ul>

<p>
This means that once <b>PrimeReactProvider</b> is present, calling
<code> locale()</code> alone is not sufficient. The locale must be provided explicitly through the provider.
</p>
</DocSectionText>

<DocSectionCode code={code} hideToggleCode import hideStackBlitz />
</>
);
Expand Down
253 changes: 141 additions & 112 deletions components/lib/organizationchart/OrganizationChartNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,23 @@ import { ChevronDownIcon } from '../icons/chevrondown';
import { ChevronUpIcon } from '../icons/chevronup';
import { IconUtils, ObjectUtils } from '../utils/Utils';

const chunkArray = (array, size) => {
const result = [];

for (let i = 0; i < array.length; i += size) {
result.push(array.slice(i, i + size));
}

return result;
};

const MAX_CHILDREN_PER_ROW = 10;

export const OrganizationChartNode = React.memo((props) => {
const mergeProps = useMergeProps();
const node = props.node;
const [expandedState, setExpandedState] = React.useState(node.expanded);
const leaf = node.leaf === false ? false : !(node.children && node.children.length);
const colspan = node.children && node.children.length ? node.children.length * 2 : null;
const selected = props.isSelected(node);
const visibility = !leaf && expandedState ? 'inherit' : 'hidden';
const { ptm, cx, sx } = props;
Expand Down Expand Up @@ -56,133 +67,140 @@ export const OrganizationChartNode = React.memo((props) => {
}
};

const createChildNodes = () => {
const nodesProps = mergeProps(
{
className: cx('nodes'),
style: { visibility }
},
_ptm('nodes')
);
const nodeCellProps = mergeProps(
{
colSpan: '2'
},
_ptm('nodeCell')
);
const createChildNodes = (row) => {
if (!node.children || node.expanded === false) {
return null;
}

return (
<tr {...nodesProps}>
{node.children &&
node.children.map((child, index) => {
return (
<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 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 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>
);
});
};

const createLinesMiddle = () => {
const nodeChildLength = node.children && node.children.length;
const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);
const lineCellProps = mergeProps(
{
colSpan: colspan
},
_ptm('lineCell')
);
const lineDownProps = mergeProps(
{
className: cx('lineDown')
},
_ptm('lineDown')
);
const createLinesMiddle = (row) => {
if (!node.children || node.expanded === false) {
return null;
}

return (
<tr {...linesProps}>
{node.children && node.children.length === 1 && (
<td {...lineCellProps}>
<div {...lineDownProps} />
</td>
)}
{node.children &&
node.children.length > 1 &&
node.children.map((_, index) => {
const rows = chunkArray(node.children, MAX_CHILDREN_PER_ROW);

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

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 [
<td key={index + '_lineleft'} {...lineLeftProps}>
&nbsp;
</td>,
<td key={index + '_lineright'} {...lineRightProps}>
&nbsp;
</td>
];
return (
<React.Fragment key={index}>
<td {...lineLeftProps}>&nbsp;</td>
<td {...lineRightProps}>&nbsp;</td>
</React.Fragment>
);
})}
</tr>
);
</tr>
);
});
};

const createLinesDown = () => {
const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);
const createLinesDown = (row) => {
if (!node.children || node.expanded === false) {
return null;
}

const lineCellProps = mergeProps(
{
colSpan: colspan
},
_ptm('lineCell')
);
const rows = chunkArray(node.children, MAX_CHILDREN_PER_ROW);

const lineDownProps = mergeProps(
{
className: cx('lineDown')
},
_ptm('lineDown')
);
return rows.map((row, rowIndex) => {
const colspan = row.length * 2;

return (
<tr {...linesProps}>
<td {...lineCellProps}>
<div {...lineDownProps} />
</td>
</tr>
);
const linesProps = mergeProps(
{
className: cx('lines'),
style: { visibility }
},
_ptm('lines')
);

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

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

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

const createToggler = () => {
Expand Down Expand Up @@ -239,7 +257,7 @@ export const OrganizationChartNode = React.memo((props) => {

const cellProps = mergeProps(
{
colSpan: colspan
colSpan: node.children && node.children.length ? Math.min(node.children.length, MAX_CHILDREN_PER_ROW) * 2 : 2
},
_ptm('cell')
);
Expand Down Expand Up @@ -268,9 +286,22 @@ export const OrganizationChartNode = React.memo((props) => {
};

const nodeContent = createNodeContent();
const linesDown = createLinesDown();
const linesMiddle = createLinesMiddle();
const childNodes = createChildNodes();

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

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

return rows.map((row, rowIndex) => (
<React.Fragment key={rowIndex}>
{createLinesDown(row)}
{createLinesMiddle(row)}
{createChildNodes(row)}
</React.Fragment>
));
};

const tableProps = mergeProps(
{
Expand All @@ -283,9 +314,7 @@ export const OrganizationChartNode = React.memo((props) => {
<table {...tableProps}>
<tbody>
{nodeContent}
{linesDown}
{linesMiddle}
{childNodes}
{createChildrenSection()}
</tbody>
</table>
);
Expand Down
Loading