From ed10d5987026f5a2800432044e540627b3670d7e Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Mon, 18 Oct 2021 14:16:56 +0300
Subject: [PATCH] Web: Files: fixed TableGroupMenu onChange

---
 .../src/pages/Home/Section/Body/index.js      |  8 ++++----
 .../src/pages/Home/Section/Header/index.js    | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
index 691f41a456..e7b48d8c01 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
@@ -65,11 +65,11 @@ const SectionBodyContent = (props) => {
     if (
       e.target.closest(".scroll-body") &&
       !e.target.closest(".files-item") &&
-      !e.target.closest(".not-selectable")
+      !e.target.closest(".not-selectable") &&
+      !e.target.closest(".table-container_group-menu")
     ) {
-      // TODO: need fix clear selection
-      //setSelection([]);
-      //setBufferSelection(null);
+      // setSelection([]);
+      // setBufferSelection(null);
     }
   };
 
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
index 4d0bb70a2b..020fa3e559 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
@@ -302,8 +302,9 @@ class SectionHeaderContent extends React.Component {
     this.props.setSelected(checked ? "all" : "none");
   };
 
-  onSelect = (item) => {
-    this.props.setSelected(item.key);
+  onSelect = (e) => {
+    const key = e.currentTarget.dataset.key;
+    this.props.setSelected(key);
   };
 
   onClose = () => {
@@ -313,10 +314,10 @@ class SectionHeaderContent extends React.Component {
   getMenuItems = () => {
     const { t, cbMenuItems, getCheckboxItemLabel } = this.props;
 
-    const children = cbMenuItems.map((key, index) => {
-      const label = getCheckboxItemLabel(t, key);
-      return <DropDownItem key={key} label={label} data-index={index} />;
-    });
+    // const children = cbMenuItems.map((key, index) => {
+    //   const label = getCheckboxItemLabel(t, key);
+    //   return <DropDownItem key={key} label={label} data-index={index} />;
+    // });
 
     const checkboxOptions = (
       <>
@@ -337,6 +338,10 @@ class SectionHeaderContent extends React.Component {
     return checkboxOptions;
   };
 
+  onChange = (checked) => {
+    this.props.setSelected(checked ? "all" : "none");
+  };
+
   render() {
     //console.log("Body header render");
 
@@ -373,11 +378,10 @@ class SectionHeaderContent extends React.Component {
             {isHeaderVisible ? (
               <TableGroupMenu
                 checkboxOptions={menuItems}
-                // onChange={onChange}
+                onChange={this.onChange}
                 isChecked={isHeaderChecked}
                 isIndeterminate={isHeaderIndeterminate}
                 headerMenu={headerMenu}
-                // columnStorageName={columnStorageName}
               />
             ) : (
               <div className="header-container">