@carbon/ibm-products 2.0.0-rc.12 → 2.0.0-rc.14

package/es/components/ButtonMenu/ButtonMenu.js

@@ -54,6 +54,7 @@ export var ButtonMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     ),
     ariaLabel: menuAriaLabel,
     menuOptionsClass: cx("".concat(blockClass, "__options"), menuOptionsClass),
+    size: size,
     renderIcon: function renderIcon() {
       return /*#__PURE__*/React.createElement("div", {
         className: cx(["".concat(blockClass, "__trigger"), "".concat(carbonPrefix, "--btn"), "".concat(carbonPrefix, "--btn--").concat(kind), "".concat(carbonPrefix, "--btn--").concat(size)])
@@ -120,8 +121,8 @@ ButtonMenu.propTypes = {
   renderIcon: Button.propTypes.renderIcon,
 
   /**
-   * The size of the button for the menu trigger. The values can be any valid
-   * value for the carbon Button component 'size' prop.
+   * The size of the button for the menu trigger.
+   * The menu button supports: sm, md, lg
    */
-  size: Button.propTypes.size
+  size: PropTypes.oneOf(['sm', 'md', 'lg'])
 };

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -421,20 +421,24 @@ export var InlineEditCell = function InlineEditCell(_ref) {
   };
 
   var buildDate = function buildDate(value) {
+    var _config$inputProps2;
+
+    var dateFormat = config === null || config === void 0 ? void 0 : (_config$inputProps2 = config.inputProps) === null || _config$inputProps2 === void 0 ? void 0 : _config$inputProps2.dateFormat;
+
     if (value instanceof Date) {
-      var _config$dateFormat = config.dateFormat,
-          dateFormat = _config$dateFormat === void 0 ? 'm/d/Y' : _config$dateFormat;
       var maskedFullYear = value.getFullYear();
       var maskedMonth = padTo2Digits(value.getMonth() + 1);
       var maskedDay = padTo2Digits(value.getDate());
 
-      if (dateFormat === 'm/d/Y' || dateFormat === 'm/d/y') {
+      if (dateFormat === 'm/d/Y' || value === 'm/d/y') {
         return [maskedMonth, maskedDay, maskedFullYear].join('/');
       }
 
-      if (dateFormat === 'd/m/Y' || dateFormat === 'd/m/y') {
+      if (dateFormat === 'd/m/Y' || dateFormat === 'd/m/y' || dateFormat === undefined) {
         return [maskedDay, maskedMonth, maskedFullYear].join('/');
       }
+    } else {
+      return value;
     }
 
     return null;

package/es/components/Datagrid/utils/getInlineEditColumns.js

@@ -108,6 +108,7 @@ export var getInlineEditColumns = function getInlineEditColumns() {
         onChange: function onChange(newDateObj, cell) {
           console.log(newDateObj, cell);
         },
+        dateFormat: 'd/m/Y',
         // optionally pass props here to be passed through to Carbon's DatePickerInput component
         datePickerInputProps: {
           labelText: 'Change active since date'

package/es/components/Datagrid/utils/makeData.js

@@ -179,7 +179,7 @@ var newPerson = function newPerson() {
       numbers: 0
     }),
     chartType: initialChartTypeIndex === 0 ? inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? inlineEditSelectItems[1] : inlineEditSelectItems[2],
-    activeSince: activeChance > 0.66 ? activeSinceDate : activeChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
+    activeSince: activeChance > 0.66 ? activeSinceDate : activeChance > 0.33 ? yesterdayDate : '23/05/2020',
     bonus: "$\r".concat(getRandomInteger(100, 500, 2)),
     passwordStrength: getPasswordStrength(),
     doc_link: renderDocLink()

package/lib/components/ButtonMenu/ButtonMenu.js

@@ -59,6 +59,7 @@ var ButtonMenu = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     ),
     ariaLabel: menuAriaLabel,
     menuOptionsClass: (0, _classnames.default)("".concat(blockClass, "__options"), menuOptionsClass),
+    size: size,
     renderIcon: function renderIcon() {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(["".concat(blockClass, "__trigger"), "".concat(carbonPrefix, "--btn"), "".concat(carbonPrefix, "--btn--").concat(kind), "".concat(carbonPrefix, "--btn--").concat(size)])
@@ -127,8 +128,8 @@ ButtonMenu.propTypes = {
   renderIcon: _react2.Button.propTypes.renderIcon,
 
   /**
-   * The size of the button for the menu trigger. The values can be any valid
-   * value for the carbon Button component 'size' prop.
+   * The size of the button for the menu trigger.
+   * The menu button supports: sm, md, lg
    */
-  size: _react2.Button.propTypes.size
+  size: _propTypes.default.oneOf(['sm', 'md', 'lg'])
 };

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -444,20 +444,24 @@ var InlineEditCell = function InlineEditCell(_ref) {
   };
 
   var buildDate = function buildDate(value) {
+    var _config$inputProps2;
+
+    var dateFormat = config === null || config === void 0 ? void 0 : (_config$inputProps2 = config.inputProps) === null || _config$inputProps2 === void 0 ? void 0 : _config$inputProps2.dateFormat;
+
     if (value instanceof Date) {
-      var _config$dateFormat = config.dateFormat,
-          dateFormat = _config$dateFormat === void 0 ? 'm/d/Y' : _config$dateFormat;
       var maskedFullYear = value.getFullYear();
       var maskedMonth = padTo2Digits(value.getMonth() + 1);
       var maskedDay = padTo2Digits(value.getDate());
 
-      if (dateFormat === 'm/d/Y' || dateFormat === 'm/d/y') {
+      if (dateFormat === 'm/d/Y' || value === 'm/d/y') {
         return [maskedMonth, maskedDay, maskedFullYear].join('/');
       }
 
-      if (dateFormat === 'd/m/Y' || dateFormat === 'd/m/y') {
+      if (dateFormat === 'd/m/Y' || dateFormat === 'd/m/y' || dateFormat === undefined) {
         return [maskedDay, maskedMonth, maskedFullYear].join('/');
       }
+    } else {
+      return value;
     }
 
     return null;

package/lib/components/Datagrid/utils/getInlineEditColumns.js

@@ -121,6 +121,7 @@ var getInlineEditColumns = function getInlineEditColumns() {
         onChange: function onChange(newDateObj, cell) {
           console.log(newDateObj, cell);
         },
+        dateFormat: 'd/m/Y',
         // optionally pass props here to be passed through to Carbon's DatePickerInput component
         datePickerInputProps: {
           labelText: 'Change active since date'

package/lib/components/Datagrid/utils/makeData.js

@@ -190,7 +190,7 @@ var newPerson = function newPerson() {
       numbers: 0
     }),
     chartType: initialChartTypeIndex === 0 ? _getInlineEditColumns.inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? _getInlineEditColumns.inlineEditSelectItems[1] : _getInlineEditColumns.inlineEditSelectItems[2],
-    activeSince: activeChance > 0.66 ? activeSinceDate : activeChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
+    activeSince: activeChance > 0.66 ? activeSinceDate : activeChance > 0.33 ? yesterdayDate : '23/05/2020',
     bonus: "$\r".concat(getRandomInteger(100, 500, 2)),
     passwordStrength: getPasswordStrength(),
     doc_link: renderDocLink()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.12",
+  "version": "2.0.0-rc.14",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -94,5 +94,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "feb17ff087be1ed1174b0e0cfa44dd1f991e2881"
+  "gitHead": "841dab2f0145b838bd5b3691dbb58cda52c986b6"
 }