From 989894a2cff289169c28c5b1655013c62b1d8826 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 26 Mar 2024 14:22:29 -0400
Subject: [PATCH 1/5] fix(Card): updated v5 logic to prevent unclickable cards

---
 .../react-core/src/components/Card/Card.tsx   | 28 ++++++++++++++-----
 .../src/components/Card/CardHeader.tsx        | 14 ++++------
 .../src/components/Card/examples/Card.md      | 20 +++++++------
 .../Card/examples/CardSingleSelectable.tsx    | 17 +++++++++--
 .../cypress/integration/card.spec.ts          |  2 --
 5 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx
index abdf05d82b3..6ada27a1a29 100644
--- a/packages/react-core/src/components/Card/Card.tsx
+++ b/packages/react-core/src/components/Card/Card.tsx
@@ -14,15 +14,21 @@ export interface CardProps extends React.HTMLProps<HTMLElement>, OUIAProps {
   component?: keyof JSX.IntrinsicElements;
   /** Modifies the card to include compact styling. Should not be used with isLarge. */
   isCompact?: boolean;
-  /** Modifies the card to include selectable styling */
+  /** Flag indicating that the card is selectable. */
   isSelectable?: boolean;
   /** @deprecated Specifies the card is selectable, and applies raised styling on hover and select */
   isSelectableRaised?: boolean;
-  /** Modifies the card to include selected styling */
-  isSelected?: boolean;
-  /** Modifies the card to include clickable styling */
+  /** Flag indicating that the card is clickable and contains some action that triggers on click. */
   isClickable?: boolean;
-  /** Modifies a clickable or selectable card to have disabled styling. */
+  /** Flag indicating whether a card that is both clickable and selectable is currently selected and has selected styling.
+   * This will not determine the card's actual selected state.
+   */
+  isSelected?: boolean;
+  /** Flag indicating whether a card that is either only clickable or that is both clickable and selectable
+   * is currently clicked and has clicked styling.
+   */
+  isClicked?: boolean;
+  /** Flag indicating that a clickable or selectable card is disabled. */
   isDisabled?: boolean;
   /** @deprecated Modifies a raised selectable card to have disabled styling */
   isDisabledRaised?: boolean;
@@ -56,6 +62,7 @@ interface CardContextProps {
   isExpanded: boolean;
   isClickable: boolean;
   isSelectable: boolean;
+  isClicked: boolean;
   isDisabled: boolean;
   // TODO: Remove hasSelectableInput when deprecated prop is removed
   hasSelectableInput: boolean;
@@ -72,6 +79,7 @@ export const CardContext = React.createContext<Partial<CardContextProps>>({
   isExpanded: false,
   isClickable: false,
   isSelectable: false,
+  isClicked: false,
   isDisabled: false
 });
 
@@ -86,6 +94,7 @@ export const Card: React.FunctionComponent<CardProps> = ({
   isDisabled = false,
   isSelectableRaised = false,
   isSelected = false,
+  isClicked = false,
   isDisabledRaised = false,
   isFlat = false,
   isExpanded = false,
@@ -119,7 +128,11 @@ export const Card: React.FunctionComponent<CardProps> = ({
       return css(styles.modifiers.selectableRaised, isSelected && styles.modifiers.selectedRaised);
     }
     if (isSelectable && isClickable) {
-      return css(styles.modifiers.selectable, styles.modifiers.clickable, isSelected && styles.modifiers.current);
+      return css(
+        styles.modifiers.selectable,
+        styles.modifiers.clickable,
+        (isSelected || isClicked) && styles.modifiers.current
+      );
     }
 
     if (isSelectable) {
@@ -127,7 +140,7 @@ export const Card: React.FunctionComponent<CardProps> = ({
     }
 
     if (isClickable) {
-      return css(styles.modifiers.clickable, isSelected && styles.modifiers.selected);
+      return css(styles.modifiers.clickable, isClicked && styles.modifiers.current);
     }
 
     return '';
@@ -162,6 +175,7 @@ export const Card: React.FunctionComponent<CardProps> = ({
         isExpanded,
         isClickable,
         isSelectable,
+        isClicked,
         isDisabled,
         // TODO: Remove hasSelectableInput when deprecated prop is removed
         hasSelectableInput
diff --git a/packages/react-core/src/components/Card/CardHeader.tsx b/packages/react-core/src/components/Card/CardHeader.tsx
index c8b34353b34..8bb7407fc0d 100644
--- a/packages/react-core/src/components/Card/CardHeader.tsx
+++ b/packages/react-core/src/components/Card/CardHeader.tsx
@@ -80,7 +80,7 @@ export const CardHeader: React.FunctionComponent<CardHeaderProps> = ({
 }: CardHeaderProps) => (
   <CardContext.Consumer>
     {/* TODO: Remove hasSelectableInput when deprecated props are removed */}
-    {({ cardId, isClickable, isSelectable, isDisabled: isCardDisabled, hasSelectableInput }) => {
+    {({ cardId, isClickable, isSelectable, isClicked, isDisabled: isCardDisabled, hasSelectableInput }) => {
       const cardHeaderToggle = (
         <div className={css(styles.cardHeaderToggle)}>
           <Button
@@ -112,12 +112,10 @@ export const CardHeader: React.FunctionComponent<CardHeaderProps> = ({
       }
 
       const handleActionClick = (event: React.FormEvent<HTMLInputElement> | React.MouseEvent) => {
-        if (isClickable) {
-          if (selectableActions?.onClickAction) {
-            selectableActions.onClickAction(event);
-          } else if (selectableActions?.to) {
-            window.open(selectableActions.to, selectableActions.isExternalLink ? '_blank' : '_self');
-          }
+        if (selectableActions?.onClickAction) {
+          selectableActions.onClickAction(event);
+        } else if (selectableActions?.to) {
+          window.open(selectableActions.to, selectableActions.isExternalLink ? '_blank' : '_self');
         }
       };
 
@@ -134,7 +132,7 @@ export const CardHeader: React.FunctionComponent<CardHeaderProps> = ({
         };
 
         if (isClickable && !isSelectable) {
-          return { ...baseProps, onClick: handleActionClick };
+          return { ...baseProps, onClick: handleActionClick, isChecked: isClicked };
         }
         if (isSelectable) {
           return { ...baseProps, onChange: selectableActions.onChange, isChecked: selectableActions.isChecked };
diff --git a/packages/react-core/src/components/Card/examples/Card.md b/packages/react-core/src/components/Card/examples/Card.md
index af5008181e8..a4dd7f047d8 100644
--- a/packages/react-core/src/components/Card/examples/Card.md
+++ b/packages/react-core/src/components/Card/examples/Card.md
@@ -109,9 +109,9 @@ A common use case of this is to set all but one body section to `isFilled={false
 
 ### Selectable
 
-A card can be selected by clicking anywhere within the card.
+A selectable card can be selected by clicking anywhere within the card.
 
-You must avoid rendering any other interactive content within the `<Card>` when it is meant to be selectable only. Refer to our [clickable and selectable example](#clickable-and-selectable-cards) if you need a card that is both selectable and has other interactive content.
+You must avoid rendering any other interactive content within the `<Card>` when it is meant to be selectable only. Refer to our [actionable and selectable example](#clickable-and-selectable-cards) if you need a card that is both selectable and has other interactive, actionable content.
 
 ```ts file='./CardSelectable.tsx'
 
@@ -119,27 +119,29 @@ You must avoid rendering any other interactive content within the `<Card>` when
 
 ### Single selectable
 
-When a group of single selectable cards are related, you should pass the same `name` property to each card's `selectableActions` property.
+When a group of single selectable cards are related, you must pass the same `name` property to each card's `selectableActions` property.
 
 ```ts file='./CardSingleSelectable.tsx'
 
 ```
 
-### Clickable
+### Actionable
 
-A card can perform an action or navigate to a link by clicking anywhere within the card. You can also pass in the `isExternalLink` property to `selectableActions` if you want a clickable card's link to open in a new tab or window.
+An actionable card can perform an action or navigate to a link by clicking anywhere within the card. You can also pass in the `isExternalLink` property to `selectableActions` if you want an actionable card's link to open in a new tab or window.
 
-When a card is meant to be clickable only, you must avoid rendering any other interactive content within the `<Card>`, similar to selectable cards.
+You can pass the `isClicked` property to `<Card>` to convey that a card is the currently clicked one, such as when clicking a card would open a [primary-detail view](/patterns/primary-detail). This must not be used simply for "selection" of a card, and you should instead use our [selectable card](#selectable) or [single selectable card](#single-selectable).
+
+When a card is meant to be actionable only, you must avoid rendering any other interactive content within the `<Card>`, similar to selectable cards.
 
 ```ts file='./CardClickable.tsx'
 
 ```
 
-### Clickable and selectable
+### Actionable and selectable
 
-A card can be selectable and have additional interactive content by passing both the `isClickable` and `isSelectable` properties to `<Card>`. The following example shows how the "clickable" functionality can be rendered anywhere within a selectable card.
+A card can be selectable and have additional interactive content by passing both the `isClickable` and `isSelectable` properties to `<Card>`. The following example shows how the actionable functionality can be rendered anywhere within a selectable card.
 
-When passing interactive content to a clickable and selectable card that is disabled, you should also ensure the interactive content is disabled as well, if applicable.
+When passing interactive content to an actionable and selectable card that is disabled, you should also ensure the interactive content is disabled as well, if applicable.
 
 ```ts file='./CardClickableSelectable.tsx'
 
diff --git a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
index 6279ac1f6d3..4984dd6918c 100644
--- a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
@@ -2,10 +2,15 @@ import React from 'react';
 import { Card, CardHeader, CardTitle, CardBody } from '@patternfly/react-core';
 
 export const SingleSelectableCard: React.FunctionComponent = () => {
+  const [isChecked, setIsChecked] = React.useState('');
   const id1 = 'single-selectable-card-input-1';
   const id2 = 'single-selectable-card-input-2';
   const id3 = 'single-selectable-card-input-3';
 
+  const onChange = (event: React.FormEvent<HTMLInputElement>) => {
+    setIsChecked(event.currentTarget.id);
+  };
+
   return (
     <React.Fragment>
       <Card id="single-selectable-card-example-1" isSelectable>
@@ -14,7 +19,9 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
             selectableActionId: id1,
             selectableActionAriaLabelledby: 'single-selectable-card-example-1',
             name: 'single-selectable-card-example',
-            variant: 'single'
+            variant: 'single',
+            isChecked: isChecked === id1,
+            onChange
           }}
         >
           <CardTitle>First card</CardTitle>
@@ -27,7 +34,9 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
             selectableActionId: id2,
             selectableActionAriaLabelledby: 'single-selectable-card-example-2',
             name: 'single-selectable-card-example',
-            variant: 'single'
+            variant: 'single',
+            isChecked: isChecked === id2,
+            onChange
           }}
         >
           <CardTitle>Second card</CardTitle>
@@ -40,7 +49,9 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
             selectableActionId: id3,
             selectableActionAriaLabelledby: 'single-selectable-card-example-3',
             name: 'single-selectable-card-example',
-            variant: 'single'
+            variant: 'single',
+            isChecked: isChecked === id3,
+            onChange
           }}
         >
           <CardTitle>Third card</CardTitle>
diff --git a/packages/react-integration/cypress/integration/card.spec.ts b/packages/react-integration/cypress/integration/card.spec.ts
index 3d7701566c7..e06cab8ed6f 100644
--- a/packages/react-integration/cypress/integration/card.spec.ts
+++ b/packages/react-integration/cypress/integration/card.spec.ts
@@ -72,10 +72,8 @@ describe('Card Demo Test', () => {
 
   it('Verify clickable only card action is triggered', () => {
     cy.get('#clickable-card-drawer').should('not.have.class', 'pf-m-expanded');
-    cy.get('#clickable-card-example-1 #clickable-card-input-1').should('not.be.checked');
     cy.get('#clickable-card-example-1').click();
     cy.get('#clickable-card-drawer').should('have.class', 'pf-m-expanded');
-    cy.get('#clickable-card-example-1 #clickable-card-input-1').should('be.checked');
   });
 
   it('Verify clickable only card link is navigated to', () => {

From 8bfd5251cc149960bf5bb874143ad675980270e9 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Thu, 28 Mar 2024 09:40:57 -0400
Subject: [PATCH 2/5] Updated API to have isSelected control selectable card
 state

---
 .../react-core/src/components/Card/Card.tsx   |  7 +++++--
 .../src/components/Card/CardHeader.tsx        |  9 ++++++---
 .../src/components/Card/examples/Card.md      |  2 +-
 .../Card/examples/CardClickableSelectable.tsx | 19 +++++++++++--------
 .../Card/examples/CardSelectable.tsx          |  9 +++------
 .../Card/examples/CardSingleSelectable.tsx    |  9 +++------
 6 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx
index 6ada27a1a29..3cf8b760cc5 100644
--- a/packages/react-core/src/components/Card/Card.tsx
+++ b/packages/react-core/src/components/Card/Card.tsx
@@ -20,8 +20,8 @@ export interface CardProps extends React.HTMLProps<HTMLElement>, OUIAProps {
   isSelectableRaised?: boolean;
   /** Flag indicating that the card is clickable and contains some action that triggers on click. */
   isClickable?: boolean;
-  /** Flag indicating whether a card that is both clickable and selectable is currently selected and has selected styling.
-   * This will not determine the card's actual selected state.
+  /** Flag indicating whether a card that is either selectable only or both clickable and selectable is
+   * currently selected and has selected styling.
    */
   isSelected?: boolean;
   /** Flag indicating whether a card that is either only clickable or that is both clickable and selectable
@@ -62,6 +62,7 @@ interface CardContextProps {
   isExpanded: boolean;
   isClickable: boolean;
   isSelectable: boolean;
+  isSelected: boolean;
   isClicked: boolean;
   isDisabled: boolean;
   // TODO: Remove hasSelectableInput when deprecated prop is removed
@@ -79,6 +80,7 @@ export const CardContext = React.createContext<Partial<CardContextProps>>({
   isExpanded: false,
   isClickable: false,
   isSelectable: false,
+  isSelected: false,
   isClicked: false,
   isDisabled: false
 });
@@ -175,6 +177,7 @@ export const Card: React.FunctionComponent<CardProps> = ({
         isExpanded,
         isClickable,
         isSelectable,
+        isSelected,
         isClicked,
         isDisabled,
         // TODO: Remove hasSelectableInput when deprecated prop is removed
diff --git a/packages/react-core/src/components/Card/CardHeader.tsx b/packages/react-core/src/components/Card/CardHeader.tsx
index 8bb7407fc0d..d368bf47109 100644
--- a/packages/react-core/src/components/Card/CardHeader.tsx
+++ b/packages/react-core/src/components/Card/CardHeader.tsx
@@ -44,7 +44,9 @@ export interface CardHeaderSelectableActionsObject {
   isExternalLink?: boolean;
   /** Name for the input element of a clickable or selectable card. */
   name?: string;
-  /** Flag indicating whether the selectable card input is checked */
+  /** @deprecated Flag indicating whether the selectable card input is checked. We recommend using
+   * the isSelected prop on the card component instead.
+   */
   isChecked?: boolean;
 }
 
@@ -80,7 +82,7 @@ export const CardHeader: React.FunctionComponent<CardHeaderProps> = ({
 }: CardHeaderProps) => (
   <CardContext.Consumer>
     {/* TODO: Remove hasSelectableInput when deprecated props are removed */}
-    {({ cardId, isClickable, isSelectable, isClicked, isDisabled: isCardDisabled, hasSelectableInput }) => {
+    {({ cardId, isClickable, isSelectable, isSelected, isClicked, isDisabled: isCardDisabled, hasSelectableInput }) => {
       const cardHeaderToggle = (
         <div className={css(styles.cardHeaderToggle)}>
           <Button
@@ -130,12 +132,13 @@ export const CardHeader: React.FunctionComponent<CardHeaderProps> = ({
           name: selectableActions.name,
           isDisabled: isCardDisabled
         };
+        const isSelectableInputChecked = selectableActions.isChecked ?? isSelected;
 
         if (isClickable && !isSelectable) {
           return { ...baseProps, onClick: handleActionClick, isChecked: isClicked };
         }
         if (isSelectable) {
-          return { ...baseProps, onChange: selectableActions.onChange, isChecked: selectableActions.isChecked };
+          return { ...baseProps, onChange: selectableActions.onChange, isChecked: isSelectableInputChecked };
         }
 
         return baseProps;
diff --git a/packages/react-core/src/components/Card/examples/Card.md b/packages/react-core/src/components/Card/examples/Card.md
index a4dd7f047d8..a5ce91abcf3 100644
--- a/packages/react-core/src/components/Card/examples/Card.md
+++ b/packages/react-core/src/components/Card/examples/Card.md
@@ -127,7 +127,7 @@ When a group of single selectable cards are related, you must pass the same `nam
 
 ### Actionable
 
-An actionable card can perform an action or navigate to a link by clicking anywhere within the card. You can also pass in the `isExternalLink` property to `selectableActions` if you want an actionable card's link to open in a new tab or window.
+An actionable card can perform an action or navigate to a link by clicking anywhere within the card. To open a link in a new tab or window, pass the `isExternalLink` property to `selectableActions`.
 
 You can pass the `isClicked` property to `<Card>` to convey that a card is the currently clicked one, such as when clicking a card would open a [primary-detail view](/patterns/primary-detail). This must not be used simply for "selection" of a card, and you should instead use our [selectable card](#selectable) or [single selectable card](#single-selectable).
 
diff --git a/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx b/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
index 193257cbbc7..67e64bf1336 100644
--- a/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
@@ -5,14 +5,14 @@ export const CardClickable: React.FunctionComponent = () => {
   const [isChecked1, setIsChecked1] = React.useState(false);
   const [isChecked2, setIsChecked2] = React.useState(false);
   const [isChecked3, setIsChecked3] = React.useState(false);
-  const [isSelected1, setIsSelected1] = React.useState(false);
+  const [isClicked, setIsClicked] = React.useState(false);
 
   const id1 = 'clickable-selectable-card-input-1';
   const id2 = 'clickable-selectable-card-input-2';
   const id3 = 'clickable-selectable-card-input-3';
 
   const onClick = () => {
-    setIsSelected1((prevState) => !prevState);
+    setIsClicked((prevState) => !prevState);
   };
 
   const onChange = (event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
@@ -33,13 +33,18 @@ export const CardClickable: React.FunctionComponent = () => {
 
   return (
     <React.Fragment>
-      <Card id="clickable-selectable-card-example-1" isClickable isSelectable isSelected={isSelected1}>
+      <Card
+        id="clickable-selectable-card-example-1"
+        isClickable
+        isClicked={isClicked}
+        isSelectable
+        isSelected={isChecked1}
+      >
         <CardHeader
           selectableActions={{
             selectableActionId: id1,
             selectableActionAriaLabelledby: 'clickable-selectable-card-example-1',
             name: id1,
-            isChecked: isChecked1,
             onChange
           }}
         >
@@ -51,13 +56,12 @@ export const CardClickable: React.FunctionComponent = () => {
         </CardHeader>
         <CardBody>This card performs an action upon clicking the card title and is selectable.</CardBody>
       </Card>
-      <Card id="clickable-selectable-card-example-2" isClickable isSelectable>
+      <Card id="clickable-selectable-card-example-2" isClickable isSelectable isSelected={isChecked2}>
         <CardHeader
           selectableActions={{
             selectableActionId: id2,
             selectableActionAriaLabelledby: 'clickable-selectable-card-example-2',
             name: id2,
-            isChecked: isChecked2,
             onChange
           }}
         >
@@ -71,13 +75,12 @@ export const CardClickable: React.FunctionComponent = () => {
           .
         </CardBody>
       </Card>
-      <Card id="clickable-selectable-card-example-3" isClickable isSelectable isDisabled>
+      <Card id="clickable-selectable-card-example-3" isClickable isSelectable isDisabled isSelected={isChecked3}>
         <CardHeader
           selectableActions={{
             selectableActionId: id3,
             selectableActionAriaLabelledby: 'clickable-selectable-card-example-3',
             name: id3,
-            isChecked: isChecked3,
             onChange
           }}
         >
diff --git a/packages/react-core/src/components/Card/examples/CardSelectable.tsx b/packages/react-core/src/components/Card/examples/CardSelectable.tsx
index a9de63b669d..02a5dffe580 100644
--- a/packages/react-core/src/components/Card/examples/CardSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSelectable.tsx
@@ -28,13 +28,12 @@ export const SelectableCard: React.FunctionComponent = () => {
 
   return (
     <React.Fragment>
-      <Card id="selectable-card-example-1" isSelectable>
+      <Card id="selectable-card-example-1" isSelectable isSelected={isChecked1}>
         <CardHeader
           selectableActions={{
             selectableActionId: id1,
             selectableActionAriaLabelledby: 'selectable-card-example-1',
             name: id1,
-            isChecked: isChecked1,
             onChange
           }}
         >
@@ -42,13 +41,12 @@ export const SelectableCard: React.FunctionComponent = () => {
         </CardHeader>
         <CardBody>This card is selectable.</CardBody>
       </Card>
-      <Card id="selectable-card-example-2" isSelectable>
+      <Card id="selectable-card-example-2" isSelectable isSelected={isChecked2}>
         <CardHeader
           selectableActions={{
             selectableActionId: id2,
             selectableActionAriaLabelledby: 'selectable-card-example-2',
             name: id2,
-            isChecked: isChecked2,
             onChange
           }}
         >
@@ -56,13 +54,12 @@ export const SelectableCard: React.FunctionComponent = () => {
         </CardHeader>
         <CardBody>This card is selectable.</CardBody>
       </Card>
-      <Card id="selectable-card-example-3" isSelectable isDisabled>
+      <Card id="selectable-card-example-3" isSelectable isDisabled isSelected={isChecked3}>
         <CardHeader
           selectableActions={{
             selectableActionId: id3,
             selectableActionAriaLabelledby: 'selectable-card-example-3',
             name: id3,
-            isChecked: isChecked3,
             onChange
           }}
         >
diff --git a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
index 4984dd6918c..5a1a8a62495 100644
--- a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
@@ -13,14 +13,13 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
 
   return (
     <React.Fragment>
-      <Card id="single-selectable-card-example-1" isSelectable>
+      <Card id="single-selectable-card-example-1" isSelectable isSelected={isChecked === id1}>
         <CardHeader
           selectableActions={{
             selectableActionId: id1,
             selectableActionAriaLabelledby: 'single-selectable-card-example-1',
             name: 'single-selectable-card-example',
             variant: 'single',
-            isChecked: isChecked === id1,
             onChange
           }}
         >
@@ -28,14 +27,13 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
         </CardHeader>
         <CardBody>This card is single selectable.</CardBody>
       </Card>
-      <Card id="single-selectable-card-example-2" isSelectable>
+      <Card id="single-selectable-card-example-2" isSelectable isSelected={isChecked === id2}>
         <CardHeader
           selectableActions={{
             selectableActionId: id2,
             selectableActionAriaLabelledby: 'single-selectable-card-example-2',
             name: 'single-selectable-card-example',
             variant: 'single',
-            isChecked: isChecked === id2,
             onChange
           }}
         >
@@ -43,14 +41,13 @@ export const SingleSelectableCard: React.FunctionComponent = () => {
         </CardHeader>
         <CardBody>This card is single selectable.</CardBody>
       </Card>
-      <Card id="single-selectable-card-example-3" isSelectable isDisabled>
+      <Card id="single-selectable-card-example-3" isSelectable isDisabled isSelected={isChecked === id3}>
         <CardHeader
           selectableActions={{
             selectableActionId: id3,
             selectableActionAriaLabelledby: 'single-selectable-card-example-3',
             name: 'single-selectable-card-example',
             variant: 'single',
-            isChecked: isChecked === id3,
             onChange
           }}
         >

From 2974cb00da65624e561463c3ff61e53a1151e839 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Thu, 28 Mar 2024 10:13:49 -0400
Subject: [PATCH 3/5] Updated cypress test

---
 .../components/demos/CardDemo/CardDemo.tsx    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
index 8fe5068157e..67903e4358c 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
@@ -26,13 +26,14 @@ interface CardDemoState {
   isOpen: boolean;
   selectableChecked1: boolean;
   selectableChecked2: boolean;
+  singleSelectableChecked: string;
   drawerIsExpanded: boolean;
   selectableClickableChecked: boolean;
   selectableClickableSelected: boolean;
   selectaleClickableDrawerIsExpanded: boolean;
 }
 
-export class CardDemo extends React.Component {
+class CardDemo extends React.Component {
   static displayName = 'CardDemo';
 
   state: CardDemoState = {
@@ -41,6 +42,7 @@ export class CardDemo extends React.Component {
     isOpen: false,
     selectableChecked1: false,
     selectableChecked2: false,
+    singleSelectableChecked: '',
     drawerIsExpanded: false,
     selectableClickableChecked: false,
     selectableClickableSelected: false,
@@ -94,6 +96,10 @@ export class CardDemo extends React.Component {
     }
   };
 
+  onSingleSelectableChange = (event: React.FormEvent<HTMLInputElement>) => {
+    this.setState({ singleSelectableChecked: (event.target as HTMLElement).id });
+  };
+
   onSelectableClickableChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     this.setState({ selectableClickableChecked: checked });
   };
@@ -109,6 +115,7 @@ export class CardDemo extends React.Component {
     const {
       selectableChecked1,
       selectableChecked2,
+      singleSelectableChecked,
       drawerIsExpanded,
       selectableClickableChecked,
       selectableClickableSelected,
@@ -220,26 +227,36 @@ export class CardDemo extends React.Component {
           <CardBody>This card is selectable.</CardBody>
         </Card>
         <br></br>
-        <Card id="single-selectable-card-example-1" isSelectable>
+        <Card
+          id="single-selectable-card-example-1"
+          isSelectable
+          isSelected={singleSelectableChecked === 'single-selectable-card-input-1'}
+        >
           <CardHeader
             selectableActions={{
               selectableActionId: 'single-selectable-card-input-1',
               selectableActionAriaLabelledby: 'single-selectable-card-example-1',
               name: 'single-selectable-card-example',
-              variant: 'single'
+              variant: 'single',
+              onChange: this.onSingleSelectableChange
             }}
           >
             <CardTitle>First single selectable card</CardTitle>
           </CardHeader>
           <CardBody>This card is single selectable.</CardBody>
         </Card>
-        <Card id="single-selectable-card-example-2" isSelectable>
+        <Card
+          id="single-selectable-card-example-2"
+          isSelectable
+          isSelected={singleSelectableChecked === 'single-selectable-card-input-2'}
+        >
           <CardHeader
             selectableActions={{
               selectableActionId: 'single-selectable-card-input-2',
               selectableActionAriaLabelledby: 'single-selectable-card-example-2',
               name: 'single-selectable-card-example',
-              variant: 'single'
+              variant: 'single',
+              onChange: this.onSingleSelectableChange
             }}
           >
             <CardTitle>Second single selectable card</CardTitle>
@@ -332,3 +349,5 @@ export class CardDemo extends React.Component {
     );
   }
 }
+
+CardDemo.displayName = 'CardDemo';

From 322c15498eaa0616554336a0e5a10b2866d6b418 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Thu, 28 Mar 2024 10:27:53 -0400
Subject: [PATCH 4/5] Updated cypress test

---
 .../demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
index 67903e4358c..f7b45238add 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
@@ -351,3 +351,5 @@ class CardDemo extends React.Component {
 }
 
 CardDemo.displayName = 'CardDemo';
+
+export default CardDemo;

From 9d90581b7f79362cfde1a48ec4ca2815d8abb0e6 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Thu, 28 Mar 2024 10:57:01 -0400
Subject: [PATCH 5/5] Updated cypress test

---
 .../demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
index f7b45238add..404476759aa 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/CardDemo/CardDemo.tsx
@@ -352,4 +352,4 @@ class CardDemo extends React.Component {
 
 CardDemo.displayName = 'CardDemo';
 
-export default CardDemo;
+export { CardDemo };