Add pagination to navigation menus by nbradbury · Pull Request #22560 · wordpress-mobile/WordPress-Android

nbradbury · 2026-02-05T12:26:10Z

Description

Partially addresses CMM-1166.

Adds pagination support to the navigation menus feature, allowing users to browse large lists of menus, menu items, and linkable items (posts, pages, categories, tags) without loading everything at once.

Key changes:

Add pagination to menu list, menu item list, and linkable items selection
Replace linkable items dropdown with modal bottom sheet (fixes crash with LazyColumn inside ExposedDropdownMenu)
Add mutex protection to prevent race conditions during rapid pagination requests
Cancel in-flight linkable items requests when menu item type changes
Simplify error handling
Updated URL validation logic based on WordPress documentation

Limitations

Saving menu items other than custom links will always fail
I've skipped adding new tests for the pagination for now

Testing instructions

Menu list pagination:

Open navigation menus for a site with many menus (or create 20+ menus)
Scroll to the bottom of the menu list

Verify loading indicator appears when reaching the end
Verify more menus load and append to the list

Menu item list pagination:

Open a menu with many items (or create 20+ items in a menu)
Scroll to the bottom of the menu item list

Verify loading indicator appears
Verify more items load correctly with proper hierarchy/indentation

Linkable items pagination:

Create a new menu item
Select "Page" as the type
Tap the "Link to" field to open the bottom sheet

Verify pages load in the bottom sheet

Scroll to the bottom of the list

Verify more pages load

Switch type to "Post"

Verify previous loading is cancelled and posts load instead

Error handling:

Put device in airplane mode
Try to load more menus/items

Verify error message appears
Verify you can retry after re-enabling network

Screen_recording_20260205_072459.mp4

Implements infinite scroll pagination for menu list, menu item list, and linkable items dropdown with page size of 20. Shows loading spinner when fetching more items. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

- Fix pagination not triggering after second page by properly tracking state changes in LaunchedEffect keys - Remove inaccurate menu item count from menu list - Remove unused fetchAllMenuItems function - Move Edit Items button to end of menu card, centered vertically - Fix detekt warnings: swallowed exceptions, unused imports, complexity - Extract MenuItemListContent and sibling helper functions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

The ExposedDropdownMenu doesn't support LazyColumn (SubcomposeLayout intrinsic measurement issue), causing crashes when opening the dropdown. This replaces it with a ModalBottomSheet which properly supports pagination with LazyColumn. Also restores PAGE_SIZE to 20 (was 5 for testing). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

This resource was left over after removing the menu item count feature. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

dangermattic · 2026-02-05T12:26:57Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

- Extract duplicate type selection label logic to helper function - Simplify parseErrorMessage by consolidating redundant cases - Consolidate findPreviousSiblingIndex/findNextSiblingIndex into single function Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

wpmobilebot · 2026-02-05T12:51:37Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22560-0fbb501
	Build Number	`1483`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`0fbb501`
	Installation URL	6bgriur6pc670

Note: Google Login is not supported on these builds.

wpmobilebot · 2026-02-05T12:54:36Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22560-0fbb501
	Build Number	`1483`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`0fbb501`
	Installation URL	741jd6kq2e3tg

Note: Google Login is not supported on these builds.

codecov · 2026-02-05T12:59:28Z

Codecov Report

❌ Patch coverage is 5.45455% with 364 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.18%. Comparing base (908e00d) to head (0fbb501).
⚠️ Report is 2 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...wordpress/android/ui/navmenus/NavMenusViewModel.kt	8.33%	128 Missing and 4 partials ⚠️
...ndroid/ui/navmenus/screens/MenuItemDetailScreen.kt	0.00%	108 Missing ⚠️
.../android/ui/navmenus/screens/MenuItemListScreen.kt	0.00%	48 Missing ⚠️
...ress/android/ui/navmenus/screens/MenuListScreen.kt	0.00%	46 Missing ⚠️
...ress/android/ui/navmenus/data/NavMenuRestClient.kt	9.09%	30 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22560      +/-   ##
==========================================
- Coverage   38.23%   38.18%   -0.06%     
==========================================
  Files        2237     2237              
  Lines      111111   111318     +207     
  Branches    15544    15579      +35     
==========================================
+ Hits        42486    42505      +19     
- Misses      65087    65272     +185     
- Partials     3538     3541       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Prevents race conditions when multiple pagination requests occur in rapid succession. Each pagination function now uses a mutex to ensure atomic read-check-update operations, preventing duplicate items or incorrect pagination state. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Ensure canLoadMore remains true when pagination fails, allowing users to retry after transient errors (network issues, timeouts, etc.). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Prevents stale data from overwriting state when user rapidly switches between menu item types. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Support all 22 protocols from wp_allowed_protocols(): http, https, ftp, ftps, mailto, news, irc, irc6, ircs, gopher, nntp, feed, telnet, mms, rtsp, sms, svn, tel, fax, xmpp, webcal, urn. Also adds support for anchor links (#section) and protocol-relative URLs (//). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

- Derive offset from UI state instead of cache variables to avoid race conditions between initial load and pagination - Set canLoadMore=true on initial load errors to allow retry Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Pre-compute parent-to-children mapping to reduce child lookup from O(n) to O(1) per item, improving overall complexity from O(n²) to O(n log n). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Use when expression to reduce return statements from 4 to 2. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

sonarqubecloud · 2026-02-06T15:19:12Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

adalpari · 2026-02-06T17:03:49Z

WordPress/src/main/java/org/wordpress/android/ui/navmenus/NavMenusViewModel.kt

+                }
+                val offset = currentState.menus.size
+
+                @Suppress("TooGenericExceptionCaught")


⛏️ I think it's a bit more clear to extract the Suppress to the function signature level

Thanks for the review! I'll mull this over and make the change in a future PR if needed.

adalpari

LGTM! Just left a minor comment

nbradbury and others added 4 commits February 5, 2026 06:12

Add pagination to navigation menus lists

99c142b

Implements infinite scroll pagination for menu list, menu item list, and linkable items dropdown with page size of 20. Shows loading spinner when fetching more items. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Remove unused menu_item_count plural resource

f49765a

This resource was left over after removing the menu item count feature. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

nbradbury added the Menus label Feb 5, 2026

This comment was marked as resolved.

Sign in to view

nbradbury and others added 4 commits February 5, 2026 08:09

Use whitelist for url validation

aab08fb

Fix pagination state reset on error

7d6c964

Ensure canLoadMore remains true when pagination fails, allowing users to retry after transient errors (network issues, timeouts, etc.). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Cancel linkable items loading job when menu item type changes

e8be827

Prevents stale data from overwriting state when user rapidly switches between menu item types. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

nbradbury added the unit-tests-exemption label Feb 5, 2026

Suppress LongMethod detekt warning

973124b

This comment was marked as outdated.

Sign in to view

nbradbury and others added 4 commits February 5, 2026 08:35

Optimize sortItemsHierarchically with pre-computed children map

a166ebd

Pre-compute parent-to-children mapping to reduce child lookup from O(n) to O(1) per item, improving overall complexity from O(n²) to O(n log n). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Refactor isValidLinkUrl to fix detekt ReturnCount violation

89dff5f

Use when expression to reduce return statements from 4 to 2. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

nbradbury requested a review from adalpari February 5, 2026 14:34

nbradbury marked this pull request as ready for review February 5, 2026 14:34

nbradbury added 3 commits February 6, 2026 09:22

Merge branch 'trunk' into issue/menus-pagination

43d7ee1

Merge branch 'trunk' into issue/menus-pagination

36c8fca

Merge branch 'trunk' into issue/menus-pagination

0fbb501

adalpari reviewed Feb 6, 2026

View reviewed changes

adalpari approved these changes Feb 6, 2026

View reviewed changes

nbradbury merged commit d0ce0ad into trunk Feb 6, 2026
32 of 43 checks passed

nbradbury deleted the issue/menus-pagination branch February 6, 2026 18:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add pagination to navigation menus#22560

Add pagination to navigation menus#22560
nbradbury merged 17 commits intotrunkfrom
issue/menus-pagination

nbradbury commented Feb 5, 2026 •

edited by adalpari

Loading

Uh oh!

dangermattic commented Feb 5, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Feb 5, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Feb 5, 2026 •

edited

Loading

Uh oh!

codecov bot commented Feb 5, 2026 •

edited

Loading

Uh oh!

This comment was marked as resolved.

This comment was marked as outdated.

sonarqubecloud bot commented Feb 6, 2026

Uh oh!

adalpari Feb 6, 2026

Uh oh!

nbradbury Feb 6, 2026

Uh oh!

adalpari left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

nbradbury commented Feb 5, 2026 • edited by adalpari Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Limitations

Testing instructions

Uh oh!

dangermattic commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

This comment was marked as resolved.

This comment was marked as outdated.

sonarqubecloud bot commented Feb 6, 2026

Quality Gate passed

Uh oh!

adalpari Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

nbradbury Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nbradbury commented Feb 5, 2026 •

edited by adalpari

Loading

dangermattic commented Feb 5, 2026 •

edited

Loading

wpmobilebot commented Feb 5, 2026 •

edited

Loading

wpmobilebot commented Feb 5, 2026 •

edited

Loading

codecov bot commented Feb 5, 2026 •

edited

Loading