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: add slots fail #1141

Merged
merged 5 commits into from
Feb 26, 2025

Conversation

chilingling
Copy link
Member

@chilingling chilingling commented Feb 24, 2025

English | 简体中文

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)
  • Built its own designer, fully self-validated

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:

Background and solution

【问题描述】
感谢 @yanmou1995 反馈。

  1. 拖入带有插槽配置的组件,比如 TinyInput 组件
  2. 点击插槽开关
  3. 插槽未出现,控制台报错。

【问题分析】
PR #1055 新功能引入的 bug。
当 referTargetNodeId 不存在时,会报错。不继续执行后续的插入逻辑。
而插槽的开启功能使用了 updateAttribute 方法,错误传递了当前的 nodeId 为 referTargetNodeId,导致报错,无法插入插槽。

【解决方案】
增加逻辑判断新插入节点的位置,正确传递 referTargetNodeId。

What is the current behavior?

Issue Number: #1134

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

Summary by CodeRabbit

  • Refactor
    • Enhanced the logic for placing new elements on the design canvas, ensuring more robust and accurate positioning relative to existing content.

修复 insert 方法因为 referTargetNode 找不到引起的报错,导致 slot
插槽增加失败
Copy link
Contributor

coderabbitai bot commented Feb 24, 2025

Warning

Rate limit exceeded

@chilingling has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 26 minutes and 35 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between eebaf28 and 3be7ad5.

📒 Files selected for processing (1)
  • packages/canvas/DesignCanvas/src/api/useCanvas.js (1 hunks)

Walkthrough

The changes update the insertion logic used within the canvas API. Instead of relying on the loop index of the changedChildren array, the new implementation determines the insertion position and reference node based on the index of each child in the newChildren array. A conditional check determines whether the insertion should be made "before" (if the index is 0) or "after" (if the index is found and not 0) a reference node, making the logic clearer and more robust.

Changes

File Summary
packages/canvas/DesignCanvas/.../useCanvas.js Updated child node insertion logic: now calculates insertion position and reference node ID based on the index in newChildren instead of a loop index.

Suggested reviewers

  • hexqi
  • rhlin

Poem

I'm a rabbit leaping through the code,
Chewing on logic in my humble abode.
Before and after, nodes align so fine,
A hop in the flow, a step in design.
With every change, my code garden grows—
Bursting with magic that every coder knows!
🐰🌟


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

@chilingling chilingling marked this pull request as ready for review February 24, 2025 09:11
@chilingling chilingling changed the title fix/update attribute error fix: add slots fail Feb 24, 2025
@github-actions github-actions bot added the bug Something isn't working label Feb 24, 2025
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

🧹 Nitpick comments (1)
packages/canvas/DesignCanvas/src/api/useCanvas.js (1)

482-487: Simplify the position and referTargetNodeId logic.

The current implementation has redundant conditional checks. The position and referTargetNodeId can be determined more concisely:

-        if (newChildIndex === 0) {
-          position = 'before'
-        } else if (newChildIndex !== -1) {
-          position = 'after'
-          referTargetNodeId = newChildren[newChildIndex - 1]?.id
-        }
+        const position = newChildIndex === 0 ? 'before' : 'after'
+        const referTargetNodeId = newChildIndex > 0 ? newChildren[newChildIndex - 1]?.id : null
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 5ea78ad and 2e96124.

📒 Files selected for processing (1)
  • packages/canvas/DesignCanvas/src/api/useCanvas.js (1 hunks)
🔇 Additional comments (1)
packages/canvas/DesignCanvas/src/api/useCanvas.js (1)

475-511:

❓ Verification inconclusive

Verify the impact of the new insertion logic.

The changes modify how new children are inserted into the canvas. Please verify:

  1. The order of elements is preserved when inserting multiple children
  2. The reference node is correctly identified for each insertion
  3. Edge cases are handled properly (empty array, single element, etc.)

🏁 Script executed:

#!/bin/bash
# Search for test files that verify the insertion logic
fd -e spec.js -e test.js | grep -i "insert\|children\|canvas"

# Search for related component usage
rg -l "operateNode.*insert" --type js

Length of output: 178


Verify New Insertion Logic Impact

The recent changes in packages/canvas/DesignCanvas/src/api/useCanvas.js impact how new children are inserted. Please ensure that:

  • Order Preservation: When inserting multiple children, the order remains as defined by the newChildren array.
  • Reference Node Accuracy: The logic correctly identifies the reference node for each insertion—using newChildIndex and the preceding node in newChildren—especially at the start and for subsequent elements.
  • Edge-Case Handling: Situations like an empty children array or a single element insertion are correctly managed.

Our repository search only identified usage in packages/configurator/src/container-configurator/ContainerConfigurator.vue and did not return dedicated test files addressing these points. It is advisable to verify these behaviors through manual checks or by adding/updating unit tests to cover these scenarios.

@chilingling
Copy link
Member Author

@CodeRabbit review

Copy link
Contributor

coderabbitai bot commented Feb 24, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@hexqi hexqi merged commit cc2e062 into opentiny:release/v2.3.0 Feb 26, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants