Skip to content

Commit

Permalink
Merge branch 'main' into bug
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Oct 2, 2024
2 parents 717cd72 + 23e1521 commit 6ba3c8f
Show file tree
Hide file tree
Showing 52 changed files with 631 additions and 346 deletions.
4 changes: 4 additions & 0 deletions gatsby-ssr.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
name="twitter:creator"
content="@_carbondesign"
/>,
<script
key="video-player"
type="module"
src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/video-player.min.js" />,
]);

setPostBodyComponents([
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
],
"dependencies": {
"@carbon/charts-react": "0.55.0",
"@carbon/icons-react": "^11.48.0",
"@carbon/pictograms": "^12.39.0",
"@carbon/pictograms-react": "^11.65.0",
"@carbon/icons-react": "^11.50.0",
"@carbon/pictograms": "^12.41.0",
"@carbon/pictograms-react": "^11.67.0",
"@loadable/babel-plugin": "^5.16.1",
"@loadable/component": "^5.16.4",
"codesandbox": "^2.2.3",
"d3": "^7.9.0",
"gatsby": "^5.13.5",
"gatsby-plugin-sharp": "^5.13.1",
"gatsby-theme-carbon": "^4.0.8",
"gatsby-theme-carbon": "^4.1.4",
"markdown-it": "^14.1.0",
"prettier-config-carbon": "^0.11.0",
"react": "^18.2.0",
Expand Down
45 changes: 45 additions & 0 deletions src/components/KalturaVideo/KalturaVideo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from 'react';
import PropTypes from 'prop-types';

/**
* KalturaVideo component: A video player container for Kaltura videos.
*
* @param {object} videoProps - KalturaVideo component props
* @param {string} videoProps.videoid - The ID of the Kaltura video to be played.
* @param {boolean} videoProps.hideCaption - Determines if caption should be hidden.
* @returns {JSX.Element} JSX element containing the video player container.
*/
const KalturaVideo = ({ videoid, hideCaption = false }) => {
let videoProps = {
'video-id': videoid,
};

if (hideCaption) {
videoProps['hide-caption'] = true;
}

return (
<div>
<dds-video-player-container {...videoProps}></dds-video-player-container>
</div>
);
};

/**
* @typedef {object} KalturaVideoProps
*
* @property {string} videoid - The ID of the Kaltura video to be played.
*/
KalturaVideo.propTypes = {
hideCaption: PropTypes.bool,
videoid: PropTypes.string.isRequired,
};

/**
* @type {{hideCaption: boolean}}
*/
KalturaVideo.defaultProps = {
hideCaption: false,
};

export default KalturaVideo;
3 changes: 3 additions & 0 deletions src/components/KalturaVideo/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import KalturaVideo from './KalturaVideo';

export default KalturaVideo;
8 changes: 3 additions & 5 deletions src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@
- title: Contributing
pages:
- title: Get started
path: /contributing/get-started/
- title: Code
path: /contributing/code/
- title: Design
path: /contributing/design/
path: /contributing/get-started/overview
- title: Component checklist
path: /contributing/component-checklist/
- title: Documentation
path: /contributing/documentation/
- title: Migrating
Expand Down
2 changes: 2 additions & 0 deletions src/pages/all-about-carbon/releases.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ redesign product UIs and begin a migration plan to comply with IBM brand
experience standards. For more details about this release, see our
[v10 release page](https://v10.carbondesignsystem.com/help/migration-guide/overview).

As of September 30, 2024, all v10 assets have been deprecated.

## Release history

{/* prettier-ignore-start */}
Expand Down
4 changes: 3 additions & 1 deletion src/pages/all-about-carbon/what-is-carbon.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ description:
consists of working code, design tools, and more.
---

import KalturaVideo from 'components/KalturaVideo';

<PageDescription>

Carbon is IBM's open source design system for products and digital experiences.
Expand Down Expand Up @@ -52,7 +54,7 @@ Learn about Carbon and its history. This video covers how the IBM Design
Language is applied to Carbon, how Carbon interacts with domain level guidance,
and what it means to be an open source design system.

<Video title="Introduction to Carbon" vimeoId="457802924" />
<KalturaVideo videoid="1_68e5qyal"></KalturaVideo>

## How Carbon works

Expand Down
1 change: 0 additions & 1 deletion src/pages/all-about-carbon/who-uses-carbon.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -280,5 +280,4 @@ Here are some ways people in support roles can begin engaging with Carbon:

- Report issues in these primary support Slack channels:
- [#carbon-design-system](https://ibm-studios.slack.com/messages/C0M053VPT/)
- [#carbon-components](https://ibm-studios.slack.com/archives/C046Y0YUD)
- [#carbon-react](https://ibm-studios.slack.com/archives/C2K6RFJ1G)
4 changes: 2 additions & 2 deletions src/pages/components/UI-shell-header/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ the Storybooks for each framework below.

<Row className="resource-card-group">
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell--header-base"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell-header--header-w-navigation"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/UI-shell-left-panel/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell--fixed-side-nav"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell-sidenav--fixed-side-nav"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/UI-shell-right-panel/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell--header-base-w-actions-and-right-panel"
href="https://react.carbondesignsystem.com/?path=/story/components-ui-shell-header--header-w-actions-and-right-panel"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/ai-label/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/docs/experimental-unstable-slug--overview"
href="https://react.carbondesignsystem.com/?path=/story/components-ailabel--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/breadcrumb/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ usage documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-breadcrumb--breadcrumb"
href="https://react.carbondesignsystem.com/?path=/story/components-breadcrumb--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/checkbox/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-checkbox--checkbox"
href="https://react.carbondesignsystem.com/?path=/story/components-checkbox--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/file-uploader/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ usage documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-fileuploader--file-uploader"
href="https://react.carbondesignsystem.com/?path=/story/components-fileuploader--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/inline-loading/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ usage documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-inlineloading--inline-loading"
href="https://react.carbondesignsystem.com/?path=/story/components-inlineloading--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/menu/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ documentation, see the Storybooks for each framework below.
variants={[
{
label: 'Menu',
variant: 'components-context-menu--default',
variant: 'components-menu--playground',
},
]}
/>
Binary file modified src/pages/components/menu/images/accessibility-menu-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/menu/images/accessibility-menu-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6ba3c8f

Please sign in to comment.