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

feat: user-dropdown support hover trigger #5143

Merged
merged 2 commits into from
Dec 15, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 15, 2024

Description

顶部的UserDropdown支持hover激活弹窗,也可配置hoverDelay属性设置hover延迟打开或关闭的时间。

Issue #4465

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

    • Added support for hover-triggered dropdown functionality in the user dropdown component.
    • Introduced a new useHoverToggle hook to manage hover states for specified elements.
    • Enhanced UserDropdown component to accept a trigger prop for customizable interaction methods.
  • Bug Fixes

    • Improved handling of hover delay in the dropdown component.
  • Chores

    • Updated dependencies in the hooks package for improved functionality.

Copy link

changeset-bot bot commented Dec 15, 2024

⚠️ No Changeset found

Latest commit: 506f0ec

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 15, 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/effects/hooks/src/use-hover-toggle.ts

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

This pull request introduces a new useHoverToggle hook in the @vben/hooks package, which provides a flexible mechanism for tracking mouse hover states across multiple elements. The hook is integrated into the UserDropdown component, allowing more interactive dropdown behavior. Dependencies like @vueuse/core and vue-router were added to support the new functionality. The changes enable both click and hover triggers for the dropdown, with configurable delay options.

Changes

File Change Summary
packages/effects/hooks/package.json Added dependencies: @vueuse/core, vue, vue-router, watermark-js-plus with "catalog:" version
packages/effects/hooks/src/index.ts Added export for use-hover-toggle module
packages/effects/hooks/src/use-hover-toggle.ts New file introducing useHoverToggle composable function for mouse hover tracking
packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue Added trigger and hoverDelay props, integrated useHoverToggle hook
playground/src/layouts/basic.vue Added trigger="both" prop to UserDropdown component

Sequence Diagram

sequenceDiagram
    participant User
    participant Dropdown
    participant HoverToggle
    
    User->>Dropdown: Hover/Click
    Dropdown->>HoverToggle: Check hover state
    HoverToggle-->>Dropdown: Update visibility
    Dropdown->>User: Show/Hide menu
Loading

Possibly related PRs

Suggested labels

feature

Suggested reviewers

  • vince292007
  • anncwb

Poem

🐰 A rabbit's tale of hover and glee,
Dropdown dancing with agility!
Click or hover, the menu will sway,
Smooth interactions pave the way!
Coding magic, oh so light! 🎉


📜 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 beb2efd and 506f0ec.

📒 Files selected for processing (1)
  • packages/effects/hooks/src/use-hover-toggle.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/effects/hooks/src/use-hover-toggle.ts

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.

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: 3

🧹 Nitpick comments (3)
packages/effects/hooks/src/use-hover-toggle.ts (2)

10-19: Consider adding English documentation.

While the current documentation is clear, adding English documentation would improve maintainability and accessibility for a broader developer audience.

 /**
- * 监测鼠标是否在元素内部,如果在元素内部则返回 true,否则返回 false
- * @param refElement 所有需要检测的元素。如果提供了一个数组,那么鼠标在任何一个元素内部都会返回 true
- * @param delay 延迟更新状态的时间
+ * Monitors if the mouse is inside the specified elements. Returns true if the mouse is inside any of the elements.
+ * @param refElement Elements to monitor. If an array is provided, returns true if mouse is inside any element
+ * @param delay Time to delay state updates (in milliseconds)
  * @returns 返回一个数组,第一个元素是一个 ref,表示鼠标是否在元素内部,第二个元素是一个控制器,可以通过 enable 和 disable 方法来控制监听器的启用和禁用
  */

41-59: Consider using explicit return type instead of type assertion.

The current implementation uses type assertion for the return value. Consider using an explicit return type for better type safety and readability.

+type HoverToggleReturn = [Ref<boolean>, { enable: () => void; disable: () => void }];

 export function useHoverToggle(
   refElement: Arrayable<MaybeElementRef>,
   delay: (() => number) | number = 500,
-) {
+): HoverToggleReturn {
   // ... existing implementation ...

-  return [value, controller] as [typeof value, typeof controller];
+  return [value, controller];
 }
packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue (1)

185-186: Consider improving hover behavior between trigger and content

The current implementation might cause the dropdown to close unexpectedly when the user moves the cursor from the trigger to the content area, as there could be a gap between these elements.

Consider adding a small delay before closing or ensuring there's no gap between trigger and content areas. You could:

  1. Add a small padding area to catch the mouse movement
  2. Increase the close delay slightly higher than the open delay
  3. Use a more sophisticated hover detection that accounts for cursor velocity and direction

Example implementation for option 2:

 const [openPopover, hoverWatcher] = useHoverToggle(
   [refTrigger, refContent],
-  () => props.hoverDelay,
+  () => ({
+    open: props.hoverDelay,
+    close: props.hoverDelay + 100,
+  }),
 );

Also applies to: 194-194

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 7581fb3 and beb2efd.

⛔ Files ignored due to path filters (1)
  • pnpm-lock.yaml is excluded by !**/pnpm-lock.yaml
📒 Files selected for processing (5)
  • packages/effects/hooks/package.json (1 hunks)
  • packages/effects/hooks/src/index.ts (1 hunks)
  • packages/effects/hooks/src/use-hover-toggle.ts (1 hunks)
  • packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue (5 hunks)
  • playground/src/layouts/basic.vue (1 hunks)
🔇 Additional comments (5)
packages/effects/hooks/src/use-hover-toggle.ts (1)

1-8: LGTM! Imports are well-organized and complete.

All necessary utilities and types are properly imported.

packages/effects/hooks/src/index.ts (1)

4-4: LGTM! Export is properly integrated.

The new hook export follows the established pattern and is well-organized within the file.

playground/src/layouts/basic.vue (1)

135-135: LGTM! Verify prop documentation

The trigger="both" prop is correctly added to enable both click and hover triggers for the dropdown.

Let's verify the prop documentation:

✅ Verification successful

Prop is well-documented and type-safe

The trigger prop is properly documented in the UserDropdown component with correct TypeScript types supporting all three modes: 'both', 'click', and 'hover'.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for documentation of the trigger prop
rg -A 5 "trigger.*'both'.*'click'.*'hover'" 

Length of output: 585

packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue (2)

57-60: LGTM! Well-documented props with type safety

The new props are well-defined with:

  • Clear JSDoc comments
  • Type-safe trigger options
  • Reasonable default values

93-112: LGTM! Clean hover implementation with proper cleanup

The hover functionality is well-implemented using:

  • Template refs for precise element targeting
  • Proper watch setup with immediate execution
  • Clean enable/disable logic based on trigger prop

@mynetfan mynetfan merged commit f446cbf into vbenjs:main Dec 15, 2024
14 checks passed
@mynetfan mynetfan deleted the feat/header-dropdown-trigger branch December 15, 2024 10:24
@github-actions github-actions bot locked and limited conversation to collaborators Jan 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant