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: the position of the pop-up window for configuring internationalized entries in the editor is incorrect when the full screen is switched #969

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

yy-wow
Copy link
Collaborator

@yy-wow yy-wow commented Dec 27, 2024

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

Background and solution

编辑器中国际化词条配置弹窗切换全屏时位置问题

What is the current behavior?

image

Issue Number: N/A

What is the new behavior?

切换全屏时,关闭国际化弹窗

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Introduced new event emissions in the Monaco Editor component for enhanced interactivity: @change and @fullscreenChange.
    • Added functionality to manage the visibility of the internationalization tool during fullscreen mode.
  • Bug Fixes

    • Improved handling of fullscreen state changes to ensure proper UI behavior.

Copy link
Contributor

coderabbitai bot commented Dec 27, 2024

Walkthrough

The pull request introduces enhanced event emissions in the MonacoEditor.vue component, adding @change and @fullscreenChange events. These new events provide more interaction capabilities for parent components. In the CreateVariable.vue, a new fullscreenChange event handler is implemented to manage the visibility of the i18n tool during fullscreen mode transitions, improving the overall user interface responsiveness.

Changes

File Change Summary
packages/common/component/MonacoEditor.vue - Updated emits to include change and fullscreenChange events
- Modified switchFullScreen method to emit fullscreenChange event
packages/plugins/state/src/CreateVariable.vue - Added fullscreenChange event handler
- Implemented logic to hide popover during fullscreen mode changes

Possibly related PRs

Suggested reviewers

  • hexqi
  • chilingling

Poem

🐰 In Monaco's realm of code so bright,
Events now dance with newfound might.
Fullscreen toggles, changes take flight,
A rabbit's code, a joyful sight!
Emit and listen, pure delight! 🖥️


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.

@github-actions github-actions bot added bug Something isn't working refactor-main refactor/develop branch feature labels Dec 27, 2024
Copy link
Contributor

@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: 0

🧹 Nitpick comments (1)
packages/common/component/MonacoEditor.vue (1)

117-117: Fullscreen change event emission.

Emitting the 'fullscreenChange' event in switchFullScreen is a clean way to notify parent components about fullscreen toggles. If you foresee passing more data (e.g. bounding rectangle info) in the future, consider emitting an object.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 9027902 and dc3f7f2.

📒 Files selected for processing (2)
  • packages/common/component/MonacoEditor.vue (3 hunks)
  • packages/plugins/state/src/CreateVariable.vue (3 hunks)
🔇 Additional comments (5)
packages/common/component/MonacoEditor.vue (2)

31-32: Emitting new “change” and “shortcutSave” events.

These event emissions look properly declared and aligned with Vue’s emits approach. If these events are intended to fire frequently, be mindful of their performance impact in higher-level components. Otherwise, this is good practice for letting parent components respond to editor changes.


65-66: Expanded emits array.

Including 'change', 'shortcutSave', and 'fullscreenChange' in the emits declaration is consistent with Vue 3’s recommended pattern for props and events, ensuring that consumers are aware of the events. This addition is properly reflected in the template, so everything is coherent.

packages/plugins/state/src/CreateVariable.vue (3)

31-31: Handling fullscreen changes in the template.

Binding the fullscreenChange event to the @fullscreenChange listener ensures the popover’s display logic remains in sync with editor fullscreen states. This is a solid approach for keeping the UI consistent.


406-406: Exposing fullnameChange in setup return.

Returning the fullscreenChange method in the setup() function ensures that it’s accessible in the template. This usage is valid; no changes needed here.


344-346: Popover hiding logic upon fullscreen changes.

Calling i18nToolRef.value.state.showPopover = false effectively dismisses the popover during fullscreen transitions. Make sure i18nToolRef is guaranteed to exist before the user toggles fullscreen, to avoid potential runtime errors.

If you’d like to confirm that i18nToolRef is always properly set, run a quick code search:

✅ Verification successful

i18nToolRef is properly initialized and safely used

The code search reveals that i18nToolRef is:

  • Properly initialized as a ref with const i18nToolRef = ref(null)
  • Bound to a component via ref="i18nToolRef"
  • Used in a Vue component's template and script sections consistently

The fullscreen change handler's usage of i18nToolRef.value.state.showPopover is safe because:

  1. The ref is initialized at component creation
  2. The template binding ensures the reference is set when the component mounts
  3. The fullscreen event can only occur after component mounting
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify i18nToolRef initialization
rg -A 10 "i18nToolRef"

Length of output: 4434

@yy-wow yy-wow changed the title fix: 编辑器中国际化词条配置弹窗切换全屏时位置问题 fix: the position of the pop-up window for configuring internationalized entries in the editor is incorrect when the full screen is switched Jan 2, 2025
@hexqi hexqi added this to the v2.2.0 milestone Jan 13, 2025
Copy link
Contributor

@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: 0

🧹 Nitpick comments (1)
packages/common/component/MonacoEditor.vue (1)

Line range hint 1-183: Consider adding JSDoc comments for the emitted events.

While the implementation is correct, it would be helpful to document the payload type and purpose of each emitted event using JSDoc comments.

Add documentation above the emits array:

+  /**
+   * @event editorDidMount - Emitted when the Monaco editor instance is mounted
+   * @event change - Emitted when the editor content changes
+   * @event fullscreenChange - Emitted when the editor's fullscreen state changes
+   * @param {boolean} fullscreenChange.value - The new fullscreen state
+   */
   emits: ['editorDidMount', 'change', 'fullscreenChange'],
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between dc3f7f2 and 56c0e51.

📒 Files selected for processing (1)
  • packages/common/component/MonacoEditor.vue (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: push-check
🔇 Additional comments (3)
packages/common/component/MonacoEditor.vue (3)

31-31: LGTM! Good practice for event propagation.

The @change event emission allows parent components to react to editor content changes, following Vue's event handling best practices.


64-64: LGTM! Proper event declaration.

The updated emits array correctly declares all events that the component can emit, improving component documentation and type checking.


116-116: LGTM! This addresses the popup positioning issue.

The fullscreenChange event emission allows parent components (like the i18n tool) to react to fullscreen transitions, which should fix the popup positioning issue when switching to fullscreen mode.

Let's verify the popup behavior:

✅ Verification successful

Verified: The fullscreenChange event properly handles popup positioning

The implementation correctly manages popup positioning during fullscreen transitions by automatically closing the i18n tool's popup when the editor enters or exits fullscreen mode, preventing any positioning issues.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for proper popup handling in parent components

# Look for components that use MonacoEditor and handle fullscreenChange
rg -l "fullscreenChange.*MonacoEditor" --type vue

# Check for popup-related code that might need the fullscreenChange event
rg "popup|popover|i18nTool" --type vue

Length of output: 148


Script:

#!/bin/bash
# Find all Vue-related files
echo "=== Vue and JS/TS files ==="
fd -e vue -e js -e ts -e jsx -e tsx

# Search for MonacoEditor usage and fullscreenChange handlers
echo -e "\n=== MonacoEditor and fullscreenChange usage ==="
rg "MonacoEditor|fullscreenChange" -l

# Search for popup/popover/i18n related code
echo -e "\n=== Popup and i18n related code ==="
rg "popup|popover|i18nTool|i18n-tool" -l

# Look for specific event handler syntax in Vue files
echo -e "\n=== Event handler patterns ==="
rg "@fullscreenChange|v-on:fullscreenChange|\$emit\('fullscreenChange" -l

Length of output: 47180


Script:

#!/bin/bash
# Check CreateVariable.vue implementation
echo "=== CreateVariable.vue content ==="
cat packages/plugins/state/src/CreateVariable.vue

# Look for connections between MonacoEditor and i18n tool
echo -e "\n=== EditorI18nTool.vue content ==="
cat packages/plugins/state/src/EditorI18nTool.vue

Length of output: 18470

@hexqi hexqi merged commit f2db03a into opentiny:refactor/develop Jan 13, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working refactor-main refactor/develop branch feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants