Skip to content

Commit

Permalink
Merge branch 'prerelease/minor' of https://github.com/Workday/canvas-kit
Browse files Browse the repository at this point in the history
 into info_highlight_creation

merge prerelease minor
  • Loading branch information
Arianna Malakis committed Dec 17, 2024
2 parents c1cad00 + e113df5 commit 41b376d
Show file tree
Hide file tree
Showing 17 changed files with 43 additions and 40 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [v12.1.14](https://github.com/Workday/canvas-kit/releases/tag/v12.1.14) (2024-12-17)

### Components

- fix(multi-select): Update selected state when pill is removed ([#3076](https://github.com/Workday/canvas-kit/pull/3076)) ([@NicholasBoll](https://github.com/NicholasBoll))


## [v12.1.13](https://github.com/Workday/canvas-kit/releases/tag/v12.1.13) (2024-12-16)




## [v12.1.12](https://github.com/Workday/canvas-kit/releases/tag/v12.1.12) (2024-12-10)

### Documentation
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"modules/**"
],
"version": "12.1.12",
"version": "12.1.14",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion modules/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@workday/canvas-kit-codemod",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
"version": "12.1.12",
"version": "12.1.14",
"description": "A collection of codemods for use on Workday Canvas Kit packages.",
"main": "dist/es6/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion modules/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css",
"version": "12.1.12",
"version": "12.1.14",
"description": "The parent module that contains all Workday Canvas Kit CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
10 changes: 5 additions & 5 deletions modules/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-docs",
"version": "12.1.12",
"version": "12.1.14",
"description": "Documentation components of Canvas Kit components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -44,10 +44,10 @@
"dependencies": {
"@emotion/styled": "^11.6.0",
"@storybook/csf": "0.0.1",
"@workday/canvas-kit-labs-react": "^12.1.12",
"@workday/canvas-kit-preview-react": "^12.1.12",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-kit-labs-react": "^12.1.14",
"@workday/canvas-kit-preview-react": "^12.1.14",
"@workday/canvas-kit-react": "^12.1.14",
"@workday/canvas-kit-styling": "^12.1.14",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"markdown-to-jsx": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/labs-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-labs-css",
"version": "12.1.12",
"version": "12.1.14",
"description": "The parent module that contains all Workday Canvas Kit Labs CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
6 changes: 3 additions & 3 deletions modules/labs-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-labs-react",
"version": "12.1.12",
"version": "12.1.14",
"description": "Canvas Kit Labs is an incubator for new and experimental components. Since we have a rather rigorous process for getting components in at a production level, it can be valuable to make them available earlier while we continuously iterate on the API/functionality. The Labs modules allow us to do that as needed.",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -46,8 +46,8 @@
"dependencies": {
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-kit-react": "^12.1.14",
"@workday/canvas-kit-styling": "^12.1.14",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8",
Expand Down
2 changes: 1 addition & 1 deletion modules/popup-stack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-popup-stack",
"version": "12.1.12",
"version": "12.1.14",
"description": "Stack for managing popup UIs to coordinate global concerns like escape key handling and rendering order",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/preview-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-preview-css",
"version": "12.1.12",
"version": "12.1.14",
"description": "The parent module that contains all Workday Canvas Kit Preview CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/preview-react/multi-select/lib/MultiSelectedList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ export interface MultiSelectedListProps
extends MultiSelectedItemProps,
React.HTMLAttributes<HTMLDivElement> {}

export const MultiSelectedList = createSubcomponent()({
export const MultiSelectedList = createSubcomponent('div')({
modelHook: useMultiSelectModel,
})<MultiSelectedListProps>(({'aria-labelledby': ariaLabelledBy, removeLabel}, Element, model) => {
return model.selected.state.items.length ? (
<>
<div data-part="separator" />
<ListBox
model={model.selected}
as="div"
as={Element}
role="listbox"
aria-orientation="horizontal"
aria-labelledby={ariaLabelledBy}
Expand Down
11 changes: 1 addition & 10 deletions modules/preview-react/multi-select/lib/useMultiSelectModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,12 @@ export const useMultiSelectModel = createModelHook({
orientation: 'horizontal',
onRemove({id}) {
model.events.select({id});
setSelectedItems(cachedSelected.filter(item => item.id !== id));
},
shouldVirtualize: false,
items: model.state.visibility === 'hidden' ? cachedSelected : selectedItems,
});

const state = {
...model.state,
};

const events = {
...model.events,
};

return {
selected: {
...selected,
Expand All @@ -94,7 +87,5 @@ export const useMultiSelectModel = createModelHook({
},
},
...model,
state,
events,
};
});
6 changes: 3 additions & 3 deletions modules/preview-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-preview-react",
"version": "12.1.12",
"version": "12.1.14",
"description": "Canvas Kit Preview is made up of components that have the full design and a11y review, are part of the DS ecosystem and are approved for use in product. The API's could be subject to change, but not without strong communication and migration strategies.",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -46,8 +46,8 @@
"dependencies": {
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-kit-react": "^12.1.14",
"@workday/canvas-kit-styling": "^12.1.14",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8"
Expand Down
2 changes: 1 addition & 1 deletion modules/react-fonts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-react-fonts",
"version": "12.1.12",
"version": "12.1.14",
"description": "Fonts for canvas-kit-react",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
6 changes: 3 additions & 3 deletions modules/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-react",
"version": "12.1.12",
"version": "12.1.14",
"description": "The parent module that contains all Workday Canvas Kit React components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -49,8 +49,8 @@
"@emotion/styled": "^11.6.0",
"@popperjs/core": "^2.5.4",
"@workday/canvas-colors-web": "^2.0.0",
"@workday/canvas-kit-popup-stack": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-kit-popup-stack": "^12.1.14",
"@workday/canvas-kit-styling": "^12.1.14",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8",
Expand Down
4 changes: 2 additions & 2 deletions modules/styling-transform/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-styling-transform",
"version": "12.1.12",
"version": "12.1.14",
"description": "The custom CSS in JS solution that takes JS styles and turns them into static CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -34,7 +34,7 @@
],
"dependencies": {
"@emotion/serialize": "^1.0.2",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.14",
"@workday/canvas-tokens-web": "^2.0.1",
"stylis": "4.0.13",
"ts-node": "^10.9.1",
Expand Down
4 changes: 2 additions & 2 deletions modules/styling/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-styling",
"version": "12.1.12",
"version": "12.1.14",
"description": "The custom CSS in JS solution that takes JS styles and turns them into static CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -53,7 +53,7 @@
"@emotion/react": "^11.7.1",
"@emotion/serialize": "^1.0.2",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-react": "^12.1.14",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"typescript": "5.0"
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12983,9 +12983,9 @@ nanoclone@^0.2.1:
integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

natural-compare-lite@^1.4.0:
version "1.4.0"
Expand Down

0 comments on commit 41b376d

Please sign in to comment.