Refactor(web-react): Grid useGridStylesProps use new hooks for genera…

…ting classes - uses new hook for generate alignment classes
lmc-eu · Aug 26, 2024 · b96c4e7 · b96c4e7
1 parent 70313d6
commit b96c4e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 34 deletions.
diff --git a/packages/web-react/src/components/Grid/useGridStyleProps.ts b/packages/web-react/src/components/Grid/useGridStyleProps.ts
@@ -1,15 +1,10 @@
 import classNames from 'classnames';
 import { CSSProperties, ElementType } from 'react';
 import { DirectionAxis } from '../../constants';
-import { useClassNamePrefix, useSpacingStyle } from '../../hooks';
-import { GridColsBreakpoints, GridCustomLayoutProps, SpiritGridProps } from '../../types';
+import { useAlignmentClass, useClassNamePrefix, useSpacingStyle } from '../../hooks';
+import { GridColsBreakpoints, SpiritGridProps } from '../../types';
 
-type AlignmentOrCols =
-  | string
-  | number
-  | Pick<GridCustomLayoutProps, 'alignmentX' | 'alignmentY' | 'cols'>
-  | GridColsBreakpoints
-  | undefined;
+type AlignmentOrCols = number | GridColsBreakpoints | undefined;
 
 interface GridCSSProperties extends CSSProperties {
   [key: string]: string | undefined | number;
@@ -24,14 +19,6 @@ export interface GridStyles<T> {
   styleProps: GridCSSProperties;
 }
 
-function capitalizeFirstLetter(str: string): string {
-  if (typeof str !== 'string') {
-    return str;
-  }
-
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
 export function useGridStyleProps(props: SpiritGridProps<ElementType>): GridStyles<SpiritGridProps<ElementType>> {
   const { alignmentX, alignmentY, cols, spacing, spacingX, spacingY, ...restProps } = props;
 
@@ -46,36 +33,26 @@ export function useGridStyleProps(props: SpiritGridProps<ElementType>): GridStyl
     ...useSpacingStyle(spacingY, 'grid', DirectionAxis.Y),
   };
 
-  function generateGridClass(componentClass: string, property: AlignmentOrCols, type: string) {
+  function generateColsClasses(componentClass: string, property: AlignmentOrCols, type: string) {
     if (typeof property === 'object' && property !== null) {
-      // If the property is an object, we need to check if the mobile property is set.
-      // If not, we set it to stretch
-      if (!Object.keys(property).includes('mobile')) {
-        (property as Record<string, string>).mobile = 'stretch';
-      }
-
       // We map over the object and generate the classes for each breakpoint
       return Object.keys(property)
         .map((key) => {
           const infix = key === 'mobile' ? '' : `--${key}`;
           const responsiveProperty = (property as Record<string, string>)[key];
 
-          return `${componentClass}${infix}--${type}${
-            responsiveProperty && typeof responsiveProperty === 'string'
-              ? capitalizeFirstLetter(responsiveProperty)
-              : `-${responsiveProperty}`
-          }`;
+          return `${componentClass}${infix}--${type}-${responsiveProperty}`;
         })
         .join(' ');
     }
 
-    return `${componentClass}--${type}${property && typeof property === 'string' ? capitalizeFirstLetter(property) : `-${property}`}`;
+    return `${componentClass}--${type}-${property}`;
   }
 
   const classes = classNames(gridClass, {
-    [generateGridClass(gridClass, alignmentX, 'alignmentX')]: alignmentX,
-    [generateGridClass(gridClass, alignmentY, 'alignmentY')]: alignmentY,
-    [generateGridClass(gridClass, cols, 'cols')]: cols,
+    [useAlignmentClass(gridClass, alignmentX, 'alignmentX')]: alignmentX,
+    [useAlignmentClass(gridClass, alignmentY, 'alignmentY')]: alignmentY,
+    [generateColsClasses(gridClass, cols, 'cols')]: cols,
   });
 
   return {

diff --git a/packages/web-react/src/types/grid.ts b/packages/web-react/src/types/grid.ts
@@ -41,9 +41,12 @@ export interface GridItemElementTypeProps<T extends ElementType = 'div'> {
   elementType?: T | JSXElementConstructor<unknown>;
 }
 
+type OmittedAlignmentXExtended = Omit<AlignmentXExtendedDictionaryType, 'space-between'>
+type OmittedAlignmentYExtended = Omit<AlignmentYExtendedDictionaryType, 'baseline'>
+
 export interface GridCustomLayoutProps {
-  alignmentX?: AlignmentXExtendedDictionaryType | { [key: string]: AlignmentXExtendedDictionaryType };
-  alignmentY?: AlignmentYExtendedDictionaryType | { [key: string]: AlignmentYExtendedDictionaryType };
+  alignmentX?: OmittedAlignmentXExtended| { [key: string]: OmittedAlignmentXExtended };
+  alignmentY?: OmittedAlignmentYExtended | { [key: string]: OmittedAlignmentYExtended };
   cols?: GridColumns | GridColsBreakpoints;
   /** Custom spacing between items */
   spacing?: SpaceToken | Partial<Record<BreakpointToken, SpaceToken>>;