@carbon/ibm-products 1.24.0 → 2.0.0-rc.0

package/lib/components/EmptyStates/EmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../global/js/utils/devtools");
 
@@ -83,10 +83,10 @@ EmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -112,7 +112,7 @@ EmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/EmptyStateContent.js

@@ -19,7 +19,7 @@ var _settings = require("../../settings");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -39,12 +39,13 @@ var EmptyStateContent = function EmptyStateContent(_ref) {
     className: (0, _classnames.default)("".concat(blockClass, "__header"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__header--small"), size === 'sm'))
   }, title), subtitle && /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _classnames.default)("".concat(blockClass, "__subtitle"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__subtitle--small"), size === 'sm'))
-  }, subtitle), (action === null || action === void 0 ? void 0 : action.text) && (action === null || action === void 0 ? void 0 : action.onClick) && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, (0, _extends2.default)({}, action, {
+  }, subtitle), (action === null || action === void 0 ? void 0 : action.text) && (action === null || action === void 0 ? void 0 : action.onClick) && /*#__PURE__*/_react.default.createElement(_react2.Button, (0, _extends2.default)({}, action, {
     className: "".concat(blockClass, "__action-button"),
     kind: action.kind || 'tertiary',
     onClick: action.onClick,
-    renderIcon: action.renderIcon || null
-  }), action.text), (link === null || link === void 0 ? void 0 : link.text) && (link === null || link === void 0 ? void 0 : link.href) && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Link, (0, _extends2.default)({}, link, {
+    renderIcon: action.renderIcon || null,
+    size: 'sm'
+  }), action.text), (link === null || link === void 0 ? void 0 : link.text) && (link === null || link === void 0 ? void 0 : link.href) && /*#__PURE__*/_react.default.createElement(_react2.Link, (0, _extends2.default)({}, link, {
     className: "".concat(blockClass, "__link"),
     href: link.href
   }), link.text));
@@ -61,18 +62,18 @@ EmptyStateContent.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     iconDescription: _propTypes.default.string,
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/ErrorEmptyState/ErrorEmptyState.js

@@ -17,7 +17,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -79,10 +79,10 @@ ErrorEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ ErrorEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/NoDataEmptyState/NoDataEmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../../global/js/utils/devtools");
 
@@ -79,10 +79,10 @@ NoDataEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ NoDataEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/NoTagsEmptyState/NoTagsEmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../../global/js/utils/devtools");
 
@@ -79,10 +79,10 @@ NoTagsEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ NoTagsEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/NotFoundEmptyState/NotFoundEmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../../global/js/utils/devtools");
 
@@ -79,10 +79,10 @@ NotFoundEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ NotFoundEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/NotificationsEmptyState/NotificationsEmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../../global/js/utils/devtools");
 
@@ -79,10 +79,10 @@ NotificationsEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ NotificationsEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/EmptyStates/UnauthorizedEmptyState/UnauthorizedEmptyState.js

@@ -19,7 +19,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _devtools = require("../../../global/js/utils/devtools");
 
@@ -79,10 +79,10 @@ UnauthorizedEmptyState.propTypes = {
   /**
    * Empty state action button
    */
-  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
+  action: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Button.propTypes), {}, {
     kind: _propTypes.default.oneOf(['primary', 'secondary', 'tertiary']),
     renderIcon: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    onClick: _carbonComponentsReact.Button.propTypes.onClick,
+    onClick: _react2.Button.propTypes.onClick,
     text: _propTypes.default.string
   })),
 
@@ -102,7 +102,7 @@ UnauthorizedEmptyState.propTypes = {
   /**
    * Empty state link object
    */
-  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  link: _propTypes.default.shape(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     text: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
     href: _propTypes.default.string
   })),

package/lib/components/ExampleComponent/ExampleComponent.js

@@ -21,7 +21,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _settings = require("../../settings");
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _excluded = ["borderColor", "boxedBorder", "className", "disabled", "onPrimaryClick", "onSecondaryClick", "primaryButtonLabel", "primaryKind", "secondaryButtonLabel", "secondaryKind", "size", "style"];
 
