Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: keepAlive not working for popup appendToMain #5666

Merged
merged 2 commits into from
Mar 6, 2025

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Mar 6, 2025

Description

  • 修复弹窗和抽屉 appendToMain 时且启用keepAlive 时未能正确缓存的问题

fix: #5665

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 the drawer and modal display for improved layout consistency and visual behavior.
    • Introduced interactive input fields in demo views with two-way data binding.
    • Updated navigation routes to preserve component state, resulting in a smoother user experience.
    • Added specific CSS selectors for improved element targeting in drawer and modal components.
    • Defined component names for better identification and debugging within the Vue ecosystem.

Copy link

changeset-bot bot commented Mar 6, 2025

⚠️ No Changeset found

Latest commit: befb338

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 Mar 6, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

This pull request refines the element targeting logic in the drawer and modal components by updating their computed getAppendTo properties to return more specific CSS selectors. Additionally, it introduces the keepAlive property to route metadata for component state preservation, and enhances demo components by adding reactive variables, input components, and component name definitions.

Changes

File(s) Change Summary
`packages/@core/ui-kit/.../(drawer modal).vue`
playground/src/router/.../examples.ts Added keepAlive: true to the meta objects for both ModalExample and DrawerExample routes to preserve component state.
playground/src/views/examples/drawer/{in-content-demo.vue,index.vue} Introduced a new reactive variable with ref, imported and added an Input component in the demo, and defined the component name using defineOptions({ name: 'DrawerExample' }).
playground/src/views/examples/modal/{in-content-demo.vue,index.vue} Added a reactive variable with ref and integrated an Input component with v-model. Also updated modal configuration with destroyOnClose: false and defined the component name using defineOptions({ name: 'ModalExample' }).

Sequence Diagram(s)

sequenceDiagram
  participant User
  participant DrawerComponent
  participant ModalComponent
  participant DOM
  participant Router

  User->>DrawerComponent: Opens Drawer
  DrawerComponent->>DOM: Evaluate getAppendTo (using selector "#main-content > div:not(.absolute)>div")
  Note over DrawerComponent: Determines target element for appending
  
  User->>ModalComponent: Opens Modal
  ModalComponent->>DOM: Evaluate getAppendTo & check isDeactivated
  Note over ModalComponent: Applies conditional "hidden" class if needed
  
  Router->>ModalComponent: Loads component with keepAlive state
  Router->>DrawerComponent: Loads component with keepAlive state
Loading

Possibly related PRs

  • fix: drawer component header does not take effect #4844: The changes in this PR and the retrieved PR both modify the getAppendTo computed property in their respective Vue component files, enhancing the specificity of the CSS selectors used for appending elements.
  • fix: modal radius not follow preferences #5063: The changes in this PR and the retrieved PR both modify the getAppendTo computed property in their respective Vue components (drawer.vue and modal.vue), enhancing the specificity of CSS selectors used for appending elements.
  • feat: popup component support overlay blur effect #5359: The changes in this PR and the retrieved PR are related as both modify the getAppendTo computed property in their respective drawer.vue and modal.vue files, enhancing the specificity of element selection for appending.

Suggested labels

bug

Suggested reviewers

  • anncwb
  • vince292007

Poem

I'm a bunny with code in my paws,
Hopping through selectors without a pause.
I nibble on bugs and make fixes bright,
Binding inputs and routes just right.
With Vue magic and a gentle hop,
I celebrate these changes at every stop!
🐰💻


📜 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 dd3fc62 and befb338.

📒 Files selected for processing (7)
  • packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue (1 hunks)
  • packages/@core/ui-kit/popup-ui/src/modal/modal.vue (1 hunks)
  • playground/src/router/routes/modules/examples.ts (2 hunks)
  • playground/src/views/examples/drawer/in-content-demo.vue (2 hunks)
  • playground/src/views/examples/drawer/index.vue (1 hunks)
  • playground/src/views/examples/modal/in-content-demo.vue (3 hunks)
  • playground/src/views/examples/modal/index.vue (1 hunks)

🪧 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.
  • @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: 1

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 31a6ab5 and f3f1649.

📒 Files selected for processing (7)
  • packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue (1 hunks)
  • packages/@core/ui-kit/popup-ui/src/modal/modal.vue (2 hunks)
  • playground/src/router/routes/modules/examples.ts (2 hunks)
  • playground/src/views/examples/drawer/in-content-demo.vue (2 hunks)
  • playground/src/views/examples/drawer/index.vue (1 hunks)
  • playground/src/views/examples/modal/in-content-demo.vue (3 hunks)
  • playground/src/views/examples/modal/index.vue (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: Check (windows-latest)
  • GitHub Check: Check (ubuntu-latest)
  • GitHub Check: Test (windows-latest)
  • GitHub Check: Lint (windows-latest)
  • GitHub Check: post-update (windows-latest)
  • GitHub Check: Lint (ubuntu-latest)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: post-update (ubuntu-latest)
🔇 Additional comments (12)
playground/src/views/examples/modal/index.vue (1)

17-18: Good addition of component name definition

Adding the component name with defineOptions is a good practice. This is essential for proper functioning of the keep-alive caching mechanism in Vue, which addresses the PR objective of fixing keep-alive functionality for popups.

playground/src/views/examples/drawer/index.vue (1)

16-16: Good addition of component name definition

Adding the component name is necessary for proper keep-alive functionality. This change works with the route metadata update mentioned in the summary (adding keepAlive: true) to ensure the drawer component state is preserved when navigating away.

playground/src/views/examples/drawer/in-content-demo.vue (1)

2-3: Good test implementation for keep-alive functionality

The addition of the reactive value variable and Input component creates a good test case for verifying keep-alive functionality. When keep-alive is working correctly, the input value should be preserved when navigating away and back to this component.

Also applies to: 6-9, 24-24

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

130-132:

✅ Verification successful

Fixed keep-alive functionality with more specific selector

This change directly addresses the PR objective by refining the target element selector when appendToMain is true. Using a more specific CSS selector (>div:not(.absolute)>div) ensures the drawer will be appended to the correct DOM element, which is essential for proper component caching with keep-alive.


🏁 Script executed:

#!/bin/bash
# Check if there's a similar change in the modal component for consistency
echo "Checking for similar implementation in modal component:"
rg -A3 -B1 "getAppendTo = computed" packages/@core/ui-kit/popup-ui/src/modal/

Length of output: 598


Consistent keep-alive fix confirmed across components

The updated CSS selector in drawer.vue is consistent with the implementation in modal.vue, ensuring that when appendToMain is true, the component is correctly appended to the designated DOM element. This improved specificity is essential for proper keep-alive functionality.

  • File: packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue (lines 130-132)
  • Observation: The selector >div:not(.absolute)>div is identical to the one used in modal.vue, confirming consistency.
playground/src/router/routes/modules/examples.ts (2)

215-217: Added keepAlive property to fix modal state persistence.

This change enables component caching for the ModalExample route, which is necessary for maintaining the state of modals when navigating away and returning to this route.


225-227: Added keepAlive property to fix drawer state persistence.

This change enables component caching for the DrawerExample route, which is necessary for maintaining the state of drawers when navigating away and returning to this route.

playground/src/views/examples/modal/in-content-demo.vue (5)

2-3: Added necessary import for reactive state management.

The import of ref is required for the new reactive variable introduced below.


6-6: Added Input component import for the state persistence test.

The Input component is now imported to be used as a test case for the keepAlive functionality.


8-9: Set destroyOnClose: false to maintain component state.

This is a crucial change for the fix. By setting destroyOnClose: false, the modal's DOM will be preserved when closed, allowing the keepAlive functionality to work correctly.


18-18: Added reactive variable for testing state persistence.

This variable will be used to demonstrate and test that the modal state is properly preserved when navigating away and back.


27-28: Added Input component for testing keepAlive functionality.

This Input component provides a clear way to verify that the modal state is preserved, as any text entered should remain when returning to the modal after navigation.

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

174-178: Updated element targeting for better DOM placement.

The selector has been refined to more precisely target the correct container element, which is essential for proper functioning of keepAlive when using appendToMain.

mynetfan added 2 commits March 6, 2025 22:22
* 修复弹窗和抽屉 `appendToMain` 时且启用`keepAlive` 时未能正确缓存的问题
@mynetfan mynetfan force-pushed the fix/popup-append-to-main branch from dd3fc62 to befb338 Compare March 6, 2025 14:22
@mynetfan mynetfan merged commit f86c9f9 into vbenjs:main Mar 6, 2025
11 checks passed
@mynetfan mynetfan deleted the fix/popup-append-to-main branch March 6, 2025 14:22
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: 当限制弹窗在内容区域打开时,切换tab页签,弹窗依然存在
1 participant