Fix FocusOrder attribute not being respected in focus traversal by Copilot · Pull Request #282 · RazorConsole/RazorConsole

Copilot · 2026-01-14T21:03:14Z

Fix FocusOrder Attribute in Focus Management

This PR fixes the issue where the FocusOrder parameter on focusable components (like TextButton and TextInput) is not being respected during focus traversal.

Changes Made:

Analyzed current FocusManager implementation
Identified root cause: CollectTargets method doesn't sort by data-focus-order
Modified CollectTargets to sort focusable elements by FocusOrder after collection
Added comprehensive tests for FocusOrder sorting (both with and without mixed order attributes)
Verified Core library builds successfully
Refactored to use static lambdas and move OrderBy logic to Select (based on review feedback)
Request code review

Implementation Details:

The fix modifies the CollectTargets method in FocusManager.cs to:

Collect all focusable elements in DOM order (as before)
Extract FocusOrder value in the Select projection (avoiding repeated OrderBy calls)
Sort them by the extracted FocusOrder value (lower values first) using static lambdas
Elements without a focus order come last, maintaining DOM order
Elements with the same focus order maintain their relative DOM order (stable sort)

Test Coverage:

Added two test cases:

FocusOrder_RespectsFocusOrderAttribute: Tests sequential FocusOrder values (2, 3, 4) with out-of-order DOM
FocusOrder_MixedWithoutOrderAttribute: Tests mixed scenarios with and without FocusOrder attributes

This ensures that when components like TextButton set FocusOrder="2", FocusOrder="3", and FocusOrder="4", they will be focused in that numeric order (2, 3, 4) regardless of their position in the DOM.

Original prompt

This section details on the original issue you should resolve

<issue_title>[Bug]: Focus order not working.</issue_title>
<issue_description>### Description

Tried to test new FocusOrder attribute in TextButton component (#279 )

Steps to Reproduce

Change text button gallery to this (use new text button version from #279):

    <Panel Title="Preview" Border="BoxBorder.Rounded" Expand="true">
        <Columns>
            <TextButton Content="4"
                        FocusOrder="4"
                        BackgroundColor="@_restingColor"
                        OnClick="ToggleAsync" />
            <TextButton Content="2"
                        BackgroundColor="@_restingColor"
                        OnClick="ToggleAsync"
                        FocusOrder="2"/>
            <TextButton Content="3"
                        FocusOrder="3"
                        BackgroundColor="@_restingColor"
                        OnClick="ToggleAsync" />
            <Markup Content="@_status"
                    Foreground="@_statusColor"
                    Decoration="@_statusDecoration" />
        </Columns>
    </Panel>

Expected Behavior

Focus must be, as the button labels describes.

Actual Behavior

Focus by elements layout order.

Environment

No response

Additional Context

No response</issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes [Bug]: Focus order not working. #280

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com>

github-actions · 2026-01-14T21:21:24Z

🚀 Preview Deployment

A preview build has been generated for this PR from CI run #21815517723!

Download the artifact:
website-preview-282-b52bbe99f83b83a7c1b766eef258fbeb13715be6

To view the preview locally:

Download the artifact from the CI workflow run
Extract the ZIP file
Serve the files with a local web server
(e.g., npx serve dist)

🌐 Live Preview URL: https://0c5d3de8.razorconsole.pages.dev

The live preview will be automatically updated when you push new
commits to this PR.

ParadiseFallen · 2026-01-21T14:37:09Z

src/RazorConsole.Core/Focus/FocusManager.cs

+        // Sort by focus order if specified, maintaining DOM order for elements with same/no order
+        targets = targets
+            .Select((target, index) => new { Target = target, OriginalIndex = index })
+            .OrderBy(item =>


OrderBy can be called multiple times. It's better to move it to select.
Also it whould be nice to mark as delegate static

@copilot fix the comment

Fixed in 66ed768. Moved the FocusOrder extraction logic to the Select projection and marked all lambdas as static to improve performance.

…c to Select Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com>

Signed-off-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>

* Initial plan * Fix FocusOrder attribute to sort focus targets correctly Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com> * Refactor FocusOrder logic to use static lambdas and move OrderBy logic to Select Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com> * Refactor focus order sorting in FocusManager Signed-off-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com> --------- Signed-off-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com> Co-authored-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>

Initial plan

95fe174

Copilot AI assigned Copilot and LittleLittleCloud Jan 14, 2026

Copilot started work on behalf of LittleLittleCloud January 14, 2026 21:03 View session

Fix FocusOrder attribute to sort focus targets correctly

d504dd1

Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix focus order issue in TextButton component~~ Fix FocusOrder attribute not being respected in focus traversal Jan 14, 2026

Copilot AI requested a review from LittleLittleCloud January 14, 2026 21:11

Copilot finished work on behalf of LittleLittleCloud January 14, 2026 21:11

LittleLittleCloud marked this pull request as ready for review January 18, 2026 06:41

ParadiseFallen requested changes Jan 21, 2026

View reviewed changes

Marcin-Lach mentioned this pull request Jan 25, 2026

[Bug]: Button focus style not applied when switching pages #283

Closed

Copilot started work on behalf of LittleLittleCloud January 25, 2026 09:38 View session

Refactor FocusOrder logic to use static lambdas and move OrderBy logi…

66ed768

…c to Select Co-authored-by: LittleLittleCloud <16876986+LittleLittleCloud@users.noreply.github.com>

Copilot finished work on behalf of LittleLittleCloud January 25, 2026 09:40

ParadiseFallen previously approved these changes Jan 26, 2026

View reviewed changes

Merge branch 'main' into copilot/fix-focus-order-in-textbutton

14e488f

Signed-off-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>

LittleLittleCloud dismissed ParadiseFallen’s stale review via 14e488f February 7, 2026 19:43

LittleLittleCloud added 2 commits February 8, 2026 09:50

Refactor focus order sorting in FocusManager

cdeb31b

Signed-off-by: Xiaoyun Zhang <bigmiao.zhang@gmail.com>

Merge branch 'main' into copilot/fix-focus-order-in-textbutton

b52bbe9

ParadiseFallen approved these changes Feb 9, 2026

View reviewed changes

LittleLittleCloud approved these changes Feb 9, 2026

View reviewed changes

LittleLittleCloud added 2 commits February 9, 2026 08:56

Merge branch 'main' into copilot/fix-focus-order-in-textbutton

4304421

Merge branch 'main' into copilot/fix-focus-order-in-textbutton

f16b7da

LittleLittleCloud closed this Feb 9, 2026

LittleLittleCloud reopened this Feb 9, 2026

LittleLittleCloud merged commit 360141c into main Feb 10, 2026
13 checks passed

LittleLittleCloud deleted the copilot/fix-focus-order-in-textbutton branch February 10, 2026 02:34

github-actions bot added this to the v0.4.0 milestone Feb 10, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix FocusOrder attribute not being respected in focus traversal#282

Fix FocusOrder attribute not being respected in focus traversal#282
LittleLittleCloud merged 8 commits intomainfrom
copilot/fix-focus-order-in-textbutton

Copilot AI commented Jan 14, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 14, 2026 •

edited

Loading

Uh oh!

ParadiseFallen Jan 21, 2026

Uh oh!

LittleLittleCloud Jan 25, 2026

Uh oh!

Copilot AI Jan 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Copilot AI commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fix FocusOrder Attribute in Focus Management

Changes Made:

Implementation Details:

Test Coverage:

Steps to Reproduce

Expected Behavior

Actual Behavior

Environment

Additional Context

Comments on the Issue (you are @copilot in this section)

Uh oh!

github-actions bot commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Preview Deployment

Uh oh!

ParadiseFallen Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

LittleLittleCloud Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Jan 14, 2026 •

edited

Loading

github-actions bot commented Jan 14, 2026 •

edited

Loading