chore: Merge support into master (#3002)

Co-authored-by: @mannycarrera4 <[email protected]>
Co-authored-by: manuel.carrera <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [v11.1.18](https://github.com/Workday/canvas-kit/releases/tag/v11.1.18) (2024-10-23)
+
+### Components
+
+- fix: Ensure button label icon uses rem ([#3001](https://github.com/Workday/canvas-kit/pull/3001)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera)
 ## [v12.0.5](https://github.com/Workday/canvas-kit/releases/tag/v12.0.5) (2024-10-23)
 
 ### Documentation

modules/react/button/lib/parts/ButtonLabelIcon.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {ButtonSizes} from '../types';
 import {createComponent} from '@workday/canvas-kit-react/common';
 import {SystemIcon, SystemIconProps} from '@workday/canvas-kit-react/icon';
+import {px2rem} from '@workday/canvas-kit-styling';
 
 export interface ButtonLabelIconProps extends Partial<SystemIconProps> {
   /**
@@ -42,8 +43,8 @@ export const ButtonLabelIcon = createComponent('span')({
         size={iconSize}
         icon={icon}
         shouldMirror={shouldMirrorIcon}
-        width={size ? iconSizes[size] : iconSizes.large}
-        height={size ? iconSizes[size] : iconSizes.large}
+        width={px2rem(iconSize)}
+        height={px2rem(iconSize)}
         display="inline-block"
         {...elemProps}
       />