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: sidebar header height #5183

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 19, 2024

Description

修复侧边栏的菜单在滚动后顶部的分割线没有与右侧顶部分割线没有对齐的问题

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

  • New Features
    • Enhanced sidebar interaction and visibility, particularly in mixed mode scenarios.
  • Bug Fixes
    • Improved handling of hover states for the sidebar.
  • Style
    • Adjusted header height for better visual representation.

Copy link

changeset-bot bot commented Dec 19, 2024

⚠️ No Changeset found

Latest commit: 3d9009e

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

packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue

Oops! Something went wrong! :(

ESLint: 9.16.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 modifications to the layout-sidebar.vue component, focusing on adjusting the sidebar's header height and improving the interaction logic for mixed mode scenarios. The changes primarily involve tweaking the headerStyle computed property by reducing the header height by 1 pixel and refining the handleMouseenter and handleMouseleave functions to better manage sidebar expansion and collapse behavior.

Changes

File Change Summary
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue - Modified headerStyle computed property to reduce header height by 1px
- Updated handleMouseenter function to control sidebar expansion in collapsed state
- Refined handleMouseleave function to manage sidebar leave events and scroll locking

Suggested labels

bug

Suggested reviewers

  • vince292007
  • anncwb

Possibly related PRs

Poem

🐰 A sidebar's dance, a pixel's grace,
Collapsing, expanding with subtle trace
One pixel less, a height so neat
Mixed mode magic, now complete!
Code rabbit hops with pure delight 🎉


📜 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 85cbb3b and 3d9009e.

📒 Files selected for processing (1)
  • packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue (1 hunks)
🔇 Additional comments (1)
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue (1)

169-169: LGTM! The height adjustment aligns with the PR objective.

The 1px reduction in header height effectively addresses the misalignment of the sidebar's top dividing line. This is a focused fix that maintains the component's existing behavior while improving visual consistency.

Let's verify if this height adjustment is consistently applied across related styles:

✅ Verification successful

Note: Adjusting the search strategy since the previous command had issues with file type recognition. Using multiple approaches to ensure we catch all relevant height calculations.


The height adjustment is consistently applied and properly coordinated with other layout calculations

The verification shows that the 1px reduction in header height is part of a well-coordinated layout system:

  • The adjustment appears in the sidebar header style calculation (height: ${headerHeight - 1}px)
  • Other components that depend on headerHeight properly handle the full headerHeight value:
    • Content area calculations use appropriate offsets: calc(100% - ${headerHeight + collapseHeight}px)
    • Page component adjusts its height accordingly: calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px)
  • The headerHeight value is properly managed through composables and CSS variables
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other height calculations that might need similar adjustments
rg -A 2 "headerHeight.*px" --type vue

Length of output: 67


Script:

#!/bin/bash
# Search for height calculations in all files, focusing on headerHeight
rg -A 2 "headerHeight.*px"

Length of output: 1679


Script:

#!/bin/bash
# Find all vue files and search for headerHeight calculations
fd -e vue -x rg -A 2 "headerHeight.*px" {}

Length of output: 524


Script:

#!/bin/bash
# Find all style-related files that might contain headerHeight
fd -e css -e scss -e less -e vue -e js -e ts -x rg -A 2 "headerHeight" {}

Length of output: 1871


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.

@mynetfan mynetfan merged commit 1853ba1 into vbenjs:main Dec 19, 2024
14 checks passed
@mynetfan mynetfan deleted the fix/sidebar-logo-height branch December 19, 2024 03:45
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