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: change drawer and modal zIndex to 2000 compatible with element-plus #5293

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

warmthsea
Copy link
Contributor

@warmthsea warmthsea commented Jan 3, 2025

Description

Why?

element-plus some pop-up controls have a z-index of 2000, causing some display issues.

https://github.com/search?q=repo%3Aelement-plus%2Felement-plus%20z-index%3A%202000&type=code

Before

screenshots

After

screenshots

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

  • If you introduce new functionality, document it. You can run documentation with pnpm run docs:dev command.
  • Run the tests with pnpm test.
  • Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • Documentation

    • Updated documentation for Vben Drawer and Modal components
    • Updated documentation for Dialog and Sheet components
  • Chores

    • Modified default zIndex from 1000 to 2000 across multiple UI components
    • Ensures consistent layering of UI elements with higher default z-index values

@warmthsea warmthsea requested review from anncwb, vince292007, mynetfan and a team as code owners January 3, 2025 01:42
Copy link

changeset-bot bot commented Jan 3, 2025

⚠️ No Changeset found

Latest commit: 8ed1c4e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Jan 3, 2025

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.

packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue

Oops! Something went wrong! :(

ESLint: 9.17.0

Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/node_modules/@vben/eslint-config/dist/index.mjs' imported from /eslint.config.mjs
at finalizeResolution (node:internal/modules/esm/resolve:257:11)
at moduleResolve (node:internal/modules/esm/resolve:914:10)
at defaultResolve (node:internal/modules/esm/resolve:1038:11)
at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:557:12)
at ModuleLoader.resolve (node:internal/modules/esm/loader:525:25)
at ModuleLoader.getModuleJob (node:internal/modules/esm/loader:246:38)
at ModuleJob._link (node:internal/modules/esm/module_job:126:49)

Walkthrough

The pull request introduces a consistent update to the zIndex property across multiple UI components in the project. The default zIndex value is being uniformly changed from 1000 to 2000 for various overlay components like drawers, modals, dialogs, and sheets. This modification ensures that these UI elements have a higher default stacking order, potentially improving their visibility and layering in complex user interfaces.

Changes

File Change Summary
docs/src/components/common-ui/vben-drawer.md Updated documentation for zIndex default value from 1000 to 2000
docs/src/components/common-ui/vben-modal.md Updated documentation for zIndex default value from 1000 to 2000
packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue Changed zIndex prop default from 1000 to 2000
packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue Updated zIndex prop default from 1000 to 2000
packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue Changed zIndex prop default from 1000 to 2000
packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue Modified zIndex prop default from 1000 to 2000

Suggested labels

bug

Suggested reviewers

  • anncwb
  • vince292007

Poem

🐰 Layers rising, z-index high
Components dance, no more shy
From thousand to two thousand's gleam
Our UI now rules the screen supreme!
A rabbit's code, precise and bright 🎨


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.

@warmthsea warmthsea changed the title fix: change drawer and modal zIndex to 2000 compatible with element-plus fix: change drawer and modal zIndex to 2000 compatible with element-plus Jan 3, 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 (2)
docs/src/components/common-ui/vben-drawer.md (1)

103-103: LGTM! Consider adding a compatibility note.

The z-index update to 2000 aligns well with element-plus's z-index system.

Consider adding a note about element-plus compatibility, like:

| zIndex | 抽屉的ZIndex层级 | `number` | `2000` |
+
+> Note: The default z-index of 2000 is chosen for compatibility with element-plus components.
docs/src/components/common-ui/vben-modal.md (1)

113-113: LGTM! Consider adding a compatibility note.

The z-index update to 2000 maintains consistency with the drawer component and aligns with element-plus's z-index system.

Consider adding a note about element-plus compatibility, like:

| zIndex | 弹窗的ZIndex层级 | `number` | `2000` |
+
+> Note: The default z-index of 2000 is chosen for compatibility with element-plus components.
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 801c640 and 8ed1c4e.

📒 Files selected for processing (6)
  • docs/src/components/common-ui/vben-drawer.md (1 hunks)
  • docs/src/components/common-ui/vben-modal.md (1 hunks)
  • packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue (1 hunks)
  • packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue (1 hunks)
  • packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue (1 hunks)
  • packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue (1 hunks)
🔇 Additional comments (5)
packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue (1)

19-19: Consistent zIndex update.

Raising the default zIndex from 1000 to 2000 helps align with element-plus components. This looks good.

packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue (1)

30-30: Aligning zIndex with external library requirements.

The default zIndex value is now set to 2000, which is in line with the element-plus library. This standardizes component layering and avoids overlap issues.

packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue (1)

32-32: Ensuring visibility above element-plus components.

The updated default zIndex value of 2000 is consistent with other components, preventing stacking conflicts.

packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue (1)

39-39: Unified zIndex approach for drawer overlay.

Updating the drawer default zIndex to 2000 aligns this component with the new standard across the codebase, preventing display conflicts when used alongside element-plus components.

docs/src/components/common-ui/vben-modal.md (1)

Line range hint 103-103: Verify z-index consistency across all overlay components.

The z-index updates in both drawer and modal components look good. Let's verify that all related overlay components have been updated consistently.

Also applies to: 113-113

✅ Verification successful

Z-index values are consistent across overlay components

Based on the code inspection:

  • The only high z-index values (9999) found are in loading screens, which is appropriate for app-level overlays
  • The modal component accepts a configurable z-index prop
  • The drawer component has a default z-index of 2000
  • The dialog and sheet overlays use CSS classes for layering without hardcoded z-index values
  • No components were found with the problematic z-index value of 1000

The z-index implementation across overlay components appears to be consistent and follows good practices by:

  1. Using configurable z-index props where needed
  2. Leveraging CSS classes for layering
  3. Maintaining appropriate stacking contexts
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any remaining z-index values that might need updating
# Look for z-index values in vue files that might still be set to 1000

# Search for z-index declarations with value 1000
rg -i "z-?index.*1000" --type vue

# Search for style declarations with z-index: 1000
rg "z-index:\s*1000" --type vue

Length of output: 125


Script:

#!/bin/bash
# Search for z-index declarations in all files, not limiting to specific file types
rg -i "z-?index.*1000"

# Search for style declarations with z-index: 1000
rg "z-index:\s*1000"

# Also search for other common z-index values used in overlays (e.g., 999, 1001, etc.)
rg -i "z-?index.*(999|1001)"

# Search for files that might contain overlay components
fd -e vue -e tsx -e jsx -e css -e scss -e less "dialog|modal|drawer|popup|overlay"

Length of output: 1903


Script:

#!/bin/bash
# Let's check the z-index values in the overlay components we found
# Focusing on the core UI components first

# Check DialogOverlay.vue content
cat "packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue"

# Check SheetOverlay.vue content
cat "packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetOverlay.vue"

# Check modal.vue content
cat "packages/@core/ui-kit/popup-ui/src/modal/modal.vue"

# Check drawer.vue content
cat "packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue"

Length of output: 16100

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