From ee02bb388f3636c482c2ffd4c55fd233e050aaf2 Mon Sep 17 00:00:00 2001
From: undergroundwires <git@undergroundwires.dev>
Date: Sat, 28 Oct 2023 02:19:11 +0200
Subject: [PATCH] Improve UI performance by optimizing reactivity

- Replace `ref`s with `shallowRef` when deep reactivity is not needed.
- Replace `readonly`s with `shallowReadonly` where the goal is to only
  prevent `.value` mutation.
- Remove redundant `ref` in `SizeObserver.vue`.
- Remove redundant nested `ref` in `TooltipWrapper.vue`.
- Remove redundant `events` export from `UseCollectionState.ts`.
- Remove redundant `computed` from `UseCollectionState.ts`.
- Remove `timestamp` from `TreeViewFilterEvent` that becomes unnecessary
  after using `shallowRef`.
- Add missing unit tests for `UseTreeViewFilterEvent`.
- Add missing stub for `FilterChangeDetails`.
---
 .../Scripts/Slider/HorizontalResizeSlider.vue |   4 +-
 .../Scripts/View/Cards/CardListItem.vue       |   4 +-
 .../TreeView/Bindings/TreeInputFilterEvent.ts |  10 -
 .../View/Tree/TreeView/Node/UseNodeState.ts   |   4 +-
 .../Scripts/View/Tree/TreeView/TreeView.vue   |   4 +-
 .../View/Tree/TreeView/UseCurrentTreeNodes.ts |   8 +-
 .../TreeView/UseNodeStateChangeAggregator.ts  |   4 +-
 .../UseSelectedScriptNodeIds.ts               |   8 +-
 .../TreeViewAdapter/UseTreeViewFilterEvent.ts |   6 +-
 .../Shared/Hooks/UseCollectionState.ts        |   9 +-
 .../components/Shared/Icon/UseSvgLoader.ts    |   4 +-
 .../components/Shared/Modal/ModalContent.vue  |   4 +-
 .../components/Shared/SizeObserver.vue        |   6 +-
 .../components/Shared/TooltipWrapper.vue      |  12 +-
 .../View/Tree/TreeView/TreeView.spec.ts       |   6 +-
 .../Context/State/Filter/UserFilter.spec.ts   |   4 +-
 .../Scripts/View/TheScriptsView.spec.ts       |  28 +-
 .../Bindings/TreeViewFilterEvent.spec.ts      |  28 +-
 .../Tree/TreeView/Node/UseNodeState.spec.ts   |  10 +-
 .../Tree/TreeView/UseCurrentTreeNodes.spec.ts |   8 +-
 .../UseTreeViewFilterEvent.spec.ts            | 279 ++++++++++++++++++
 .../shared/Stubs/FilterChangeDetailsStub.ts   |  26 ++
 .../shared/Stubs/UseCollectionStateStub.ts    |   8 +-
 .../shared/Stubs/UseCurrentTreeNodesStub.ts   |   4 +-
 24 files changed, 377 insertions(+), 111 deletions(-)
 create mode 100644 tests/unit/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.spec.ts

