Skip to content

fix: page tree search results do not automatically expanded#1476

Merged
hexqi merged 2 commits intoopentiny:release/v2.6.xfrom
gene9831:fix/page-tree-filter
Jun 18, 2025
Merged

fix: page tree search results do not automatically expanded#1476
hexqi merged 2 commits intoopentiny:release/v2.6.xfrom
gene9831:fix/page-tree-filter

Conversation

@gene9831
Copy link
Collaborator

@gene9831 gene9831 commented Jun 18, 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

页面树搜索框,搜索结果更新后。匹配到的页面或者文件夹节点,如果被收起了,不会自动展开

What is the current behavior?

页面树搜索框,搜索结果更新后。匹配到的页面或者文件夹节点,如果被收起了,不会自动展开

Issue Number: N/A

What is the new behavior?

页面树搜索框,搜索结果更新后。匹配到的页面或者文件夹节点,如果被收起了,会自动展开并显示
Kapture 2025-06-18 at 16 40 51

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Filtered tree nodes now automatically expand their ancestor nodes, making filtered results and their context easier to view.
  • Improvements

    • Enhanced reliability and consistency of drag-and-drop interactions within the tree component.
    • Improved overall responsiveness when filtering or interacting with tree nodes.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jun 18, 2025

Walkthrough

This update enhances the Tree.vue component by introducing TypeScript typings for improved type safety, especially for tree nodes and drag-and-drop handlers. It adds reactive filtering that auto-expands ancestor nodes of filtered results. The collapse map API is extended, and several function signatures are updated for clarity and consistency.

Changes

File(s) Change Summary
packages/plugins/page/src/Tree.vue Added TypeScript typings and TreeNode interface, improved drag-and-drop typings, made filtering reactive with ancestor expansion, updated collapse map API (setCollapse and switchCollapse), and refined function signatures accordingly.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant TreeComponent
    participant CollapseMap

    User->>TreeComponent: Update filterValue
    TreeComponent->>TreeComponent: Watch filterValue
    TreeComponent->>TreeComponent: Compute filteredNodes
    TreeComponent->>TreeComponent: Identify ancestors of filtered nodes
    TreeComponent->>CollapseMap: setCollapse(ancestorId, false) for each ancestor
    TreeComponent->>TreeComponent: Update collapse state to expand ancestors
    User->>TreeComponent: Interact with drag-and-drop or collapse
    TreeComponent->>CollapseMap: switchCollapse or setCollapse as needed
Loading

Poem

In the forest of code, where the tree nodes grow,
TypeScript brings order, with types all aglow.
Ancestors expand when filters are set,
Drag-and-drop dances—no type errors yet!
Collapse maps are clever, the structure is neat,
This bunny’s delighted—these changes are sweet! 🐇🌳


📜 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 2fc9eb3 and 93ece36.

📒 Files selected for processing (1)
  • packages/plugins/page/src/Tree.vue (11 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/plugins/page/src/Tree.vue
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: push-check

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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate sequence diagram to generate a sequence diagram of the changes in 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.

@github-actions github-actions bot added bug Something isn't working release merge to release/ branch, before release period labels Jun 18, 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: 2

🔭 Outside diff range comments (1)
packages/plugins/page/src/Tree.vue (1)

242-256: Guard against draggedNode being null – avoid hard crash

draggedNode.value!.id uses a non-null assertion but dragstart may originate outside the component (or be prevented), leaving draggedNode null and throwing on every hover.

-const isDescendant = getAncestorIds(node.id).includes(draggedNode.value!.id)
+if (!draggedNode.value) return
+const isDescendant = getAncestorIds(node.id).includes(draggedNode.value.id)

A defensive check costs nothing and removes a critical runtime risk.

🧹 Nitpick comments (3)
packages/plugins/page/src/Tree.vue (3)

162-166: Duplicate filter logic – consolidate into one reactive source

filteredNodes is populated here and again in the filterValue watcher below, causing the same nodes.filter(...) to run twice and introducing divergence risk.
A single computed property (or a single watchEffect) driven by both nodes and props.filterValue would be simpler and cheaper.


214-232: Minor: ensure layerLine intermediate objects exist

Inside the inner for loop you assume result[i] was initialised in an earlier iteration.
If the algorithm changes (e.g., reverse traversal) this will explode.
Add a cheap safeguard:

for (let i = parentIndex + 1; i < index; i++) {
-  result[i][node.level - 1] = (result[i][node.level - 1] || 0) | lines.layer
+  result[i] = result[i] || {}
+  result[i][node.level - 1] = (result[i][node.level - 1] || 0) | lines.layer
}

148-160: Iterative getAncestorIds scales better than recursion

Deep trees (≫1 k levels) risk stack overflow.
Refactor to an iterative loop to remove the depth limit; the function is hot in drag-&-drop.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between aaf416b and 2fc9eb3.

📒 Files selected for processing (1)
  • packages/plugins/page/src/Tree.vue (11 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: push-check

@gene9831 gene9831 added this to the v2.6.0 milestone Jun 18, 2025
hexqi
hexqi previously approved these changes Jun 18, 2025
@hexqi hexqi merged commit 11d52a0 into opentiny:release/v2.6.x Jun 18, 2025
2 checks passed
@gene9831 gene9831 deleted the fix/page-tree-filter branch June 18, 2025 14:56
chilingling pushed a commit to chilingling/tiny-engine that referenced this pull request Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working release merge to release/ branch, before release period

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants