simplify logic into more generic prop

Author: kmcfaul

packages/react-icons/src/__tests__/createIcon.test.tsx

@@ -65,13 +65,13 @@ test('sets correct svgClassName by default', () => {
   expect(screen.getByRole('img', { hidden: true })).toHaveClass('pf-v6-icon-rh-standard');
 });
 
-test('sets svgClassName when noStandardSetStyling is false', () => {
-  render(<RhStandardIcon noStandardSetStyling={false} />);
+test('sets svgClassName when noDefaultStyle is false', () => {
+  render(<RhStandardIcon noDefaultStyle={false} />);
   expect(screen.getByRole('img', { hidden: true })).toHaveClass('pf-v6-icon-rh-standard');
 });
 
-test('does not set svgClassName when noStandardSetStyling is true', () => {
-  render(<RhStandardIcon noStandardSetStyling />);
+test('does not set svgClassName when noDefaultStyle is true', () => {
+  render(<RhStandardIcon noDefaultStyle />);
   expect(screen.getByRole('img', { hidden: true })).not.toHaveClass('pf-v6-icon-rh-standard');
 });
 

packages/react-icons/src/createIcon.tsx

@@ -24,10 +24,10 @@ export interface CreateIconProps {
 export interface SVGIconProps extends Omit<React.HTMLProps<SVGElement>, 'ref'> {
   title?: string;
   className?: string;
-  /* Indicates the icon should render using alternate svg data for unified theme */
+  /** Indicates the icon should render using alternate svg data for the unified theme */
   set?: 'default' | 'rh-ui';
-  /** Applicable to RH standard icons only. Indicates the icon should render without the standard set styling. */
-  noStandardSetStyling?: boolean;
+  /** Indicates the icon should render without its default styling specified in its IconDefinition.svgClassName. */
+  noDefaultStyle?: boolean;
 }
 
 let currentId = 0;
@@ -73,15 +73,15 @@ export function createIcon({ name, icon, rhUiIcon = null }: CreateIconProps): Re
     id = `icon-title-${currentId++}`;
 
     static defaultProps: SVGIconProps = {
-      noStandardSetStyling: false
+      noDefaultStyle: false
     };
 
     constructor(props: SVGIconProps) {
       super(props);
     }
 
     render() {
-      const { title, className: propsClassName, set, noStandardSetStyling, ...props } = this.props;
+      const { title, className: propsClassName, set, noDefaultStyle, ...props } = this.props;
 
       const hasTitle = Boolean(title);
       const classNames = ['pf-v6-svg'];
@@ -104,14 +104,8 @@ export function createIcon({ name, icon, rhUiIcon = null }: CreateIconProps): Re
         const _yOffset = yOffset ?? 0;
         const viewBox = [_xOffset, _yOffset, width, height].join(' ');
 
-        if (svgClassName) {
-          if (svgClassName !== 'pf-v6-icon-rh-standard') {
-            classNames.push(svgClassName);
-          } else {
-            if (!noStandardSetStyling) {
-              classNames.push(svgClassName);
-            }
-          }
+        if (svgClassName && !noDefaultStyle) {
+          classNames.push(svgClassName);
         }
 
         const svgPaths =