-
Notifications
You must be signed in to change notification settings - Fork 330
FIX: disabling the InputSystemUIInputModule component resets all actions to None #2192
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX: disabling the InputSystemUIInputModule component resets all actions to None #2192
Conversation
| InputActionState.s_GlobalState.onActionControlsChanged.RemoveCallback(m_OnControlsChangedDelegate); | ||
| DisableAllActions(); | ||
| UnhookActions(); | ||
| UnassignActions(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
^ This line is very wrong, it results in user data being lost on component deactivation.
Codecov ReportAttention: Patch coverage is
@@ Coverage Diff @@
## develop #2192 +/- ##
===========================================
- Coverage 67.78% 67.78% -0.01%
===========================================
Files 367 367
Lines 53526 53536 +10
===========================================
+ Hits 36284 36287 +3
- Misses 17242 17249 +7
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
|
As to the catches by Copilot: (1) This is fine. Historically, we've only had UnassignActions since the beginning of the year, and that was a mistake, so I think future maintainers don't need to know we made that mistake and corrected it quickly (2) There is a short, but to the point comment actually. Not sure I'd like to expand it further. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found an issue with the UI default actions getting added in after a scene load. Steps are: Open our main repo as a unity project -> top dropdown QA Tools -> Add all core samples / open core scene -> import the textmeshpro essentials if needed -> make sure the event system is set to use a project wide actions asset if it isn't already -> enter play mode and observe the action count -> pick anything from the scene loader -> esc -> return to scene picker and observe the action count again. This does not reproduce in Develop
06.06.2025.-.Unity.197.mp4
|
Hey @Pauliusd01, could you try it again please? With this new patch, I tried: (1) With actions asset set before play mode
(2) With no actions asset set before play mode
Note that when you enter play mode with InputSystemUIInputModule that had no actions asset assigned it results in us creating some default actions asset behind the scenes and using it to assign all actions. Disabling this component results in us destroying the default asset, and thus the actions get unassigned as well, so you do get "None" in this case, which I guess is kinda by design (though unfortunate). Enabling it back will restore defaults. If I were to redesign this component from scratch, I would make an explicit checkbox in the component called "Use defaults", and in this case I would hide all the actions, so that the user doesn't get confused by what is going on behind the scenes. This would also simplify code a little bit. |
| UnhookActions(); | ||
| UnassignActions(); | ||
|
|
||
| // In the case we've been initialialised with default actions, we want to unalloc them |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want to do this because if we don't dealloc them, then no one would
| { | ||
| if (defaultActions != null) | ||
| { | ||
| defaultActions.Dispose(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess, calling Dispose is just to stay on the safe side since the only data default actions stores is a ref to ScriptableObject that won't survive even with domain reload off. It will be in this intermediate state though, where its native data is gone but the instance is not null until the next gc run (however you'll see it as "null" in debugger, and ==null will be true as well, thanks to Unity's Equals overload for all Object descendants).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this comment imply that it should be Object.ReferenceEquals(null, defaultActions) in if statement above? If its disposable, yes it should be disposed, even if the implementation would do nothing IMO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I wasn't clear, pardon. DefaultActions is fine to check for null like above since it's not destroyed natively. What is in the intermediate state happens to be aggregated in defaultActions (DefaultActions has a ref to ScriptableObject, so it's the ScriptableObject would have to be checked with ReferenceEquals if we needed to, but we don't).
bb42698 to
e4eba87
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR fixes an issue where disabling the InputSystemUIInputModule component unintentionally resets user-assigned actions by refining the reset logic for default actions.
- Introduces a static ResetDefaultActions method to dispose of lingering static default actions across domain reloads.
- Modifies OnDisable to only unassign default actions when they match the current actions asset.
- Adds a regression Unity test to verify user actions persist and updates a test description in the editor tests for clarity.
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs | Added ResetDefaultActions method with proper disposal logic and refined OnDisable unassignment for default actions. |
| Packages/com.unity.inputsystem/CHANGELOG.md | Added a changelog entry summarizing the fix. |
| Assets/Tests/InputSystem/Plugins/UITests.InputModuleTests.cs | Added a new regression test ensuring disabling does not reset user actions. |
| Assets/Tests/InputSystem.Editor/ProjectWideInputActionsEditorTests.cs | Updated test description for improved grammar. |
Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs
Outdated
Show resolved
Hide resolved
ekcoh
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice and tidy, looks good to me, great you added a test for the regression. Only a single comment/question regarding the null check.
| } | ||
|
|
||
| [UnityTest] | ||
| [Description("Regression test for https://jira.unity3d.com/browse/ISXB-1493")] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great you added a specific test for the regression
| { | ||
| if (defaultActions != null) | ||
| { | ||
| defaultActions.Dispose(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this comment imply that it should be Object.ReferenceEquals(null, defaultActions) in if statement above? If its disposable, yes it should be disposed, even if the implementation would do nothing IMO.
|
@K-Tone Looks like you need to rerun the formatter on this branch before CI will be happier. Other failures look like instabilities. |
…ving junk after reloading
…temUIInputModule.cs Co-authored-by: Copilot <[email protected]>
eb2a2b1 to
5c996c0
Compare
Description
This PR fixes a problem where disabling the InputSystemUIInputModule component would reset all the actions, even if they had been priorly set by user.
This started to happen after a fix for another regression landed, where we unassigned all actions from the components OnDisable. I believe this is wrong, since the only thing we really need to be resetting is the default actions asset that shouldn't normally survive re-reentering playmode.
Testing status & QA
Local testing, a new regression test, pending a QA pass
Overall Product Risks
Checklist
Before review:
Changed,Fixed,Addedsections.Area_CanDoX,Area_CanDoX_EvenIfYIsTheCase,Area_WhenIDoX_AndYHappens_ThisIsTheResult.During merge:
NEW: ___.FIX: ___.DOCS: ___.CHANGE: ___.RELEASE: 1.1.0-preview.3.After merge: