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

perf: add nested modal demo #5353

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Jan 11, 2025

Description

添加嵌套弹窗演示。
close #5352

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 a nested modal demonstration in the modal examples
    • Improved modal layout with responsive design using Flex components
    • Introduced ability to open a modal within another modal
  • Improvements

    • Reorganized modal example cards for better visual presentation
    • Enhanced modal example structure with more organized button placements

Copy link

changeset-bot bot commented Jan 11, 2025

⚠️ No Changeset found

Latest commit: d897fe8

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

playground/src/views/examples/modal/index.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 new nested modal functionality in the Vben Admin V5 project. It modifies the modal examples in index.vue and creates a new nested-demo.vue component to demonstrate nested modal usage. The changes include restructuring the modal layout using Flex and Card components, and implementing a nested modal example that allows opening a modal within another modal.

Changes

File Change Summary
playground/src/views/examples/modal/index.vue - Added Flex import
- Created NestedModal using useVbenModal
- Added openNestedModal function
- Restructured modal layout with Flex and Card components
playground/src/views/examples/modal/nested-demo.vue - New Vue component with TypeScript
- Implemented nested modal functionality
- Added openNestedModal method

Sequence Diagram

sequenceDiagram
    participant User
    participant MainModal
    participant NestedModal
    
    User->>MainModal: Open Main Modal
    MainModal->>User: Display Main Modal
    User->>MainModal: Click Open Nested Modal
    MainModal->>NestedModal: Trigger Nested Modal
    NestedModal->>User: Display Nested Modal
Loading

Assessment against linked issues

Objective Addressed Explanation
Fix nested useVbenModal modal opening issue [#5352]

Possibly related PRs

Suggested reviewers

  • anncwb
  • vince292007

Poem

🐰 Modals dancing, nested and bright,
Flex and cards taking playful flight,
Vben's magic, a modal delight,
Layers opening, pure coding might!
Rabbit's code, a whimsical sight! 🎉


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

🧹 Nitpick comments (5)
playground/src/views/examples/modal/nested-demo.vue (3)

1-7: Consider adding component documentation.

Since this is a new demo component, adding JSDoc comments would help other developers understand its purpose and usage.

Add documentation above the script tag:

+/**
+ * Nested Modal Demo
+ * 
+ * Demonstrates the ability to open a modal within another modal using VbenModal.
+ * The outer modal contains a button that triggers an inner modal using DragDemo component.
+ */
 <script lang="ts" setup>

8-13: Consider adding type annotations for modal instances.

The modal instances could benefit from explicit type annotations for better type safety and documentation.

-const [Modal] = useVbenModal({
+const [Modal] = useVbenModal<void>({
   destroyOnClose: true,
 });
-const [BaseModal, baseModalApi] = useVbenModal({
+const [BaseModal, baseModalApi] = useVbenModal<void>({
   connectedComponent: DragDemo,
 });

20-22: Consider translating UI text to English.

The modal title and button text are in Chinese. For consistency and international usage, consider using English or implementing i18n.

-  <Modal title="嵌套弹窗示例">
-    <Button @click="openNestedModal" type="primary">打开子弹窗</Button>
+  <Modal title="Nested Modal Example">
+    <Button @click="openNestedModal" type="primary">Open Child Modal</Button>
playground/src/views/examples/modal/index.vue (2)

46-48: Consider adding type annotation for nested modal.

For consistency with the suggestion in nested-demo.vue, consider adding type annotation here as well.

-const [NestedModal, nestedModalApi] = useVbenModal({
+const [NestedModal, nestedModalApi] = useVbenModal<void>({
   connectedComponent: NestedDemo,
 });

173-178: Consider translating card text to English.

Similar to the nested-demo.vue suggestion, consider translating the card title and description to English or implementing i18n.

-      <Card class="w-[300px]" title="嵌套弹窗示例">
-        <p>在已经打开的弹窗中再次打开弹窗</p>
+      <Card class="w-[300px]" title="Nested Modal Example">
+        <p>Open a modal within an already opened modal</p>
         <template #actions>
-          <Button type="primary" @click="openNestedModal">打开嵌套弹窗</Button>
+          <Button type="primary" @click="openNestedModal">Open Nested Modal</Button>
         </template>
       </Card>
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 1a04a05 and d897fe8.

📒 Files selected for processing (2)
  • playground/src/views/examples/modal/index.vue (5 hunks)
  • playground/src/views/examples/modal/nested-demo.vue (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (9)
  • GitHub Check: Lint (windows-latest)
  • GitHub Check: Check (windows-latest)
  • GitHub Check: Lint (ubuntu-latest)
  • GitHub Check: Test (windows-latest)
  • GitHub Check: Check (ubuntu-latest)
  • GitHub Check: Test (ubuntu-latest)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: post-update (windows-latest)
  • GitHub Check: post-update (ubuntu-latest)
🔇 Additional comments (2)
playground/src/views/examples/modal/index.vue (2)

4-4: LGTM! Clean import additions.

The imports for new components (Flex, Card) and NestedDemo are properly organized.

Also applies to: 13-13


114-179: Verify accessibility of the new card layout.

The new Flex and Card layout looks clean, but ensure it's accessible:

  1. Check if the layout works well with screen readers
  2. Verify keyboard navigation between cards
  3. Ensure sufficient color contrast

@mynetfan mynetfan merged commit 4676895 into vbenjs:main Jan 11, 2025
14 checks passed
@mynetfan mynetfan deleted the demo/nested-modal branch January 11, 2025 04:12
@github-actions github-actions bot locked and limited conversation to collaborators Feb 11, 2025
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: useVbenModal内嵌套useVbenModal导致弹窗无法正常打开
1 participant