From 4cb831fd71817a0cdab199d2ca32ec9313610f3c Mon Sep 17 00:00:00 2001 From: Nicholas Boll Date: Mon, 4 Nov 2024 08:17:44 -0700 Subject: [PATCH 1/8] fix: Add flex gap to overflow list calculations (#3021) Adds Flexbox `gap` to overflow list calculations so that a the overflow list doesn't render outside the container. This is more noticeable with higher gap values. Fixes #3020 [category:Components] --- .../collection/lib/useOverflowListModel.tsx | 40 ++++++++++-- .../collection/spec/useOverflowModel.spec.tsx | 64 ++++++++++++++++--- 2 files changed, 90 insertions(+), 14 deletions(-) diff --git a/modules/react/collection/lib/useOverflowListModel.tsx b/modules/react/collection/lib/useOverflowListModel.tsx index 8f4ea9b1f5..97e09cc304 100644 --- a/modules/react/collection/lib/useOverflowListModel.tsx +++ b/modules/react/collection/lib/useOverflowListModel.tsx @@ -6,10 +6,11 @@ import {Item} from './useBaseListModel'; export function getHiddenIds( containerWidth: number, + containerGap: number, overflowTargetWidth: number, itemWidthCache: Record, selectedIds: string[] | 'all', - items?: Item[] + items: Item[] ): string[] { /** Allows us to prioritize showing the selected item */ let selectedKey: undefined | string; @@ -18,17 +19,22 @@ export function getHiddenIds( /** Tally ids that won't fit inside the container. These will be used by components to hide * elements that won't fit in the container */ const hiddenIds: string[] = []; + /** Track if gap should be calculated since gap doesn't apply to the width of the first item, only + * consecutive items */ + let shouldAddGap = false; + if (selectedIds !== 'all' && selectedIds.length) { - if (items?.length) { + if (items.length) { // If selectedIds[0] is not in items, use the first id from items selectedKey = items.find(item => item.id === selectedIds[0]) ? selectedIds[0] : items[0].id; - } else { - selectedKey = selectedIds[0]; } } if ( - Object.keys(itemWidthCache).reduce((sum, key) => sum + itemWidthCache[key], 0) <= containerWidth + Object.keys(itemWidthCache).reduce( + (sum, key, index) => sum + itemWidthCache[key] + (index > 0 ? containerGap : 0), + 0 + ) <= containerWidth ) { // All items fit, return empty array return []; @@ -39,6 +45,7 @@ export function getHiddenIds( } else { // at least the selected item and overflow target fit. Update our itemWidth with the sum itemWidth += itemWidthCache[selectedKey] + overflowTargetWidth; + shouldAddGap = true; } } else { itemWidth += overflowTargetWidth; @@ -46,7 +53,8 @@ export function getHiddenIds( for (const key in itemWidthCache) { if (key !== selectedKey) { - itemWidth += itemWidthCache[key]; + itemWidth += itemWidthCache[key] + (shouldAddGap ? containerGap : 0); + shouldAddGap = true; if (itemWidth > containerWidth) { hiddenIds.push(key); } @@ -75,6 +83,7 @@ export const useOverflowListModel = createModelHook({ const [hiddenIds, setHiddenIds] = React.useState(config.initialHiddenIds); const [itemWidthCache, setItemWidthCache] = React.useState>({}); const [containerWidth, setContainerWidth] = React.useState(0); + const [containerGap, setContainerGap] = React.useState(0); const containerWidthRef = React.useRef(0); const itemWidthCacheRef = React.useRef(itemWidthCache); const [overflowTargetWidth, setOverflowTargetWidth] = React.useState(0); @@ -96,6 +105,7 @@ export const useOverflowListModel = createModelHook({ hiddenIds: internalHiddenIds, itemWidthCache, containerWidth, + containerGap, overflowTargetWidth, }; @@ -105,6 +115,7 @@ export const useOverflowListModel = createModelHook({ const {selectedIds} = model.selection.select(data.id, state); const ids = getHiddenIds( containerWidthRef.current, + containerGap, overflowTargetWidthRef.current, itemWidthCacheRef.current, selectedIds, @@ -120,6 +131,21 @@ export const useOverflowListModel = createModelHook({ const ids = getHiddenIds( containerWidthRef.current, + containerGap, + overflowTargetWidthRef.current, + itemWidthCacheRef.current, + state.selectedIds, + config.items + ); + + setHiddenIds(ids); + }, + setContainerGap(data: {size: number}) { + setContainerGap(data.size); + + const ids = getHiddenIds( + containerWidthRef.current, + data.size, overflowTargetWidthRef.current, itemWidthCacheRef.current, state.selectedIds, @@ -142,6 +168,7 @@ export const useOverflowListModel = createModelHook({ const ids = getHiddenIds( containerWidthRef.current, + containerGap, overflowTargetWidthRef.current, itemWidthCacheRef.current, state.selectedIds, @@ -158,6 +185,7 @@ export const useOverflowListModel = createModelHook({ const ids = getHiddenIds( containerWidthRef.current, + containerGap, overflowTargetWidthRef.current, itemWidthCacheRef.current, state.selectedIds !== 'all' diff --git a/modules/react/collection/spec/useOverflowModel.spec.tsx b/modules/react/collection/spec/useOverflowModel.spec.tsx index d45f00fffb..0bc2e41b0d 100644 --- a/modules/react/collection/spec/useOverflowModel.spec.tsx +++ b/modules/react/collection/spec/useOverflowModel.spec.tsx @@ -4,41 +4,89 @@ describe('useOverflowModel', () => { describe('getHiddenIds', () => { const itemWidthCache = { first: 100, - second: 100, - third: 100, - fourth: 100, + second: 150, + third: 200, + fourth: 250, }; const overflowTargetWidth = 100; - const io = [ + [ { containerWidth: 100, + gap: 0, selected: 'first', hiddenIds: ['first', 'second', 'third', 'fourth'], }, { containerWidth: 199, + gap: 0, selected: 'first', hiddenIds: ['first', 'second', 'third', 'fourth'], }, { containerWidth: 200, + gap: 0, selected: 'first', hiddenIds: ['second', 'third', 'fourth'], }, - {containerWidth: 400, selected: 'first', hiddenIds: []}, - {containerWidth: 399, selected: 'first', hiddenIds: ['third', 'fourth']}, + {containerWidth: 700, gap: 0, selected: 'first', hiddenIds: []}, + {containerWidth: 350, gap: 0, selected: 'first', hiddenIds: ['third', 'fourth']}, + {containerWidth: 549, gap: 0, selected: 'first', hiddenIds: ['third', 'fourth']}, + {containerWidth: 550, gap: 0, selected: 'first', hiddenIds: ['fourth']}, + { + containerWidth: 250, + gap: 0, + selected: 'second', + hiddenIds: ['first', 'third', 'fourth'], + }, + // gap + { + containerWidth: 100, + gap: 10, + selected: 'first', + hiddenIds: ['first', 'second', 'third', 'fourth'], + }, + { + containerWidth: 199, + gap: 10, + selected: 'first', + hiddenIds: ['first', 'second', 'third', 'fourth'], + }, { containerWidth: 200, + gap: 10, + selected: 'first', + hiddenIds: ['second', 'third', 'fourth'], + }, + {containerWidth: 729, gap: 10, selected: 'first', hiddenIds: ['fourth']}, + {containerWidth: 730, gap: 10, selected: 'first', hiddenIds: []}, + {containerWidth: 360, gap: 10, selected: 'first', hiddenIds: ['third', 'fourth']}, + {containerWidth: 559, gap: 10, selected: 'first', hiddenIds: ['third', 'fourth']}, + {containerWidth: 570, gap: 10, selected: 'first', hiddenIds: ['fourth']}, + { + containerWidth: 250, + gap: 10, selected: 'second', hiddenIds: ['first', 'third', 'fourth'], }, - ].forEach(({containerWidth, hiddenIds, selected}) => { + ].forEach(({containerWidth, hiddenIds, gap, selected}) => { it(`when containerWidth is ${containerWidth} and selected is '${selected}' should contain hiddenIds [${hiddenIds.join( ', ' )}] `, () => { expect( - getHiddenIds(containerWidth, overflowTargetWidth, itemWidthCache, [selected]) + getHiddenIds( + containerWidth, + gap, + overflowTargetWidth, + itemWidthCache, + [selected], + [ + {id: 'first', value: 'first', index: 0, textValue: 'first'}, + {id: 'second', value: 'second', index: 1, textValue: 'second'}, + {id: 'third', value: 'third', index: 2, textValue: 'third'}, + {id: 'fourth', value: 'fourth', index: 3, textValue: 'fourth'}, + ] + ) ).toEqual(hiddenIds); }); }); From a46b2245c28110769ba8aa8393a2573763918701 Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Mon, 4 Nov 2024 15:18:35 +0000 Subject: [PATCH 2/8] chore: Release v11.1.20 [skip release] --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 4 ++-- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a573ca0ea..dd97efb69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [v11.1.20](https://github.com/Workday/canvas-kit/releases/tag/v11.1.20) (2024-11-04) + +### Components + +- fix: Add flex gap to overflow list calculations ([#3021](https://github.com/Workday/canvas-kit/pull/3021)) ([@NicholasBoll](https://github.com/NicholasBoll)) + + ## [v11.1.19](https://github.com/Workday/canvas-kit/releases/tag/v11.1.19) (2024-10-28) ### Components diff --git a/lerna.json b/lerna.json index 9e064f8b7f..ba6ac3798a 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "11.1.19", + "version": "11.1.20", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index 99713f32b6..01e5369692 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -2,7 +2,7 @@ "name": "@workday/canvas-kit-codemod", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", - "version": "11.1.19", + "version": "11.1.20", "description": "A collection of codemods for use on Workday Canvas Kit packages.", "main": "dist/es6/index.js", "sideEffects": false, diff --git a/modules/css/package.json b/modules/css/package.json index 8c252755bb..8c37fbb658 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-css", - "version": "11.1.19", + "version": "11.1.20", "description": "The parent module that contains all Workday Canvas Kit CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/docs/package.json b/modules/docs/package.json index f47471bb29..6d24566529 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-docs", - "version": "11.1.19", + "version": "11.1.20", "description": "Documentation components of Canvas Kit components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -44,10 +44,10 @@ "dependencies": { "@emotion/styled": "^11.6.0", "@storybook/csf": "0.0.1", - "@workday/canvas-kit-labs-react": "^11.1.19", - "@workday/canvas-kit-preview-react": "^11.1.19", - "@workday/canvas-kit-react": "^11.1.19", - "@workday/canvas-kit-styling": "^11.1.19", + "@workday/canvas-kit-labs-react": "^11.1.20", + "@workday/canvas-kit-preview-react": "^11.1.20", + "@workday/canvas-kit-react": "^11.1.20", + "@workday/canvas-kit-styling": "^11.1.20", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "markdown-to-jsx": "^7.2.0", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index d01adb6860..647cbc081b 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-css", - "version": "11.1.19", + "version": "11.1.20", "description": "The parent module that contains all Workday Canvas Kit Labs CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index f397105281..8019f9e6d4 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-react", - "version": "11.1.19", + "version": "11.1.20", "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", @@ -46,7 +46,7 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.19", + "@workday/canvas-kit-react": "^11.1.20", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/design-assets-types": "^0.2.8", "chroma-js": "^2.1.0", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 487a25115f..94b03d9df1 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-popup-stack", - "version": "11.1.19", + "version": "11.1.20", "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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index 14d83d96af..6bee872150 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-css", - "version": "11.1.19", + "version": "11.1.20", "description": "The parent module that contains all Workday Canvas Kit Preview CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index 1f283773de..6811fa337c 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-react", - "version": "11.1.19", + "version": "11.1.20", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.19", - "@workday/canvas-kit-styling": "^11.1.19", + "@workday/canvas-kit-react": "^11.1.20", + "@workday/canvas-kit-styling": "^11.1.20", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "@workday/design-assets-types": "^0.2.8" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index 376da428b1..3a6f8a7afe 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react-fonts", - "version": "11.1.19", + "version": "11.1.20", "description": "Fonts for canvas-kit-react", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/react/package.json b/modules/react/package.json index c3b4572e80..c99f8cc3dc 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react", - "version": "11.1.19", + "version": "11.1.20", "description": "The parent module that contains all Workday Canvas Kit React components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -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": "^11.1.19", - "@workday/canvas-kit-styling": "^11.1.19", + "@workday/canvas-kit-popup-stack": "^11.1.20", + "@workday/canvas-kit-styling": "^11.1.20", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index d1632407dd..649914b880 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling-transform", - "version": "11.1.19", + "version": "11.1.20", "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", @@ -34,7 +34,7 @@ ], "dependencies": { "@emotion/serialize": "^1.0.2", - "@workday/canvas-kit-styling": "^11.1.19", + "@workday/canvas-kit-styling": "^11.1.20", "@workday/canvas-tokens-web": "^2.0.0", "stylis": "4.0.13", "typescript": "4.2" diff --git a/modules/styling/package.json b/modules/styling/package.json index 71d04802e4..e84a392639 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling", - "version": "11.1.19", + "version": "11.1.20", "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", @@ -53,7 +53,7 @@ "@emotion/react": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.19", + "@workday/canvas-kit-react": "^11.1.20", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "typescript": "4.2" From 9ebd23f30ca9bfce6bf6b8d2a0de3e01c0bc64e2 Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Mon, 4 Nov 2024 16:08:16 +0000 Subject: [PATCH 3/8] chore: Release v12.0.7 [skip release] --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 6 +++--- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 33 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c216e3a73..eab862e157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [v12.0.7](https://github.com/Workday/canvas-kit/releases/tag/v12.0.7) (2024-11-04) + +### Components + +- fix: Update Select to open with spacebar ([#3006](https://github.com/Workday/canvas-kit/pull/3006)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera, [@NicholasBoll](https://github.com/NicholasBoll)) +- fix: Add flex gap to overflow list calculations ([#3021](https://github.com/Workday/canvas-kit/pull/3021)) ([@NicholasBoll](https://github.com/NicholasBoll)) + + ## [v11.1.20](https://github.com/Workday/canvas-kit/releases/tag/v11.1.20) (2024-11-04) ### Components diff --git a/lerna.json b/lerna.json index ffcab38c74..35d5941eec 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "12.0.6", + "version": "12.0.7", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index 355dc7e028..41036b0a24 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -2,7 +2,7 @@ "name": "@workday/canvas-kit-codemod", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", - "version": "12.0.6", + "version": "12.0.7", "description": "A collection of codemods for use on Workday Canvas Kit packages.", "main": "dist/es6/index.js", "sideEffects": false, diff --git a/modules/css/package.json b/modules/css/package.json index b4044b9398..b4496b7b53 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-css", - "version": "12.0.6", + "version": "12.0.7", "description": "The parent module that contains all Workday Canvas Kit CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/docs/package.json b/modules/docs/package.json index 72717ae07e..85fb85c0e5 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-docs", - "version": "12.0.6", + "version": "12.0.7", "description": "Documentation components of Canvas Kit components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -44,10 +44,10 @@ "dependencies": { "@emotion/styled": "^11.6.0", "@storybook/csf": "0.0.1", - "@workday/canvas-kit-labs-react": "^12.0.6", - "@workday/canvas-kit-preview-react": "^12.0.6", - "@workday/canvas-kit-react": "^12.0.6", - "@workday/canvas-kit-styling": "^12.0.6", + "@workday/canvas-kit-labs-react": "^12.0.7", + "@workday/canvas-kit-preview-react": "^12.0.7", + "@workday/canvas-kit-react": "^12.0.7", + "@workday/canvas-kit-styling": "^12.0.7", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "markdown-to-jsx": "^7.2.0", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index 82f9ca7f3c..700cc0a3cd 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-css", - "version": "12.0.6", + "version": "12.0.7", "description": "The parent module that contains all Workday Canvas Kit Labs CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index b1aed49c81..ff81e7afce 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-react", - "version": "12.0.6", + "version": "12.0.7", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.6", - "@workday/canvas-kit-styling": "^12.0.6", + "@workday/canvas-kit-react": "^12.0.7", + "@workday/canvas-kit-styling": "^12.0.7", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 336718a724..202f710426 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-popup-stack", - "version": "12.0.6", + "version": "12.0.7", "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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index 1d39d4e6b8..049139a691 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-css", - "version": "12.0.6", + "version": "12.0.7", "description": "The parent module that contains all Workday Canvas Kit Preview CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index fbcf87b320..1ccbe3fc0c 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-react", - "version": "12.0.6", + "version": "12.0.7", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.6", - "@workday/canvas-kit-styling": "^12.0.6", + "@workday/canvas-kit-react": "^12.0.7", + "@workday/canvas-kit-styling": "^12.0.7", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index cebad9b078..febd4ba281 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react-fonts", - "version": "12.0.6", + "version": "12.0.7", "description": "Fonts for canvas-kit-react", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/react/package.json b/modules/react/package.json index 0b3f0e7851..c8ce53d3fe 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react", - "version": "12.0.6", + "version": "12.0.7", "description": "The parent module that contains all Workday Canvas Kit React components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -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.0.6", - "@workday/canvas-kit-styling": "^12.0.6", + "@workday/canvas-kit-popup-stack": "^12.0.7", + "@workday/canvas-kit-styling": "^12.0.7", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index 87c0b558f5..6e3be854c7 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling-transform", - "version": "12.0.6", + "version": "12.0.7", "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", @@ -34,7 +34,7 @@ ], "dependencies": { "@emotion/serialize": "^1.0.2", - "@workday/canvas-kit-styling": "^12.0.6", + "@workday/canvas-kit-styling": "^12.0.7", "@workday/canvas-tokens-web": "^2.0.1", "stylis": "4.0.13", "ts-node": "^10.9.1", diff --git a/modules/styling/package.json b/modules/styling/package.json index 844dd04d1a..bf663cd5a7 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling", - "version": "12.0.6", + "version": "12.0.7", "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", @@ -53,7 +53,7 @@ "@emotion/react": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.6", + "@workday/canvas-kit-react": "^12.0.7", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "typescript": "5.0" From 7e352e48ecf2ba364d5b12d9cb18e8a78339b2db Mon Sep 17 00:00:00 2001 From: Josh <44883293+josh-bagwell@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:11:36 -0700 Subject: [PATCH 4/8] ci: Updated forward merge yml (#3027) Fixes: #3026 Updating the forward merge yml file to add `--component` flag. [category:Infrastructure] --- .github/workflows/forward-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/forward-merge.yml b/.github/workflows/forward-merge.yml index 09fa97fdc6..9cb03d6f54 100644 --- a/.github/workflows/forward-merge.yml +++ b/.github/workflows/forward-merge.yml @@ -150,7 +150,7 @@ jobs: run: npx http-server docs -p 9001 & npx wait-on http://localhost:9001 - name: Integration tests - run: yarn cypress run --record --parallel --env skip_storybook_test=true # skip the Storybook test during forward merges + run: yarn cypress run --component --record --parallel --env skip_storybook_test=true # skip the Storybook test during forward merges env: # Github Actions doesn't support encryption on forks # If these keys become compromised, we will rotate and disable these features From f53db79d238904a7395f5f79c416c13ce4371518 Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Mon, 4 Nov 2024 19:12:29 +0000 Subject: [PATCH 5/8] chore: Release v12.0.8 [skip release] --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 6 +++--- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 32 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eab862e157..b6ea84b295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [v12.0.8](https://github.com/Workday/canvas-kit/releases/tag/v12.0.8) (2024-11-04) + +### Infrastructure + +- ci: Updated forward merge yml ([#3027](https://github.com/Workday/canvas-kit/pull/3027)) ([@josh-bagwell](https://github.com/josh-bagwell)) + + ## [v12.0.7](https://github.com/Workday/canvas-kit/releases/tag/v12.0.7) (2024-11-04) ### Components diff --git a/lerna.json b/lerna.json index 35d5941eec..fb7bfd5f1e 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "12.0.7", + "version": "12.0.8", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index 41036b0a24..333f26c8cc 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -2,7 +2,7 @@ "name": "@workday/canvas-kit-codemod", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", - "version": "12.0.7", + "version": "12.0.8", "description": "A collection of codemods for use on Workday Canvas Kit packages.", "main": "dist/es6/index.js", "sideEffects": false, diff --git a/modules/css/package.json b/modules/css/package.json index b4496b7b53..6476a0e229 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-css", - "version": "12.0.7", + "version": "12.0.8", "description": "The parent module that contains all Workday Canvas Kit CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/docs/package.json b/modules/docs/package.json index 85fb85c0e5..329fc6655d 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-docs", - "version": "12.0.7", + "version": "12.0.8", "description": "Documentation components of Canvas Kit components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -44,10 +44,10 @@ "dependencies": { "@emotion/styled": "^11.6.0", "@storybook/csf": "0.0.1", - "@workday/canvas-kit-labs-react": "^12.0.7", - "@workday/canvas-kit-preview-react": "^12.0.7", - "@workday/canvas-kit-react": "^12.0.7", - "@workday/canvas-kit-styling": "^12.0.7", + "@workday/canvas-kit-labs-react": "^12.0.8", + "@workday/canvas-kit-preview-react": "^12.0.8", + "@workday/canvas-kit-react": "^12.0.8", + "@workday/canvas-kit-styling": "^12.0.8", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "markdown-to-jsx": "^7.2.0", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index 700cc0a3cd..1b7573a1b0 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-css", - "version": "12.0.7", + "version": "12.0.8", "description": "The parent module that contains all Workday Canvas Kit Labs CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index ff81e7afce..49d3b083e4 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-react", - "version": "12.0.7", + "version": "12.0.8", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.7", - "@workday/canvas-kit-styling": "^12.0.7", + "@workday/canvas-kit-react": "^12.0.8", + "@workday/canvas-kit-styling": "^12.0.8", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 202f710426..a80d8baf94 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-popup-stack", - "version": "12.0.7", + "version": "12.0.8", "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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index 049139a691..b0f3f0ce7e 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-css", - "version": "12.0.7", + "version": "12.0.8", "description": "The parent module that contains all Workday Canvas Kit Preview CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index 1ccbe3fc0c..243a49ee7d 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-react", - "version": "12.0.7", + "version": "12.0.8", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.7", - "@workday/canvas-kit-styling": "^12.0.7", + "@workday/canvas-kit-react": "^12.0.8", + "@workday/canvas-kit-styling": "^12.0.8", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index febd4ba281..46499c9925 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react-fonts", - "version": "12.0.7", + "version": "12.0.8", "description": "Fonts for canvas-kit-react", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/react/package.json b/modules/react/package.json index c8ce53d3fe..84f8646ff6 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react", - "version": "12.0.7", + "version": "12.0.8", "description": "The parent module that contains all Workday Canvas Kit React components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -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.0.7", - "@workday/canvas-kit-styling": "^12.0.7", + "@workday/canvas-kit-popup-stack": "^12.0.8", + "@workday/canvas-kit-styling": "^12.0.8", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index 6e3be854c7..d97d52f5b5 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling-transform", - "version": "12.0.7", + "version": "12.0.8", "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", @@ -34,7 +34,7 @@ ], "dependencies": { "@emotion/serialize": "^1.0.2", - "@workday/canvas-kit-styling": "^12.0.7", + "@workday/canvas-kit-styling": "^12.0.8", "@workday/canvas-tokens-web": "^2.0.1", "stylis": "4.0.13", "ts-node": "^10.9.1", diff --git a/modules/styling/package.json b/modules/styling/package.json index bf663cd5a7..4bd028d347 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling", - "version": "12.0.7", + "version": "12.0.8", "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", @@ -53,7 +53,7 @@ "@emotion/react": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.7", + "@workday/canvas-kit-react": "^12.0.8", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "typescript": "5.0" From e5cb5dd4edbcd8451dc3ad20151549593fb1bc6c Mon Sep 17 00:00:00 2001 From: Nicholas Boll Date: Mon, 4 Nov 2024 14:40:18 -0700 Subject: [PATCH 6/8] fix: Add gap to overflow calculations (#3029) Adds the setting of the container gap to the `useOverflowListMeasure` hook [category:Components] --- .../collection/lib/useOverflowListMeasure.ts | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/react/collection/lib/useOverflowListMeasure.ts b/modules/react/collection/lib/useOverflowListMeasure.ts index b9fc1c2bc8..4dbf953efc 100644 --- a/modules/react/collection/lib/useOverflowListMeasure.ts +++ b/modules/react/collection/lib/useOverflowListMeasure.ts @@ -1,6 +1,11 @@ import * as React from 'react'; -import {createElemPropsHook, useForkRef, useResizeObserver} from '@workday/canvas-kit-react/common'; +import { + createElemPropsHook, + useMountLayout, + useResizeObserver, + useLocalRef, +} from '@workday/canvas-kit-react/common'; import {useOverflowListModel} from './useOverflowListModel'; @@ -9,12 +14,21 @@ import {useOverflowListModel} from './useOverflowListModel'; * overflow detection. */ export const useOverflowListMeasure = createElemPropsHook(useOverflowListModel)((model, ref) => { - const localRef = React.useRef(null); - const {ref: resizeRef} = useResizeObserver({ + const {elementRef, localRef} = useLocalRef(ref as React.Ref); + const gapProperty = model.state.orientation === 'horizontal' ? 'columnGap' : 'rowGap'; + + useResizeObserver({ ref: localRef, onResize: model.events.setContainerWidth, }); - const elementRef = useForkRef(ref, resizeRef); + useMountLayout(() => { + if (localRef.current) { + const styles = getComputedStyle(localRef.current); + model.events.setContainerGap({ + size: styles.gap === 'normal' ? 0 : Number(styles[gapProperty].replace('px', '')), + }); + } + }); return { ref: elementRef, From 2a7e546a8df8c8ff4340f9b2be26e678244f720b Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Mon, 4 Nov 2024 21:40:58 +0000 Subject: [PATCH 7/8] chore: Release v11.1.21 [skip release] --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 4 ++-- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd97efb69b..b39b9c799d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [v11.1.21](https://github.com/Workday/canvas-kit/releases/tag/v11.1.21) (2024-11-04) + +### Components + +- fix: Add gap to overflow calculations ([#3029](https://github.com/Workday/canvas-kit/pull/3029)) ([@NicholasBoll](https://github.com/NicholasBoll)) + + ## [v11.1.20](https://github.com/Workday/canvas-kit/releases/tag/v11.1.20) (2024-11-04) ### Components diff --git a/lerna.json b/lerna.json index ba6ac3798a..8b8fce188e 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "11.1.20", + "version": "11.1.21", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index 01e5369692..02d4157d7e 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -2,7 +2,7 @@ "name": "@workday/canvas-kit-codemod", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", - "version": "11.1.20", + "version": "11.1.21", "description": "A collection of codemods for use on Workday Canvas Kit packages.", "main": "dist/es6/index.js", "sideEffects": false, diff --git a/modules/css/package.json b/modules/css/package.json index 8c37fbb658..1cf5838581 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-css", - "version": "11.1.20", + "version": "11.1.21", "description": "The parent module that contains all Workday Canvas Kit CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/docs/package.json b/modules/docs/package.json index 6d24566529..1512e507a5 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-docs", - "version": "11.1.20", + "version": "11.1.21", "description": "Documentation components of Canvas Kit components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -44,10 +44,10 @@ "dependencies": { "@emotion/styled": "^11.6.0", "@storybook/csf": "0.0.1", - "@workday/canvas-kit-labs-react": "^11.1.20", - "@workday/canvas-kit-preview-react": "^11.1.20", - "@workday/canvas-kit-react": "^11.1.20", - "@workday/canvas-kit-styling": "^11.1.20", + "@workday/canvas-kit-labs-react": "^11.1.21", + "@workday/canvas-kit-preview-react": "^11.1.21", + "@workday/canvas-kit-react": "^11.1.21", + "@workday/canvas-kit-styling": "^11.1.21", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "markdown-to-jsx": "^7.2.0", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index 647cbc081b..a1b7386040 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-css", - "version": "11.1.20", + "version": "11.1.21", "description": "The parent module that contains all Workday Canvas Kit Labs CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index 8019f9e6d4..a4a696ebb2 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-react", - "version": "11.1.20", + "version": "11.1.21", "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", @@ -46,7 +46,7 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.20", + "@workday/canvas-kit-react": "^11.1.21", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/design-assets-types": "^0.2.8", "chroma-js": "^2.1.0", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 94b03d9df1..2f04c7817e 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-popup-stack", - "version": "11.1.20", + "version": "11.1.21", "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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index 6bee872150..36f70fd511 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-css", - "version": "11.1.20", + "version": "11.1.21", "description": "The parent module that contains all Workday Canvas Kit Preview CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index 6811fa337c..1e8e175be4 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-react", - "version": "11.1.20", + "version": "11.1.21", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.20", - "@workday/canvas-kit-styling": "^11.1.20", + "@workday/canvas-kit-react": "^11.1.21", + "@workday/canvas-kit-styling": "^11.1.21", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "@workday/design-assets-types": "^0.2.8" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index 3a6f8a7afe..0bbb6afa1e 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react-fonts", - "version": "11.1.20", + "version": "11.1.21", "description": "Fonts for canvas-kit-react", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/react/package.json b/modules/react/package.json index c99f8cc3dc..e4e375e4ec 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react", - "version": "11.1.20", + "version": "11.1.21", "description": "The parent module that contains all Workday Canvas Kit React components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -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": "^11.1.20", - "@workday/canvas-kit-styling": "^11.1.20", + "@workday/canvas-kit-popup-stack": "^11.1.21", + "@workday/canvas-kit-styling": "^11.1.21", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index 649914b880..8371a59782 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling-transform", - "version": "11.1.20", + "version": "11.1.21", "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", @@ -34,7 +34,7 @@ ], "dependencies": { "@emotion/serialize": "^1.0.2", - "@workday/canvas-kit-styling": "^11.1.20", + "@workday/canvas-kit-styling": "^11.1.21", "@workday/canvas-tokens-web": "^2.0.0", "stylis": "4.0.13", "typescript": "4.2" diff --git a/modules/styling/package.json b/modules/styling/package.json index e84a392639..589c8944bd 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling", - "version": "11.1.20", + "version": "11.1.21", "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", @@ -53,7 +53,7 @@ "@emotion/react": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^11.1.20", + "@workday/canvas-kit-react": "^11.1.21", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.0", "typescript": "4.2" From 67994adcbd4aa2c420f5901cb9b71b2fdbc31bd7 Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Mon, 4 Nov 2024 22:05:33 +0000 Subject: [PATCH 8/8] chore: Release v12.0.9 [skip release] --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 6 +++--- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 32 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 603af5c630..b1ecb40b89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [v12.0.9](https://github.com/Workday/canvas-kit/releases/tag/v12.0.9) (2024-11-04) + +### Components + +- fix: Add gap to overflow calculations ([#3029](https://github.com/Workday/canvas-kit/pull/3029)) ([@NicholasBoll](https://github.com/NicholasBoll)) + + ## [v11.1.21](https://github.com/Workday/canvas-kit/releases/tag/v11.1.21) (2024-11-04) ### Components diff --git a/lerna.json b/lerna.json index fb7bfd5f1e..cfb483318b 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "12.0.8", + "version": "12.0.9", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index 333f26c8cc..6891e112c4 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -2,7 +2,7 @@ "name": "@workday/canvas-kit-codemod", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", - "version": "12.0.8", + "version": "12.0.9", "description": "A collection of codemods for use on Workday Canvas Kit packages.", "main": "dist/es6/index.js", "sideEffects": false, diff --git a/modules/css/package.json b/modules/css/package.json index 6476a0e229..1f73e2df58 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-css", - "version": "12.0.8", + "version": "12.0.9", "description": "The parent module that contains all Workday Canvas Kit CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/docs/package.json b/modules/docs/package.json index 329fc6655d..4e8c32fec9 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-docs", - "version": "12.0.8", + "version": "12.0.9", "description": "Documentation components of Canvas Kit components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -44,10 +44,10 @@ "dependencies": { "@emotion/styled": "^11.6.0", "@storybook/csf": "0.0.1", - "@workday/canvas-kit-labs-react": "^12.0.8", - "@workday/canvas-kit-preview-react": "^12.0.8", - "@workday/canvas-kit-react": "^12.0.8", - "@workday/canvas-kit-styling": "^12.0.8", + "@workday/canvas-kit-labs-react": "^12.0.9", + "@workday/canvas-kit-preview-react": "^12.0.9", + "@workday/canvas-kit-react": "^12.0.9", + "@workday/canvas-kit-styling": "^12.0.9", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "markdown-to-jsx": "^7.2.0", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index 1b7573a1b0..07d6d86b73 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-css", - "version": "12.0.8", + "version": "12.0.9", "description": "The parent module that contains all Workday Canvas Kit Labs CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index 49d3b083e4..25d1458ef7 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-labs-react", - "version": "12.0.8", + "version": "12.0.9", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.8", - "@workday/canvas-kit-styling": "^12.0.8", + "@workday/canvas-kit-react": "^12.0.9", + "@workday/canvas-kit-styling": "^12.0.9", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index a80d8baf94..a8bb5e89f5 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-popup-stack", - "version": "12.0.8", + "version": "12.0.9", "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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index b0f3f0ce7e..5981b6ac01 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-css", - "version": "12.0.8", + "version": "12.0.9", "description": "The parent module that contains all Workday Canvas Kit Preview CSS components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index 243a49ee7d..989f8ad8fc 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-preview-react", - "version": "12.0.8", + "version": "12.0.9", "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", @@ -46,8 +46,8 @@ "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.8", - "@workday/canvas-kit-styling": "^12.0.8", + "@workday/canvas-kit-react": "^12.0.9", + "@workday/canvas-kit-styling": "^12.0.9", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index 46499c9925..9f9a6d14bc 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react-fonts", - "version": "12.0.8", + "version": "12.0.9", "description": "Fonts for canvas-kit-react", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", diff --git a/modules/react/package.json b/modules/react/package.json index 84f8646ff6..697e36b1b9 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-react", - "version": "12.0.8", + "version": "12.0.9", "description": "The parent module that contains all Workday Canvas Kit React components", "author": "Workday, Inc. (https://www.workday.com)", "license": "Apache-2.0", @@ -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.0.8", - "@workday/canvas-kit-styling": "^12.0.8", + "@workday/canvas-kit-popup-stack": "^12.0.9", + "@workday/canvas-kit-styling": "^12.0.9", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "@workday/design-assets-types": "^0.2.8", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index d97d52f5b5..52e8e2390e 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling-transform", - "version": "12.0.8", + "version": "12.0.9", "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", @@ -34,7 +34,7 @@ ], "dependencies": { "@emotion/serialize": "^1.0.2", - "@workday/canvas-kit-styling": "^12.0.8", + "@workday/canvas-kit-styling": "^12.0.9", "@workday/canvas-tokens-web": "^2.0.1", "stylis": "4.0.13", "ts-node": "^10.9.1", diff --git a/modules/styling/package.json b/modules/styling/package.json index 4bd028d347..5b557b95aa 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -1,6 +1,6 @@ { "name": "@workday/canvas-kit-styling", - "version": "12.0.8", + "version": "12.0.9", "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", @@ -53,7 +53,7 @@ "@emotion/react": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/styled": "^11.6.0", - "@workday/canvas-kit-react": "^12.0.8", + "@workday/canvas-kit-react": "^12.0.9", "@workday/canvas-system-icons-web": "^3.0.0", "@workday/canvas-tokens-web": "^2.0.1", "typescript": "5.0"