Skip to content

Close open modals on escape keydown#1809

Merged
esimkowitz merged 1 commit intomainfrom
evan/modal-escape
Jan 23, 2025
Merged

Close open modals on escape keydown#1809
esimkowitz merged 1 commit intomainfrom
evan/modal-escape

Conversation

@esimkowitz
Copy link
Contributor

No description provided.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 23, 2025

Walkthrough

The pull request introduces modifications to the key event handling mechanism in the frontend application, specifically for the "Escape" key functionality. The changes involve integrating modal management into the existing key binding logic. The new implementation first checks for open modals using a newly imported modalsModel. If modals are present, the code prioritizes closing the most recent modal through popModal(). When no modals are open, the system falls back to the previous search deactivation mechanism. This approach creates a hierarchical event handling strategy that ensures modal interactions take precedence over other key-triggered actions, providing a more structured approach to managing user interface interactions and key press events.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 088964f and 5cd920f.

📒 Files selected for processing (1)
  • frontend/app/store/keymodel.ts (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Analyze (go)
  • GitHub Check: Build for TestDriver.ai
🔇 Additional comments (2)
frontend/app/store/keymodel.ts (2)

25-25: LGTM!

Clean import that follows the existing import style in the file.


388-397: LGTM! Verify modal state consistency.

The implementation creates a clear hierarchy for Escape key handling, with modals taking precedence over search deactivation. The early return pattern makes the control flow clear and maintainable.

Let's verify that this implementation aligns with the existing modal state atom:

✅ Verification successful

Modal state implementation is consistent and well-integrated

The Escape key handler correctly integrates with the centralized modal state management through ModalsModel. The implementation maintains a single source of truth using Jotai atoms, and there are no conflicting key handlers in the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for potential inconsistencies between modalModel and the existing modal state atom

# Search for modal-related state management
echo "Searching for modal state management..."
rg -l "modalOpen|hasOpenModals|popModal" --type ts

# Search for other Escape key handlers that might conflict
echo "Searching for other Escape key handlers..."
rg "Escape.*=>" --type ts

# Search for potential modal-related event handlers
echo "Searching for modal-related keyboard event handlers..."
ast-grep --pattern 'function $FUNC($EVENT) {
  $$$
  modal
  $$$
}'

Length of output: 788


Script:

#!/bin/bash
# Examine modal state implementation and integration

# Check modalmodel.ts implementation
echo "=== Modal Model Implementation ==="
rg -A 10 "class.*Modal" frontend/app/store/modalmodel.ts

# Check for modal state management in global.ts
echo -e "\n=== Global State Integration ==="
rg "modal" frontend/app/store/global.ts

# Examine modal component integration
echo -e "\n=== Modal Component Integration ==="
rg -A 5 "hasOpenModals|popModal" frontend/app/modals/modalsrenderer.tsx

Length of output: 1006

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

@esimkowitz esimkowitz changed the title Pop open modals on escape keydown Close open modals on escape keydown Jan 23, 2025
@esimkowitz esimkowitz merged commit 2304b8b into main Jan 23, 2025
5 checks passed
@esimkowitz esimkowitz deleted the evan/modal-escape branch January 23, 2025 20:23
xxyy2024 pushed a commit to xxyy2024/waveterm_aipy that referenced this pull request Jun 24, 2025
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.

1 participant