@codecademy/styleguide 78.5.6-alpha.abebfb.0 → 78.5.6-alpha.ce723a.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-### [78.5.6-alpha.abebfb.0](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@78.5.5...@codecademy/styleguide@78.5.6-alpha.abebfb.0) (2026-01-20)
+### [78.5.6-alpha.ce723a.0](https://github.com/Codecademy/gamut/compare/@codecademy/styleguide@78.5.5...@codecademy/styleguide@78.5.6-alpha.ce723a.0) (2026-01-26)
 
 **Note:** Version bump only for package @codecademy/styleguide
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@codecademy/styleguide",
   "description": "Styleguide & Component library for codecademy.com",
-  "version": "78.5.6-alpha.abebfb.0",
+  "version": "78.5.6-alpha.ce723a.0",
   "author": "Codecademy Engineering",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
   "repository": "git@github.com:Codecademy/gamut.git",
-  "gitHead": "bb48e953c9bd7f75ef8f34e6f61d19b40db48901"
+  "gitHead": "94d68b577f706e7cef78c2045545e3350b492526"
 }

package/src/lib/Atoms/FormElements/FormGroup/FormGroup.mdx

@@ -69,6 +69,12 @@ A field can include <LinkTo id="Molecules/Tips/InfoTip"> our existing `InfoTip`<
 
 <Canvas of={FormGroupStories.HighEmphasisInfoTip} />
 
+#### Accessibility
+
+InfoTip buttons are automatically labelled by string field labels for accessibility - you can override this behaviour if needed by passing `ariaLabel` or `ariaLabelledBy` to the field's `InfoTip` via the `infoTipProps` object.
+
+<Canvas of={FormGroupStories.InfoTipAutoLabelling} />
+
 ## Playground
 
 <Canvas sourceState="shown" of={FormGroupStories.Default} />

package/src/lib/Atoms/FormElements/FormGroup/FormGroup.stories.tsx

@@ -1,4 +1,4 @@
-import { FormGroup, Input } from '@codecademy/gamut';
+import { Box, FormGroup, Input } from '@codecademy/gamut';
 import type { Meta, StoryObj } from '@storybook/react';
 import type { TypeWithDeepControls } from 'storybook-addon-deep-controls';
 
@@ -6,9 +6,7 @@ import { infotipNestedArgTypes } from '~styleguide/argTypes';
 
 const meta: TypeWithDeepControls<Meta<typeof FormGroup>> = {
   component: FormGroup,
-  argTypes: {
-    ...infotipNestedArgTypes,
-  },
+  argTypes: { ...infotipNestedArgTypes },
 };
 
 export default meta;
@@ -97,3 +95,46 @@ export const HighEmphasisInfoTip: Story = {
     children: <Input />,
   },
 };
+
+const InfoTipLabellingExamples = () => {
+  return (
+    <Box display="flex" flexDirection="column" gap={32}>
+      <FormGroup
+        htmlFor="auto-label-input"
+        infotip={{
+          info: 'We will never share your email with third parties.',
+        }}
+        label="Auto-labelling (default)"
+      >
+        <Input htmlFor="auto-label-input" type="email" />
+      </FormGroup>
+
+      <FormGroup
+        htmlFor="aria-label-input"
+        infotip={{
+          ariaLabel: 'Email privacy information',
+          info: 'We will never share your email with third parties.',
+        }}
+        label="With ariaLabel"
+      >
+        <Input htmlFor="aria-label-input" type="email" />
+      </FormGroup>
+
+      <FormGroup
+        htmlFor="aria-labelledby-input"
+        infotip={{
+          ariaLabelledby: 'custom-label-id',
+          info: 'We will never share your email with third parties.',
+        }}
+        label="With ariaLabelledBy"
+      >
+        <span id="custom-label-id">Custom label for InfoTip button</span>
+        <Input htmlFor="aria-labelledby-input" type="email" />
+      </FormGroup>
+    </Box>
+  );
+};
+
+export const InfoTipAutoLabelling: Story = {
+  render: () => <InfoTipLabellingExamples />,
+};

package/src/lib/Atoms/FormInputs/Radio/Radio.mdx

@@ -58,6 +58,14 @@ The `label` is a `ReactNode`, making it customizable outside of a standard text
 
 <Canvas of={RadioStories.CustomLabel} />
 
+## RadioGroup with InfoTip
+
+You can add an InfoTip to a RadioGroup label by wrapping the `RadioGroup` with a `FormGroup` and passing the `infotip` prop. The InfoTip will be automatically linked to the RadioGroup label via `aria-labelledby` for accessibility.
+
+Individual Radio options can also have their own InfoTips, which are automatically linked to their respective labels.
+
+<Canvas of={RadioStories.RadioGroupWithInfoTips} />
+
 ## Playground
 
 <Canvas sourceState="shown" of={RadioStories.Default} />

package/src/lib/Atoms/FormInputs/Radio/Radio.stories.tsx

@@ -1,4 +1,4 @@
-import { Radio, RadioGroup } from '@codecademy/gamut';
+import { FormGroup, Radio, RadioGroup } from '@codecademy/gamut';
 import type { Meta, StoryObj } from '@storybook/react';
 import type { TypeWithDeepControls } from 'storybook-addon-deep-controls';
 
@@ -25,13 +25,47 @@ export const Default: Story = {
 
 export const RadioGroupComponent: Story = {
   render: () => (
-    <RadioGroup htmlForPrefix="example-radio">
-      <Radio htmlFor="example-radio" label="Radio 1" name="example-radio-1" />
-      <Radio htmlFor="example-radio" label="Radio 2" name="example-radio-2" />
+    <RadioGroup htmlForPrefix="example-radio" name="example-radio">
+      <Radio label="Radio 1" />
+      <Radio label="Radio 2" />
     </RadioGroup>
   ),
 };
 
+export const RadioGroupWithInfoTips: Story = {
+  render: () => (
+    <FormGroup
+      htmlFor="example-radio-infotip"
+      infotip={{
+        info: 'This InfoTip is linked to the RadioGroup label. Individual options can also have their own InfoTips.',
+        placement: 'floating',
+      }}
+      label="Select an option"
+      width="fit-content"
+    >
+      <RadioGroup
+        htmlForPrefix="example-radio-infotip"
+        name="example-radio-infotip"
+      >
+        <Radio
+          infotip={{
+            info: 'This option includes additional information about the choice.',
+            placement: 'floating',
+          }}
+          label="Option with InfoTip"
+        />
+        <Radio
+          infotip={{
+            info: 'Each radio option can have its own InfoTip for context.',
+          }}
+          label="Another option"
+        />
+        <Radio label="Option without InfoTip" />
+      </RadioGroup>
+    </FormGroup>
+  ),
+};
+
 export const Checked: Story = {
   args: {
     htmlFor: 'example-checked',

package/src/lib/Molecules/Tips/InfoTip/InfoTip.mdx

@@ -28,8 +28,7 @@ export const parameters = {
 A tip is triggered by clicking on an information icon button and can be closed by clicking outside, pressing <KeyboardKey>Esc</KeyboardKey>, or clicking the info button again.
 
 Use an infotip to provide additional info about a nearby element or content.
-
-Infotip consists of an icon button and the .tip-bg subcomponent. The info button has low and high emphasis variants and the `.tip` has 4 alignment variants.
+The info button has low and high emphasis variants and the `Tip` has 4 alignment variants.
 
 ## Variants
 
@@ -57,17 +56,19 @@ This `floating` variant should only be used as needed.
 
 ### InfoTips with links or buttons
 
-Links or buttons within InfoTips should be used sparingly and only when the information is critical to the user's understanding of the content. If an infotip _absolutely requires_ a link or button, it needs to provide a programmatic focus by way of the `onClick` prop. The `onClick` prop accepts a function that can accept an `{isTipHidden}` argument and using that you can set programmatic focus as needed.
+Links or buttons within InfoTips should be used sparingly and only when the information is critical to the user's understanding of the content. When an InfoTip opens, focus automatically moves to the tip content, allowing keyboard users to immediately interact with any links or buttons inside.
 
 <Canvas of={InfoTipStories.WithLinksOrButtons} />
 
-### Floating placement
+### Automatic Focus Management
 
-When using `placement="floating"`, InfoTips implements focus management for easier navigation:
+InfoTips automatically manage focus for optimal keyboard accessibility:
 
-- **<KeyboardKey>Tab</KeyboardKey>**: Navigate forward through focusable elements (links, buttons) inside the tip. When reaching the last element, wraps back to the InfoTip button for convenience
-- **<KeyboardKey>Shift</KeyboardKey>+<KeyboardKey>Tab</KeyboardKey>**: Navigate backward naturally through the page
-- **<KeyboardKey>Esc</KeyboardKey>**: Closes the tip and returns focus to the InfoTip button
+- **Opening**: Focus automatically moves to the tip content when opened
+- ** <KeyboardKey>Tab</KeyboardKey> (Floating)**: Navigate forward through focusable elements (links, buttons) inside the tip. When reaching the last element, wraps back to the InfoTip button
+- **<KeyboardKey>Shift </KeyboardKey> + <KeyboardKey>Tab</KeyboardKey> (Floating)**: Navigate backward naturally - from the button, exits to the previous page element
+- **<KeyboardKey>Tab</KeyboardKey> or <KeyboardKey>Shift</KeyboardKey> +<KeyboardKey>Tab</KeyboardKey> (Inline)**: Follows normal document flow
+- **<KeyboardKey>Escape</KeyboardKey>**: Closes the tip and returns focus to the InfoTip button
 
 <Canvas of={InfoTipStories.KeyboardNavigation} />
 
@@ -82,6 +83,21 @@ InfoTips have intelligent Escape key handling that works correctly both inside a
 
 <Canvas of={InfoTipStories.InfoTipInsideModal} />
 
+## Custom Accessible Labeling
+
+Provide either `ariaLabel` or `ariaLabelledby` to ensure screen reader users understand the purpose of the InfoTip button.
+
+The InfoTip button's accessible label can be customized using either prop:
+
+- **`ariaLabel`**: Directly sets the accessible label text. Useful when you want to provide a custom label without referencing another element.
+- **`ariaLabelledby`**: References the ID of another element to use as the label. Useful when you want the InfoTip button to be labeled by visible text elsewhere on the page. This is useful for when the `InfoTip` is beside text that contextualizes it.
+
+### Custom Role Description
+
+The `InfoTipButton` uses [`aria-roledescription`](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-roledescription) to provide additional context to screen reader users about the button's specific purpose. This defaults to `"More information button"` but can be customized via the `ariaRoleDescription` prop for translation or other accessibility needs.
+
+<Canvas of={InfoTipStories.AriaLabel} />
+
 ## InfoTips and zIndex
 
 You can change the zIndex of your `InfoTip` with the zIndex property.

package/src/lib/Molecules/Tips/InfoTip/InfoTip.stories.tsx

@@ -4,17 +4,20 @@ import {
   FillButton,
   FlexBox,
   GridBox,
+  IconButton,
   InfoTip,
   Modal,
   Text,
 } from '@codecademy/gamut';
+import { SparkleIcon } from '@codecademy/gamut-icons';
 import type { Meta, StoryObj } from '@storybook/react';
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 
 const meta: Meta<typeof InfoTip> = {
   component: InfoTip,
   args: {
     alignment: 'top-left',
+    ariaLabel: 'More information',
     info: `I am additional information about a nearby element or content.`,
   },
 };
@@ -28,7 +31,10 @@ export const Emphasis: Story = {
   },
   render: (args) => (
     <FlexBox center m={24} py={64}>
-      <Text mr={4}>Some text that needs info</Text> <InfoTip {...args} />
+      <Text id="emphasis-text" mr={4}>
+        Some text that needs info
+      </Text>
+      <InfoTip {...args} ariaLabelledby="emphasis-text" />
     </FlexBox>
   ),
 };
@@ -38,10 +44,15 @@ export const Alignments: Story = {
     <GridBox gap={24} gridTemplateColumns="1fr 1fr" ml={8} py={64}>
       {(['top-right', 'top-left', 'bottom-right', 'bottom-left'] as const).map(
         (alignment) => {
+          const labelId = `alignment-${alignment}`;
           return (
             <Box key={alignment}>
-              <Text>{alignment}</Text>
-              <InfoTip {...args} alignment={alignment} />
+              <Text id={labelId}>{alignment}</Text>
+              <InfoTip
+                {...args}
+                alignment={alignment}
+                ariaLabelledby={labelId}
+              />
             </Box>
           );
         }
@@ -56,10 +67,51 @@ export const Placement: Story = {
   },
   render: (args) => (
     <FlexBox center>
-      <Text mr={4}>
+      <Text id="placement-text" mr={4}>
         This text is in a small space and needs floating placement
       </Text>{' '}
-      <InfoTip {...args} />
+      <InfoTip {...args} ariaLabelledby="placement-text" />
+    </FlexBox>
+  ),
+};
+
+export const AriaLabel: Story = {
+  render: (args) => (
+    <FlexBox center column gap={24} my={48} width={1}>
+      <FlexBox alignItems="center" gap={8}>
+        <Text fontSize={16} fontWeight="bold">
+          Using ariaLabel (no visible label text):
+        </Text>
+      </FlexBox>
+      <FlexBox alignItems="center" gap={8}>
+        <IconButton
+          icon={SparkleIcon}
+          tip="This tool needs to be explained in the InfoTip"
+          tipProps={{ placement: 'floating' }}
+          onClick={() => null}
+        />
+        <InfoTip
+          {...args}
+          ariaLabel="Learn more about this tool"
+          info="This is some helpful info about the tool represented by the IconButton"
+        />
+      </FlexBox>
+
+      <FlexBox alignItems="center" gap={8}>
+        <Text fontSize={16} fontWeight="bold">
+          Using ariaLabelledby (references visible text):
+        </Text>
+      </FlexBox>
+      <FlexBox alignItems="center" gap={8}>
+        <Text id="custom-info-id">
+          I am some helpful yet concise text that needs more explanation
+        </Text>
+        <InfoTip
+          alignment="bottom-left"
+          ariaLabelledby="custom-info-id"
+          info="I am clarifying information related to the concise text."
+        />
+      </FlexBox>
     </FlexBox>
   ),
 };
@@ -69,19 +121,16 @@ export const WithLinksOrButtons: Story = {
     placement: 'floating',
   },
   render: function WithLinksOrButtons(args) {
-    const ref = useRef<HTMLDivElement>(null);
-
-    const onClick = ({ isTipHidden }: { isTipHidden: boolean }) => {
-      if (!isTipHidden) ref.current?.focus();
-    };
-
     return (
       <FlexBox center py={64}>
-        <Text mr={4}>This text is in a small space and needs info </Text>{' '}
+        <Text id="links-text" mr={4}>
+          This text is in a small space and needs info
+        </Text>{' '}
         <InfoTip
           {...args}
+          ariaLabelledby="links-text"
           info={
-            <Text ref={ref} tabIndex={-1}>
+            <Text tabIndex={-1}>
               Hey! Here is a{' '}
               <Anchor href="https://giphy.com/search/nichijou">
                 cool link
@@ -93,7 +142,6 @@ export const WithLinksOrButtons: Story = {
               that is also super important.
             </Text>
           }
-          onClick={onClick}
         />
       </FlexBox>
     );
@@ -102,42 +150,35 @@ export const WithLinksOrButtons: Story = {
 
 export const KeyboardNavigation: Story = {
   render: function KeyboardNavigation() {
-    const floatingRef = useRef<HTMLDivElement>(null);
-    const inlineRef = useRef<HTMLDivElement>(null);
-
     const examples = [
       {
         title: 'Floating Placement',
         placement: 'floating' as const,
-        ref: floatingRef,
         links: ['Link 1', 'Link 2', 'Link 3'],
       },
       {
         title: 'Inline Placement',
         placement: 'inline' as const,
         alignment: 'bottom-right' as const,
-        ref: inlineRef,
         links: ['Link A', 'Link B'],
       },
     ];
 
     return (
-      <FlexBox center column gap={24} py={64}>
+      <FlexBox center flexDirection="column" gap={24} py={64}>
         <GridBox gap={16} gridTemplateColumns="1fr 1fr">
-          {examples.map(({ title, placement, alignment, ref, links }) => {
-            const onClick = ({ isTipHidden }: { isTipHidden: boolean }) => {
-              if (!isTipHidden) ref.current?.focus();
-            };
-
+          {examples.map(({ title, placement, alignment, links }) => {
+            const labelId = `keyboard-nav-${placement}`;
             return (
               <FlexBox gap={8} key={placement}>
-                <Text fontSize={16} fontWeight="bold">
+                <Text fontSize={16} fontWeight="bold" id={labelId}>
                   {title}
                 </Text>
                 <InfoTip
                   alignment={alignment}
+                  ariaLabelledby={labelId}
                   info={
-                    <Text ref={ref} tabIndex={-1}>
+                    <Text>
                       {links.map((label, idx) => (
                         <>
                           {idx > 0 && ', '}
@@ -150,7 +191,6 @@ export const KeyboardNavigation: Story = {
                     </Text>
                   }
                   placement={placement}
-                  onClick={onClick}
                 />
               </FlexBox>
             );
@@ -162,6 +202,10 @@ export const KeyboardNavigation: Story = {
             Keyboard Navigation:
           </Text>
           <Box as="ul" fontSize={14} pl={16}>
+            <li>
+              <strong>Opening:</strong> Focus automatically moves to the tip
+              content when opened
+            </li>
             <li>
               <strong>Floating - Tab:</strong> Navigates forward through links,
               then wraps to button (contained)
@@ -224,8 +268,10 @@ export const InfoTipInsideModal: Story = {
             <Text>This modal contains an InfoTip below:</Text>
 
             <FlexBox alignItems="center" gap={8}>
-              <Text>Some text that needs explanation</Text>
-              <InfoTip {...args} />
+              <Text id="modal-infotip-text">
+                Some text that needs explanation
+              </Text>
+              <InfoTip {...args} ariaLabelledby="modal-infotip-text" />
             </FlexBox>
 
             <Text color="text-disabled" fontSize={14}>
@@ -253,11 +299,14 @@ export const ZIndex: Story = {
       <Box bg="paleBlue" zIndex={3}>
         I will not be behind the infotip, sad + unreadable
       </Box>
-      <InfoTip info="I am inline, cool" />
+      <InfoTip
+        ariaLabel="z-index example without override"
+        info="I am inline, cool"
+      />
       <Box bg="paleBlue" zIndex={3}>
         I will be behind the infotip, nice + great
       </Box>
-      <InfoTip {...args} />
+      <InfoTip {...args} ariaLabel="z-index example with override" />
     </FlexBox>
   ),
 };
@@ -265,7 +314,10 @@ export const ZIndex: Story = {
 export const Default: Story = {
   render: (args) => (
     <FlexBox center m={24} py={64}>
-      <Text mr={4}>Some text that needs info</Text> <InfoTip {...args} />
+      <Text id="default-text" mr={4}>
+        Some text that needs info
+      </Text>
+      <InfoTip {...args} ariaLabelledby="default-text" />
     </FlexBox>
   ),
 };

package/src/lib/Organisms/ConnectedForm/ConnectedForm/ConnectedForm.mdx

@@ -1,9 +1,7 @@
-import { DetailedCode } from '@codecademy/gamut';
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 
 import { ComponentHeader, LinkTo } from '~styleguide/blocks';
 
-import { codeExample } from './codeExample';
 import * as ConnectedFormStories from './ConnectedForm.stories';
 
 export const parameters = {
@@ -42,7 +40,75 @@ This hook also returns the `FormRequiredText` component - include this before yo
 
 ### Example code
 
-<DetailedCode language="tsx" code={codeExample} preview />
+```tsx
+import {
+  ConnectedCheckbox,
+  ConnectedInput,
+  ConnectedSelect,
+  useConnectedForm,
+} from '@codecademy/gamut';
+
+import { TerminalIcon } from '@codecademy/gamut-icons';
+
+export const GoodForm = () => {
+  const {
+    ConnectedFormGroup,
+    ConnectedForm,
+    connectedFormProps,
+    FormRequiredText,
+  } = useConnectedForm({
+    defaultValues: {
+      thisField: true,
+      thatField: 'zero',
+      anotherField: 'state your name.',
+    },
+    validationRules: {
+      thisField: { required: 'you need to check this.' },
+      thatField: {
+        pattern: {
+          value: /^(?:(?!zero).)*$/,
+          message: 'literally anything but zero',
+        },
+      },
+    },
+  });
+
+  return (
+    <ConnectedForm
+      onSubmit={({ thisField }) => console.log(thisField)}
+      resetOnSubmit
+      {...connectedFormProps}
+    >
+      <SubmitButton>submit this form.</SubmitButton>
+      <ConnectedFormGroup
+        name="thisField"
+        label="cool checkbox bruh"
+        field={{
+          component: ConnectedCheckbox,
+          label: 'check it ouuut',
+        }}
+      />
+      <ConnectedFormGroup
+        name="thatField"
+        label="cool select dude"
+        field={{
+          component: ConnectedSelect,
+          options: ['one', 'two', 'zero'],
+        }}
+      />
+      <ConnectedFormGroup
+        name="anotherField"
+        label="cool input"
+        field={{
+          component: ConnectedInput,
+          icon: TerminalIcon,
+        }}
+      />
+      <FormRequiredText />
+    </ConnectedForm>
+  );
+};
+```
 
 ## Variants
 

package/src/lib/Organisms/ConnectedForm/ConnectedFormGroup/ConnectedFormGroup.mdx

@@ -61,6 +61,25 @@ A `ConnectedFormGroup` can be in one of three states: `default`, `error`, or `di
 
 <Canvas of={ConnectedFormGroupStories.States} />
 
+## InfoTip
+
+A `ConnectedFormGroup` can include an `infotip` prop to provide additional context.
+
+### Automatic labelling
+
+InfoTip buttons are automatically labelled by string field labels for accessibility.
+
+<Canvas of={ConnectedFormGroupStories.InfoTipAutoLabelling} />
+
+### ReactNode labels
+
+For ReactNode labels (e.g., styled text or icons), the InfoTip is automatically labelled by the field label. You can override this behavior by providing:
+
+- `ariaLabel` - provide a custom accessible name
+- `ariaLabelledby` - reference another element on the page, such as a section heading
+
+<Canvas of={ConnectedFormGroupStories.InfoTipWithReactNodeLabel} />
+
 ## Playground
 
 To see how a `ConnectedFormGroup` can be used in a `ConnectedForm`, check out the <LinkTo id="Organisms/ConnectedForm/ConnectedForm">ConnectedForm</LinkTo> page.

package/src/lib/Organisms/ConnectedForm/ConnectedFormGroup/ConnectedFormGroup.stories.tsx

@@ -2,7 +2,9 @@ import {
   ConnectedForm,
   ConnectedFormGroup,
   ConnectedFormGroupProps,
+  ConnectedInput,
   ConnectedRadioGroupInput,
+  Text,
   useConnectedForm,
 } from '@codecademy/gamut';
 import { action } from '@storybook/addon-actions';
@@ -119,3 +121,74 @@ export const States = () => {
     </ConnectedForm>
   );
 };
+
+export const InfoTipAutoLabelling: Story = {
+  render: () => (
+    <ConnectedForm
+      defaultValues={{ email: '' }}
+      onSubmit={(values) => action('Form Submitted')(values)}
+    >
+      <ConnectedFormGroup
+        field={{ component: ConnectedInput, type: 'email' }}
+        infotip={{
+          info: 'We will never share your email with third parties.',
+          placement: 'floating',
+        }}
+        label="Email address"
+        name="email"
+      />
+    </ConnectedForm>
+  ),
+};
+
+export const InfoTipWithReactNodeLabel: Story = {
+  render: () => (
+    <ConnectedForm
+      defaultValues={{ username: '', password: '', apiKey: '' }}
+      onSubmit={(values) => action('Form Submitted')(values)}
+    >
+      <Text as="h3" id="api-section-heading" mb={8}>
+        API Configuration
+      </Text>
+      <ConnectedFormGroup
+        field={{ component: ConnectedInput }}
+        infotip={{
+          alignment: 'bottom-left',
+          info: 'Choose a unique username between 3-20 characters.',
+        }}
+        label={
+          <Text as="span" fontWeight="bold">
+            Username (automatic label)
+          </Text>
+        }
+        name="username"
+      />
+      <ConnectedFormGroup
+        field={{ component: ConnectedInput, type: 'password' }}
+        infotip={{
+          info: 'Password must be at least 8 characters with one uppercase letter and one number.',
+          ariaLabel: 'Password requirements',
+        }}
+        label={
+          <Text as="span" fontWeight="bold">
+            Password (ariaLabel)
+          </Text>
+        }
+        name="password"
+      />
+      <ConnectedFormGroup
+        field={{ component: ConnectedInput }}
+        infotip={{
+          info: 'You can find your API key in the developer settings dashboard.',
+          ariaLabelledby: 'api-section-heading',
+        }}
+        label={
+          <Text as="span" fontWeight="bold">
+            API Key (ariaLabelledby)
+          </Text>
+        }
+        name="apiKey"
+      />
+    </ConnectedForm>
+  ),
+};

package/src/lib/Organisms/GridForm/Fields.mdx

@@ -95,3 +95,22 @@ Hidden inputs can be used to include data that users can't see or modify with th
 We call it a "sweet container" so that bots do not immediately detect it as a honeypot input.
 
 <Canvas of={FieldsStories.SweetContainer} />
+
+## InfoTip
+
+Any field can include an `infotip` prop to provide additional context to users.
+
+### Automatic labelling
+
+InfoTip buttons are automatically labelled by string field labels for accessibility.
+
+<Canvas of={FieldsStories.InfoTipAutoLabelling} />
+
+### ReactNode labels
+
+For ReactNode labels, the InfoTip is automatically labelled by the field label. You can override this behavior by providing:
+
+- `ariaLabel` - provide a custom accessible name
+- `ariaLabelledby` - reference another element on the page, such as a section heading
+
+<Canvas of={FieldsStories.InfoTipWithReactNodeLabel} />

package/src/lib/Organisms/GridForm/Fields.stories.tsx

@@ -1,4 +1,4 @@
-import { FormGroup, GridForm, Input } from '@codecademy/gamut';
+import { FormGroup, GridForm, Input, Text } from '@codecademy/gamut';
 import { action } from '@storybook/addon-actions';
 import type { Meta, StoryObj } from '@storybook/react';
 
@@ -328,3 +328,64 @@ export const SweetContainer: Story = {
     ],
   },
 };
+
+export const InfoTipAutoLabelling: Story = {
+  args: {
+    fields: [
+      {
+        label: 'Email address',
+        name: 'email',
+        size: 9,
+        type: 'email',
+        infotip: {
+          info: 'We will never share your email with third parties.',
+          placement: 'floating',
+        },
+      },
+    ],
+  },
+};
+
+export const InfoTipWithReactNodeLabel: Story = {
+  render: (args) => (
+    <>
+      <Text as="h3" id="api-section-heading" mb={8}>
+        API Configuration
+      </Text>
+      <GridForm {...args} />
+    </>
+  ),
+  args: {
+    fields: [
+      {
+        label: <strong>Username (automatic label)</strong>,
+        name: 'username',
+        size: 9,
+        type: 'text',
+        infotip: {
+          info: 'Choose a unique username between 3-20 characters.',
+        },
+      },
+      {
+        label: <strong>Password (ariaLabel)</strong>,
+        name: 'password',
+        size: 9,
+        type: 'password',
+        infotip: {
+          info: 'Password must be at least 8 characters with one uppercase letter and one number.',
+          ariaLabel: 'Password requirements',
+        },
+      },
+      {
+        label: <strong>API Key (ariaLabelledby)</strong>,
+        name: 'apiKey',
+        size: 9,
+        type: 'text',
+        infotip: {
+          info: 'You can find your API key in the developer settings dashboard.',
+          ariaLabelledby: 'api-section-heading',
+        },
+      },
+    ],
+  },
+};

package/src/lib/Organisms/GridForm/Layout.mdx

@@ -34,7 +34,7 @@ Solo field form should always have their solo input be required. They should aut
 
 ## InfoTips
 
-A field can include our existing `InfoTip`. See the <LinkTo id="Molecules/Tips/InfoTip">InfoTip</LinkTo> story for more information on what props are available.
+A field can include our existing `InfoTip`. See the <LinkTo id="Molecules/Tips/InfoTip">Fields</LinkTo> story for specific accessibility tooling and <LinkTo id="Molecules/Tips/InfoTip">InfoTip</LinkTo> story for more information on what props are available.
 
 See the <LinkTo id="Atoms/FormInputs/Radio">Radio</LinkTo> story for an example of how to add a infotip to a radio option.
 

package/src/lib/Organisms/ConnectedForm/ConnectedForm/codeExample.ts

@@ -1,67 +0,0 @@
-export const codeExample = `import {
-  ConnectedCheckbox,
-  ConnectedInput,
-  ConnectedSelect,
-  useConnectedForm,
-} from '@codecademy/gamut';
-
-import { TerminalIcon } from '@codecademy/gamut-icons';
-
-export const GoodForm = () => {
-  const {
-    ConnectedFormGroup,
-    ConnectedForm,
-    connectedFormProps,
-    FormRequiredText,
-  } = useConnectedForm({
-    defaultValues: {
-      thisField: true,
-      thatField: 'zero',
-      anotherField: 'state your name.',
-    },
-    validationRules: {
-      thisField: { required: 'you need to check this.' },
-      thatField: {
-        pattern: {
-          value: /^(?:(?!zero).)*$/,
-          message: 'literally anything but zero',
-        },
-      },
-    },
-  });
-
-  return (
-    <ConnectedForm
-      onSubmit={({ thisField }) => console.log(thisField)}
-      resetOnSubmit
-      {...connectedFormProps}
-    >
-      <SubmitButton>submit this form.</SubmitButton>
-      <ConnectedFormGroup
-        name="thisField"
-        label="cool checkbox bruh"
-        field={{
-          component: ConnectedCheckbox,
-          label: 'check it ouuut',
-        }}
-      />
-      <ConnectedFormGroup
-        name="thatField"
-        label="cool select dude"
-        field={{
-          component: ConnectedSelect,
-          options: ['one', 'two', 'zero'],
-        }}
-      />
-      <ConnectedFormGroup
-        name="anotherField"
-        label="cool input"
-        field={{
-          component: ConnectedInput,
-          icon: TerminalIcon,
-        }}
-      />
-      <FormRequiredText />
-    </ConnectedForm>
-  );
-};`;