Merge branch 'main' into enhance-plex-support-storybook

carbon-design-system · Sep 3, 2024 · 0532e00 · 0532e00
2 parents f95c334 + 3fcf739
commit 0532e00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -24,9 +24,9 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
diff --git a/packages/react/src/components/Grid/Column.tsx b/packages/react/src/components/Grid/Column.tsx
@@ -385,12 +385,16 @@ function getClassNameForBreakpoints(
     if (typeof breakpoint === 'object') {
       const { span, offset, start, end } = breakpoint;
 
-      if (typeof offset === 'number' && offset > 0) {
-        classNames.push(`${prefix}--${name}:col-start-${offset + 1}`);
+      if (typeof offset === 'number') {
+        classNames.push(
+          `${prefix}--${name}:col-start-${offset > 0 ? offset + 1 : 'auto'}`
+        );
       }
 
       if (typeof start === 'number') {
-        classNames.push(`${prefix}--${name}:col-start-${start}`);
+        classNames.push(
+          `${prefix}--${name}:col-start-${start ? start : 'auto'}`
+        );
       }
 
       if (typeof end === 'number') {