Skip to content

perf(button): memoize icon, label and badge rendering #8530

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
sudheerchauhan452-lab wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −15
Open

perf(button): memoize icon, label and badge rendering #8530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6958091
perf(button): memoize icon, label and badge rendering
SudheerCnEL Apr 15, 2026
010349b
style(button): fix prettier formatting
SudheerCnEL Apr 15, 2026
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
30 changes: 15 additions & 15 deletions components/lib/button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ export const Button = React.memo(
ObjectUtils.combinedRefs(elementRef, ref);
}, [elementRef, ref]);

if (props.visible === false) {
return null;
}

const createIcon = () => {
const icon = React.useMemo(() => {
let className = classNames('p-button-icon p-c', {
[`p-button-icon-${props.iconPos}`]: props.label
});
Expand All @@ -61,12 +57,12 @@ export const Button = React.memo(
ptm('loadingIcon')
);

const icon = props.loading ? props.loadingIcon || <SpinnerIcon {...loadingIconProps} spin /> : props.icon;
const iconValue = props.loading ? props.loadingIcon || <SpinnerIcon {...loadingIconProps} spin /> : props.icon;

return IconUtils.getJSXIcon(icon, { ...iconsProps }, { props });
};
return IconUtils.getJSXIcon(iconValue, { ...iconsProps }, { props });
}, [props.icon, props.loading, props.iconPos, props.loadingIcon, props.label, mergeProps, ptm, cx]);

const createLabel = () => {
const label = React.useMemo(() => {
const labelProps = mergeProps(
{
className: cx('label')
Expand All @@ -79,9 +75,9 @@ export const Button = React.memo(
}

return !props.children && !props.label && <span {...labelProps} dangerouslySetInnerHTML={{ __html: '&nbsp;' }} />;
};
}, [props.label, props.children, mergeProps, ptm, cx]);

const createBadge = () => {
const badge = React.useMemo(() => {
if (props.badge) {
const badgeProps = mergeProps(
{
Expand All @@ -97,19 +93,23 @@ export const Button = React.memo(
}

return null;
};
}, [props.badge, props.badgeClassName, props.unstyled, mergeProps, ptm, metaData]);

// ✅ AFTER hooks (important)
if (props.visible === false) {
return null;
}

const showTooltip = !disabled || (props.tooltipOptions && props.tooltipOptions.showOnDisabled);
const hasTooltip = ObjectUtils.isNotEmpty(props.tooltip) && showTooltip;

const sizeMapping = {
large: 'lg',
small: 'sm'
};

const size = sizeMapping[props.size];

const icon = createIcon();
const label = createLabel();
const badge = createBadge();
const defaultAriaLabel = props.label ? props.label + (props.badge ? ' ' + props.badge : '') : props['aria-label'];

const rootProps = mergeProps(
Expand Down
Loading