Merge branch 'main' into joshblack-patch-1

carbon-design-system · Jun 14, 2022 · 1a85612 · 1a85612
2 parents afd57d2 + 88d7121
commit 1a85612
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -2157,6 +2157,9 @@ Map {
       "className": Object {
         "type": "string",
       },
+      "closeOnSelect": Object {
+        "type": "bool",
+      },
       "dateFormat": Object {
         "type": "string",
       },

diff --git a/...components/Breadcrumb/Breadcrumb-story.js → ...mponents/Breadcrumb/Breadcrumb.stories.js b/...components/Breadcrumb/Breadcrumb-story.js → ...mponents/Breadcrumb/Breadcrumb.stories.js
@@ -8,8 +8,6 @@
 /* eslint-disable no-console */
 
 import React from 'react';
-import { action } from '@storybook/addon-actions';
-import { withKnobs, boolean } from '@storybook/addon-knobs';
 import { Breadcrumb, BreadcrumbItem, BreadcrumbSkeleton } from '../Breadcrumb';
 import OverflowMenu from '../OverflowMenu';
 import OverflowMenuItem from '../OverflowMenuItem';
@@ -22,7 +20,6 @@ export default {
     BreadcrumbItem,
     BreadcrumbSkeleton,
   },
-  decorators: [withKnobs],
   parameters: {
     docs: {
       page: mdx,
@@ -62,24 +59,21 @@ export const BreadcrumbWithOverflowMenu = () => (
 
 export const Skeleton = () => <BreadcrumbSkeleton />;
 
-const props = () => ({
-  className: 'some-class',
-  noTrailingSlash: boolean('No trailing slash (noTrailingSlash)', false),
-  onClick: action('onClick'),
-});
-
-export const Playground = () => (
-  <Breadcrumb {...props()}>
+export const Playground = (args) => (
+  <Breadcrumb {...args}>
     <BreadcrumbItem>
       <a href="/#">Breadcrumb 1</a>
     </BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 2</BreadcrumbItem>
-    <BreadcrumbItem
-      href="#"
-      {...props()}
-      isCurrentPage={boolean('Is current page (isCurrentPage)', false)}>
-      Breadcrumb 3
-    </BreadcrumbItem>
+    <BreadcrumbItem href="#">Breadcrumb 3</BreadcrumbItem>
     <BreadcrumbItem>Breadcrumb 4</BreadcrumbItem>
   </Breadcrumb>
 );
+
+Playground.argTypes = {
+  children: {
+    table: {
+      disable: true,
+    },
+  },
+};
diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js
@@ -179,6 +179,7 @@ function DatePicker({
   appendTo,
   children,
   className,
+  closeOnSelect = true,
   dateFormat = 'm/d/Y',
   datePickerType,
   disable,
@@ -286,6 +287,7 @@ function DatePicker({
       inline: inline ?? false,
       disableMobile: true,
       defaultDate: value,
+      closeOnSelect: closeOnSelect,
       mode: datePickerType,
       allowInput: allowInput ?? true,
       dateFormat: dateFormat,
@@ -488,6 +490,11 @@ DatePicker.propTypes = {
    */
   className: PropTypes.string,
 
+  /**
+   * flatpickr prop passthrough. Controls whether the calendar dropdown closes upon selection.
+   */
+  closeOnSelect: PropTypes.bool,
+
   /**
    * The date format.
    */

diff --git a/packages/react/src/components/Grid/Grid.mdx b/packages/react/src/components/Grid/Grid.mdx
@@ -143,7 +143,7 @@ In these situations, you can make use of the auto columns feature of the
 breakpoint props, and it will automatically set each column to a percentage of
 the total available width.
 
-For example, if you have on `Column` component it would span 100%, two `Column`
+For example, if you have one `Column` component it would span 100%, two `Column`
 components would span 50% each, four `Column` components would span 25% each,
 and so on.
 

diff --git a/packages/react/src/components/RadioButton/next/RadioButton.js b/packages/react/src/components/RadioButton/next/RadioButton.js
@@ -53,6 +53,7 @@ const RadioButton = React.forwardRef(function RadioButton(
         ref={ref}
         disabled={disabled}
         value={value}
+        name={name}
       />
       <label htmlFor={uniqueId} className={`${prefix}--radio-button__label`}>
         <span className={`${prefix}--radio-button__appearance`} />

diff --git a/packages/styles/scss/components/notification/_actionable-notification.scss b/packages/styles/scss/components/notification/_actionable-notification.scss
@@ -227,6 +227,7 @@
     @include type-style('body-compact-01');
 
     display: flex;
+    flex-wrap: wrap;
     word-break: break-word;
   }