add flex processing to mergeStyles

Workday · May 8, 2024 · 63791b2 · 63791b2
1 parent 9ad9f2a
commit 63791b2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/react/layout/lib/utils/mergeStyles.ts b/modules/react/layout/lib/utils/mergeStyles.ts
@@ -1,5 +1,6 @@
 import {CSToPropsInput, handleCsProp} from '@workday/canvas-kit-styling';
 import {boxStyleFn} from '../Box';
+import {flex} from '../utils/flex';
 import {backgroundStyleFnConfigs} from './background';
 import {borderStyleFnConfigs} from './border';
 import {colorStyleFnConfigs} from './color';
@@ -77,7 +78,7 @@ export function mergeStyles<T extends {}>(
   // We have style props. We need to create style and merge with our `csToProps` to get the correct
   // merging order for styles
   if (shouldRuntimeMergeStyles) {
-    styles = boxStyleFn(styleProps);
+    styles = {...boxStyleFn(styleProps), ...flex(styleProps)};
   }
 
   return handleCsProp(elemProps, [localCs, styles]) as Omit<T, 'cs' | keyof CommonStyleProps>;