Merge branch 'master' into chore/update-fs-extra-8.1.0

packages/bundler/package.json

@@ -28,7 +28,7 @@
     "autoprefixer": "^9.4.3",
     "babel-plugin-macros": "^2.4.2",
     "chalk": "^2.4.1",
-    "change-case": "^3.0.2",
+    "change-case": "^4.1.1",
     "cli-table": "^0.3.1",
     "commander": "^2.19.0",
     "cssnano": "^4.1.7",

packages/colors/package.json

@@ -35,7 +35,7 @@
     "@carbon/cli-reporter": "10.3.0",
     "@carbon/scss-generator": "^10.5.0",
     "@carbon/test-utils": "^10.6.0",
-    "change-case": "^3.0.2",
+    "change-case": "^4.1.1",
     "core-js": "^3.0.1",
     "fs-extra": "^8.1.0",
     "node-sass": "^4.11.0",

packages/components/Staticfile

@@ -1 +1,2 @@
 root: demo
+force_https: true

packages/components/docs/sass.md

@@ -6381,7 +6381,6 @@ $text-02: if(
   - [carbon--theme [mixin]](#carbon--theme-mixin)
   - [content-switcher [mixin]](#content-switcher-mixin)
   - [data-table-core [mixin]](#data-table-core-mixin)
-  - [date-picker [mixin]](#date-picker-mixin)
   - [dropdown [mixin]](#dropdown-mixin)
   - [file-uploader [mixin]](#file-uploader-mixin)
   - [form [mixin]](#form-mixin)
@@ -16164,9 +16163,9 @@ Date picker styles
     }
   }
 
-  .#{$prefix}--date-picker__days .nextMonthDay,
-  .#{$prefix}--date-picker__days .prevMonthDay {
-    color: $text-02;
+  .#{$prefix}--date-picker__day.nextMonthDay,
+  .#{$prefix}--date-picker__day.prevMonthDay {
+    color: $text-05;
   }
 
   .#{$prefix}--date-picker__day.today,
@@ -16200,11 +16199,10 @@ Date picker styles
     }
   }
 
-  .#{$prefix}--date-picker__day.disabled,
-  .flatpickr-day.disabled {
+  .#{$prefix}--date-picker__day.flatpickr-day.flatpickr-disabled {
     cursor: not-allowed;
     opacity: 0.5;
-    color: $ui-05;
+    color: $disabled-02;
 
     &:hover {
       background: transparent;
@@ -16358,9 +16356,8 @@ Date picker styles
   - [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
   - [interactive-01 [variable]](#interactive-01-variable)
   - [hover-ui [variable]](#hover-ui-variable)
-  - [text-02 [variable]](#text-02-variable)
-  - [ui-05 [variable]](#ui-05-variable)
   - [text-04 [variable]](#text-04-variable)
+  - [ui-05 [variable]](#ui-05-variable)
 
 ## dropdown
 

packages/components/src/components/date-picker/_date-picker.scss

@@ -316,9 +316,9 @@
     }
   }
 
-  .#{$prefix}--date-picker__days .nextMonthDay,
-  .#{$prefix}--date-picker__days .prevMonthDay {
-    color: $text-02;
+  .#{$prefix}--date-picker__day.nextMonthDay,
+  .#{$prefix}--date-picker__day.prevMonthDay {
+    color: $text-05;
   }
 
   .#{$prefix}--date-picker__day.today,
@@ -352,11 +352,10 @@
     }
   }
 
-  .#{$prefix}--date-picker__day.disabled,
-  .flatpickr-day.disabled {
+  .#{$prefix}--date-picker__day.flatpickr-day.flatpickr-disabled {
     cursor: not-allowed;
     opacity: 0.5;
-    color: $ui-05;
+    color: $disabled-02;
 
     &:hover {
       background: transparent;

packages/icon-build-helpers/package.json

@@ -23,7 +23,7 @@
     "@carbon/cli-reporter": "10.3.0",
     "@carbon/icon-helpers": "^10.5.0",
     "browserslist-config-carbon": "10.4.0",
-    "change-case": "^3.0.2",
+    "change-case": "^4.1.1",
     "core-js": "^3.1.3",
     "fs-extra": "^8.1.0",
     "joi": "^14.3.1",

packages/icon-build-helpers/src/builders/react/builder.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const { camel } = require('change-case');
+const { camelCase } = require('change-case');
 const { reporter } = require('@carbon/cli-reporter');
 const fs = require('fs-extra');
 const path = require('path');
@@ -269,7 +269,7 @@ function shouldTransformAttribute(attribute) {
 function formatAttributes(attrs) {
   return Object.keys(attrs).reduce((acc, key, index) => {
     const attribute = shouldTransformAttribute(key)
-      ? `${camel(key)}="${attrs[key]}"`
+      ? `${camelCase(key)}="${attrs[key]}"`
       : `${key}="${attrs[key]}"`;
 
     if (index === 0) {

packages/icon-build-helpers/src/builders/vanilla/builder.js

@@ -8,7 +8,7 @@
 'use strict';
 
 const { reporter } = require('@carbon/cli-reporter');
-const { pascal } = require('change-case');
+const { pascalCase } = require('change-case');
 const fs = require('fs-extra');
 const path = require('path');
 const prettier = require('prettier');
@@ -211,7 +211,7 @@ function getModuleName(name, size, prefixParts, descriptor) {
   const height = parseInt(descriptor.attrs.height, 10);
   let prefix = prefixParts
     .filter(size => isNaN(size))
-    .map(pascal)
+    .map(pascalCase)
     .join('');
   const isGlyph = width < 16 || height < 16;
 
@@ -221,25 +221,25 @@ function getModuleName(name, size, prefixParts, descriptor) {
     }
     if (!size) {
       if (isGlyph) {
-        return prefix + pascal(name) + 'Glyph';
+        return prefix + pascalCase(name) + 'Glyph';
       }
-      return prefix + pascal(name);
+      return prefix + pascalCase(name);
     }
-    return prefix + pascal(name) + size;
+    return prefix + pascalCase(name) + size;
   }
 
   if (!size) {
     if (isGlyph) {
-      return pascal(name) + 'Glyph';
+      return pascalCase(name) + 'Glyph';
     }
-    return pascal(name);
+    return pascalCase(name);
   }
 
   if (isNaN(name[0])) {
-    return pascal(name) + size;
+    return pascalCase(name) + size;
   }
 
-  return '_' + pascal(name) + size;
+  return '_' + pascalCase(name) + size;
 }
 
 function createIconSource(file, descriptor) {

packages/icons-angular/package.json

@@ -40,7 +40,7 @@
     "@angular/core": "6.1.10",
     "@carbon/cli-reporter": "10.3.0",
     "@carbon/icons": "^10.8.0",
-    "change-case": "3.0.2",
+    "change-case": "4.1.1",
     "fs-extra": "8.1.0",
     "rollup": "^0.66.6",
     "typescript": "2.9.2"

packages/react/Staticfile

@@ -1 +1,2 @@
 root: storybook-static
+force_https: true

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

@@ -51,6 +51,7 @@ const TableHeader = React.forwardRef(function TableHeader(
   {
     className: headerClassName,
     children,
+    colSpan,
     isSortable,
     isSortHeader,
     onClick,
@@ -63,7 +64,7 @@ const TableHeader = React.forwardRef(function TableHeader(
 ) {
   if (!isSortable) {
     return (
-      <th {...rest} className={headerClassName} scope={scope}>
+      <th {...rest} className={headerClassName} scope={scope} colSpan={colSpan}>
         <span className={`${prefix}--table-header-label`}>{children}</span>
       </th>
     );
@@ -80,10 +81,11 @@ const TableHeader = React.forwardRef(function TableHeader(
 
   return (
     <th
-      scope={scope}
-      className={headerClassName}
       aria-sort={ariaSort}
-      ref={ref}>
+      className={headerClassName}
+      colSpan={colSpan}
+      ref={ref}
+      scope={scope}>
       <button className={className} onClick={onClick} {...rest}>
         <span className={`${prefix}--table-header-label`}>{children}</span>
         <Arrow
@@ -120,6 +122,12 @@ TableHeader.propTypes = {
    */
   children: PropTypes.node,
 
+  /**
+   * Specify `colSpan` as a non-negative integer value to indicate how
+   * many columns the TableHeader cell extends in a table
+   */
+  colSpan: PropTypes.number,
+
   /**
    * Specify whether this header is one through which a user can sort the table
    */

packages/themes/package.json

@@ -32,7 +32,7 @@
     "@carbon/cli-reporter": "10.3.0",
     "@carbon/scss-generator": "^10.5.0",
     "@carbon/test-utils": "^10.6.0",
-    "change-case": "^3.1.0",
+    "change-case": "^4.1.1",
     "core-js": "^3.0.1",
     "fs-extra": "^8.1.0",
     "js-yaml": "^3.13.0",

packages/type/package.json

@@ -38,7 +38,7 @@
   "devDependencies": {
     "@carbon/bundler": "^10.5.0",
     "@carbon/test-utils": "^10.6.0",
-    "change-case": "^3.1.0",
+    "change-case": "^4.1.1",
     "rimraf": "^3.0.0"
   },
   "eyeglass": {

packages/upgrade/package.json

@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "chalk": "^2.4.2",
-    "change-case": "^3.1.0",
+    "change-case": "^4.1.1",
     "cross-spawn": "^6.0.5",
     "fast-glob": "^2.2.6",
     "fs-extra": "^8.1.0",

packages/upgrade/src/migrations/carbon-icons-react/10.3.0/update-icon-import-path.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const { pascal } = require('change-case');
+const { pascalCase } = require('change-case');
 
 /**
  * This transform upgrades the import path that teams may be using for icons
@@ -164,23 +164,23 @@ module.exports = (file, api) => {
 function getModuleName(name, size, prefixParts) {
   const prefix = prefixParts
     .filter(size => isNaN(size))
-    .map(pascal)
+    .map(pascalCase)
     .join('');
 
   if (prefix !== '') {
     if (!size) {
-      return prefix + pascal(name) + 'Glyph';
+      return prefix + pascalCase(name) + 'Glyph';
     }
-    return prefix + pascal(name) + size;
+    return prefix + pascalCase(name) + size;
   }
 
   if (!size) {
-    return pascal(name) + 'Glyph';
+    return pascalCase(name) + 'Glyph';
   }
 
   if (isNaN(name[0])) {
-    return pascal(name) + size;
+    return pascalCase(name) + size;
   }
 
-  return '_' + pascal(name) + size;
+  return '_' + pascalCase(name) + size;
 }