Reviewing files that changed from the base of the PR and between e025b58 and 3f6a3b5.

• packages/nuxt/src/app/composables/loading-indicator.ts (1 hunks)
• packages/nuxt/src/pages/runtime/page.ts (4 hunks)
• test/nuxt/loading-indicator.test.ts (1 hunks)

• packages/nuxt/src/pages/runtime/page.ts

• GitHub Check: codeql (actions)
• GitHub Check: code

packages/nuxt/src/app/composables/loading-indicator.ts (1)

52-56: Good fix to clear timeouts before starting a new loading process.

Adding the _clearTimeouts() call at the beginning of the start method ensures that any existing timeouts related to hiding or resetting the loading indicator are properly cleared before initiating a new loading process. This prevents potential race conditions where timeouts from previous loading operations could interfere with new ones.

This fix directly addresses the issue where the loading indicator could get stuck in a loading state during certain navigation patterns, particularly when navigating between nested pages with query parameters.

test/nuxt/loading-indicator.test.ts (4)

1-129: Excellent test coverage for the loading indicator bug

This new test file thoroughly validates the fix for the loading indicator issue. The test specifically reproduces the problematic navigation pattern (nested page → same page with query parameter → different sibling nested page) that was causing the loading indicator to remain stuck.

The test structure is well-organised:

• It sets up a router with nested routes that simulate asynchronous loading
• It tracks loading state through hooks to verify start/end events are properly triggered
• The expectNavigatesWithLoading helper function encapsulates the navigation logic and assertions
• The test validates both the internal loading state and the visual representation of the loading indicator

This test will help prevent regression of this issue in the future.

---

73-98: Well-implemented navigation testing helper function

The expectNavigatesWithLoading function is a great example of test code reuse. It encapsulates all the necessary steps to validate the loading indicator's behaviour during navigation:

1. Resetting counters before navigation
2. Verifying that loading has started but not yet completed
3. Checking the visual state of the loading indicator
4. Allowing for custom assertions during the loading phase
5. Waiting for loading to complete
6. Verifying loading has properly finished
7. Checking the final visual state of the loading indicator

This approach makes the test more readable and maintainable.

---

60-65: Good use of hook counters to track loading events

Using counters to track the number of times the loading hooks are triggered is an effective way to verify that the hooks are being called correctly. This approach helps ensure that:

1. The page:loading:start hook is triggered exactly once per navigation
2. The page:loading:end hook is also triggered exactly once per navigation
3. No extra or missing hook calls occur during the test

This is crucial for validating the fix for the loading indicator issue, where the bug was specifically related to the end hook not being triggered.

---

109-125: Comprehensive test coverage for the specific bug scenario

This portion of the test directly addresses the bug scenario described in the PR objectives:

1. Navigate to a nested page (/page-load-hook/subpage)
2. Navigate to the same page with a new query parameter (?someQuery=toto)
3. Navigate to a different sibling nested page (/page-load-hook/other-slug)

The test verifies that the loading indicator correctly shows and hides during each navigation step. This is exactly the scenario where the loading indicator was getting stuck, so this test provides confidence that the fix works as expected.