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: inline chat lower level than findwidget #4251

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

Ricbet
Copy link
Member

@Ricbet Ricbet commented Dec 19, 2024

Types

  • 💄 Style Changes

Background or solution

Changelog

修复 findWidget 部件被 inline chat 遮挡的问题

Summary by CodeRabbit

  • 新功能
    • 在堆叠级别中添加了新的 FindWidget 属性,z-index 值为 25,确保其在现有组件之上。
  • 改动
    • 更新了 getDomNode() 方法中的 z-index 计算方式,使用新的堆叠级别引用。

@Ricbet Ricbet requested review from zhanba, hacke2 and erha19 December 19, 2024 11:53
@Ricbet Ricbet self-assigned this Dec 19, 2024
@Ricbet Ricbet linked an issue Dec 19, 2024 that may be closed by this pull request
@opensumi opensumi bot added the 🐞 bug Something isn't working label Dec 19, 2024
Copy link
Contributor

coderabbitai bot commented Dec 19, 2024

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

warning eslint@8.57.1: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/config-array@0.13.0: Use @eslint/config-array instead
warning eslint > @humanwhocodes/config-array > @humanwhocodes/object-schema@2.0.3: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > rimraf@3.0.2: Rimraf versions prior to v4 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob@7.2.3: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > inflight@1.0.6: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning eslint-import-resolver-typescript > glob@7.2.3: Glob versions prior to v9 are no longer supported
error Couldn't find any versions for "@opensumi/ide-dev-tool" that matches "workspace:*"

概述

演练

此拉取请求主要修改了两个文件中的堆叠层级(z-index)处理。在 inline-content-widget.tsx 中,导入语句从 StackingLevelStr 变更为 StackingLevel,并相应地调整了 getDomNode 方法中的 z-index 计算。在 rule.ts 中,为 StackingLevel 常量对象新增了 FindWidget 属性,其值为 25。

变更

文件路径 变更摘要
packages/ai-native/src/browser/widget/inline-chat/inline-content-widget.tsx - 移除 StackingLevelStr 导入
- 添加 StackingLevel 导入
- 修改 getDomNode 方法中的 z-index 计算
packages/core-browser/src/design/rule.ts - 在 StackingLevel 常量中新增 FindWidget: 25 属性

可能相关的 PR

建议标签

💄 style change

建议审阅者

  • bytemain
  • erha19
  • hacke2

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

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/core-browser/src/design/rule.ts (1)

38-42: 代码结构清晰,建议完善文档

z-index 的设置合理,位于 EditorFloatingContainer (20) 和 Popup (100) 之间。建议在注释中补充说明为什么选择 25 这个具体数值,以及与相邻层级的关系。

建议将注释修改为:

  /**
-  * Find 控件的 zIndex 是 25
+  * Find 控件的 zIndex 设置为 25
+  * 确保在 EditorFloatingContainer (20) 之上
+  * 同时保持在 Popup (100) 之下
   */
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between dbaccc5 and 01453dd.

📒 Files selected for processing (2)
  • packages/ai-native/src/browser/widget/inline-chat/inline-content-widget.tsx (2 hunks)
  • packages/core-browser/src/design/rule.ts (1 hunks)
🔇 Additional comments (1)
packages/ai-native/src/browser/widget/inline-chat/inline-content-widget.tsx (1)

264-264: z-index 设置合理

通过将内联聊天组件的 z-index 设置为 FindWidget - 1,确保了其不会遮挡查找组件,同时保持了合适的层级关系。使用 requestAnimationFrame 处理 DOM 更新也是正确的做法。

@Ricbet Ricbet changed the base branch from main to v3.6 December 19, 2024 12:14
Copy link

codecov bot commented Dec 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.92%. Comparing base (47aace4) to head (01453dd).
Report is 1 commits behind head on v3.6.

Additional details and impacted files
@@            Coverage Diff             @@
##             v3.6    #4251      +/-   ##
==========================================
- Coverage   54.15%   53.92%   -0.24%     
==========================================
  Files        1617     1618       +1     
  Lines      101900    98307    -3593     
  Branches    21484    20126    -1358     
==========================================
- Hits        55188    53013    -2175     
+ Misses      38522    37631     -891     
+ Partials     8190     7663     -527     
Flag Coverage Δ
jsdom 49.51% <ø> (-0.38%) ⬇️
node 15.51% <ø> (+0.15%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Ricbet Ricbet merged commit cf44454 into v3.6 Dec 20, 2024
14 checks passed
@Ricbet Ricbet deleted the fix/inline-chat-find-widget branch December 20, 2024 02:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] AI widget obstructing the search bar in Editor
2 participants