chore: Merge prerelease/minor into prerelease/major (#2880)

Co-authored-by: @mannycarrera4 <[email protected]> Co-authored-by: manuel.carrera <[email protected]> Co-authored-by: @mannycarrera4 <[email protected]> Co-authored-by: @NicholasBoll <[email protected]>
Workday · Aug 21, 2024 · 1e0bc45 · 1e0bc45
2 parents e249801 + 6f79355
commit 1e0bc45
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
 
+## [v11.1.4](https://github.com/Workday/canvas-kit/releases/tag/v11.1.4) (2024-08-21)
+
+### Documentation
+
+- docs: Update CanvasProvider info on install page ([#2878](https://github.com/Workday/canvas-kit/pull/2878)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera, [@alanbsmith](https://github.com/alanbsmith))
+
+
+## [v10.3.54](https://github.com/Workday/canvas-kit/releases/tag/v10.3.54) (2024-08-21)
+
+### Documentation
+
+- docs: Update CanvasProvider info on install page ([#2878](https://github.com/Workday/canvas-kit/pull/2878)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera, [@alanbsmith](https://github.com/alanbsmith))
 ## [v11.1.3](https://github.com/Workday/canvas-kit/releases/tag/v11.1.3) (2024-08-20)
 
 ### Components

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "modules/**"
   ],
-  "version": "11.1.3",
+  "version": "11.1.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git 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.3",
+  "version": "11.1.4",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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/mdx/welcome.stories.mdx b/modules/docs/mdx/welcome.stories.mdx
@@ -16,20 +16,42 @@ import {version} from '../../../lerna.json';
 
 <WelcomePage />
 
-After installing Canvas Kit, you need to set up the CanvasProvider at the root of your application.
-This can be either in your `index.jsx`,`index.tsx` or `App.jsx` depending on the framework you use.
-This ensures proper styling, theming, and focus behavior on our components.
+### Canvas Provider
+
+The `<CanvasProvider>` is required for proper branding support. Furthermore, if you use Emotion for
+styling your components, the `<CanvasProvider>` ensures your styles will merge as expected. Note:
+Custom use of `<CacheProvider>` provided by Emotion is not supported. `@workday/canvas-kit-styling`
+owns the creating of the cache reference. This ensures both static styling and Emotion’s dynamic
+styling solutions work together. In most cases you'll want to wrap your application at the root
+level in `<CanvasProvider>`.
 
 ```tsx
 import * as React from 'react';
-// 1. import `CanvasProvider` component
-import {CanvasProvider} from '@workday/canvas-kit-react';
-function App() {
-  // 2. Wrap CanvasProvider at the root of your app
+import {
+  CanvasProvider,
+  ContentDirection,
+  PartialEmotionCanvasTheme,
+  useTheme,
+} from '@workday/canvas-kit-react/common';
+// Ensure CSS variables are defined. You Can also do this at the root index.css
+import '@workday/canvas-tokens-web/css/base/_variables.css';
+import '@workday/canvas-tokens-web/css/brand/_variables.css';
+import '@workday/canvas-tokens-web/css/system/_variables.css';
+
+export const App = () => {
+  // useTheme is filling in the Canvas theme object if any keys are missing
+  const canvasTheme: PartialEmotionCanvasTheme = useTheme({
+    canvas: {
+      // Switch to `ContentDirection.RTL` to change direction
+      direction: ContentDirection.LTR,
+    },
+  });
   return (
-    <CanvasProvider>
-      <YourApp />
+    <CanvasProvider theme={canvasTheme}>
+        <main>
+          <p>Get Started With Canvas Kit</p>
+        </main>
     </CanvasProvider>
   );
-}
+};
 ```
diff --git a/modules/docs/mdx/welcomePage.tsx b/modules/docs/mdx/welcomePage.tsx
@@ -14,7 +14,7 @@ import {version} from '../../../lerna.json';
 
 export const WelcomePage = () => {
   return (
-    <Flex flexDirection="column" gap="s">
+    <Flex flexDirection="column" gap="s" marginBottom="m">
       <Box borderRadius="m" overflow="hidden" position="relative">
         <Flex position="absolute" flexDirection="column" top="30%" left="10%">
           <Text

diff --git a/modules/docs/package.json b/modules/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-docs",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
-    "@workday/canvas-kit-preview-react": "^11.1.3",
-    "@workday/canvas-kit-react": "^11.1.3",
-    "@workday/canvas-kit-styling": "^11.1.3",
+    "@workday/canvas-kit-labs-react": "^11.1.4",
+    "@workday/canvas-kit-preview-react": "^11.1.4",
+    "@workday/canvas-kit-react": "^11.1.4",
+    "@workday/canvas-kit-styling": "^11.1.4",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-labs-css",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-labs-react",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
+    "@workday/canvas-kit-react": "^11.1.4",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-popup-stack",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-preview-css",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-preview-react",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
-    "@workday/canvas-kit-styling": "^11.1.3",
+    "@workday/canvas-kit-react": "^11.1.4",
+    "@workday/canvas-kit-styling": "^11.1.4",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-react-fonts",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-react",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
-    "@workday/canvas-kit-styling": "^11.1.3",
+    "@workday/canvas-kit-popup-stack": "^11.1.4",
+    "@workday/canvas-kit-styling": "^11.1.4",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-styling-transform",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
+    "@workday/canvas-kit-styling": "^11.1.4",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-styling",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "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.3",
+    "@workday/canvas-kit-react": "^11.1.4",
     "@workday/canvas-system-icons-web": "^3.0.0",
     "@workday/canvas-tokens-web": "^2.0.0",
     "typescript": "4.2"