Merge branch '2026.2' into 2026.x - #3916
Merged
Merged
Conversation
…nts SDK (#3909) Module-federation plugins cannot drive conditional visibility of fields inside a field-collection row: per-row binding relies on the host Form.Item prepending the group prefix from useFormGroupOptional().name, but Form.useWatch (antd) does not apply that prefix, and the hook/context are not reachable from a plugin because they are not re-exported from the components SDK barrel. Export both so plugins can resolve the row prefix. Purely additive; no behavior change.
Forward-merge from 2026.2. Only the SDK export from 74f6d76 (#3909, [SDK] Export useFormGroupOptional / FormGroupContext) is delivered. The revert commit 6f035bb (Revert #3884 full-height tabs, #3914) is intentionally NOT applied to 2026.x: those changes were accidentally merged from 2026.x into 2026.2, so the full-height tabs feature must stay in 2026.x. Merge resolved with strategy 'ours' to preserve the 2026.x tree, then the 74f6d76 change was applied on top. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Verdict: LGTM. Exposes the existing form-group context API through the components SDK for module-federation consumers.
Changes:
- Exports
useFormGroupOptional(assets/js/src/sdk/components/index.ts:87). - Exports
FormGroupContextandFormGroupProvider(assets/js/src/sdk/components/index.ts:88).
Review contract:
- Claim/root cause: Fixes the missing SDK export at the correct public barrel boundary (
index.ts:87-88). - Call sites: Additive export; existing callers require no migration.
- Compatibility: No breaking or runtime behavior change.
- Tests/docs: SDK build and generated-type verification are the appropriate seam; no additional documentation issue identified.
- Risk: Low; build verification was reported but not independently rerun.
|
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Forward-merge 2026.2 → 2026.x
Routine upstream forward-merge from
2026.2into2026.x, with one deliberate exception.What is delivered
[SDK] Export useFormGroupOptional / FormGroupContext from the components SDK(commit74f6d76). This is the only net source change:+2lines inassets/js/src/sdk/components/index.ts.What is intentionally NOT applied
Revert "[Studio UI] Fix full-height tabs and compact tab spacing" (#3884) #3914 —
Revert "[Studio UI] Fix full-height tabs and compact tab spacing (#3884)"(commit6f035bb).The full-height-tabs changes ([Studio UI] Fix full-height tabs and compact tab spacing #3884, Scope full-height tab rules to own panes (fix nested-tabs collapse) #3903) originated in
2026.xand were accidentally merged from 2026.x into 2026.2, where they were then reverted. Letting that revert flow back into2026.xwould wrongly drop the feature here. The merge was therefore resolved with strategyours(2026.x tree preserved), so the revert is recorded as merged — and will not resurface in future forward-merges — but its effect is not applied. The2026.2"Automatic frontend build" zip (which bakes in the reverted state) is likewise not taken.Why
Keeps
2026.xand2026.2in sync for future merges while preserving the full-height-tabs feature that belongs in2026.x, and forwards the additive SDK export needed by module-federation plugins.Net effect on 2026.x
🤖 Generated with Claude Code