From fbe90bcd852f8c1474f13869006a2e9dcdb6a82b Mon Sep 17 00:00:00 2001
From: Airike Jaska <95303654+airikej@users.noreply.github.com>
Date: Mon, 23 Mar 2026 09:28:20 +0200
Subject: [PATCH] fix(status-badge): add missing forwardRef, update stories
 #546

---
 .../status-badge/status-badge.stories.tsx     | 68 +++++++++++++------
 .../tags/status-badge/status-badge.tsx        |  8 ++-
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/tedi/components/tags/status-badge/status-badge.stories.tsx b/src/tedi/components/tags/status-badge/status-badge.stories.tsx
index b764bf02..65d905da 100644
--- a/src/tedi/components/tags/status-badge/status-badge.stories.tsx
+++ b/src/tedi/components/tags/status-badge/status-badge.stories.tsx
@@ -1,9 +1,11 @@
 import { Meta, StoryFn, StoryObj } from '@storybook/react';
 import { Fragment } from 'react/jsx-runtime';
 
+import { Text } from '../../base/typography/text/text';
 import { Col, Row } from '../../layout/grid';
 import { VerticalSpacing } from '../../layout/vertical-spacing';
-import { StatusBadge, StatusBadgeColor, StatusBadgeProps, StatusBadgeStatus } from './status-badge';
+import { Tooltip } from '../../overlays/tooltip';
+import { StatusBadge, StatusBadgeColor, StatusBadgeProps, StatusBadgeSize, StatusBadgeStatus } from './status-badge';
 
 /**
  * <a href="https://www.figma.com/file/jWiRIXhHRxwVdMSimKX2FF/TEDI-Design-System-(draft)?type=design&node-id=2385-24154&m=dev" target="_BLANK">Figma ↗</a><br/>
@@ -31,9 +33,14 @@ export default meta;
 
 type Story = StoryObj<typeof StatusBadge>;
 
+interface TemplateMultipleProps<Type = StatusBadgeProps['size']> extends StatusBadgeProps {
+  array: Type[];
+}
+
 const colors: StatusBadgeColor[] = ['neutral', 'brand', 'accent', 'warning', 'danger', 'success'];
 const variants: StatusBadgeProps['variant'][] = ['filled', 'filled-bordered', 'bordered'];
 const statuses: StatusBadgeStatus[] = ['inactive', 'success', 'warning', 'danger'];
+const sizeArray: StatusBadgeSize[] = ['default', 'large'];
 const colorToIconMap: Record<StatusBadgeColor, string> = {
   neutral: 'edit',
   brand: 'send',
@@ -43,6 +50,7 @@ const colorToIconMap: Record<StatusBadgeColor, string> = {
   warning: 'warning',
   transparent: 'edit',
 };
+
 const statusToIconMap: Record<StatusBadgeStatus, string> = {
   inactive: 'edit',
   success: 'send',
@@ -139,6 +147,35 @@ const TemplateStatusGrid: StoryFn<StatusBadgeProps> = (args) => {
   );
 };
 
+const TemplateColumn: StoryFn<TemplateMultipleProps> = (args) => {
+  const { array } = args;
+
+  return (
+    <div className="example-list">
+      {array.map((value, key) => (
+        <Row className={`${key === array.length - 1 ? '' : 'border-bottom'} padding-14-16`} key={key}>
+          <Col width={6}>
+            <Text modifiers="bold">{value ? value.charAt(0).toUpperCase() + value.slice(1) : ''}</Text>
+          </Col>
+          <Col className="display-flex gap-2">
+            <StatusBadge {...args} color="neutral" size={array[key]} />
+            <StatusBadge {...args} color="neutral" size={array[key]} status="success" />
+          </Col>
+        </Row>
+      ))}
+    </div>
+  );
+};
+
+export const Sizes: StoryObj<TemplateMultipleProps> = {
+  render: TemplateColumn,
+  args: {
+    array: sizeArray,
+    children: 'Draft',
+    color: 'neutral',
+  },
+};
+
 export const Colors: Story = {
   render: TemplateAllCombos,
 };
@@ -150,22 +187,15 @@ export const StatusIndicator: Story = {
   },
 };
 
-const TemplateLarge: StoryFn<StatusBadgeProps> = (args) => (
-  <Row>
-    <Col width="auto">
-      <StatusBadge {...args} />
-    </Col>
-    <Col width="auto">
-      <StatusBadge {...args} status="success" />
-    </Col>
-  </Row>
-);
-
-export const Large: Story = {
-  render: TemplateLarge,
-  args: {
-    color: 'neutral',
-    size: 'large',
-    children: 'Draft',
-  },
+export const WithTooltip: StoryFn<StatusBadgeProps> = () => {
+  return (
+    <Tooltip placement="top">
+      <Tooltip.Trigger>
+        <StatusBadge color="warning" icon="warning" />
+      </Tooltip.Trigger>
+      <Tooltip.Content>
+        Icon-only badges should always have a tooltip to provide context and ensure accessibility.
+      </Tooltip.Content>
+    </Tooltip>
+  );
 };
diff --git a/src/tedi/components/tags/status-badge/status-badge.tsx b/src/tedi/components/tags/status-badge/status-badge.tsx
index a2ee589c..27e809c5 100644
--- a/src/tedi/components/tags/status-badge/status-badge.tsx
+++ b/src/tedi/components/tags/status-badge/status-badge.tsx
@@ -1,4 +1,5 @@
 import cn from 'classnames';
+import { forwardRef } from 'react';
 
 import { BreakpointSupport, useBreakpointProps } from '../../../helpers';
 import { Icon } from '../../base/icon/icon';
@@ -60,7 +61,7 @@ export interface StatusBadgeProps extends BreakpointSupport<StatusBadgePropsBrea
   role?: React.AriaRole;
 }
 
-export const StatusBadge = (props: StatusBadgeProps): JSX.Element => {
+export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>((props, ref) => {
   const { getCurrentBreakpointProps } = useBreakpointProps(props.defaultServerBreakpoint);
   const {
     color = 'neutral',
@@ -93,6 +94,7 @@ export const StatusBadge = (props: StatusBadgeProps): JSX.Element => {
 
   return (
     <BadgeElement
+      ref={ref}
       className={badgeClass}
       id={id}
       title={title}
@@ -104,4 +106,6 @@ export const StatusBadge = (props: StatusBadgeProps): JSX.Element => {
       {children && <span className={styles['tedi-status-badge__inner-text']}>{children}</span>}
     </BadgeElement>
   );
-};
+});
+
+StatusBadge.displayName = 'StatusBadge';