From e513e90decb67beb6a10d1587706c2a12e6a231f Mon Sep 17 00:00:00 2001
From: Jeff King <jeff@Jeffs-MacBook-Pro.local>
Date: Fri, 17 Aug 2018 02:11:28 -0700
Subject: [PATCH 1/4] Fix DetailsList width given nested groups (#5857)

---
 .../src/components/DetailsList/DetailsList.base.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.base.tsx b/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.base.tsx
index 28926110fdebaa..6aaaa8ab225b36 100644
--- a/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.base.tsx
+++ b/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.base.tsx
@@ -799,10 +799,10 @@ export class DetailsListBase extends BaseComponent<IDetailsListProps, IDetailsLi
     props: IDetailsListProps,
     firstIndex: number
   ): IColumn[] {
-    const { selectionMode, checkboxVisibility, groups } = props;
+    const { selectionMode, checkboxVisibility } = props;
     const rowCheckWidth =
       selectionMode !== SelectionMode.none && checkboxVisibility !== CheckboxVisibility.hidden ? CHECKBOX_WIDTH : 0;
-    const groupExpandWidth = groups ? GROUP_EXPAND_WIDTH : 0;
+    const groupExpandWidth = this._getGroupNestingDepth() * GROUP_EXPAND_WIDTH;
     let totalWidth = 0; // offset because we have one less inner padding.
     const availableWidth = viewportWidth - (rowCheckWidth + groupExpandWidth);
     const adjustedColumns: IColumn[] = newColumns.map((column, i) => {

From dda99ca71a4f90fdbfd2bcbbda19c7eee90cb3f6 Mon Sep 17 00:00:00 2001
From: Jeff King <jeff@Jeffs-MacBook-Pro.local>
Date: Fri, 17 Aug 2018 11:19:33 -0700
Subject: [PATCH 2/4] Add change request file for issue 5857.

---
 .../issue5857_2018-08-17-18-09.json.txt               | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt

diff --git a/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt b/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
new file mode 100644
index 00000000000000..3baa19e30051d4
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "DetailsList width calculation is not currently taking into account grouping depth >1. This fixes that.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "jeffking@gmail.com"
+}
\ No newline at end of file

From f913cfb1f7344edc362eb229df4f32fff0080c28 Mon Sep 17 00:00:00 2001
From: Jason Gore <jagore@microsoft.com>
Date: Fri, 17 Aug 2018 11:21:23 -0700
Subject: [PATCH 3/4] Tweak change file comment.

---
 .../issue5857_2018-08-17-18-09.json.txt                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt b/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
index 3baa19e30051d4..ffac4abc13c4b4 100644
--- a/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
+++ b/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
@@ -2,10 +2,10 @@
   "changes": [
     {
       "packageName": "office-ui-fabric-react",
-      "comment": "DetailsList width calculation is not currently taking into account grouping depth >1. This fixes that.",
+      "comment": "DetailsList: Account for grouping depth of more than one in width calculation.",
       "type": "patch"
     }
   ],
   "packageName": "office-ui-fabric-react",
   "email": "jeffking@gmail.com"
-}
\ No newline at end of file
+}

From 8e7b0292674edd4f4aad9fb6d33c55ca688b5aa8 Mon Sep 17 00:00:00 2001
From: Jeff King <jeff@Jeffs-MacBook-Pro.local>
Date: Fri, 17 Aug 2018 11:35:41 -0700
Subject: [PATCH 4/4] Rename change request file 5857 back to JSON.

---
 ..._2018-08-17-18-09.json.txt => issue5857_2018-08-17-18-09.json} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename common/changes/office-ui-fabric-react/{issue5857_2018-08-17-18-09.json.txt => issue5857_2018-08-17-18-09.json} (100%)

diff --git a/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt b/common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json
similarity index 100%
rename from common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json.txt
rename to common/changes/office-ui-fabric-react/issue5857_2018-08-17-18-09.json