Skip to content

Conversation

@alanbsmith
Copy link
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/prerelease/minor-into-prerelease/major || true
    git fetch upstream
    git checkout --track upstream/merge/prerelease/minor-into-prerelease/major
    git pull upstream merge/prerelease/minor-into-prerelease/major -f
    git pull upstream prerelease/minor
    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 prerelease/minor into prerelease/major"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/prerelease/minor-into-prerelease/major
    

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.

Zav39 and others added 2 commits January 13, 2026 08:51
Resolve issue with incorrect calculations in non-chrome browsers. 
getBoundingClientRect  take into account: width + padding + border + scroll
clientWidth:
- In firefox does not take padding into account
- Does not take border into account (that why there was +2 hack previously I assume)

It should not lead to any notable visual by most of users in Chrome. Popup will match size of the input (+2px for the border). In other browsers behavior will match.

Since border-box used for all sizing using getBoundingClientRect looks like a correct approach for coherent sizing across browsers and devices.

Samples:

Before:

Firefox:
<img width="531" height="640" alt="image" src="https://github.com/user-attachments/assets/d606358e-acf5-43b2-88f3-f49e9a7b02a4" />

Edge:
<img width="499" height="573" alt="image" src="https://github.com/user-attachments/assets/52df9a71-3169-4f90-bbbb-ee5cd203876a" />

After:

Firefox:
<img width="559" height="602" alt="image" src="https://github.com/user-attachments/assets/69c06115-cc69-4e0f-9749-971ad04278a4" />

Edge:
<img width="529" height="719" alt="image" src="https://github.com/user-attachments/assets/cc05b233-7bec-41e2-bb6a-b2c443698336" />

[category:SelectMenu
ComboBox (and derived ones)]
@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit Jan 13, 2026
mannycarrera4 and others added 9 commits January 15, 2026 09:14
It's useful information when a component has `variant="inverse"` adding this to insights tracking.

[category:Components]

Co-authored-by: manuel.carrera <manuel.carrera@workday.com>
Co-authored-by: Alan Smith <a.smith@workday.com>
Fixes: #3682

Adds a new `.mdc` (Markdown with Cursor rules) file to provide Canvas Kit best practices for developers using AI assistants like Cursor and Claude.

This file helps teams ensure consistent adherence to Canvas Kit patterns by providing:
- Token usage guidelines (system tokens, import patterns)
- Styling best practices (`createStyles`, `createStencil`, `cs` prop)
- Component patterns (compound components, controlled components)
- Accessibility guidelines (semantic HTML, ARIA, keyboard navigation)
- Theming guidelines (global vs scoped theming)
- Code style conventions

The content is derived from existing Canvas Kit documentation in `modules/docs/` and synthesized into a single, always-applied rule file.

[category:Documentation]

Release Note:
Added `modules/docs/llm/canvas-kit.mdc` - a Cursor/Claude rules file containing Canvas Kit best practices. Teams can add this to their `.cursor/rules/` directory to have AI assistants follow Canvas Kit conventions automatically.

Co-authored-by: Youry Stancatte <youry.stancatte@at3wn6qqt2g.workdayinternal.com>
…nButton (#3691)

Fixes: #3690 

Fixes the default color for icon buttons and toolbar dropdown buttons. Currently, the buttons are the same color as disabled buttons, making it difficult to differentiate when a button is disabled or not.

[category:Components]

Co-authored-by: Adam Bui <adam.bui@workday.com>
@cypress
Copy link

cypress bot commented Jan 16, 2026

Workday/canvas-kit    Run #10067

Run Properties:  status check passed Passed #10067  •  git commit b9ed706b94 ℹ️: Merge 28d0e672d9d3836eba72c1a9470cae725d32475a into 6ae356a755611bdedfb05d0a5a5c...
Project Workday/canvas-kit
Branch Review merge/prerelease/minor-into-prerelease/major
Run status status check passed Passed #10067
Run duration 02m 16s
Commit git commit b9ed706b94 ℹ️: Merge 28d0e672d9d3836eba72c1a9470cae725d32475a into 6ae356a755611bdedfb05d0a5a5c...
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 15
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 802
View all changes introduced in this branch ↗︎
UI Coverage  19.47%
  Untested elements 1520  
  Tested elements 365  
Accessibility  99.47%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 71  

@alanbsmith alanbsmith merged commit 242f986 into prerelease/major Jan 16, 2026
19 of 20 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Canvas Kit Jan 16, 2026
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch January 16, 2026 19:28
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.

6 participants