Filter by default values in the FilterBar

Author: grzegorz-bielski

scala3doc/resources/dotty_res/scripts/components/DocumentableList.js

@@ -1,5 +1,6 @@
 /**
  * @typedef { import("./Filter").Filter } Filter
+ * @typedef { { ref: Element; name: string; description: string } } ListElement
  */
 
 class DocumentableList extends Component {
@@ -55,10 +56,6 @@ class DocumentableList extends Component {
   }
 }
 
-/**
- * @typedef { { ref: Element; name: string; description: string } } ListElement
- */
-
 class List { 
   /**
    * @param tabsRef { Element[] }
@@ -126,31 +123,49 @@ class List {
   * @param filter { Filter }
   */
   isElementVisible(elementData, filter) {
-    if (!areFiltersFromElementSelected(elementData, filter)) {
-      return false;
-    } else {
-      return includesInputValue(elementData, filter);
-    }
+    return !areFiltersFromElementSelected() 
+      ? false 
+      : includesInputValue()
 
     function includesInputValue() {
       return elementData.name.includes(filter.value) || elementData.description.includes(filter.value);
     }
 
     function areFiltersFromElementSelected() {
-      /** @type {[key: string, value: string][]} */
-      const dataset = Object.entries(elementData.ref.dataset).filter(([key]) => startsWith(key, "f"));
-
-      const hasCorrespondingFilters = () =>
-        dataset.every(([key, value]) => {
-          const filterGroup = filter.filters[key];
-          return value.split(",").every(val => filterGroup && filterGroup[val].selected);
-        });
-
-      return dataset.length ? hasCorrespondingFilters() : true;
+      /** @param str { string } */
+      const haveKeywordData = str => str.startsWith("f")
+      /** @type { [key: string, value: string][] } */
+      const dataset = Object.entries(elementData.ref.dataset) 
+      
+      const datasetWithDefaultData =  dataset.filter(([key]) => !haveKeywordData(key));
+      const datasetWithKeywordData =  dataset.filter(([key]) => haveKeywordData(key));
+
+      return datasetWithKeywordData.length > 0 
+        ? hasCorrespondingFilters() 
+        : haveDefaultFilters()
+
+      function haveDefaultFilters() {
+        return (
+          filter.filters.fKeywords[Filter.defaultFilterKey] && 
+          filter.filters.fKeywords[Filter.defaultFilterKey].selected &&
+          datasetWithDefaultData.length >= 1
+        )
+      }
+        
+      function hasCorrespondingFilters() {
+        return (
+          datasetWithKeywordData
+            .every(([key, value]) => {
+              const filterGroup = filter.filters[key];
+              return value.split(",").every(val => filterGroup && filterGroup[val].selected);
+            })
+        )
+      }
     }
   }
 
   /**
+  * @private
   * @param elementData { ListElement }
   */
   _getTogglable = elementData => elementData.dataset.togglable;

scala3doc/resources/dotty_res/scripts/components/Filter.js

@@ -17,6 +17,11 @@ class Filter {
     this._filters = this._init ? this._withNewFilters() : filters;
   }
 
+  /**
+   * Key for filters without the `fKeywords`
+   */
+  static defaultFilterKey = 'default'
+
   get value() {
     return this._value;
   }
@@ -71,24 +76,20 @@ class Filter {
   * @returns { Filters }
   */
   _generateFiltersOnTyping(value) {
-    return this.elementsRefs
+    const datasets = this.elementsRefs
       .filter((elRef) => {
         const name = getElementTextContent(getElementNameRef(elRef));
         const description = getElementTextContent(getElementDescription(elRef));
 
         return name.includes(value) || description.includes(value);
       })
       .map((elRef) => this._getDatasetWithKeywordData(elRef.dataset))
-      .reduce((filtersObject, datasets) => {
+
+
+      return dataset.reduce((filtersObject, datasets) => {
         datasets.forEach(([key, value]) => {
           this._splitByComma(value).forEach((val) => {
-            filtersObject[key] = {
-              ...filtersObject[key],
-              [val]: {
-                ...filtersObject[key][val],
-                visible: true,
-              },
-            };
+            filtersObject[key] = { ...filtersObject[key], [val]: { ...filtersObject[key][val], visible: true} };
           });
         });
         return filtersObject;
@@ -157,7 +158,7 @@ class Filter {
     const shouldAddDefaultFilter = this._elementsRefs.some(ref => !!ref.dataset['fKeywords'])
 
     return shouldAddDefaultFilter 
-      ? { ...newFilters, fKeywords: { ...newFilters.fKeywords, default: newFilter } } 
+      ? { ...newFilters, fKeywords: { ...newFilters.fKeywords, [Filter.defaultFilterKey]: newFilter } } 
       : newFilters
   }