From 6861ba7ebbf9ec0d8cf9e08e6a0e27742d98dd35 Mon Sep 17 00:00:00 2001
From: Humberto Makoto Morimoto Burgos <makotom@microsoft.com>
Date: Tue, 29 Nov 2022 13:50:45 -0800
Subject: [PATCH 1/3] fix: Allow data-selection-disabled to be respected by
 DetailsRow.

---
 .../react/src/components/DetailsList/DetailsRow.base.tsx  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/components/DetailsList/DetailsRow.base.tsx b/packages/react/src/components/DetailsList/DetailsRow.base.tsx
index 872f4a923b255e..61d69150f43169 100644
--- a/packages/react/src/components/DetailsList/DetailsRow.base.tsx
+++ b/packages/react/src/components/DetailsList/DetailsRow.base.tsx
@@ -327,7 +327,7 @@ export class DetailsRowBase extends React.Component<IDetailsRowBaseProps, IDetai
         className={this._classNames.root}
         data-selection-index={itemIndex}
         data-selection-touch-invoke={true}
-        data-selection-disabled={disabled || undefined}
+        data-selection-disabled={(this.props as any)['data-selection-disabled'] ?? disabled ?? undefined}
         data-item-index={itemIndex}
         aria-rowindex={ariaPositionInSet === undefined ? itemIndex + flatIndexOffset : undefined}
         data-automationid="DetailsRow"
@@ -354,7 +354,7 @@ export class DetailsRowBase extends React.Component<IDetailsRowBaseProps, IDetai
               className: this._classNames.check,
               theme,
               isVisible: checkboxVisibility === CheckboxVisibility.always,
-              onRenderDetailsCheckbox: onRenderDetailsCheckbox,
+              onRenderDetailsCheckbox,
               useFastIcons,
             })}
           </div>
@@ -432,9 +432,7 @@ export class DetailsRowBase extends React.Component<IDetailsRowBaseProps, IDetai
     const selectionState = getSelectionState(this.props);
 
     if (!shallowCompare(selectionState, this.state.selectionState)) {
-      this.setState({
-        selectionState: selectionState,
-      });
+      this.setState({ selectionState });
     }
   };
 

From 10830ea93be18ac7568592aa969cfc6e02aa27ca Mon Sep 17 00:00:00 2001
From: Humberto Makoto Morimoto Burgos <makotom@microsoft.com>
Date: Tue, 29 Nov 2022 13:55:36 -0800
Subject: [PATCH 2/3] Adding change file.

---
 ...luentui-react-5ad3027a-0dd8-4a63-bb67-aa14172f043f.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-5ad3027a-0dd8-4a63-bb67-aa14172f043f.json

diff --git a/change/@fluentui-react-5ad3027a-0dd8-4a63-bb67-aa14172f043f.json b/change/@fluentui-react-5ad3027a-0dd8-4a63-bb67-aa14172f043f.json
new file mode 100644
index 00000000000000..12c72aa6c68343
--- /dev/null
+++ b/change/@fluentui-react-5ad3027a-0dd8-4a63-bb67-aa14172f043f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: Allow data-selection-disabled to be respected by DetailsRow.",
+  "packageName": "@fluentui/react",
+  "email": "makotom@microsoft.com",
+  "dependentChangeType": "patch"
+}

From 62c4af79816bbe72f3793f91a8556177da563fa0 Mon Sep 17 00:00:00 2001
From: Humberto Makoto Morimoto Burgos <makotom@microsoft.com>
Date: Tue, 29 Nov 2022 14:21:08 -0800
Subject: [PATCH 3/3] Fixing test error.

---
 packages/react/src/components/DetailsList/DetailsRow.base.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/components/DetailsList/DetailsRow.base.tsx b/packages/react/src/components/DetailsList/DetailsRow.base.tsx
index 61d69150f43169..1834fa0c9ab837 100644
--- a/packages/react/src/components/DetailsList/DetailsRow.base.tsx
+++ b/packages/react/src/components/DetailsList/DetailsRow.base.tsx
@@ -327,7 +327,7 @@ export class DetailsRowBase extends React.Component<IDetailsRowBaseProps, IDetai
         className={this._classNames.root}
         data-selection-index={itemIndex}
         data-selection-touch-invoke={true}
-        data-selection-disabled={(this.props as any)['data-selection-disabled'] ?? disabled ?? undefined}
+        data-selection-disabled={(this.props as any)['data-selection-disabled'] ?? (disabled || undefined)}
         data-item-index={itemIndex}
         aria-rowindex={ariaPositionInSet === undefined ? itemIndex + flatIndexOffset : undefined}
         data-automationid="DetailsRow"