[UPMERGE] 5.1 -> 2026.x - #3126
Open
github-actions[bot] wants to merge 3 commits into
Open
Conversation
The entity list, the index class-definition/selected-fields trees and the variant generator each rendered a hand-rolled antd Tree with their own .ant-tree-* overrides, so they looked nothing like Pimcore's trees. They now use TreeElement from @pimcore/studio-ui-bundle, which carries the Pimcore node paddings, hover/selected colors, chevron switcher and icon slot. Titles are plain strings (counts and type hints go into the string, the way Pimcore does it) and context menu entries are declared as node actions. titleRender is only used where a wrapper element is unavoidable: drag-and-drop and double-click. Those wrappers render a block-level div inside .ant-tree-title, which is why the nodes carry 'ant-tree-node--has-drag-and-drop' plus a single height rule — the same fix Pimcore applies to its own drag wrappers. Also share antd, antd-style and their peers as module federation singletons. Without that every CoreShop remote instantiated its own antd and rendered outside Pimcore's ConfigProvider/antd-style theme, falling back to antd's default tokens (blue instead of the Pimcore palette). Adds `npm run clean:builds` to drop generated Studio build output locally. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
[Studio] Render CoreShop trees with Pimcore's TreeElement
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR has been generated automatically.
Remember! The upmerge should always be merged with using
Merge pull requestbutton.In case of conflicts, please resolve them manually with usign the following commands: