Fix navigation menu issues by nbradbury · Pull Request #22576 · wordpress-mobile/WordPress-Android

nbradbury · 2026-02-09T18:00:44Z

Description

Partially addresses CMM-1166.

This PR is the result of asking Claude to investigate the Menus feature and locate potentially serious issues. The following problems were found and fixed in this PR:

Cache sync after reorder: updateMenuItemOrder() now updates currentMenuItems after a successful server-side swap, preventing stale data from causing incorrect menu order assignments, wrong available parents, and cascading reorder failures
Silent navigation failures: navigateToEditMenu(), navigateToMenuItems(), and navigateToEditMenuItem() now log a warning and show an error to the user instead of silently returning when an item isn't found in cache
NavController null safety: Added navigateTo() helper with null-check logging so navigation failures when navController isn't set are visible in logs instead of silently swallowed
JSON parsing logging: parseJsonStringArray() now logs parse failures via AppLog.w instead of silently returning an empty list
sanitizeInput trims on every keystroke: The trim() should happen at save time, not during input, otherwise users can't type spaces in the input fields

These two bugs found during testing are also fixed:

Keyboard hides Save button: The menu detail and menu item detail screens are now scrollable so the keyboard no longer prevents access to the Save button
Link URL validation: Previously we validated link item URLs, but checking the web app it doesn't validate but instead lets the user enter anything and then makes it a valid URL. We now follow the same approach here.

Testing instructions

Reorder menu items:

Open a site with navigation menus
Navigate to a menu's items list
Reorder an item using the up/down buttons
Tap the reordered item to edit it

Verify the edit screen shows the correct data (not stale pre-reorder data)

Reorder the same item again

Verify the second reorder works correctly without data inconsistency

Navigation error handling:

Open the menus list
Tap a menu to view its items

Verify navigation works normally when data is in cache
Verify an error message appears if the menu data is missing (edge case)

Sanitize input:

Verify you can type spaces in titles & descriptions

Keyboard hides Save button:

Verify you can scroll the Save button into view when the keyboard is showing the menu detail and menu item detail screens

Link URL validation:

Verify that link URLs are normalized after saving the menu item

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>

- 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>

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>

Add light and dark mode previews for MenuListScreen, MenuDetailScreen, MenuItemListScreen, and MenuItemDetailScreen showing various states including loading, empty, error, and populated views. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

…-Android into issue/menus-compose-previews Conflicts: WordPress/src/main/java/org/wordpress/android/ui/navmenus/screens/MenuItemDetailScreen.kt

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Restore onDismissRequest and reset showBottomSheet after hiding, so users can dismiss by tapping the scrim or swiping down, and the sheet is properly removed from composition after item selection. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Sync currentMenuItems cache after successful reorder to prevent stale data - Show error to user instead of silently returning on cache misses in navigation - Add navigateTo() helper with null-check logging for navController - Log JSON parsing failures in parseJsonStringArray() instead of silently swallowing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

dangermattic · 2026-02-09T18:01:39Z

	1 Warning
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

wpmobilebot · 2026-02-09T18:18: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	pr22576-c148937
	Build Number	`1484`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`c148937`
	Installation URL	6ir8gjubgb9ho

Note: Google Login is not supported on these builds.

wpmobilebot · 2026-02-09T18:25:31Z

📲 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	pr22576-c148937
	Build Number	`1484`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`c148937`
	Installation URL	5cl3ipph9avpg

Note: Google Login is not supported on these builds.

- Sync currentMenuItems cache after successful reorder to prevent stale data - Show error to user instead of silently returning on cache misses in navigation - Add navigateTo() helper with null-check logging for navController - Log JSON parsing failures in parseJsonStringArray() instead of silently swallowing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> � Conflicts: � WordPress/src/main/java/org/wordpress/android/ui/navmenus/NavMenusViewModel.kt

codecov · 2026-02-09T22:13:22Z

Codecov Report

❌ Patch coverage is 6.66667% with 56 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.17%. Comparing base (8d17379) to head (c148937).
⚠️ Report is 3 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...wordpress/android/ui/navmenus/NavMenusViewModel.kt	7.84%	45 Missing and 2 partials ⚠️
...ss/android/ui/navmenus/screens/MenuDetailScreen.kt	0.00%	7 Missing ⚠️
...g/wordpress/android/ui/navmenus/NavMenusUiState.kt	0.00%	1 Missing ⚠️
...ndroid/ui/navmenus/screens/MenuItemDetailScreen.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22576      +/-   ##
==========================================
- Coverage   38.18%   38.17%   -0.01%     
==========================================
  Files        2238     2238              
  Lines      111776   111808      +32     
  Branches    15586    15591       +5     
==========================================
+ Hits        42677    42680       +3     
- Misses      65558    65588      +30     
+ Partials     3541     3540       -1

☔ 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.

Add navMenuItemType to buildMenuItemCreateParams and buildMenuItemUpdateParams so the API receives the correct item type (custom, post_type, taxonomy, post_type_archive). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The previous approach used mapTypeLabelToType() which matched against hardcoded English display strings (e.g. "Page", "Post"). These labels are localized by the WordPress API, so on non-English sites all items would incorrectly map to TYPE_CUSTOM. Now uses the NavMenuItemType enum from the API response directly. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sanitizeInput() was calling trim() on every keystroke, which stripped trailing spaces while typing and made it difficult to enter multi-word text. Now only enforces max length during input, and trims whitespace when building models at save time. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add imePadding() to MenuDetailScreen and MenuItemDetailScreen so the Save button remains visible above the keyboard. Also inset the auto-add switch row to prevent it from extending to the screen edge. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Instead of rejecting URLs without recognized protocols, normalize them at save time by prepending https:// when needed. Anchor links, relative paths, and recognized protocols (mailto:, tel:, etc.) are preserved as-is. This matches WordPress web behavior. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sonarqubecloud · 2026-02-11T21:14:04Z

Quality Gate passed

Issues
0 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

Great fixes!! 👏

nbradbury and others added 29 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>

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>

Suppress LongMethod detekt warning

973124b

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>

Fixed minor warnings

553f3b2

Wrap Compose previews with AppThemeM3 for proper theming

1490a02

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Merge branch 'trunk' into issue/menus-compose-previews

b0385bb

Resolved conflicts

2e820d6

Merge branch 'trunk' of https://github.com/wordpress-mobile/WordPress…

932c7a3

…-Android into issue/menus-compose-previews Conflicts: WordPress/src/main/java/org/wordpress/android/ui/navmenus/screens/MenuItemDetailScreen.kt

Fixed warnings

a2d06c8

Reverted changes to Dangerfile

34c10b3

Add Compose preview for LinkableItemBottomSheetContent

c6ca0a5

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge branch 'trunk' into issue/menus-compose-previews

8352246

Merge branch 'trunk' into issue/menus-compose-previews

3531a9e

Merge branch 'trunk' into issue/menus-compose-previews

f04cc09

Add missing onFabVisibilityChange parameter to preview functions

6e94749

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury added the Menus label Feb 9, 2026

wordpress-mobile deleted a comment from claude bot Feb 9, 2026

nbradbury changed the title ~~Fix navigation menu bugs: cache sync, error handling, and null safety~~ Fix navigation menu issues Feb 10, 2026

nbradbury mentioned this pull request Feb 10, 2026

Add tests for NavMenusViewModel #22577

Merged

1 task

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

Base automatically changed from issue/menus-compose-previews to trunk February 10, 2026 15:09

nbradbury and others added 12 commits February 10, 2026 10:10

Merge branch 'trunk' into issue/menu-fixes

b187b0e

Pass menu item type when creating and updating menu items

a964c43

Add navMenuItemType to buildMenuItemCreateParams and buildMenuItemUpdateParams so the API receives the correct item type (custom, post_type, taxonomy, post_type_archive). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Log unknown menu types

60f54be

Added Kdoc

c6b413a

Merge branch 'issue/menu-types' into issue/menu-fixes

6bffe0a

Merge branch 'issue/menu-types' into issue/menu-fixes

895d0dc

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Suppress ReturnCount warning on normalizeUrl

eb73b72

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge branch 'trunk' into issue/menu-fixes

c148937

nbradbury requested a review from adalpari February 11, 2026 21:38

nbradbury marked this pull request as ready for review February 11, 2026 21:47

adalpari approved these changes Feb 12, 2026

View reviewed changes

nbradbury merged commit 62feda7 into trunk Feb 12, 2026
33 of 34 checks passed

nbradbury deleted the issue/menu-fixes branch February 12, 2026 11:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Fix navigation menu issues#22576

Fix navigation menu issues#22576
nbradbury merged 42 commits intotrunkfrom
issue/menu-fixes

nbradbury commented Feb 9, 2026 •

edited by adalpari

Loading

Uh oh!

dangermattic commented Feb 9, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Feb 9, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Feb 9, 2026 •

edited

Loading

Uh oh!

codecov bot commented Feb 9, 2026 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Feb 11, 2026

Uh oh!

adalpari left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

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

Uh oh!

Description

Testing instructions

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

sonarqubecloud bot commented Feb 11, 2026

Quality Gate passed

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 9, 2026 •

edited by adalpari

Loading

dangermattic commented Feb 9, 2026 •

edited

Loading

wpmobilebot commented Feb 9, 2026 •

edited

Loading

wpmobilebot commented Feb 9, 2026 •

edited

Loading

codecov bot commented Feb 9, 2026 •

edited

Loading