refactor: - inline taskListHiddenClasses() method

Author: ilandikov

src/Layout/TaskLayout.ts

@@ -44,7 +44,7 @@ export class QueryLayout {
         }
     }
 
-    protected applyQueryLayoutOptions() {
+    public applyQueryLayoutOptions() {
         const taskListHiddenClasses: string[] = [];
         const componentsToGenerateClassesOnly: [boolean, string][] = [
             // The following components are handled in QueryRenderer.ts and thus are not part of the same flow that
@@ -83,9 +83,6 @@ function hiddenComponentClassName(component: string) {
  * modified by applying {@link TaskLayoutOptions} objects.
  */
 export class TaskLayout extends QueryLayout {
-    public taskListHiddenClasses(): string[] {
-        return [...this.applyTaskLayoutOptions(), ...this.applyQueryLayoutOptions()];
-    }
     private taskLayoutOptions: TaskLayoutOptions;
 
     constructor(taskLayoutOptions?: TaskLayoutOptions, queryLayoutOptions?: QueryLayoutOptions) {
@@ -97,7 +94,7 @@ export class TaskLayout extends QueryLayout {
             this.taskLayoutOptions = new TaskLayoutOptions();
         }
     }
-    private applyTaskLayoutOptions() {
+    public applyTaskLayoutOptions() {
         const taskListHiddenClasses: string[] = [];
         this.taskLayoutOptions.toggleableComponents.forEach((component) => {
             generateHiddenClassForTaskList(

src/Renderer/QueryRenderer.ts

@@ -224,7 +224,7 @@ class QueryRenderChild extends MarkdownRenderChild {
         const layout = new TaskLayout(this.query.taskLayoutOptions, this.query.queryLayoutOptions);
         const taskList = content.createEl('ul');
         taskList.addClasses(['contains-task-list', 'plugin-tasks-query-result']);
-        taskList.addClasses(layout.taskListHiddenClasses());
+        taskList.addClasses([...layout.applyTaskLayoutOptions(), ...layout.applyQueryLayoutOptions()]);
         const groupingAttribute = this.getGroupingAttribute();
         if (groupingAttribute && groupingAttribute.length > 0) taskList.dataset.taskGroupBy = groupingAttribute;
 

tests/Layout/TaskLayout.test.ts

@@ -9,7 +9,9 @@ import { TaskLayout } from '../../src/Layout/TaskLayout';
 describe('TaskLayout tests', () => {
     it('should generate expected CSS classes for default layout', () => {
         const taskLayout = new TaskLayout();
-        expect(taskLayout.taskListHiddenClasses().join('\n')).toMatchInlineSnapshot('"tasks-layout-hide-urgency"');
+        expect(
+            [...taskLayout.applyTaskLayoutOptions(), ...taskLayout.applyQueryLayoutOptions()].join('\n'),
+        ).toMatchInlineSnapshot('"tasks-layout-hide-urgency"');
     });
 
     it('should generate expected CSS classes with all default options reversed', () => {
@@ -25,7 +27,8 @@ describe('TaskLayout tests', () => {
 
         const taskLayout = new TaskLayout(taskLayoutOptions, queryLayoutOptions);
 
-        expect(taskLayout.taskListHiddenClasses().join('\n')).toMatchInlineSnapshot(`
+        expect([...taskLayout.applyTaskLayoutOptions(), ...taskLayout.applyQueryLayoutOptions()].join('\n'))
+            .toMatchInlineSnapshot(`
             "tasks-layout-hide-id
             tasks-layout-hide-blockedBy
             tasks-layout-hide-priority