Skip to content

chore: Merge support into master - #4237

Merged
alanbsmith merged 4 commits into
masterfrom
merge/support-into-master
Nov 5, 2026
Merged

alanbsmith merged 4 commits into
masterfrom
merge/support-into-master

Conversation

@alanbsmith

@alanbsmith alanbsmith commented Nov 4, 2026 •

Copy link
Copy Markdown
Member

This pull request was automatically created by an automated forward-merge job. The automated job failed automated checks and must be resolved manually.
Reasons for failure may include:

  • Merge conflicts that cannot be automatically resolved
  • A merge resulted in check failures
    • Lint or type errors
    • Test failures
    • Unexpected visual changes
      The pull request should inform you of merge conflicts before you start if any.
  1. Run the following commands in your terminal. If this succeeds, skip step 2. The last command will run a script that tries to merge and resolve conflicts automatically.
    git branch -D merge/support-into-master || true
    git fetch upstream
    git checkout --track upstream/merge/support-into-master
    git pull upstream merge/support-into-master -f
    git pull upstream support
    node utils/forward-merge.js
    
  2. If the previous step succeeded, skip to step 4.
  3. Resolve conflicts manually. Then run the following.
    git add .
    git commit -m "chore: Merge support into master"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/support-into-master
    

If there were no merge conflicts, the forward-merge job failed because of a test failure. You can wait for the pull request to give errors, or you can check the logs for failures. You'll have to update code to fix errors.
This pull request will be merged using the merge strategy instead of the squash strategy. This means any commit in the log will show in the branch's history. Any commit you make should amend the merge commit. Use the following command:

git commit --amend --no-edit

You must then force-push the branch and the CI will rerun verification.
Use the automerge label like normal and the CI will pick the correct merge strategy.

Summary by CodeRabbit

  • Bug Fixes
    • Fixed excess space below body text in information highlights when it is the final element. The existing spacing is preserved when a link follows the body text.
  • Documentation
    • Added a changelog entry documenting the spacing fix and its release.

alanbsmith and others added 2 commits November 4, 2026 11:39
…ast element (#4229)

Fixes: #4228

`InformationHighlight.Body` always applied `margin-block-end`, even when nothing followed it. The margin is meant to separate Body from content below it (typically `InformationHighlight.Link`), so when Body is the last element it added unnecessary space at the bottom of the component. Design confirmed this is a bug.

This is a CSS-only fix: `&:last-child { margin-block-end: 0 }` on the Body stencil. `:last-child` was chosen over `:has(+ link)` so it keeps working if other elements (e.g. a button) are placed after Body.

`Heading` is not affected on `support` (it already has `margin: 0`). The same bug exists on `master`, where `Heading` is also affected; that will be fixed in a separate PR against `master` since `Body.tsx` differs substantially between the branches.

[category:Components]

Release Note:
Removes the extra space below `InformationHighlight.Body` when it is the last element. Spacing is unchanged when a `Link` follows. Chromatic will show a visual diff on the "Only Body" states.

Co-authored-by: @cursoragent <cursoragent@cursor.com>
@alanbsmith
alanbsmith requested a review from a team as a code owner November 4, 2026 18:48
@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit Nov 4, 2026
@coderabbitai

coderabbitai Bot commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The changelog adds the v15.1.21 release entry dated 2026-11-04. It describes the InformationHighlight.Body trailing-margin fix and notes a Chromatic visual diff for “Only Body” states.

Changes: InformationHighlight release note

Layer / File(s) Summary
v15.1.21 release entry
CHANGELOG.md
The entry describes removing trailing margin when InformationHighlight.Body is the last element. It states that spacing remains unchanged when a Link follows and notes a Chromatic visual diff for “Only Body” states.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Change: Other

Possibly related issues

  • Workday/canvas-kit#4228: The changelog records the InformationHighlight.Body trailing-margin fix described in this issue. This diff does not show the implementation.

Suggested reviewers: mannycarrera4, sheelah

Merge Risk: Minimal · up to c60a6

No concrete issue with the release note is identified. Confirm the required checks before merging.

Pre-merge checks: Passed 4 · Inconclusive 1

Failed Failed checks: 1 inconclusive

Check name Status Explanation Resolution
Title check Inconclusive The title "chore: Merge support into master" does not describe the changeset. The raw summary says the PR adds a CHANGELOG.md entry for the v15.1.21 release, which records an InformationHighlight.Body… Rewrite the title to name the primary change, for example: "chore: Release v15.1.21 with InformationHighlight.Body trailing-margin fix". If the forward-merge is the true purpose, keep the merge wording and add the release or fix detail so r…
Passed Passed checks: 4 passed

Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage Passed No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 0 files. (1 skipped: 1 unsupported.)

Full details: Title check

Explanation

The title "chore: Merge support into master" does not describe the changeset. The raw summary says the PR adds a CHANGELOG.md entry for the v15.1.21 release, which records an InformationHighlight.Body trailing-margin fix. The PR objectives describe an automated forward-merge from support into master, so the title matches the PR's stated objective but not the file-level change. The title is therefore only partially related, and it is generic about the content of the diff.

Resolution

Rewrite the title to name the primary change, for example: "chore: Release v15.1.21 with InformationHighlight.Body trailing-margin fix". If the forward-merge is the true purpose, keep the merge wording and add the release or fix detail so reviewers can see the changeset content.

Finishing Touches

Generate unit tests (beta)

  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

Recent review info

Run configuration

Commits

Reviewing files that changed from the base of the PR and between 86db413 and c60a605.

Files selected for processing: 1

  • CHANGELOG.md
Files skipped from review as they are similar to previous changes: 1

  • CHANGELOG.md

Included review availability: This review used your included allowance. Your plan provides up to 2 included reviews per hour; 1 remain after this review.

@alanbsmith alanbsmith self-assigned this Nov 5, 2026
alanbsmith and others added 2 commits November 5, 2026 12:10
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@cypress

cypress Bot commented Nov 5, 2026

Copy link
Copy Markdown

Workday/canvas-kit    Run #11819

Run Properties:  status check passed Passed #11819  •  git commit 16a7083b6b ℹ️: Merge c60a605fcfc267c84277b42e7cd23d5672779206 into d91767c1992493b3567bdf51469b...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #11819
Run duration 02m 44s
Commit git commit 16a7083b6b ℹ️: Merge c60a605fcfc267c84277b42e7cd23d5672779206 into d91767c1992493b3567bdf51469b...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 17
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 940
View all changes introduced in this branch ↗︎
UI Coverage  14.54%
  Untested elements 2572  
  Tested elements 435  
Accessibility  99.57%
  Failed rules  3 critical   5 serious   3 moderate   1 minor
  Failed elements 73  

@alanbsmith
alanbsmith merged commit b212c9a into master Nov 5, 2026
23 checks passed
@alanbsmith
alanbsmith deleted the merge/support-into-master branch November 5, 2026 19:54
@github-project-automation github-project-automation Bot moved this from 👀 In review to ✅ Done in Canvas Kit Nov 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

2 participants