feat(inventory-list): add quick navigation for active/equipped items#169
Open
zndxcvbn wants to merge 2 commits into
Open
feat(inventory-list): add quick navigation for active/equipped items#169zndxcvbn wants to merge 2 commits into
zndxcvbn wants to merge 2 commits into
Conversation
Contributor
📝 WalkthroughWalkthroughThe pull request adds a new Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Review rate limit: 0/1 reviews remaining, refill in 60 minutes.Comment |
zndxcvbn
changed the title
zndxcvbn
force-pushed
the
feat-select-next-equip
branch
from
8115058 to
25ec76a
Compare
zndxcvbn
force-pushed
the
feat-select-next-equip
branch
from
25ec76a to
3fccba8
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@source/actionscript/CraftingMenu/CraftingLists.as`:
- Around line 198-205: The Ctrl+arrow/W/S shortcut block currently consumes
navigation even when the list/input is disabled or a modal/dialog is active;
modify the handler (the block checking isCtrl, kc, details.value and calling
selectEquippedItem) to first bail out when the list/input or UI is not
interactive — e.g., check this.itemList.enabled (and any modal/dialog flag such
as this.columnDialogOpen or similar) and return false so the event is not
consumed; only when the list is enabled/interactive should you proceed to
inspect details.value and call this.selectEquippedItem(dir).
In `@source/actionscript/ItemMenus/InventoryLists.as`:
- Around line 185-192: The Ctrl-key navigation block handles equipped-item
selection even when the UI list is disabled; add an early disabled-state guard
before processing isCtrl/kc events so the handler returns without changing
selection when the list is disabled (check the list's enabled/disabled flag used
by this component — e.g., this.enabled or this._disabled — and skip the block),
keeping the existing checks for isCtrl, kc, details.value and the call to
selectEquippedItem(dir) otherwise.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 53eb0e9a-8ee4-4b2c-ab6a-eecb0a45a954
📒 Files selected for processing (2)
source/actionscript/CraftingMenu/CraftingLists.assource/actionscript/ItemMenus/InventoryLists.as
Comment on lines
+198
to
+205
| if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | ||
| if (details.value == "keyDown" || details.value == "keyHold") { | ||
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | ||
| this.selectEquippedItem(dir); | ||
| return true; | ||
| } | ||
| if (details.value == "keyUp") return true; | ||
| } |
Contributor
There was a problem hiding this comment.
Shortcut handler should respect disabled/modal list state
Line 198 currently consumes Ctrl navigation even when itemList input is disabled (e.g., search input or column dialog), which can cause unintended background selection changes.
Suggested fix
- if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) {
+ var canNavigate = !this.itemList.disableInput && !this.itemList.disableSelection && this._columnSelectDialog == undefined;
+ if (canNavigate && isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) {
if (details.value == "keyDown" || details.value == "keyHold") {
var dir = (kc == 83 || kc == 40) ? 1 : -1;
this.selectEquippedItem(dir);
return true;
}
if (details.value == "keyUp") return true;
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | |
| if (details.value == "keyDown" || details.value == "keyHold") { | |
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | |
| this.selectEquippedItem(dir); | |
| return true; | |
| } | |
| if (details.value == "keyUp") return true; | |
| } | |
| var canNavigate = !this.itemList.disableInput && !this.itemList.disableSelection && this._columnSelectDialog == undefined; | |
| if (canNavigate && isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | |
| if (details.value == "keyDown" || details.value == "keyHold") { | |
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | |
| this.selectEquippedItem(dir); | |
| return true; | |
| } | |
| if (details.value == "keyUp") return true; | |
| } |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@source/actionscript/CraftingMenu/CraftingLists.as` around lines 198 - 205,
The Ctrl+arrow/W/S shortcut block currently consumes navigation even when the
list/input is disabled or a modal/dialog is active; modify the handler (the
block checking isCtrl, kc, details.value and calling selectEquippedItem) to
first bail out when the list/input or UI is not interactive — e.g., check
this.itemList.enabled (and any modal/dialog flag such as this.columnDialogOpen
or similar) and return false so the event is not consumed; only when the list is
enabled/interactive should you proceed to inspect details.value and call
this.selectEquippedItem(dir).
Comment on lines
+185
to
+192
| if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | ||
| if (details.value == "keyDown" || details.value == "keyHold") { | ||
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | ||
| this.selectEquippedItem(dir); | ||
| return true; | ||
| } | ||
| if (details.value == "keyUp") return true; | ||
| } |
Contributor
There was a problem hiding this comment.
Missing disabled-state guard on Ctrl navigation
Line 185 intercepts and executes equipped-item navigation even when the list is disabled by active UI flows, allowing hidden selection changes.
Suggested fix
- if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) {
+ var canNavigate = !this.itemList.disableInput && !this.itemList.disableSelection && this._columnSelectDialog == undefined;
+ if (canNavigate && isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) {
if (details.value == "keyDown" || details.value == "keyHold") {
var dir = (kc == 83 || kc == 40) ? 1 : -1;
this.selectEquippedItem(dir);
return true;
}
if (details.value == "keyUp") return true;
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| if (isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | |
| if (details.value == "keyDown" || details.value == "keyHold") { | |
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | |
| this.selectEquippedItem(dir); | |
| return true; | |
| } | |
| if (details.value == "keyUp") return true; | |
| } | |
| var canNavigate = !this.itemList.disableInput && !this.itemList.disableSelection && this._columnSelectDialog == undefined; | |
| if (canNavigate && isCtrl && (kc == 87 || kc == 38 || kc == 83 || kc == 40)) { | |
| if (details.value == "keyDown" || details.value == "keyHold") { | |
| var dir = (kc == 83 || kc == 40) ? 1 : -1; | |
| this.selectEquippedItem(dir); | |
| return true; | |
| } | |
| if (details.value == "keyUp") return true; | |
| } |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@source/actionscript/ItemMenus/InventoryLists.as` around lines 185 - 192, The
Ctrl-key navigation block handles equipped-item selection even when the UI list
is disabled; add an early disabled-state guard before processing isCtrl/kc
events so the handler returns without changing selection when the list is
disabled (check the list's enabled/disabled flag used by this component — e.g.,
this.enabled or this._disabled — and skip the block), keeping the existing
checks for isCtrl, kc, details.value and the call to selectEquippedItem(dir)
otherwise.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR introduces a quality-of-life improvement for inventory management, allowing players to quickly locate and cycle through their active gear without manual scrolling.
Key Changes:
selectEquippedIteminInventoryLists.aswhich scans the list for items with an activeequipState.Ctrl + SorCtrl + Down: Cycle forward.Ctrl + WorCtrl + Up: Cycle backward.Summary by CodeRabbit