@@ -37,7 +37,7 @@ var componentName = 'ExampleComponent'; // NOTE: the component SCSS is not impor
 var defaults = {
   primaryKind: 'primary',
   secondaryKind: 'secondary',
-  size: 'default'
+  size: 'lg'
 };
 /**
  * This is an example component to show relevant conventions and usage.
@@ -74,20 +74,20 @@ var ExampleComponent = /*#__PURE__*/_react.default.forwardRef(function (_ref, re
     }
   };
 
-  return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ButtonSet, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_react2.ButtonSet, (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, // Apply the block class to the main HTML element
     className, // Apply any supplied class names to the main HTML element.
     "".concat(blockClass, "--").concat(size), modeClass),
     ref: ref,
     role: "main",
     style: _objectSpread(_objectSpread({}, style), {}, (0, _defineProperty2.default)({}, "--".concat(blockClass, "--border-color"), borderColor))
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     className: "".concat(blockClass, "__secondary-button"),
     kind: secondaryKind,
     onClick: handleSecondaryClick,
     disabled: disabled,
     size: size
-  }, secondaryButtonLabel), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }, secondaryButtonLabel), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     className: "".concat(blockClass, "__primary-button"),
     kind: primaryKind,
     onClick: handlePrimaryClick,
@@ -157,9 +157,9 @@ ExampleComponent.propTypes = {
   secondaryKind: _propTypes.default.oneOf(['secondary', 'tertiary']),
 
   /**
-   * The size for the buttons ('default', 'small' or 'field').
+   * The size for the buttons
    */
-  size: _propTypes.default.oneOf(['default', 'small', 'field']),
+  size: _propTypes.default.oneOf(['sm', 'md', 'lg', 'xl', '2xl']),
 
   /**
    * Optional style settings for the containing node.

package/lib/components/ExportModal/ExportModal.js

@@ -19,7 +19,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -150,7 +150,7 @@ var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     invalidText: invalidInputText,
     onBlur: onBlurHandler
   }, 'data-modal-primary-focus', true);
-  return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ComposedModal, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_react2.ComposedModal, (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className),
     "aria-label": title,
     size: "sm",
@@ -159,22 +159,23 @@ var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     open: open,
     ref: ref,
     onClose: onClose
-  }, (0, _devtools.getDevtoolsProps)(componentName))), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalHeader, {
+  }, (0, _devtools.getDevtoolsProps)(componentName))), /*#__PURE__*/_react.default.createElement(_react2.ModalHeader, {
     className: "".concat(blockClass, "__header"),
+    closeModal: onClose,
     title: title
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalBody, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.ModalBody, {
     className: "".concat(blockClass, "__body-container")
   }, !submitted && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, body && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__body")
-  }, body), preformattedExtensions.length ? /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FormGroup, {
+  }, body), preformattedExtensions.length ? /*#__PURE__*/_react.default.createElement(_react2.FormGroup, {
     legendText: preformattedExtensionsLabel
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButtonGroup, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.RadioButtonGroup, {
     orientation: "vertical",
     onChange: onExtensionChangeHandler,
     valueSelected: extension,
     name: "extensions"
   }, preformattedExtensions.map(function (o) {
-    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.RadioButton, {
+    return /*#__PURE__*/_react.default.createElement(_react2.RadioButton, {
       key: o.extension,
       id: o.extension,
       value: o.extension,
@@ -183,26 +184,28 @@ var ExportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     });
   }))) : /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__input-container")
-  }, inputType === 'text' ? /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, commonInputProps) : /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.PasswordInput, (0, _extends2.default)({}, commonInputProps, {
+  }, inputType === 'text' ? /*#__PURE__*/_react.default.createElement(_react2.TextInput, commonInputProps) : /*#__PURE__*/_react.default.createElement(_react2.PasswordInput, (0, _extends2.default)({}, commonInputProps, {
     showPasswordLabel: showPasswordLabel,
     hidePasswordLabel: hidePasswordLabel,
     tooltipPosition: "left"
   })))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__messaging")
