Skip to content
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: Using focus trap in web components #1338

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

Palkess
Copy link

@Palkess Palkess commented May 2, 2024

Closes #

📑 Description

When using Svelte-components as custom elements/web components, they're encapsulated with a shadow-root. When using a focus trapped component, like a Modal, document.activeElement incorrectly returns the custom element as the active element instead of the actual element inside the component. This causes the focus trap to never change focus whilst tabbing.

The solution I'm suggesting checks if document.activeElement has a shadow root and uses the correct document.activeElement.shadowRoot.activeElement to get the actual active element inside the component.

Status

  • Not Completed
  • Completed

✅ Checks

  • My pull request adheres to the code style of this project
  • My code requires changes to the documentation
  • I have updated the documentation as required
  • I have checked the page with https://validator.unl.edu/
  • All the tests have passed
  • My pull request is based on the latest commit (not the npm version).

ℹ Additional Information

Summary by CodeRabbit

  • Bug Fixes
    • Improved focus management by updating how the active element is determined, now supporting elements within shadow roots.

Copy link

vercel bot commented May 2, 2024

@Palkess is attempting to deploy a commit to the Themesberg Team on Vercel.

A member of the Team first needs to authorize it.

Copy link

coderabbitai bot commented May 2, 2024

Walkthrough

The update enhances the focusTrap function to support components within shadow roots by improving how the active element is determined. This change ensures better compatibility and functionality in complex DOM structures.

Changes

File Path Change Summary
src/lib/utils/focusTrap.js Updated logic to handle shadow roots in active element check

Possibly related issues

  • Popover component cannot work in shadow root #1155: The issue discusses a malfunction in the Popover component within shadow roots. The update in focusTrap.js similarly enhances shadow root compatibility, suggesting a shared concern that could benefit from this PR's approach.

🐰✨
Oh hooray for the code that now sees,
Through the shadows of DOM trees!
With a hop and a skip in its stride,
Now our elements no longer hide.
Cheers to roots, both deep and wide!
🌳🔍💻


Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 0727a2c and 98d1197.
Files selected for processing (1)
  • src/lib/utils/focusTrap.js (1 hunks)
Files skipped from review due to trivial changes (1)
  • src/lib/utils/focusTrap.js

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

src/lib/utils/focusTrap.js Outdated Show resolved Hide resolved
let index = tabbable.indexOf(document.activeElement ?? node);
const activeElement = !!document.activeElement?.shadowRoot ? document.activeElement.shadowRoot.activeElement : document.activeElement;

let index = tabbable.indexOf(activeElement ?? node);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider handling cases where tabbable[index] might be undefined.

In rare cases, if tabbable is empty, tabbable[index] will be undefined, and calling .focus() on it will throw an error. It might be beneficial to add a guard clause to prevent this:

+ if (tabbable[index]) {
+   tabbable[index].focus();
+ }

This ensures that the focus method is only called if there is a valid element to receive focus.


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.

Suggested change
let index = tabbable.indexOf(activeElement ?? node);
let index = tabbable.indexOf(activeElement ?? node);
if (tabbable[index]) {
tabbable[index].focus();
}

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Copy link

vercel bot commented May 2, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
flowbite-svelte ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 2, 2024 9:08am

@Palkess
Copy link
Author

Palkess commented May 21, 2024

Any ETA on when someone can check this PR out? Would be swell to have a solution for our web components without having to do some weird workaround :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant