-
Notifications
You must be signed in to change notification settings - Fork 716
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
Remove FocusTrap in favor of KFocusTrap #12718
Conversation
Thank you, @lokesh-sagi125. Is this ready for review? If so, would you please fill in the PR description and also linked the issue this is resolving? It will help reviewers. |
Build Artifacts
|
Note related KDS PR learningequality/kolibri-design-system#799. This PR can be merged after a new KDS release with that change is installed in Kolibri. |
I am not entirely sure why would the automatic lint affect another files in this commit, but perhaps it's not an issue. @rtibbles may have an idea perhaps. |
Thanks for getting the PR description ready @lokesh-sagi125. I think this can be reviewed cc @akolson @nucleogenesis @LianaHarris360. |
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.
The changes look correct to me but will review this more extensively once learningequality/kolibri-design-system#799 has been approved and released. I suspect the failing tests are to do with it. Thanks @lokesh-sagi125
Hey @lokesh-sagi125! We just released the changes made in learningequality/kolibri-design-system#799, and updated the KDS version in develop with the new release. You can now rebase this PR on top of develop, and run |
yes @AlexVelezLl will do. |
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.
The updates of FocusTrap -> KFocusTrap look good to me, but there's some misc file changes that look like they might be related to your rebase and/or some linting (ie, reordering of imports, update to .gitignore).
I thought at first it might be related to the automatic linting CI bot that automatically added the commits to your PR but that doesn't appear to be the case.
I think you may need to git fetch --all
and git rebase upstream/develop
(assuming that git remote -v
shows upstream
pointing to the learningequality
repository -- use whichever remote you have pointing to our repo).
If you don't have our repository setup in your remotes: git remote add upstream https:/github.com/learningequality/kolibri.git
then git fetch upstream
will get you the latest develop
locally, then you can run the git rebase upstream/develop
and observe and correct any conflicts that come up.
Please let me know if you have any questions or, if you're a part of our Slack community feel free to reach out in our #dev-community channel for some more direct help
41ac7cf
to
6a6888c
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.
As long as tests and linting pass, this should be good to go.
Changes addressed.
Summary
I removed all instances of ' FocusTrap ' that were wrapping ' KModal ', as the focus trapping logic is now handled internally within the KModal component. Additionally, I renamed all remaining FocusTrap instances to KFocusTrap, and finally, I deleted the FocusTrap.vue file since it is no longer necessary. These updates ensure focus trapping is handled consistently throughout the system without causing any regressions.
…
References