Fix primefaces#6939: Datatable fix row checkbox/radiobutton PT

melloware · Jul 28, 2024 · b207066 · b207066
1 parent 96817d5
commit b207066
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 39 deletions.
diff --git a/components/lib/column/column.d.ts b/components/lib/column/column.d.ts
@@ -10,9 +10,11 @@
  */
 import * as React from 'react';
 import { FilterMatchMode } from '../api/api';
+import { CheckboxPassThroughOptions } from '../checkbox/checkbox';
 import { ComponentHooks } from '../componentbase/componentbase';
 import { DataTablePassThroughOptions } from '../datatable/datatable';
 import { PassThroughOptions } from '../passthrough';
+import { RadioButtonPassThroughOptions } from '../radiobutton/radiobutton';
 import { TooltipOptions } from '../tooltip/tooltipoptions';
 import { IconType, PassThroughType } from '../utils/utils';
 
@@ -163,7 +165,7 @@ export interface ColumnPassThroughOptions {
     /**
      * Uses to pass attributes to the header checkbox's DOM element.
      */
-    headerCheckbox?: ColumnPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    headerCheckbox?: CheckboxPassThroughOptions;
     /**
      * Uses to pass attributes to the column filter's DOM element.
      */
@@ -315,19 +317,11 @@ export interface ColumnPassThroughOptions {
     /**
      * Uses to pass attributes to the row radiobutton wrapper's DOM element.
      */
-    radioButton?: ColumnPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    rowRadioButton?: RadioButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the row radiobutton input's DOM element.
      */
-    radioButtonInput?: ColumnPassThroughType<React.HTMLAttributes<HTMLInputElement>>;
-    /**
-     * Uses to pass attributes to the row radiobutton box's DOM element.
-     */
-    radioButtonBox?: ColumnPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
-    /**
-     * Uses to pass attributes to the row radiobutton icon's DOM element.
-     */
-    radioButtonIcon?: ColumnPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    rowCheckbox?: CheckboxPassThroughOptions;
     /**
      * Used to manage all lifecycle hooks
      * @see {@link ComponentHooks}

diff --git a/components/lib/datatable/RowCheckbox.js b/components/lib/datatable/RowCheckbox.js
@@ -42,19 +42,17 @@ export const RowCheckbox = React.memo((props) => {
     const checkIcon = IconUtils.getJSXIcon(icon, { ...checkboxIconProps }, { props });
     const tabIndex = props.disabled ? null : '0';
 
-    const checkboxProps = mergeProps(
-        {
-            role: 'checkbox',
-            'aria-checked': props.checked,
-            tabIndex: tabIndex,
-            onChange: onChange,
-            'aria-label': props.ariaLabel,
-            checked: props.checked,
-            icon: checkIcon,
-            disabled: props.disabled
-        },
-        getColumnPTOptions('rowCheckbox')
-    );
+    const checkboxProps = mergeProps({
+        role: 'checkbox',
+        'aria-checked': props.checked,
+        tabIndex: tabIndex,
+        onChange: onChange,
+        'aria-label': props.ariaLabel,
+        checked: props.checked,
+        icon: checkIcon,
+        disabled: props.disabled,
+        pt: getColumnPTOptions('rowCheckbox')
+    });
 
     return <Checkbox {...checkboxProps} />;
 });

diff --git a/components/lib/datatable/RowRadioButton.js b/components/lib/datatable/RowRadioButton.js
@@ -30,21 +30,16 @@ export const RowRadioButton = React.memo((props) => {
         }
     };
 
-    const radioButtonProps = mergeProps(
-        {
-            role: 'radio',
-            'aria-checked': props.checked,
-            checked: props.checked,
-            disabled: props.disabled,
-            name: `${props.tableSelector}_dt_radio`,
-            onChange: onChange,
-            input: getColumnPTOptions('radiobuttoninput'),
-            box: getColumnPTOptions('radiobuttonbox'),
-            icon: getColumnPTOptions('radiobuttonicon'),
-            unstyled: props.unstyled
-        },
-        getColumnPTOptions('radiobutton')
-    );
+    const radioButtonProps = mergeProps({
+        role: 'radio',
+        'aria-checked': props.checked,
+        checked: props.checked,
+        disabled: props.disabled,
+        name: `${props.tableSelector}_dt_radio`,
+        onChange: onChange,
+        unstyled: props.unstyled,
+        pt: getColumnPTOptions('rowRadioButton')
+    });
 
     return <RadioButton {...radioButtonProps} />;
 });