Merge pull request #990 from nataliauvarova/staging

fix design Select languages (map_search)
ispras · May 15, 2023 · 2efd3e6 · 2efd3e6
2 parents 1236c11 + caf1ce0
commit 2efd3e6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/components/Search/AdditionalFilter/Languages/Tree/index.js b/src/components/Search/AdditionalFilter/Languages/Tree/index.js
@@ -85,9 +85,11 @@ class Tree extends React.PureComponent {
     }
 
     this.updateNodesWithChecked(props.checked, props.filterMode);
+
+    const isAllChecked = this.constructor.isAllNodesChecked(Object.keys(this.flatNodes).length, props.checked);
 
     this.state = {
-      checkAll: false,
+      checkAll: isAllChecked || false,
       expanded:
         Object.values(this.flatNodes)
           .filter(item => item.expanded)

diff --git a/src/components/Search/AdditionalFilter/index.js b/src/components/Search/AdditionalFilter/index.js
@@ -568,16 +568,18 @@ class AdditionalFilter extends React.PureComponent {
           >
             <Modal.Header>{showLanguagesTreeText}</Modal.Header>
             <Modal.Content scrolling>
-              <Languages
-                onChange={this.onLangsDictsChange}
-                languagesTree={languagesTree}
-                langsChecked={languages}
-                dictsChecked={dictionaries}
-                showTree={this.state.showSearchSelectLanguages}
-                filterMode
-                checkAllButtonText={checkAllButtonText}
-                uncheckAllButtonText={uncheckAllButtonText}
-              />
+              <div className="filter-dictionaries">
+                <Languages
+                  onChange={this.onLangsDictsChange}
+                  languagesTree={languagesTree}
+                  langsChecked={languages}
+                  dictsChecked={dictionaries}
+                  showTree={this.state.showSearchSelectLanguages}
+                  filterMode
+                  checkAllButtonText={checkAllButtonText}
+                  uncheckAllButtonText={uncheckAllButtonText}
+                />
+              </div>
             </Modal.Content>
             <Modal.Actions>
               <Button onClick={this.onShowLangsButtonClick} className="lingvo-button-basic-black">