Merge branch 'main' of github.com:carbon-design-system/carbon into re…

…factor/update-components-to-use-prefix

packages/carbon-react/.storybook/main.js

@@ -19,6 +19,7 @@ const stories = glob
       '../src/**/*.stories.js',
       '../src/**/*.stories.mdx',
       '../../react/src/**/next/*.stories.js',
+      '../../react/src/**/next/**/*.stories.js',
       '../../react/src/**/next/*.stories.mdx',
       '../../react/src/**/*-story.js',
     ],
@@ -32,7 +33,17 @@ const stories = glob
   .filter((match) => {
     const filepath = path.resolve(__dirname, match);
     const basename = path.basename(match, '.js');
-    const denylist = new Set(['TooltipDefinition-story']);
+    const denylist = new Set([
+      'TooltipDefinition-story',
+      'DataTable-basic-story',
+      'DataTable-batch-actions-story',
+      'DataTable-filtering-story',
+      'DataTable-selection-story',
+      'DataTable-sorting-story',
+      'DataTable-toolbar-story',
+      'DataTable-dynamic-content-story',
+      'DataTable-expansion-story',
+    ]);
 
     if (denylist.has(basename)) {
       return false;

packages/carbon-react/package.json

@@ -45,7 +45,7 @@
     "@carbon/feature-flags": "^0.7.0",
     "@carbon/icons-react": "^10.48.0",
     "@carbon/styles": "^0.16.0",
-    "@carbon/telemetry": "0.0.0-alpha.6",
+    "@carbon/telemetry": "0.1.0",
     "carbon-components": "^10.55.0",
     "carbon-components-react": "^7.55.0",
     "carbon-icons": "^7.0.7"

packages/components/package.json

@@ -63,7 +63,7 @@
     "semantic-release": "semantic-release"
   },
   "dependencies": {
-    "@carbon/telemetry": "0.0.0-alpha.6",
+    "@carbon/telemetry": "0.1.0",
     "flatpickr": "4.6.1",
     "lodash.debounce": "^4.0.8",
     "warning": "^3.0.0"

packages/icons-react/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@carbon/icon-helpers": "^10.28.0",
-    "@carbon/telemetry": "0.0.0-alpha.6",
+    "@carbon/telemetry": "0.1.0",
     "prop-types": "^15.7.2"
   },
   "devDependencies": {

packages/pictograms-react/package.json

@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@carbon/icon-helpers": "^10.28.0",
-    "@carbon/telemetry": "0.0.0-alpha.6",
+    "@carbon/telemetry": "0.1.0",
     "prop-types": "^15.7.2"
   },
   "devDependencies": {

packages/react/package.json

@@ -49,7 +49,7 @@
     "@carbon/feature-flags": "^0.7.0",
     "@carbon/icons-react": "^10.48.0",
     "@carbon/layout": "^10.37.0",
-    "@carbon/telemetry": "0.0.0-alpha.6",
+    "@carbon/telemetry": "0.1.0",
     "classnames": "2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "downshift": "5.2.1",

packages/react/src/components/DataTable/DataTable.js

@@ -16,6 +16,7 @@ import { composeEventHandlers } from '../../tools/events';
 import { defaultFilterRows } from './tools/filter';
 import { defaultSortRow } from './tools/sorting';
 import setupGetInstanceId from './tools/instanceId';
+import * as FeatureFlags from '@carbon/feature-flags';
 
 const getInstanceId = setupGetInstanceId();
 
@@ -116,19 +117,20 @@ export default class DataTable extends React.Component {
 
     /**
      *  Change the row height of table. Currently supports `xs`, `sm`, `md`, `lg`, and `xl`.
-     *  The previous terms (`compact`, `short`, `normal`, and `tall`) will be removed in the next major release.
      */
-    size: PropTypes.oneOf([
-      'compact',
-      'short',
-      'normal',
-      'tall',
-      'xs',
-      'sm',
-      'md',
-      'lg',
-      'xl',
-    ]),
+    size: FeatureFlags.enabled('enable-v11-release')
+      ? PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl'])
+      : PropTypes.oneOf([
+          'compact',
+          'short',
+          'normal',
+          'tall',
+          'xs',
+          'sm',
+          'md',
+          'lg',
+          'xl',
+        ]),
 
     /**
      * Optional hook to manually control sorting of the rows.
@@ -163,7 +165,7 @@ export default class DataTable extends React.Component {
     sortRow: defaultSortRow,
     filterRows: defaultFilterRows,
     locale: 'en',
-    size: 'normal',
+    size: FeatureFlags.enabled('enable-v11-release') ? 'lg' : 'normal',
     overflowMenuOnHover: true,
     translateWithId,
   };

packages/react/src/components/DataTable/Table.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import * as FeatureFlags from '@carbon/feature-flags';
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -79,19 +80,20 @@ Table.propTypes = {
 
   /**
    *  Change the row height of table. Currently supports `xs`, `sm`, `md`, `lg`, and `xl`.
-   *  The previous terms (`compact`, `short`, `normal`, and `tall`) will be removed in the next major release.
    */
-  size: PropTypes.oneOf([
-    'compact',
-    'short',
-    'normal',
-    'tall',
-    'xs',
-    'sm',
-    'md',
-    'lg',
-    'xl',
-  ]),
+  size: FeatureFlags.enabled('enable-v11-release')
+    ? PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl'])
+    : PropTypes.oneOf([
+        'compact',
+        'short',
+        'normal',
+        'tall',
+        'xs',
+        'sm',
+        'md',
+        'lg',
+        'xl',
+      ]),
 
   /**
    * `false` If true, will keep the header sticky (only data rows will scroll)

packages/react/src/components/DataTable/TableToolbar.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import * as FeatureFlags from '@carbon/feature-flags';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -36,10 +37,11 @@ TableToolbar.propTypes = {
   children: PropTypes.node,
 
   /**
-   * `normal` Change the row height of table
-   * V11: remove small, normal
+   * `lg` Change the row height of table
    */
-  size: PropTypes.oneOf(['small', 'sm', 'normal', 'lg']),
+  size: FeatureFlags.enabled('enable-v11-release')
+    ? PropTypes.oneOf(['sm', 'lg'])
+    : PropTypes.oneOf(['small', 'sm', 'normal', 'lg']),
 };
 
 TableToolbar.defaultProps = {