refactor: fixed errored typings

carbon-design-system · Nov 4, 2024 · dcab08e · dcab08e
1 parent cfb3c7a
commit dcab08e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 12 deletions.
diff --git a/packages/react/src/components/DataTable/TableSelectRow.tsx b/packages/react/src/components/DataTable/TableSelectRow.tsx
@@ -87,29 +87,58 @@ const TableSelectRow = ({
 }: TableSelectRowProps) => {
   const prefix = usePrefix();
   const uniqueNameId = useId();
+
+  const handleRadioChange = onChange
+    ? (
+        value: string | number | undefined,
+        name: string | undefined,
+        event: React.ChangeEvent<HTMLInputElement>
+      ) => {
+        // Convert the radio value to boolean for consistency
+        onChange(!!value, name || '', event);
+      }
+    : undefined;
+
+  const handleCheckboxChange = onChange
+    ? (
+        checked: boolean,
+        name: string,
+        event: React.ChangeEvent<HTMLInputElement>
+      ) => {
+        onChange(checked, name, event);
+      }
+    : undefined;
+
   const selectionInputProps = {
     id,
     name: name ? name : uniqueNameId,
     onClick: onSelect,
-    onChange,
     checked,
     disabled,
   };
-  const InlineInputComponent = radio ? RadioButton : InlineCheckbox;
+  // const InlineInputComponent = radio ? RadioButton : InlineCheckbox;
+
+  const labelValue = ariaLabel || deprecatedAriaLabel || '';
   const tableSelectRowClasses = classNames(`${prefix}--table-column-checkbox`, {
     ...(className && { [className]: true }),
     [`${prefix}--table-column-radio`]: radio,
   });
   return (
     <td className={tableSelectRowClasses} aria-live="off">
-      <InlineInputComponent
-        {...selectionInputProps}
-        {...(radio && {
-          labelText: ariaLabel || deprecatedAriaLabel,
-          hideLabel: true,
-        })}
-        {...(!radio && { 'aria-label': ariaLabel || deprecatedAriaLabel })}
-      />
+      {radio ? (
+        <RadioButton
+          {...selectionInputProps}
+          labelText={labelValue}
+          onChange={handleRadioChange}
+          hideLabel={true}
+        />
+      ) : (
+        <InlineCheckbox
+          {...selectionInputProps}
+          aria-label={labelValue}
+          onChange={handleCheckboxChange}
+        />
+      )}
     </td>
   );
 };

diff --git a/packages/react/src/components/InlineCheckbox/InlineCheckbox.tsx b/packages/react/src/components/InlineCheckbox/InlineCheckbox.tsx
@@ -14,7 +14,7 @@ interface InlineCheckboxProps {
   /*
    * Specify the label for the control
    */
-  'aria-label': string;
+  'aria-label'?: string;
 
   /**
    * Deprecated, please use `aria-label` instead.
@@ -154,7 +154,7 @@ InlineCheckbox.propTypes = {
   /**
    * Specify the label for the control
    */
-  ['aria-label']: PropTypes.string.isRequired,
+  ['aria-label']: PropTypes.string,
 
   /**
    * Deprecated, please use `aria-label` instead.