Skip to content

feat(modal): [modal] enhance TINYModal functionality, add type definition andoption interface #3247

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

Merged
merged 1 commit into from
Apr 7, 2025

Conversation

zzcr
Copy link
Member

@zzcr zzcr commented Apr 3, 2025

增强TINYModal功能,添加类型定义和选项接口

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

  • New Features

    • Enhanced modal dialogs with improved configuration options for alerts, confirmations, messages, and pop-up interactions.
  • Refactor

    • Streamlined modal functionality for more consistent and reliable user interactions.

Copy link

coderabbitai bot commented Apr 3, 2025

Walkthrough

The changes update the modal component in the Vue package by introducing new type definitions and interfaces. The ModalOptions and ModalPromise interfaces are added, along with an updated TINYModalInstance type. The Modal function now accepts options of type ModalOptions and returns a ModalPromise. Additionally, the modal instantiation has been updated to use TINYModalComponent instead of the previous TINYModal, and the default options object is now more strictly typed. These adjustments enhance type safety and consistency within the modal's API.

Changes

File Change Summary
packages/.../modal/index.ts • Added interfaces: ModalOptions, ModalPromise, TINYModalInstance, and SetupComponent.
• Updated Modal function signature to accept ModalOptions and return ModalPromise.
• Renamed TINYModal to TINYModalComponent.
• Typed defOpts as Record<ModalType, Partial<ModalOptions>>.
• Updated modal methods.

Sequence Diagram(s)

sequenceDiagram
    participant U as Caller
    participant M as Modal Function
    participant C as TINYModalComponent
    U->>M: Call Modal(options)
    M->>C: Instantiate modal component
    C-->>M: Return component instance
    M->>U: Return ModalPromise with modal methods
Loading

Possibly related PRs

Suggested labels

enhancement

Poem

I hop through lines with glee so bright,
Adjusting modals with type-safe light.
Options defined and promises in tow,
Modal magic starts to flow.
This rabbit smiles at code so neat—
A joyful dance with every beat! 🐇

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/vue/src/modal/index.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-vue".

(The package "eslint-plugin-vue" was not found when loaded as a Node module from the directory "".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-vue@latest --save-dev

The plugin "eslint-plugin-vue" was referenced from the config file in ".eslintrc.js » @antfu/eslint-config » @antfu/eslint-config-vue".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @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.

@github-actions github-actions bot added the enhancement New feature or request (功能增强) label Apr 3, 2025
Copy link

github-actions bot commented Apr 3, 2025

[e2e-test-warn]
The component to be tested is missing.

The title of the Pull request should look like "fix(vue-renderless): [action-menu, alert] fix xxx bug".

Please make sure you've read our contributing guide

Copy link

@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)
packages/vue/src/modal/index.ts (5)

72-72: Avoid double casting
Consider removing the extra cast for readability.

-const TINYModalComponent = TINYModal as unknown as TINYModalInstance
+const TINYModalComponent = TINYModal as TINYModalInstance

81-126: Consider adding rejection handling in Modal
The current design only calls resolve. If you encounter unexpected errors, you might want to reject the promise for more robust error handling.

 export function Modal(options: ModalOptions): ModalPromise {
   const modalPromise = new Promise<string>((resolve, reject) => {
     // ...
     } else {
       try {
         // ... modal creation logic ...
       } catch (err) {
-        resolve('failed')
+        reject(err)
       }
     }
   }) as ModalPromise
   // ...
 }
🧰 Tools
🪛 Biome (1.9.4)

[error] 83-83: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 91-91: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 97-100: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 101-104: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 119-120: Don't use 'Function' as a type.

Prefer explicitly define the function shape. This type accepts any function-like value, which can be a common source of bugs.

(lint/complexity/noBannedTypes)


87-91: Use optional chaining
The static analysis suggests replacing && checks with optional chaining for safer and more concise code.

- events.hide && events.hide.call(this, params)
+ events.hide?.call(this, params)
🧰 Tools
🪛 Biome (1.9.4)

[error] 91-91: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


116-116: Avoid using Function as a type
This type is too broad and can weaken type checking.

- const open = $modal[options.componentType === 'popconfirm' ? 'show' : 'open'] as Function
+ const open = $modal[
+   options.componentType === 'popconfirm' ? 'show' : 'open'
+ ] as (...args: any[]) => unknown

193-195: Leverage optional chaining
Optional chaining here can simplify your code and avoid potential undefined checks.

- TINYModalComponent.tiny_mode = specifyPc || (tinyMode && tinyMode.value)
- TINYModalComponent.tiny_theme = tinyTheme && tinyTheme.value
+ TINYModalComponent.tiny_mode = specifyPc || tinyMode?.value
+ TINYModalComponent.tiny_theme = tinyTheme?.value
🧰 Tools
🪛 Biome (1.9.4)

[error] 194-194: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 358d642 and 734ee2c.

📒 Files selected for processing (1)
  • packages/vue/src/modal/index.ts (5 hunks)
🧰 Additional context used
🪛 Biome (1.9.4)
packages/vue/src/modal/index.ts

[error] 83-83: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 91-91: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 119-120: Don't use 'Function' as a type.

Prefer explicitly define the function shape. This type accepts any function-like value, which can be a common source of bugs.

(lint/complexity/noBannedTypes)


[error] 194-194: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)


[error] 195-197: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)

🔇 Additional comments (4)
packages/vue/src/modal/index.ts (4)

20-39: Great job with the ModalOptions interface
The interface is well-defined and flexible, making it easy to extend.


41-44: Extending Promise with vm property
This approach is somewhat unusual but well-typed. Consider documenting how to access and use the vm property for clarity.


46-61: Clear definitions in TINYModalInstance
The interface methods align neatly with the rest of the code, improving consistency.


63-69: SetupComponent interface
No issues found. It's well structured and straightforward.

@zzcr zzcr changed the title feat(modal): enhance TINYModal functionality, add type definition andoption interface feat(modal): [modal] enhance TINYModal functionality, add type definition andoption interface Apr 3, 2025
@kagol kagol merged commit 702671b into dev Apr 7, 2025
15 of 16 checks passed
@kagol kagol deleted the add-modal-types-0403 branch April 14, 2025 12:27
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
enhancement New feature or request (功能增强)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants