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 10, 2024
2 parents 3f9cb39 + 69bee17 commit c1cad00
Show file tree
Hide file tree
Showing 44 changed files with 235 additions and 208 deletions.
12 changes: 6 additions & 6 deletions .storybook/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ const routes = {
'/components/text/text/': 'components-text-text--basic',
'/components/text/title/': 'components-text-title--basic',
'/examples/layout/': 'examples-layouts--area-column-positioning',
'/getting-started/for-developers/contributing/': 'guides-contributing--page',
'/getting-started/for-developers/contributing/': 'guides-contributing--docs',
'/getting-started/for-developers/resources/api-pattern-guidelines/':
'guides-api-pattern-guidelines--page',
'guides-api-pattern-guidelines--docs',
'/getting-started/for-developers/resources/collection-api/': 'features-collections--basic',
'/getting-started/for-developers/resources/compound-components/':
'guides-compound-components--page',
'guides-compound-components--docs',
'/getting-started/for-developers/resources/creating-compound-components/':
'guides-creating-compound-components--page',
'guides-creating-compound-components--docs',
'/getting-started/for-developers/resources/responsive-styling/':
'features-responsive-styling--responsive-container',
'/getting-started/for-developers/resources/style-props/':
'features-style-props--background-example',
'/getting-started/for-developers/resources/testing/': 'guides-testing--page',
'/getting-started/introduction/': 'guides-getting-started--page',
'/getting-started/for-developers/resources/testing/': 'guides-testing--docs',
'/getting-started/introduction/': 'guides-getting-started--docs',
'/tokens/color/': 'tokens--colors',
'/tokens/depth/': 'tokens--depth',
'/tokens/space/': 'tokens--space',
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

### Documentation

- fix: Fixed Welcome Page ([#3069](https://github.com/Workday/canvas-kit/pull/3069)) ([@josh-bagwell](https://github.com/josh-bagwell))
- fix: Addressed Versions Table Update ([#3071](https://github.com/Workday/canvas-kit/pull/3071)) ([@josh-bagwell](https://github.com/josh-bagwell))


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

### Documentation

- fix: Fixes Broken Links from Storybook 7 Upgrade ([#3065](https://github.com/Workday/canvas-kit/pull/3065)) ([@josh-bagwell](https://github.com/josh-bagwell))


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

### Documentation

- docs: Use slash import in first example ([#3066](https://github.com/Workday/canvas-kit/pull/3066)) ([@vibdev](https://github.com/vibdev))


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

### Documentation
Expand Down
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ npm install @workday/canvas-kit-react

```tsx
import * as React from 'react';
import {SecondaryButton} from '@workday/canvas-kit-react';
import {SecondaryButton} from '@workday/canvas-kit-react/button';

<SecondaryButton>Button Label</SecondaryButton>;
```
Expand All @@ -61,13 +61,14 @@ The Canvas Kit core team will take a look and discuss it with you.
## Contributing

Want to contribute to Canvas Kit React? Please read our
[contributing guidelines](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--page) to find out more and how to get
started.
[contributing guidelines](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--docs)
to find out more and how to get started.

## Maintaining

If you're a Canvas Kit maintainer, please read our
[maintaining docs](https://workday.github.io/canvas-kit/?path=/docs/guides-maintaining--page) to learn more about our processes.
[maintaining docs](https://workday.github.io/canvas-kit/?path=/docs/guides-maintaining--docs) to
learn more about our processes.

## Open Development

Expand All @@ -79,7 +80,7 @@ process. Any and all issues are public and available for discussion.

Canvas Kit follows [semantic versioning](https://semver.org/) and is enforced automatically by
[conventional commits](https://www.conventionalcommits.org/) (see
["Commit Message Format"](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--page#commit-message-format)).
["Commit Message Format"](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--docs#commit-message-format)).

Each module is independently versioned using [Lerna](https://github.com/lerna/lerna).

Expand All @@ -102,8 +103,8 @@ recommend against using it in production until the first stable version has been

## Developer Documentation

- [Contributing](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--page)
- [Code of Conduct](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--page#code-of-conduct)
- [Contributing](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--docs)
- [Code of Conduct](https://workday.github.io/canvas-kit/?path=/docs/guides-contributing--docs#code-of-conduct)
- Upgrade Guides:
- [v4.0 Upgrade Guide](https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v4-0--docs)
- [v5.0 Upgrade Guide](https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v5-0--docs)
Expand All @@ -115,10 +116,10 @@ recommend against using it in production until the first stable version has been
- [v11.0 Upgrade Guide](https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v11-0--docs)
- [v12.0 Upgrade Guide](https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v12-0--docs)
- Code Style / Best Practices:
- [API & Pattern Guidelines](https://workday.github.io/canvas-kit/?path=/docs/guides-api-pattern-guidelines--page)
- [Compound Components](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--page)
- [Creating Compound Components](https://workday.github.io/canvas-kit/?path=/docs/guides-creating-compound-components--page)
- [Testing](https://workday.github.io/canvas-kit/?path=/docs/guides-testing--page)
- [API & Pattern Guidelines](https://workday.github.io/canvas-kit/?path=/docs/guides-api-pattern-guidelines--docs)
- [Compound Components](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--docs)
- [Creating Compound Components](https://workday.github.io/canvas-kit/?path=/docs/guides-creating-compound-components--docs)
- [Testing](https://workday.github.io/canvas-kit/?path=/docs/guides-testing--docs)

## License

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.9",
"version": "12.1.12",
"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.9",
"version": "12.1.12",
"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.9",
"version": "12.1.12",
"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
2 changes: 1 addition & 1 deletion modules/docs/mdx/10.0-UPGRADE-GUIDE.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ If you're using Canvas Kit and not directly using this package, there is nothing
end. The Canvas Kit packages are using the static compilation as part of the build process. If you
want to use this package for your own styles, you don't need to do anything special to use in
development; just reference our
[documentation](https://workday.github.io/canvas-kit/?path=/story/features-styling-welcome--page) on
[documentation](https://workday.github.io/canvas-kit/?path=/docs/styling-getting-started--docs) on
how to get started.

For more information on why this package was introduced, please reference our
Expand Down
14 changes: 7 additions & 7 deletions modules/docs/mdx/11.0-UPGRADE-GUIDE.mdx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Meta} from '@storybook/addon-docs';
import {Table} from '@workday/canvas-kit-react/table';
import {base, brand, system} from '@workday/canvas-tokens-web';
import {StatusIndicator} from '@workday/canvas-kit-preview-react/status-indicator';
import {cssVar} from '@workday/canvas-kit-styling';
import {Box} from '@workday/canvas-kit-react/layout';
import { Meta } from '@storybook/addon-docs';
import { Table } from '@workday/canvas-kit-react/table';
import { base, brand, system } from '@workday/canvas-tokens-web';
import { StatusIndicator } from '@workday/canvas-kit-preview-react/status-indicator';
import { cssVar } from '@workday/canvas-kit-styling';
import { Box } from '@workday/canvas-kit-react/layout';

<Meta title="Guides/Upgrade Guides/v11.0" />

Expand Down Expand Up @@ -852,7 +852,7 @@ previously in [Main](#main) (for reference, see
in [Main](#main) from v9).

`Table` is a
[compound component](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--page)
[compound component](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--docs)
which provides a flexible API and access to its internals via its subcomponents.

> **Note**: `rowState` prop is no longer a part of the `Table` component.
Expand Down
14 changes: 7 additions & 7 deletions modules/docs/mdx/12.0-UPGRADE-GUIDE.mdx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Meta} from '@storybook/addon-docs';
import {Table} from '@workday/canvas-kit-react/table';
import {base, brand, system} from '@workday/canvas-tokens-web';
import {StatusIndicator} from '@workday/canvas-kit-preview-react/status-indicator';
import {cssVar} from '@workday/canvas-kit-styling';
import {Box} from '@workday/canvas-kit-react/layout';
import { Meta } from '@storybook/addon-docs';
import { Table } from '@workday/canvas-kit-react/table';
import { base, brand, system } from '@workday/canvas-tokens-web';
import { StatusIndicator } from '@workday/canvas-kit-preview-react/status-indicator';
import { cssVar } from '@workday/canvas-kit-styling';
import { Box } from '@workday/canvas-kit-react/layout';

<Meta title="Guides/Upgrade Guides/v12.0" />

Expand Down Expand Up @@ -363,7 +363,7 @@ made to provide more flexibility and better explicit components when using input
##### Breaking API Change

The newly promoted `FormField` is a
[compound component](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--page).
[compound component](https://workday.github.io/canvas-kit/?path=/docs/guides-compound-components--docs).
Due to the different APIs of the component, this change is **not codemodable**. The following shows
an example of how to **update** your code to match the new compound component API.

Expand Down
2 changes: 1 addition & 1 deletion modules/docs/mdx/CONTRIBUTING.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Upon commit, [lint-staged](https://github.com/okonet/lint-staged) will run your
### Releases

- Releases are prepared by updating package versions with `lerna version`, and updating the
[changelog](/docs/changelog--page)
[changelog](/docs/changelog--docs)
- A PR is created for the above updates
- After the release PR is approved and merged, we create a release in GitHub with the contents of
the changelog updates.
Expand Down
8 changes: 6 additions & 2 deletions modules/docs/mdx/versionsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ const allVersions = [
versionNumber: version, // This will always be the current major version
documentation: 'https://github.com/Workday/canvas-kit',
},
{
{
versionNumber: 11, // This is support, update this when we release v13
documentation: 'https://d2krrudi3mmzzw.cloudfront.net/v11/?path=/docs/welcome--page',
},
{
versionNumber: 10,
documentation: 'https://d2krrudi3mmzzw.cloudfront.net/v10/?path=/docs/welcome--page',
},
{
versionNumber: 9, // This is support, update this when we release v11
versionNumber: 9,
documentation: 'https://d2krrudi3mmzzw.cloudfront.net/v9/?path=/docs/welcome--page',
},
{
Expand Down
6 changes: 3 additions & 3 deletions modules/docs/mdx/welcome.mdx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Readme from '../../../README.md';
import Markdown from '../../../utils/storybook/Markdown.tsx';
import {WelcomePage} from './welcomePage';
import {InstallBlock} from './installBlock';
import {version} from '../../../lerna.json';
import { WelcomePage } from './welcomePage';
import { InstallBlock } from './installBlock';
import { version } from '../../../lerna.json';

<Meta title="Welcome" />

Expand Down
2 changes: 1 addition & 1 deletion modules/docs/mdx/welcomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const WelcomePage = () => {
as={Hyperlink}
alignSelf="end"
marginTop="xs"
href="https://workday.github.io/canvas-kit/?path=/docs/guides-getting-started--page"
href="https://workday.github.io/canvas-kit/?path=/docs/guides-getting-started--docs"
>
{' '}
Getting Started Guide
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.9",
"version": "12.1.12",
"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.9",
"@workday/canvas-kit-preview-react": "^12.1.9",
"@workday/canvas-kit-react": "^12.1.9",
"@workday/canvas-kit-styling": "^12.1.9",
"@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-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.9",
"version": "12.1.12",
"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.9",
"version": "12.1.12",
"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.9",
"@workday/canvas-kit-styling": "^12.1.9",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@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.9",
"version": "12.1.12",
"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.9",
"version": "12.1.12",
"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
2 changes: 1 addition & 1 deletion modules/preview-react/menu/lib/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class DeprecatedMenu extends React.Component<DeprecatedMenuProps, Depreca
console.warn(
`This component is being deprecated and will be removed in a future major version.\n
For more information, please see the V8 upgrade guide:\n
https://workday.github.io/canvas-kit/?path=/story/welcome-upgrade-guides-v8-0--page
https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v8-0--docs#menu-preview
`
);

Expand Down
2 changes: 1 addition & 1 deletion modules/preview-react/menu/lib/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export class DeprecatedMenuItem extends React.Component<DeprecatedMenuItemProps>
console.warn(
`This component is being deprecated and will be removed in a future major version.\n
For more information, please see the V8 upgrade guide:\n
https://workday.github.io/canvas-kit/?path=/story/welcome-upgrade-guides-v8-0--page
https://workday.github.io/canvas-kit/?path=/docs/guides-upgrade-guides-v8-0--docs#menu-preview
`
);
}
Expand Down
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.9",
"version": "12.1.12",
"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.9",
"@workday/canvas-kit-styling": "^12.1.9",
"@workday/canvas-kit-react": "^12.1.12",
"@workday/canvas-kit-styling": "^12.1.12",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8"
Expand Down
28 changes: 14 additions & 14 deletions modules/preview-react/radio/stories/Radio.mdx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {ExampleCodeBlock, SymbolDoc} from '@workday/canvas-kit-docs';

import {Basic} from './examples/Basic';
import {Alert} from './examples/Alert';
import {Error} from './examples/Error';
import {Inverse} from './examples/Inverse';
import {LabelPosition} from './examples/LabelPosition';
import {NoValue} from './examples/NoValue';
import {RefForwarding} from './examples/RefForwarding';
import {Disabled} from './examples/Disabled';
import {Required} from './examples/Required';
import {Custom} from './examples/Custom';
import {StandaloneRadio} from './examples/StandaloneRadio';
import { ExampleCodeBlock, SymbolDoc } from '@workday/canvas-kit-docs';

import { Basic } from './examples/Basic';
import { Alert } from './examples/Alert';
import { Error } from './examples/Error';
import { Inverse } from './examples/Inverse';
import { LabelPosition } from './examples/LabelPosition';
import { NoValue } from './examples/NoValue';
import { RefForwarding } from './examples/RefForwarding';
import { Disabled } from './examples/Disabled';
import { Required } from './examples/Required';
import { Custom } from './examples/Custom';
import { StandaloneRadio } from './examples/StandaloneRadio';

import * as RadioStories from './Radio.stories';

Expand Down Expand Up @@ -142,7 +142,7 @@ how to use `RadioGroup` with React Hook Form.

Radio and its subcomponents support custom styling via the `cs` prop. For more information, check
our
["How To Customize Styles"](https://workday.github.io/canvas-kit/?path=/docs/styling-how-to-customize-styles--page).
["How To Customize Styles"](https://workday.github.io/canvas-kit/?path=/docs/styling-how-to-customize-styles--docs).

## Component API

Expand Down
Loading

0 comments on commit c1cad00

Please sign in to comment.