-  }, loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Loading, {
+  }, loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_react2.Loading, {
     small: true,
     withOverlay: false
-  }), /*#__PURE__*/_react.default.createElement("p", null, loadingMessage)), successful && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.CheckmarkFilled16, {
+  }), /*#__PURE__*/_react.default.createElement("p", null, loadingMessage)), successful && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.CheckmarkFilled, {
+    size: 16,
     className: "".concat(blockClass, "__checkmark-icon")
-  }), /*#__PURE__*/_react.default.createElement("p", null, successMessage)), error && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ErrorFilled16, {
+  }), /*#__PURE__*/_react.default.createElement("p", null, successMessage)), error && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_iconsReact.ErrorFilled, {
+    size: 16,
     className: "".concat(blockClass, "__error-icon")
-  }), /*#__PURE__*/_react.default.createElement("p", null, errorMessage)))), !submitted && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalFooter, {
+  }), /*#__PURE__*/_react.default.createElement("p", null, errorMessage)))), !submitted && /*#__PURE__*/_react.default.createElement(_react2.ModalFooter, {
     className: "".concat(blockClass, "__footer")
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.Button, {
     type: "button",
     kind: "secondary",
     onClick: onClose
-  }, secondaryButtonText), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }, secondaryButtonText), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     type: "submit",
     kind: "primary",
     onClick: onSubmitHandler,

package/lib/components/ExpressiveCard/ExpressiveCard.js

@@ -104,7 +104,7 @@ ExpressiveCard.propTypes = {
   /**
    * Provides the icon that's displayed at the top of the card
    */
-  pictogram: _propTypes.default.object,
+  pictogram: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
 
   /**
    * Optionally specify an href for your Button to become an <a> element

package/lib/components/HTTPErrors/HTTPErrorContent.js

@@ -17,7 +17,7 @@ var _propTypes = require("prop-types");
 
 var _settings = require("../../settings");
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -41,7 +41,7 @@ var HTTPErrorContent = function HTTPErrorContent(_ref) {
   }, title), description && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__description")
   }, description), links && links.length && links.map(function (link) {
-    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Link, (0, _extends2.default)({}, link, {
+    return /*#__PURE__*/_react.default.createElement(_react2.Link, (0, _extends2.default)({}, link, {
       role: "link",
       href: link.href,
       key: link.text,
@@ -71,7 +71,7 @@ HTTPErrorContent.propTypes = {
   /**
    * Links that will display for extra context when receiving particular errors
    */
-  links: (0, _propTypes.arrayOf)((0, _propTypes.shape)(_objectSpread(_objectSpread({}, _carbonComponentsReact.Link.propTypes), {}, {
+  links: (0, _propTypes.arrayOf)((0, _propTypes.shape)(_objectSpread(_objectSpread({}, _react2.Link.propTypes), {}, {
     /**
      * The text to display for the link
      */

package/lib/components/ImportModal/ImportModal.js

@@ -25,7 +25,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _iconsReact = require("@carbon/icons-react");
+
+var _react2 = require("@carbon/react");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -37,7 +39,7 @@ var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
 var _settings = require("../../settings");
 
-var _excluded = ["accept", "className", "defaultErrorBody", "defaultErrorHeader", "description", "fetchErrorBody", "fetchErrorHeader", "fileDropHeader", "fileDropLabel", "fileUploadLabel", "inputButtonText", "inputId", "inputLabel", "inputPlaceholder", "invalidFileTypeErrorBody", "invalidFileTypeErrorHeader", "invalidIconDescription", "maxFileSize", "maxFileSizeErrorBody", "maxFileSizeErrorHeader", "onClose", "onRequestSubmit", "open", "primaryButtonText", "secondaryButtonText", "title"];
+var _excluded = ["accept", "className", "defaultErrorBody", "defaultErrorHeader", "description", "fetchErrorBody", "fetchErrorHeader", "fileDropHeader", "fileDropLabel", "fileUploadLabel", "inputButtonIcon", "inputButtonText", "inputId", "inputLabel", "inputPlaceholder", "invalidFileTypeErrorBody", "invalidFileTypeErrorHeader", "invalidIconDescription", "maxFileSize", "maxFileSizeErrorBody", "maxFileSizeErrorHeader", "onClose", "onRequestSubmit", "open", "primaryButtonText", "secondaryButtonText", "title"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -64,6 +66,7 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       fileDropHeader = _ref.fileDropHeader,
       fileDropLabel = _ref.fileDropLabel,
       fileUploadLabel = _ref.fileUploadLabel,
+      inputButtonIcon = _ref.inputButtonIcon,
       inputButtonText = _ref.inputButtonText,
       inputId = _ref.inputId,
       inputLabel = _ref.inputLabel,
@@ -81,6 +84,7 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       secondaryButtonText = _ref.secondaryButtonText,
       title = _ref.title,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var carbonPrefix = (0, _react2.usePrefix)();
 
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -233,7 +237,7 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var importButtonDisabled = !importUrl || hasFiles;
   var fileStatusString = "".concat(numberOfValidFiles, " / ").concat(numberOfFiles, " ").concat(fileUploadLabel);
   var blockClass = "".concat(_settings.pkg.prefix, "--import-modal");
-  return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ComposedModal, (0, _extends2.default)({}, rest, _objectSpread({
+  return /*#__PURE__*/_react.default.createElement(_react2.ComposedModal, (0, _extends2.default)({}, rest, _objectSpread({
     open: open,
     ref: ref,
     onClose: onClose
@@ -242,16 +246,16 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     className: (0, _classnames.default)(blockClass, className),
     size: "sm",
     preventCloseOnClickOutside: true
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalHeader, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.ModalHeader, {
     className: "".concat(blockClass, "__header"),
     title: title
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalBody, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.ModalBody, {
     className: "".concat(blockClass, "__body-container")
   }, description && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__body")
   }, description), fileDropHeader && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__file-drop-header")
-  }, fileDropHeader), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FileUploaderDropContainer, {
+  }, fileDropHeader), /*#__PURE__*/_react.default.createElement(_react2.FileUploaderDropContainer, {
     accept: accept,
     labelText: fileDropLabel,
     onAddFiles: onAddFile,
@@ -261,7 +265,7 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     className: "".concat(blockClass, "__label")
   }, inputLabel), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__input-group")
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.TextInput, {
     labelText: "",
     id: inputId,
     onChange: inputHandler,
@@ -269,24 +273,29 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     value: importUrl,
     disabled: hasFiles,
     "aria-label": inputLabel
-  }), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     onClick: fetchFile,
     className: "".concat(blockClass, "__import-button"),
     size: "sm",
-    disabled: importButtonDisabled
+    disabled: importButtonDisabled,
+    renderIcon: inputButtonIcon ? function (props) {
+      return /*#__PURE__*/_react.default.createElement(_iconsReact.Add, (0, _extends2.default)({
+        size: 20
+      }, props));
+    } : null
   }, inputButtonText)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(_settings.carbon.prefix, "--file-container ").concat(blockClass, "__file-container")
+    className: "".concat(carbonPrefix, "--file-container ").concat(blockClass, "__file-container")
   }, hasFiles && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__helper-text")
   }, fileStatusString), files.map(function (file) {
-    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.FileUploaderItem, {
+    return /*#__PURE__*/_react.default.createElement(_react2.FileUploaderItem, {
       key: file.uuid,
       onDelete: function onDelete() {
         return onRemoveFile(file.uuid);
       },
       name: file.name,
       status: file.status,
-      size: "default",
+      size: "lg",
       uuid: file.uuid,
       iconDescription: file.iconDescription,
       invalid: file.invalid,
@@ -296,13 +305,13 @@ var ImportModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       /* cspell:disable-line */
 
     });
-  }))), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ModalFooter, {
+  }))), /*#__PURE__*/_react.default.createElement(_react2.ModalFooter, {
     className: "".concat(blockClass, "__footer")
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.Button, {
     type: "button",
     kind: "secondary",
     onClick: onClose
-  }, secondaryButtonText), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+  }, secondaryButtonText), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     type: "submit",
     kind: "primary",
     onClick: onSubmitHandler,
@@ -363,6 +372,11 @@ ImportModal.propTypes = {
    */
   fileUploadLabel: _propTypes.default.string,
 
+  /**
+   * Button icon for import by url button
+   */
+  inputButtonIcon: _propTypes.default.bool,
+
   /**
    * Button text for import by url button
    */