diff --git a/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue b/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue
index 197524c59..bedcb33b3 100644
--- a/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue
+++ b/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, shallowRef } from 'vue';
 import SliderHandle from './SliderHandle.vue';
 
 export default defineComponent({
@@ -45,7 +45,7 @@ export default defineComponent({
     },
   },
   setup() {
-    const firstElement = ref<HTMLElement>();
+    const firstElement = shallowRef<HTMLElement>();
 
     function onResize(displacementX: number): void {
       const leftWidth = firstElement.value.offsetWidth + displacementX;
diff --git a/src/presentation/components/Scripts/View/Cards/CardListItem.vue b/src/presentation/components/Scripts/View/Cards/CardListItem.vue
index e499c6cbc..b028ac674 100644
--- a/src/presentation/components/Scripts/View/Cards/CardListItem.vue
+++ b/src/presentation/components/Scripts/View/Cards/CardListItem.vue
@@ -50,7 +50,7 @@
 <script lang="ts">
 import {
   defineComponent, ref, watch, computed,
-  inject,
+  inject, shallowRef,
 } from 'vue';
 import AppIcon from '@/presentation/components/Shared/Icon/AppIcon.vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
@@ -95,7 +95,7 @@ export default defineComponent({
 
     const isAnyChildSelected = ref(false);
     const areAllChildrenSelected = ref(false);
-    const cardElement = ref<HTMLElement>();
+    const cardElement = shallowRef<HTMLElement>();
 
     const cardTitle = computed<string | undefined>(() => {
       if (!props.categoryId || !currentState.value) {
diff --git a/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent.ts b/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent.ts
index 664df496d..dd5b6a755 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent.ts
@@ -2,14 +2,6 @@ import type { ReadOnlyTreeNode } from '../Node/TreeNode';
 
 export interface TreeViewFilterEvent {
   readonly action: TreeViewFilterAction;
-  /**
-   * A simple numeric value to ensure uniqueness of each event.
-   *
-   * This property is used to guarantee that the watch function will trigger
-   * even if the same filter action value is emitted consecutively.
-   */
-  readonly timestamp: Date;
-
   readonly predicate?: TreeViewFilterPredicate;
 }
 
@@ -25,7 +17,6 @@ export function createFilterTriggeredEvent(
 ): TreeViewFilterEvent {
   return {
     action: TreeViewFilterAction.Triggered,
-    timestamp: new Date(),
     predicate,
   };
 }
@@ -33,6 +24,5 @@ export function createFilterTriggeredEvent(
 export function createFilterRemovedEvent(): TreeViewFilterEvent {
   return {
     action: TreeViewFilterAction.Removed,
-    timestamp: new Date(),
   };
 }
diff --git a/src/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.ts b/src/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.ts
index 099761974..52df26b3b 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.ts
@@ -1,5 +1,5 @@
 import {
-  WatchSource, inject, ref, watch,
+  WatchSource, inject, shallowRef, watch,
 } from 'vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { ReadOnlyTreeNode } from './TreeNode';
@@ -10,7 +10,7 @@ export function useNodeState(
 ) {
   const { events } = inject(InjectionKeys.useAutoUnsubscribedEvents)();
 
-  const state = ref<TreeNodeStateDescriptor>();
+  const state = shallowRef<TreeNodeStateDescriptor>();
 
   watch(nodeWatcher, (node: ReadOnlyTreeNode) => {
     if (!node) {
diff --git a/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue b/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue
index de817bc17..207655241 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue
@@ -14,7 +14,7 @@
 <script lang="ts">
 import {
   defineComponent, onMounted, watch,
-  ref, PropType,
+  shallowRef, PropType,
 } from 'vue';
 import { TreeRootManager } from './TreeRoot/TreeRootManager';
 import TreeRoot from './TreeRoot/TreeRoot.vue';
@@ -53,7 +53,7 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    const treeContainerElement = ref<HTMLElement | undefined>();
+    const treeContainerElement = shallowRef<HTMLElement | undefined>();
 
     const tree = new TreeRootManager();
 
diff --git a/src/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.ts b/src/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.ts
index ba422f3d3..1d0a75d53 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.ts
@@ -1,5 +1,5 @@
 import {
-  WatchSource, watch, inject, readonly, ref,
+  WatchSource, watch, inject, shallowReadonly, shallowRef,
 } from 'vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { TreeRoot } from './TreeRoot/TreeRoot';
@@ -8,8 +8,8 @@ import { QueryableNodes } from './TreeRoot/NodeCollection/Query/QueryableNodes';
 export function useCurrentTreeNodes(treeWatcher: WatchSource<TreeRoot>) {
   const { events } = inject(InjectionKeys.useAutoUnsubscribedEvents)();
 
-  const tree = ref<TreeRoot | undefined>();
-  const nodes = ref<QueryableNodes | undefined>();
+  const tree = shallowRef<TreeRoot | undefined>();
+  const nodes = shallowRef<QueryableNodes | undefined>();
 
   watch(treeWatcher, (newTree) => {
     tree.value = newTree;
@@ -22,6 +22,6 @@ export function useCurrentTreeNodes(treeWatcher: WatchSource<TreeRoot>) {
   }, { immediate: true });
 
   return {
-    nodes: readonly(nodes),
+    nodes: shallowReadonly(nodes),
   };
 }
diff --git a/src/presentation/components/Scripts/View/Tree/TreeView/UseNodeStateChangeAggregator.ts b/src/presentation/components/Scripts/View/Tree/TreeView/UseNodeStateChangeAggregator.ts
index bfb573b41..9d44e87d5 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeView/UseNodeStateChangeAggregator.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeView/UseNodeStateChangeAggregator.ts
@@ -1,5 +1,5 @@
 import {
-  WatchSource, inject, watch, ref,
+  WatchSource, inject, watch, shallowRef,
 } from 'vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { IEventSubscription } from '@/infrastructure/Events/IEventSource';
@@ -17,7 +17,7 @@ export function useNodeStateChangeAggregator(
   const { nodes } = useTreeNodes(treeWatcher);
   const { events } = inject(InjectionKeys.useAutoUnsubscribedEvents)();
 
-  const onNodeChangeCallback = ref<NodeStateChangeEventCallback>();
+  const onNodeChangeCallback = shallowRef<NodeStateChangeEventCallback>();
 
   watch([
     () => nodes.value,
diff --git a/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseSelectedScriptNodeIds.ts b/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseSelectedScriptNodeIds.ts
index 5d9025cd2..94eea8451 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseSelectedScriptNodeIds.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseSelectedScriptNodeIds.ts
@@ -1,5 +1,5 @@
 import {
-  computed, inject, readonly, ref,
+  computed, inject, shallowReadonly, shallowRef,
 } from 'vue';
 import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
@@ -15,7 +15,7 @@ export function useSelectedScriptNodeIds(scriptNodeIdParser = getScriptNodeId) {
   });
 
   return {
-    selectedScriptNodeIds: readonly(selectedNodeIds),
+    selectedScriptNodeIds: shallowReadonly(selectedNodeIds),
   };
 }
 
@@ -23,7 +23,7 @@ function useSelectedScripts() {
   const { events } = inject(InjectionKeys.useAutoUnsubscribedEvents)();
   const { onStateChange } = inject(InjectionKeys.useCollectionState)();
 
-  const selectedScripts = ref<readonly SelectedScript[]>([]);
+  const selectedScripts = shallowRef<readonly SelectedScript[]>([]);
 
   onStateChange((state) => {
     selectedScripts.value = state.selection.selectedScripts;
@@ -35,6 +35,6 @@ function useSelectedScripts() {
   }, { immediate: true });
 
   return {
-    selectedScripts: readonly(selectedScripts),
+    selectedScripts: shallowReadonly(selectedScripts),
   };
 }
diff --git a/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.ts b/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.ts
index 32c977e99..e652017cb 100644
--- a/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.ts
+++ b/src/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.ts
@@ -1,5 +1,5 @@
 import {
-  Ref, inject, readonly, ref,
+  Ref, inject, shallowReadonly, shallowRef,
 } from 'vue';
 import { IScript } from '@/domain/IScript';
 import { ICategory } from '@/domain/ICategory';
@@ -21,7 +21,7 @@ export function useTreeViewFilterEvent() {
   const { onStateChange } = inject(InjectionKeys.useCollectionState)();
   const { events } = inject(InjectionKeys.useAutoUnsubscribedEvents)();
 
-  const latestFilterEvent = ref<TreeViewFilterEvent | undefined>(undefined);
+  const latestFilterEvent = shallowRef<TreeViewFilterEvent | undefined>(undefined);
 
   const treeNodePredicate: TreeNodeFilterResultPredicate = (node, filterResult) => filterMatches(
     getNodeMetadata(node),
@@ -36,7 +36,7 @@ export function useTreeViewFilterEvent() {
   }, { immediate: true });
 
   return {
-    latestFilterEvent: readonly(latestFilterEvent),
+    latestFilterEvent: shallowReadonly(latestFilterEvent),
   };
 }
 
diff --git a/src/presentation/components/Shared/Hooks/UseCollectionState.ts b/src/presentation/components/Shared/Hooks/UseCollectionState.ts
index 600ecd26b..998b0c0e9 100644
--- a/src/presentation/components/Shared/Hooks/UseCollectionState.ts
+++ b/src/presentation/components/Shared/Hooks/UseCollectionState.ts
@@ -1,6 +1,4 @@
-import {
-  ref, computed, readonly,
-} from 'vue';
+import { shallowRef, shallowReadonly } from 'vue';
 import { IApplicationContext, IReadOnlyApplicationContext } from '@/application/Context/IApplicationContext';
 import { ICategoryCollectionState, IReadOnlyCategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { IEventSubscriptionCollection } from '@/infrastructure/Events/IEventSubscriptionCollection';
@@ -16,7 +14,7 @@ export function useCollectionState(
     throw new Error('missing events');
   }
 
-  const currentState = ref<ICategoryCollectionState>(context.state);
+  const currentState = shallowRef<IReadOnlyCategoryCollectionState>(context.state);
   events.register([
     context.contextChanged.on((event) => {
       currentState.value = event.newState;
@@ -66,8 +64,7 @@ export function useCollectionState(
     modifyCurrentContext,
     onStateChange,
     currentContext: context as IReadOnlyApplicationContext,
-    currentState: readonly(computed<IReadOnlyCategoryCollectionState>(() => currentState.value)),
-    events: events as IEventSubscriptionCollection,
+    currentState: shallowReadonly(currentState),
   };
 }
 
diff --git a/src/presentation/components/Shared/Icon/UseSvgLoader.ts b/src/presentation/components/Shared/Icon/UseSvgLoader.ts
index 2fef97168..3d9274fdb 100644
--- a/src/presentation/components/Shared/Icon/UseSvgLoader.ts
+++ b/src/presentation/components/Shared/Icon/UseSvgLoader.ts
@@ -1,5 +1,5 @@
 import {
-  WatchSource, readonly, ref, watch,
+  WatchSource, shallowReadonly, ref, watch,
 } from 'vue';
 import { AsyncLazy } from '@/infrastructure/Threading/AsyncLazy';
 import { IconName } from './IconName';
@@ -15,7 +15,7 @@ export function useSvgLoader(
   }, { immediate: true });
 
   return {
-    svgContent: readonly(svgContent),
+    svgContent: shallowReadonly(svgContent),
   };
 }
 
diff --git a/src/presentation/components/Shared/Modal/ModalContent.vue b/src/presentation/components/Shared/Modal/ModalContent.vue
index 6b65be991..4f157437c 100644
--- a/src/presentation/components/Shared/Modal/ModalContent.vue
+++ b/src/presentation/components/Shared/Modal/ModalContent.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, shallowRef } from 'vue';
 
 export default defineComponent({
   props: {
@@ -31,7 +31,7 @@ export default defineComponent({
     'transitionedOut',
   ],
   setup(_, { emit }) {
-    const modalElement = ref<HTMLElement>();
+    const modalElement = shallowRef<HTMLElement>();
 
     function onAfterTransitionLeave() {
       emit('transitionedOut');
diff --git a/src/presentation/components/Shared/SizeObserver.vue b/src/presentation/components/Shared/SizeObserver.vue
index 171ff1d4a..d5c0053d3 100644
--- a/src/presentation/components/Shared/SizeObserver.vue
+++ b/src/presentation/components/Shared/SizeObserver.vue
@@ -1,12 +1,12 @@
 <template>
   <div ref="containerElement" class="container">
-    <slot ref="containerElement" />
+    <slot />
   </div>
 </template>
 
 <script lang="ts">
 import {
-  defineComponent, ref, onMounted, onBeforeUnmount,
+  defineComponent, shallowRef, onMounted, onBeforeUnmount,
 } from 'vue';
 import { useResizeObserverPolyfill } from '@/presentation/components/Shared/Hooks/UseResizeObserverPolyfill';
 
@@ -21,7 +21,7 @@ export default defineComponent({
   setup(_, { emit }) {
     const { resizeObserverReady } = useResizeObserverPolyfill();
 
-    const containerElement = ref<HTMLElement>();
+    const containerElement = shallowRef<HTMLElement>();
 
     let width = 0;
     let height = 0;
diff --git a/src/presentation/components/Shared/TooltipWrapper.vue b/src/presentation/components/Shared/TooltipWrapper.vue
index 1449264b6..f3bfdc2f2 100644
--- a/src/presentation/components/Shared/TooltipWrapper.vue
+++ b/src/presentation/components/Shared/TooltipWrapper.vue
@@ -26,7 +26,7 @@
 import {
   useFloating, arrow, shift, flip, Placement, offset, Side, Coords, autoUpdate,
 } from '@floating-ui/vue';
-import { defineComponent, ref, computed } from 'vue';
+import { defineComponent, shallowRef, computed } from 'vue';
 import { useResizeObserverPolyfill } from '@/presentation/components/Shared/Hooks/UseResizeObserverPolyfill';
 import type { CSSProperties } from 'vue/types/jsx'; // In Vue 3.0 import from 'vue'
 
@@ -36,10 +36,10 @@ const MARGIN_FROM_DOCUMENT_EDGE_IN_PX = 2;
 
 export default defineComponent({
   setup() {
-    const tooltipDisplayElement = ref<HTMLElement | undefined>();
-    const triggeringElement = ref<HTMLElement | undefined>();
-    const arrowElement = ref<HTMLElement | undefined>();
-    const placement = ref<Placement>('top');
+    const tooltipDisplayElement = shallowRef<HTMLElement | undefined>();
+    const triggeringElement = shallowRef<HTMLElement | undefined>();
+    const arrowElement = shallowRef<HTMLElement | undefined>();
+    const placement = shallowRef<Placement>('top');
 
     useResizeObserverPolyfill();
 
@@ -47,7 +47,7 @@ export default defineComponent({
       triggeringElement,
       tooltipDisplayElement,
       {
-        placement: ref(placement),
+        placement,
         middleware: [
           offset(ARROW_SIZE_IN_PX + GAP_BETWEEN_TOOLTIP_AND_TRIGGER_IN_PX),
           /* Shifts the element along the specified axes in order to keep it in view. */
diff --git a/tests/integration/presentation/components/Scripts/View/Tree/TreeView/TreeView.spec.ts b/tests/integration/presentation/components/Scripts/View/Tree/TreeView/TreeView.spec.ts
index 49519d246..fc06dd62e 100644
--- a/tests/integration/presentation/components/Scripts/View/Tree/TreeView/TreeView.spec.ts
+++ b/tests/integration/presentation/components/Scripts/View/Tree/TreeView/TreeView.spec.ts
@@ -2,7 +2,7 @@ import {
   describe, it, expect,
 } from 'vitest';
 import { mount } from '@vue/test-utils';
-import { defineComponent, ref } from 'vue';
+import { defineComponent, shallowRef } from 'vue';
 import TreeView from '@/presentation/components/Scripts/View/Tree/TreeView/TreeView.vue';
 import { TreeInputNodeData } from '@/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputNodeData';
 import { provideDependencies } from '@/presentation/bootstrapping/DependencyProvider';
@@ -33,8 +33,8 @@ function createTreeViewWrapper(initialNodeData: readonly TreeInputNodeData[]) {
     setup() {
       provideDependencies(new ApplicationContextStub());
 
-      const initialNodes = ref(initialNodeData);
-      const selectedLeafNodeIds = ref<readonly string[]>([]);
+      const initialNodes = shallowRef(initialNodeData);
+      const selectedLeafNodeIds = shallowRef<readonly string[]>([]);
       return {
         initialNodes,
         selectedLeafNodeIds,
diff --git a/tests/unit/application/Context/State/Filter/UserFilter.spec.ts b/tests/unit/application/Context/State/Filter/UserFilter.spec.ts
index 87a895ea3..dbeadb216 100644
--- a/tests/unit/application/Context/State/Filter/UserFilter.spec.ts
+++ b/tests/unit/application/Context/State/Filter/UserFilter.spec.ts
@@ -3,8 +3,8 @@ import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult'
 import { UserFilter } from '@/application/Context/State/Filter/UserFilter';
 import { CategoryStub } from '@tests/unit/shared/Stubs/CategoryStub';
 import { ScriptStub } from '@tests/unit/shared/Stubs/ScriptStub';
+import { FilterChangeDetailsStub } from '@tests/unit/shared/Stubs/FilterChangeDetailsStub';
 import { CategoryCollectionStub } from '@tests/unit/shared/Stubs/CategoryCollectionStub';
-import { FilterChange } from '@/application/Context/State/Filter/Event/FilterChange';
 import { IFilterChangeDetails } from '@/application/Context/State/Filter/Event/IFilterChangeDetails';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 
@@ -12,7 +12,7 @@ describe('UserFilter', () => {
   describe('clearFilter', () => {
     it('signals when removing filter', () => {
       // arrange
-      const expectedChange = FilterChange.forClear();
+      const expectedChange = FilterChangeDetailsStub.forClear();
       let actualChange: IFilterChangeDetails;
       const sut = new UserFilter(new CategoryCollectionStub());
       sut.filterChanged.on((change) => {
diff --git a/tests/unit/presentation/components/Scripts/View/TheScriptsView.spec.ts b/tests/unit/presentation/components/Scripts/View/TheScriptsView.spec.ts
index 185e13d05..8150fc921 100644
--- a/tests/unit/presentation/components/Scripts/View/TheScriptsView.spec.ts
+++ b/tests/unit/presentation/components/Scripts/View/TheScriptsView.spec.ts
@@ -10,10 +10,10 @@ import { InjectionKeys } from '@/presentation/injectionSymbols';
 import { UseApplicationStub } from '@tests/unit/shared/Stubs/UseApplicationStub';
 import { UserFilterMethod, UserFilterStub } from '@tests/unit/shared/Stubs/UserFilterStub';
 import { FilterResultStub } from '@tests/unit/shared/Stubs/FilterResultStub';
-import { FilterChange } from '@/application/Context/State/Filter/Event/FilterChange';
 import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
 import { IFilterChangeDetails } from '@/application/Context/State/Filter/Event/IFilterChangeDetails';
 import { UseAutoUnsubscribedEventsStub } from '@tests/unit/shared/Stubs/UseAutoUnsubscribedEventsStub';
+import { FilterChangeDetailsStub } from '@tests/unit/shared/Stubs/FilterChangeDetailsStub';
 
 const DOM_SELECTOR_NO_MATCHES = '.search-no-matches';
 const DOM_SELECTOR_CLOSE_BUTTON = '.search__query__close-button';
@@ -123,7 +123,7 @@ describe('TheScriptsView.vue', () => {
             new FilterResultStub().withQueryAndSomeMatches(),
           ),
         changeEvents: [
-          FilterChange.forClear(),
+          FilterChangeDetailsStub.forClear(),
         ],
         expectedComponent: CardList,
         componentsToDisappear: [ScriptsTree],
@@ -132,7 +132,7 @@ describe('TheScriptsView.vue', () => {
         name: 'tree on search',
         initialView: ViewType.Cards,
         changeEvents: [
-          FilterChange.forApply(
+          FilterChangeDetailsStub.forApply(
             new FilterResultStub().withQueryAndSomeMatches(),
           ),
         ],
@@ -143,10 +143,10 @@ describe('TheScriptsView.vue', () => {
         name: 'return to card after search',
         initialView: ViewType.Cards,
         changeEvents: [
-          FilterChange.forApply(
+          FilterChangeDetailsStub.forApply(
             new FilterResultStub().withQueryAndSomeMatches(),
           ),
-          FilterChange.forClear(),
+          FilterChangeDetailsStub.forClear(),
         ],
         expectedComponent: CardList,
         componentsToDisappear: [ScriptsTree],
@@ -155,10 +155,10 @@ describe('TheScriptsView.vue', () => {
         name: 'return to tree after search',
         initialView: ViewType.Tree,
         changeEvents: [
-          FilterChange.forApply(
+          FilterChangeDetailsStub.forApply(
             new FilterResultStub().withQueryAndSomeMatches(),
           ),
-          FilterChange.forClear(),
+          FilterChangeDetailsStub.forClear(),
         ],
         expectedComponent: ScriptsTree,
         componentsToDisappear: [CardList],
@@ -223,11 +223,11 @@ describe('TheScriptsView.vue', () => {
           });
 
           // act
-          filterStub.notifyFilterChange(FilterChange.forApply(
+          filterStub.notifyFilterChange(FilterChangeDetailsStub.forApply(
             new FilterResultStub().withQueryAndSomeMatches(),
           ));
           await wrapper.vm.$nextTick();
-          filterStub.notifyFilterChange(FilterChange.forClear());
+          filterStub.notifyFilterChange(FilterChangeDetailsStub.forClear());
           await wrapper.vm.$nextTick();
 
           // assert
@@ -264,7 +264,7 @@ describe('TheScriptsView.vue', () => {
           });
 
           // act
-          filterStub.notifyFilterChange(FilterChange.forApply(
+          filterStub.notifyFilterChange(FilterChangeDetailsStub.forApply(
             new FilterResultStub().withQueryAndSomeMatches(),
           ));
           await wrapper.vm.$nextTick();
@@ -283,7 +283,7 @@ describe('TheScriptsView.vue', () => {
       const wrapper = mountComponent({
         useCollectionState: stateStub.get(),
       });
-      filterStub.notifyFilterChange(FilterChange.forApply(
+      filterStub.notifyFilterChange(FilterChangeDetailsStub.forApply(
         new FilterResultStub().withQueryAndSomeMatches(),
       ));
       await wrapper.vm.$nextTick();
@@ -359,7 +359,7 @@ describe('TheScriptsView.vue', () => {
           });
 
           // act
-          filterStub.notifyFilterChange(FilterChange.forApply(
+          filterStub.notifyFilterChange(FilterChangeDetailsStub.forApply(
             filter,
           ));
           await wrapper.vm.$nextTick();
@@ -379,10 +379,10 @@ describe('TheScriptsView.vue', () => {
         });
 
         // act
-        filter.notifyFilterChange(FilterChange.forApply(
+        filter.notifyFilterChange(FilterChangeDetailsStub.forApply(
           new FilterResultStub().withSomeMatches(),
         ));
-        filter.notifyFilterChange(FilterChange.forClear());
+        filter.notifyFilterChange(FilterChangeDetailsStub.forClear());
         await wrapper.vm.$nextTick();
 
         // expect
diff --git a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeViewFilterEvent.spec.ts b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeViewFilterEvent.spec.ts
index 933fd2773..fb2cb799d 100644
--- a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeViewFilterEvent.spec.ts
+++ b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeViewFilterEvent.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import {
-  TreeViewFilterAction, TreeViewFilterEvent, TreeViewFilterPredicate,
+  TreeViewFilterAction, TreeViewFilterPredicate,
   createFilterRemovedEvent, createFilterTriggeredEvent,
 } from '@/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent';
 
@@ -47,19 +47,6 @@ describe('TreeViewFilterEvent', () => {
       // expect
       expect(event.predicate).to.equal(predicate);
     });
-    it('returns unique timestamp', () => {
-      // arrange
-      const instances = new Array<TreeViewFilterEvent>();
-      // act
-      instances.push(
-        createFilterTriggeredEvent(createPredicateStub()),
-        createFilterTriggeredEvent(createPredicateStub()),
-        createFilterTriggeredEvent(createPredicateStub()),
-      );
-      // assert
-      const uniqueDates = new Set(instances.map((instance) => instance.timestamp));
-      expect(uniqueDates).to.have.length(instances.length);
-    });
   });
 
   describe('createFilterRemovedEvent', () => {
@@ -79,19 +66,6 @@ describe('TreeViewFilterEvent', () => {
       // assert
       expect(event.predicate).to.equal(expected);
     });
-    it('returns unique timestamp', () => {
-      // arrange
-      const instances = new Array<TreeViewFilterEvent>();
-      // act
-      instances.push(
-        createFilterRemovedEvent(),
-        createFilterRemovedEvent(),
-        createFilterRemovedEvent(),
-      );
-      // assert
-      const uniqueDates = new Set(instances.map((instance) => instance.timestamp));
-      expect(uniqueDates).to.have.length(instances.length);
-    });
   });
 });
 
diff --git a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.spec.ts b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.spec.ts
index 69d7dfe59..cc1a2b15b 100644
--- a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.spec.ts
+++ b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/Node/UseNodeState.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import {
-  ref, defineComponent, WatchSource, nextTick,
+  shallowRef, defineComponent, WatchSource, nextTick,
 } from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { ReadOnlyTreeNode } from '@/presentation/components/Scripts/View/Tree/TreeView/Node/TreeNode';
@@ -16,7 +16,7 @@ describe('useNodeState', () => {
   it('should set state on immediate invocation if node exists', () => {
     // arrange
     const expectedState = new TreeNodeStateDescriptorStub();
-    const nodeWatcher = ref<ReadOnlyTreeNode | undefined>(undefined);
+    const nodeWatcher = shallowRef<ReadOnlyTreeNode | undefined>(undefined);
     nodeWatcher.value = new TreeNodeStub()
       .withState(new TreeNodeStateAccessStub().withCurrent(expectedState));
     // act
@@ -27,7 +27,7 @@ describe('useNodeState', () => {
 
   it('should not set state on immediate invocation if node is undefined', () => {
     // arrange
-    const nodeWatcher = ref<ReadOnlyTreeNode | undefined>(undefined);
+    const nodeWatcher = shallowRef<ReadOnlyTreeNode | undefined>(undefined);
     // act
     const { returnObject } = mountWrapperComponent(nodeWatcher);
     // assert
@@ -37,7 +37,7 @@ describe('useNodeState', () => {
   it('should update state when nodeWatcher changes', async () => {
     // arrange
     const expectedNewState = new TreeNodeStateDescriptorStub();
-    const nodeWatcher = ref<ReadOnlyTreeNode | undefined>(undefined);
+    const nodeWatcher = shallowRef<ReadOnlyTreeNode | undefined>(undefined);
     const { returnObject } = mountWrapperComponent(nodeWatcher);
     // act
     nodeWatcher.value = new TreeNodeStub()
@@ -49,7 +49,7 @@ describe('useNodeState', () => {
 
   it('should update state when node state changes', () => {
     // arrange
-    const nodeWatcher = ref<ReadOnlyTreeNode | undefined>(undefined);
+    const nodeWatcher = shallowRef<ReadOnlyTreeNode | undefined>(undefined);
     const stateAccessStub = new TreeNodeStateAccessStub();
     const expectedChangedState = new TreeNodeStateDescriptorStub();
     nodeWatcher.value = new TreeNodeStub()
diff --git a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.spec.ts b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.spec.ts
index e559bf133..02abc5bcc 100644
--- a/tests/unit/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.spec.ts
+++ b/tests/unit/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import {
-  ref, defineComponent, WatchSource, nextTick,
+  shallowRef, defineComponent, WatchSource, nextTick,
 } from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { TreeRoot } from '@/presentation/components/Scripts/View/Tree/TreeView/TreeRoot/TreeRoot';
@@ -15,7 +15,7 @@ describe('useCurrentTreeNodes', () => {
   it('should set nodes on immediate invocation', () => {
     // arrange
     const expectedNodes = new QueryableNodesStub();
-    const treeWatcher = ref<TreeRoot>(new TreeRootStub().withCollection(
+    const treeWatcher = shallowRef<TreeRoot>(new TreeRootStub().withCollection(
       new TreeNodeCollectionStub().withNodes(expectedNodes),
     ));
     // act
@@ -27,7 +27,7 @@ describe('useCurrentTreeNodes', () => {
   it('should update nodes when treeWatcher changes', async () => {
     // arrange
     const initialNodes = new QueryableNodesStub();
-    const treeWatcher = ref(
+    const treeWatcher = shallowRef(
       new TreeRootStub().withCollection(new TreeNodeCollectionStub().withNodes(initialNodes)),
     );
     const { returnObject } = mountWrapperComponent(treeWatcher);
@@ -45,7 +45,7 @@ describe('useCurrentTreeNodes', () => {
     // arrange
     const initialNodes = new QueryableNodesStub();
     const treeCollectionStub = new TreeNodeCollectionStub().withNodes(initialNodes);
-    const treeWatcher = ref(new TreeRootStub().withCollection(treeCollectionStub));
+    const treeWatcher = shallowRef(new TreeRootStub().withCollection(treeCollectionStub));
 
     const { returnObject } = mountWrapperComponent(treeWatcher);
 
diff --git a/tests/unit/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.spec.ts b/tests/unit/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.spec.ts
new file mode 100644
index 000000000..42686a9af
--- /dev/null
+++ b/tests/unit/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent.spec.ts
@@ -0,0 +1,279 @@
+import { shallowMount } from '@vue/test-utils';
+import { describe, it, expect } from 'vitest';
+import { Ref, nextTick, watch } from 'vue';
+import { InjectionKeys } from '@/presentation/injectionSymbols';
+import { UseCollectionStateStub } from '@tests/unit/shared/Stubs/UseCollectionStateStub';
+import { UseAutoUnsubscribedEventsStub } from '@tests/unit/shared/Stubs/UseAutoUnsubscribedEventsStub';
+import { useTreeViewFilterEvent } from '@/presentation/components/Scripts/View/Tree/TreeViewAdapter/UseTreeViewFilterEvent';
+import { FilterResultStub } from '@tests/unit/shared/Stubs/FilterResultStub';
+import { TreeViewFilterAction, TreeViewFilterEvent } from '@/presentation/components/Scripts/View/Tree/TreeView/Bindings/TreeInputFilterEvent';
+import { ScriptStub } from '@tests/unit/shared/Stubs/ScriptStub';
+import { CategoryStub } from '@tests/unit/shared/Stubs/CategoryStub';
+import { TreeNodeStub } from '@tests/unit/shared/Stubs/TreeNodeStub';
+import { HierarchyAccessStub } from '@tests/unit/shared/Stubs/HierarchyAccessStub';
+import { IScript } from '@/domain/IScript';
+import { ICategory } from '@/domain/ICategory';
+import { TreeNode } from '@/presentation/components/Scripts/View/Tree/TreeView/Node/TreeNode';
+import { UserFilterStub } from '@tests/unit/shared/Stubs/UserFilterStub';
+import { FilterChangeDetailsStub } from '@tests/unit/shared/Stubs/FilterChangeDetailsStub';
+import { IFilterChangeDetails } from '@/application/Context/State/Filter/Event/IFilterChangeDetails';
+import { CategoryCollectionStateStub } from '@tests/unit/shared/Stubs/CategoryCollectionStateStub';
+import { NodeMetadataStub } from '@tests/unit/shared/Stubs/NodeMetadataStub';
+
+describe('UseTreeViewFilterEvent', () => {
+  describe('initially', () => {
+    testFilterEvents((filterChange) => {
+      // arrange
+      const useCollectionStateStub = new UseCollectionStateStub()
+        .withFilterResult(filterChange.filter);
+      // act
+      const { returnObject } = mountWrapperComponent({
+        useStateStub: useCollectionStateStub,
+      });
+      // assert
+      return Promise.resolve({
+        event: returnObject.latestFilterEvent,
+      });
+    });
+  });
+  describe('on filter state changed', () => {
+    describe('handles new event correctly', () => {
+      testFilterEvents((filterChange) => {
+        // arrange
+        const newFilter = filterChange;
+        const initialFilter = new FilterResultStub().withSomeMatches();
+        const filterStub = new UserFilterStub()
+          .withCurrentFilterResult(initialFilter);
+        const stateStub = new UseCollectionStateStub()
+          .withFilter(filterStub);
+        const { returnObject } = mountWrapperComponent({ useStateStub: stateStub });
+        // act
+        filterStub.notifyFilterChange(newFilter);
+        // assert
+        return Promise.resolve({
+          event: returnObject.latestFilterEvent,
+        });
+      });
+    });
+    describe('handles if event is fired multiple times with same object', () => {
+      testFilterEvents(async (filterChange) => {
+        // arrange
+        const newFilter = filterChange;
+        const initialFilter = new FilterResultStub().withSomeMatches();
+        const filterStub = new UserFilterStub()
+          .withCurrentFilterResult(initialFilter);
+        const stateStub = new UseCollectionStateStub()
+          .withFilter(filterStub);
+        const { returnObject } = mountWrapperComponent({ useStateStub: stateStub });
+        let totalFilterUpdates = 0;
+        watch(() => returnObject.latestFilterEvent.value, () => {
+          totalFilterUpdates++;
+        });
+        // act
+        filterStub.notifyFilterChange(newFilter);
+        await nextTick();
+        filterStub.notifyFilterChange(newFilter);
+        await nextTick();
+        // assert
+        expect(totalFilterUpdates).to.equal(2);
+        return {
+          event: returnObject.latestFilterEvent,
+        };
+      });
+    });
+  });
+  describe('on collection state changed', () => {
+    describe('sets initial filter from new collection state', () => {
+      testFilterEvents((filterChange) => {
+        // arrange
+        const newCollection = new CategoryCollectionStateStub()
+          .withFilter(new UserFilterStub().withCurrentFilterResult(filterChange.filter));
+        const initialCollection = new CategoryCollectionStateStub();
+        const useCollectionStateStub = new UseCollectionStateStub()
+          .withState(initialCollection);
+        // act
+        const { returnObject } = mountWrapperComponent({
+          useStateStub: useCollectionStateStub,
+        });
+        useCollectionStateStub.triggerOnStateChange({
+          newState: newCollection,
+          immediateOnly: false,
+        });
+        // assert
+        return Promise.resolve({
+          event: returnObject.latestFilterEvent,
+        });
+      });
+    });
+    describe('updates filter from new collection state', () => {
+      testFilterEvents((filterChange) => {
+        // arrange
+        const newFilter = filterChange;
+        const initialFilter = new FilterResultStub().withSomeMatches();
+        const filterStub = new UserFilterStub();
+        const newCollection = new CategoryCollectionStateStub()
+          .withFilter(filterStub.withCurrentFilterResult(initialFilter));
+        const initialCollection = new CategoryCollectionStateStub();
+        const useCollectionStateStub = new UseCollectionStateStub()
+          .withState(initialCollection);
+        // act
+        const { returnObject } = mountWrapperComponent({
+          useStateStub: useCollectionStateStub,
+        });
+        useCollectionStateStub.triggerOnStateChange({
+          newState: newCollection,
+          immediateOnly: false,
+        });
+        filterStub.notifyFilterChange(newFilter);
+        // assert
+        return Promise.resolve({
+          event: returnObject.latestFilterEvent,
+        });
+      });
+    });
+  });
+});
+
+function mountWrapperComponent(options?: {
+  readonly useStateStub?: UseCollectionStateStub,
+}) {
+  const useStateStub = options.useStateStub ?? new UseCollectionStateStub();
+  let returnObject: ReturnType<typeof useTreeViewFilterEvent> | undefined;
+
+  shallowMount({
+    setup() {
+      returnObject = useTreeViewFilterEvent();
+    },
+    template: '<div></div>',
+  }, {
+    provide: {
+      [InjectionKeys.useCollectionState as symbol]:
+        () => useStateStub.get(),
+      [InjectionKeys.useAutoUnsubscribedEvents as symbol]:
+        () => new UseAutoUnsubscribedEventsStub().get(),
+    },
+  });
+
+  return {
+    returnObject,
+    useStateStub,
+  };
+}
+
+type FilterChangeTestScenario = (result: IFilterChangeDetails) => Promise<{
+  readonly event: Ref<TreeViewFilterEvent>,
+}>;
+
+function testFilterEvents(
+  act: FilterChangeTestScenario,
+) {
+  describe('handles cleared filter correctly', () => {
+    itExpectedFilterRemovedEvent(act);
+  });
+  describe('handles applied filter correctly', () => {
+    itExpectedFilterTriggeredEvent(act);
+  });
+}
+
+function itExpectedFilterRemovedEvent(
+  act: FilterChangeTestScenario,
+) {
+  it('given cleared filter', async () => {
+    // arrange
+    const newFilter = FilterChangeDetailsStub.forClear();
+    // act
+    const { event } = await act(newFilter);
+    // assert
+    expectFilterEventAction(event, TreeViewFilterAction.Removed);
+    expect(event.value.predicate).toBeUndefined();
+  });
+}
+
+function itExpectedFilterTriggeredEvent(
+  act: FilterChangeTestScenario,
+) {
+  const testScenarios: ReadonlyArray<{
+    readonly description: string;
+    readonly scriptMatches: IScript[],
+    readonly categoryMatches: ICategory[],
+    readonly givenNode: TreeNode,
+    readonly expectedPredicateResult: boolean;
+  }> = [
+    {
+      description: 'returns true when category exists',
+      scriptMatches: [],
+      categoryMatches: [new CategoryStub(1)],
+      givenNode: createNode({ id: '1', hasParent: false }),
+      expectedPredicateResult: true,
+    },
+    {
+      description: 'returns true when script exists',
+      scriptMatches: [new ScriptStub('a')],
+      categoryMatches: [],
+      givenNode: createNode({ id: 'a', hasParent: true }),
+      expectedPredicateResult: true,
+    },
+    {
+      description: 'returns false when category is missing',
+      scriptMatches: [new ScriptStub('b')],
+      categoryMatches: [new CategoryStub(2)],
+      givenNode: createNode({ id: '1', hasParent: false }),
+      expectedPredicateResult: false,
+    },
+    {
+      description: 'finds false when script is missing',
+      scriptMatches: [new ScriptStub('b')],
+      categoryMatches: [new CategoryStub(1)],
+      givenNode: createNode({ id: 'a', hasParent: true }),
+      expectedPredicateResult: false,
+    },
+  ];
+  testScenarios.forEach(({
+    description, scriptMatches, categoryMatches, givenNode, expectedPredicateResult,
+  }) => {
+    it(description, async () => {
+      // arrange
+      const filterResult = new FilterResultStub()
+        .withScriptMatches(scriptMatches)
+        .withCategoryMatches(categoryMatches);
+      const filterChange = FilterChangeDetailsStub.forApply(filterResult);
+      // act
+      const { event } = await act(filterChange);
+      // assert
+      expectFilterEventAction(event, TreeViewFilterAction.Triggered);
+      expect(event.value.predicate).toBeDefined();
+      const actualPredicateResult = event.value.predicate(givenNode);
+      expect(actualPredicateResult).to.equal(
+        expectedPredicateResult,
+        [
+          '\n---',
+          `Script matches (${scriptMatches.length}): [${scriptMatches.map((s) => s.id).join(', ')}]`,
+          `Category matches (${categoryMatches.length}): [${categoryMatches.map((s) => s.id).join(', ')}]`,
+          `Expected node: "${givenNode.id}"`,
+          '---\n\n',
+        ].join('\n'),
+      );
+    });
+  });
+}
+
+function createNode(options: {
+  readonly id: string;
+  readonly hasParent: boolean;
+}): TreeNode {
+  return new TreeNodeStub()
+    .withId(options.id)
+    .withMetadata(new NodeMetadataStub().withId(options.id))
+    .withHierarchy(options.hasParent
+      ? new HierarchyAccessStub().withParent(new TreeNodeStub())
+      : new HierarchyAccessStub());
+}
+
+function expectFilterEventAction(
+  event: Ref<TreeViewFilterEvent | undefined>,
+  expectedAction: TreeViewFilterAction,
+) {
+  expect(event).toBeDefined();
+  expect(event.value).toBeDefined();
+  expect(event.value.action).to.equal(expectedAction);
+}
diff --git a/tests/unit/shared/Stubs/FilterChangeDetailsStub.ts b/tests/unit/shared/Stubs/FilterChangeDetailsStub.ts
index e69de29bb..690e84fbe 100644
--- a/tests/unit/shared/Stubs/FilterChangeDetailsStub.ts
+++ b/tests/unit/shared/Stubs/FilterChangeDetailsStub.ts
@@ -0,0 +1,26 @@
+import { FilterActionType } from '@/application/Context/State/Filter/Event/FilterActionType';
+import { IFilterChangeDetails, IFilterChangeDetailsVisitor } from '@/application/Context/State/Filter/Event/IFilterChangeDetails';
+import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
+
+export class FilterChangeDetailsStub implements IFilterChangeDetails {
+  public static forApply(filter: IFilterResult) {
+    return new FilterChangeDetailsStub(FilterActionType.Apply, filter);
+  }
+
+  public static forClear() {
+    return new FilterChangeDetailsStub(FilterActionType.Clear);
+  }
+
+  private constructor(
+    public actionType: FilterActionType,
+    public filter?: IFilterResult,
+  ) { /* Private constructor to enforce factory methods */ }
+
+  visit(visitor: IFilterChangeDetailsVisitor): void {
+    if (this.filter) {
+      visitor.onApply(this.filter);
+    } else {
+      visitor.onClear();
+    }
+  }
+}
diff --git a/tests/unit/shared/Stubs/UseCollectionStateStub.ts b/tests/unit/shared/Stubs/UseCollectionStateStub.ts
index cb1a65ab9..4f351a439 100644
--- a/tests/unit/shared/Stubs/UseCollectionStateStub.ts
+++ b/tests/unit/shared/Stubs/UseCollectionStateStub.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue';
+import { shallowRef } from 'vue';
 import {
   ContextModifier, IStateCallbackSettings, NewStateEventHandler,
   StateModifier, useCollectionState,
@@ -8,7 +8,6 @@ import { IUserFilter } from '@/application/Context/State/Filter/IUserFilter';
 import { IApplicationContext } from '@/application/Context/IApplicationContext';
 import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
 import { CategoryCollectionStateStub } from './CategoryCollectionStateStub';
-import { EventSubscriptionCollectionStub } from './EventSubscriptionCollectionStub';
 import { ApplicationContextStub } from './ApplicationContextStub';
 import { UserFilterStub } from './UserFilterStub';
 import { StubWithObservableMethodCalls } from './StubWithObservableMethodCalls';
@@ -17,7 +16,9 @@ export class UseCollectionStateStub
   extends StubWithObservableMethodCalls<ReturnType<typeof useCollectionState>> {
   private currentContext: IApplicationContext = new ApplicationContextStub();
 
-  private readonly currentState = ref<ICategoryCollectionState>(new CategoryCollectionStateStub());
+  private readonly currentState = shallowRef<ICategoryCollectionState>(
+    new CategoryCollectionStateStub(),
+  );
 
   public withFilter(filter: IUserFilter) {
     const state = new CategoryCollectionStateStub()
@@ -100,7 +101,6 @@ export class UseCollectionStateStub
       onStateChange: this.onStateChange.bind(this),
       currentContext: this.currentContext,
       currentState: this.currentState,
-      events: new EventSubscriptionCollectionStub(),
     };
   }
 }
diff --git a/tests/unit/shared/Stubs/UseCurrentTreeNodesStub.ts b/tests/unit/shared/Stubs/UseCurrentTreeNodesStub.ts
index f0a11e1c4..4100895cf 100644
--- a/tests/unit/shared/Stubs/UseCurrentTreeNodesStub.ts
+++ b/tests/unit/shared/Stubs/UseCurrentTreeNodesStub.ts
@@ -1,5 +1,5 @@
 import {
-  WatchSource, readonly, shallowRef, triggerRef,
+  WatchSource, shallowReadonly, shallowRef, triggerRef,
 } from 'vue';
 import { TreeRoot } from '@/presentation/components/Scripts/View/Tree/TreeView/TreeRoot/TreeRoot';
 import { useCurrentTreeNodes } from '@/presentation/components/Scripts/View/Tree/TreeView/UseCurrentTreeNodes';
@@ -25,7 +25,7 @@ export class UseCurrentTreeNodesStub {
     return (treeWatcher: WatchSource<TreeRoot>) => {
       this.treeWatcher = treeWatcher;
       return {
-        nodes: readonly(this.nodes),
+        nodes: shallowReadonly(this.nodes),
       };
     };
   }