@splunk/react-ui 4.1.0 → 4.4.1

package/CollapsiblePanel.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 155);
+/******/ 	return __webpack_require__(__webpack_require__.s = 143);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -115,7 +115,7 @@ module.exports = require("@splunk/react-ui/Clickable");
 
 /***/ }),
 
-/***/ 155:
+/***/ 143:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -143,11 +143,11 @@ var i18n_ = __webpack_require__(5);
 var id_ = __webpack_require__(10);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/TransitionOpen"
-var TransitionOpen_ = __webpack_require__(44);
+var TransitionOpen_ = __webpack_require__(46);
 var TransitionOpen_default = /*#__PURE__*/__webpack_require__.n(TransitionOpen_);
 
 // EXTERNAL MODULE: ./src/icons/ChevronRight.tsx
-var ChevronRight = __webpack_require__(25);
+var ChevronRight = __webpack_require__(27);
 
 // EXTERNAL MODULE: external "styled-components"
 var external_styled_components_ = __webpack_require__(3);
@@ -570,14 +570,14 @@ module.exports = require("react");
 
 /***/ }),
 
-/***/ 25:
+/***/ 27:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChevronRight; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _splunk_react_icons_ChevronRight__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
+/* harmony import */ var _splunk_react_icons_ChevronRight__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
 /* harmony import */ var _splunk_react_icons_ChevronRight__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_splunk_react_icons_ChevronRight__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _ThemedIcon__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var _SVG__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
@@ -620,17 +620,17 @@ function ChevronRight(props) {
 
 /***/ }),
 
-/***/ 28:
+/***/ 3:
 /***/ (function(module, exports) {
 
-module.exports = require("@splunk/react-icons/ChevronRight");
+module.exports = require("styled-components");
 
 /***/ }),
 
-/***/ 3:
+/***/ 31:
 /***/ (function(module, exports) {
 
-module.exports = require("styled-components");
+module.exports = require("@splunk/react-icons/ChevronRight");
 
 /***/ }),
 
@@ -641,7 +641,7 @@ module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 44:
+/***/ 46:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/TransitionOpen");

package/Color.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 120);
+/******/ 	return __webpack_require__(__webpack_require__.s = 124);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -108,7 +108,7 @@ module.exports = require("@splunk/react-ui/Clickable");
 
 /***/ }),
 
-/***/ 120:
+/***/ 124:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -132,34 +132,34 @@ var external_prop_types_default = /*#__PURE__*/__webpack_require__.n(external_pr
 var external_lodash_ = __webpack_require__(4);
 
 // EXTERNAL MODULE: external "@splunk/themes/SplunkThemeProvider"
-var SplunkThemeProvider_ = __webpack_require__(72);
+var SplunkThemeProvider_ = __webpack_require__(74);
 var SplunkThemeProvider_default = /*#__PURE__*/__webpack_require__.n(SplunkThemeProvider_);
 
 // EXTERNAL MODULE: external "@splunk/ui-utils/i18n"
 var i18n_ = __webpack_require__(5);
 
 // EXTERNAL MODULE: external "@splunk/ui-utils/color"
-var color_ = __webpack_require__(30);
+var color_ = __webpack_require__(33);
 
 // EXTERNAL MODULE: external "@splunk/ui-utils/keyboard"
 var keyboard_ = __webpack_require__(9);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/Dropdown"
-var Dropdown_ = __webpack_require__(16);
+var Dropdown_ = __webpack_require__(19);
 var Dropdown_default = /*#__PURE__*/__webpack_require__.n(Dropdown_);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/Text"
-var Text_ = __webpack_require__(24);
+var Text_ = __webpack_require__(26);
 var Text_default = /*#__PURE__*/__webpack_require__.n(Text_);
 
 // EXTERNAL MODULE: external "@splunk/themes"
 var themes_ = __webpack_require__(0);
 
 // EXTERNAL MODULE: ./src/icons/Check.tsx
-var Check = __webpack_require__(45);
+var Check = __webpack_require__(47);
 
 // EXTERNAL MODULE: ./src/icons/ChevronDown.tsx
-var ChevronDown = __webpack_require__(54);
+var ChevronDown = __webpack_require__(56);
 
 // EXTERNAL MODULE: external "styled-components"
 var external_styled_components_ = __webpack_require__(3);
@@ -231,37 +231,12 @@ var StyledClickable = external_styled_components_default()(Clickable_default.a).
 });
 
 // CONCATENATED MODULE: ./src/Color/Swatch.tsx
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-
 
 
 
@@ -287,102 +262,51 @@ var propTypes = {
   /** @private */
   showSelected: external_prop_types_default.a.bool
 };
-var defaultProps = {
-  error: false
-};
-
-var Swatch_Swatch = /*#__PURE__*/function (_Component) {
-  _inherits(Swatch, _Component);
-
-  var _super = _createSuper(Swatch);
-
-  function Swatch() {
-    var _this;
-
-    _classCallCheck(this, Swatch);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "clickable", null);
-
-    _defineProperty(_assertThisInitialized(_this), "handleMount", function (c) {
-      _this.clickable = c;
-    });
-
-    return _this;
+var Swatch = /*#__PURE__*/external_react_default.a.forwardRef(function (_ref, ref) {
+  var append = _ref.append,
+      _ref$error = _ref.error,
+      error = _ref$error === void 0 ? false : _ref$error,
+      _onClick = _ref.onClick,
+      prepend = _ref.prepend,
+      value = _ref.value,
+      noBorder = _ref.noBorder,
+      showSelected = _ref.showSelected,
+      otherProps = _objectWithoutProperties(_ref, ["append", "error", "onClick", "prepend", "value", "noBorder", "showSelected"]);
+
+  var screenReaderValue = value === null || value === undefined ? Object(i18n_["_"])('No color') : value; // Only valid hexadecimal strings, 'transparent' and `null` are allowed for background colors
+  // Invalid values are converted to `undefined`
+
+  var $value = value;
+
+  if (!(typeof $value === 'string' && (Object(color_["isValidHexColor"])($value) || $value === 'transparent')) && $value !== null && $value !== undefined) {
+    $value = undefined;
   }
 
-  _createClass(Swatch, [{
-    key: "focus",
-    value: function focus() {
-      var _this$clickable;
-
-      (_this$clickable = this.clickable) === null || _this$clickable === void 0 ? void 0 : _this$clickable.focus();
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          append = _this$props.append,
-          error = _this$props.error,
-          onClick = _this$props.onClick,
-          prepend = _this$props.prepend,
-          value = _this$props.value,
-          noBorder = _this$props.noBorder,
-          showSelected = _this$props.showSelected,
-          otherProps = _objectWithoutProperties(_this$props, ["append", "error", "onClick", "prepend", "value", "noBorder", "showSelected"]);
-
-      var screenReaderValue = value === null || value === undefined ? Object(i18n_["_"])('No color') : value;
-
-      function handleClick(e) {
-        onClick === null || onClick === void 0 ? void 0 : onClick(e, {
-          value: value
-        });
-      } // Only valid hexadecimal strings, 'transparent' and `null` are allowed for background colors
-      // Invalid values are converted to `null`
-
-
-      var $value = value;
-
-      if (!(typeof $value === 'string' && (Object(color_["isValidHexColor"])($value) || $value === 'transparent')) && $value !== null && $value !== undefined) {
-        $value = null;
-      }
-
-      return /*#__PURE__*/external_react_default.a.createElement(StyledClickable, _extends({
-        onClick: handleClick,
-        ref: this.handleMount,
-        $value: $value,
-        $append: append,
-        $prepend: prepend,
-        $hasError: error,
-        $noBorder: noBorder,
-        $showSelected: showSelected,
-        "data-test": "swatch",
-        "data-test-value": value
-      }, otherProps), showSelected && /*#__PURE__*/external_react_default.a.createElement(Check["a" /* default */], {
-        role: "presentation",
-        style: {
-          color: '#d3d3d3'
-        },
-        screenReaderText: Object(i18n_["_"])('Selected')
-      }), /*#__PURE__*/external_react_default.a.createElement(ScreenReaderContent_default.a, null, screenReaderValue));
-    }
-  }]);
-
-  return Swatch;
-}(external_react_["Component"]);
-
-_defineProperty(Swatch_Swatch, "propTypes", propTypes);
-
-_defineProperty(Swatch_Swatch, "defaultProps", defaultProps);
-
-_defineProperty(Swatch_Swatch, Dropdown_["legacyRefMode"], true);
-
-/* harmony default export */ var Color_Swatch = (Swatch_Swatch);
+  return /*#__PURE__*/external_react_default.a.createElement(StyledClickable, _extends({
+    onClick: function onClick(e) {
+      return _onClick === null || _onClick === void 0 ? void 0 : _onClick(e, {
+        value: value
+      });
+    },
+    ref: ref,
+    $value: $value,
+    $append: append,
+    $prepend: prepend,
+    $hasError: error,
+    $noBorder: noBorder,
+    $showSelected: showSelected,
+    "data-test": "swatch",
+    "data-test-value": value
+  }, otherProps), showSelected && /*#__PURE__*/external_react_default.a.createElement(Check["a" /* default */], {
+    role: "presentation",
+    style: {
+      color: '#d3d3d3'
+    },
+    screenReaderText: Object(i18n_["_"])('Selected')
+  }), /*#__PURE__*/external_react_default.a.createElement(ScreenReaderContent_default.a, null, screenReaderValue));
+});
+Swatch.propTypes = propTypes;
+/* harmony default export */ var Color_Swatch = (Swatch);
 // CONCATENATED MODULE: ./src/Color/ColorStyles.ts
 
 
@@ -470,7 +394,7 @@ var StyledToggleSwatch = external_styled_components_default()(Color_Swatch).with
 }));
 
 // CONCATENATED MODULE: ./src/Color/Color.tsx
-function Color_typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { Color_typeof = function _typeof(obj) { return typeof obj; }; } else { Color_typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return Color_typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function Color_extends() { Color_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return Color_extends.apply(this, arguments); }
 
@@ -490,27 +414,27 @@ function Color_objectWithoutProperties(source, excluded) { if (source == null) r
 
 function Color_objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function Color_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function Color_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function Color_createClass(Constructor, protoProps, staticProps) { if (protoProps) Color_defineProperties(Constructor.prototype, protoProps); if (staticProps) Color_defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function Color_inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) Color_setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function Color_setPrototypeOf(o, p) { Color_setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return Color_setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function Color_createSuper(Derived) { var hasNativeReflectConstruct = Color_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = Color_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = Color_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return Color_possibleConstructorReturn(this, result); }; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function Color_possibleConstructorReturn(self, call) { if (call && (Color_typeof(call) === "object" || typeof call === "function")) { return call; } return Color_assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-function Color_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function Color_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
 
-function Color_getPrototypeOf(o) { Color_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return Color_getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-function Color_defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
 
@@ -548,7 +472,7 @@ var Color_propTypes = {
   splunkTheme: external_prop_types_default.a.object,
   value: external_prop_types_default.a.string
 };
-var Color_defaultProps = {
+var defaultProps = {
   append: false,
   disabled: false,
   error: false,
@@ -571,11 +495,11 @@ var Color_isValidHEX = function isValidHEX(value) {
 
 
 var Color_Color = /*#__PURE__*/function (_Component) {
-  Color_inherits(Color, _Component);
+  _inherits(Color, _Component);
 
-  var _super = Color_createSuper(Color);
+  var _super = _createSuper(Color);
 
-  Color_createClass(Color, null, [{
+  _createClass(Color, null, [{
     key: "hasNull",
     // @docs-props-type ColorPropsBase
     value: function hasNull(palette) {
@@ -595,19 +519,19 @@ var Color_Color = /*#__PURE__*/function (_Component) {
   function Color(props) {
     var _this;
 
-    Color_classCallCheck(this, Color);
+    _classCallCheck(this, Color);
 
     _this = _super.call(this, props);
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "focusSwatch", void 0);
+    _defineProperty(_assertThisInitialized(_this), "focusSwatch", void 0);
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "focusExpandButton", void 0);
+    _defineProperty(_assertThisInitialized(_this), "focusExpandButton", void 0);
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "controlledExternally", void 0);
+    _defineProperty(_assertThisInitialized(_this), "controlledExternally", void 0);
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "dropdown", null);
+    _defineProperty(_assertThisInitialized(_this), "dropdown", null);
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleSwatchClick", function (e, _ref) {
+    _defineProperty(_assertThisInitialized(_this), "handleSwatchClick", function (e, _ref) {
       var value = _ref.value;
       e.preventDefault();
       var _this$props = _this.props,
@@ -640,7 +564,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       _this.focus();
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handlePaletteExpand", function () {
+    _defineProperty(_assertThisInitialized(_this), "handlePaletteExpand", function () {
       _this.setState(function (state) {
         return {
           expanded: !state.expanded
@@ -648,7 +572,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       });
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleTextChange", function (e, _ref2) {
+    _defineProperty(_assertThisInitialized(_this), "handleTextChange", function (e, _ref2) {
       var value = _ref2.value;
 
       _this.setState({
@@ -656,7 +580,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       });
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleTextKeyDown", function (e) {
+    _defineProperty(_assertThisInitialized(_this), "handleTextKeyDown", function (e) {
       if (Object(keyboard_["keycode"])(e.nativeEvent) === 'enter') {
         e.preventDefault();
 
@@ -668,7 +592,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       }
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleButtonClick", function (e) {
+    _defineProperty(_assertThisInitialized(_this), "handleButtonClick", function (e) {
       e.preventDefault();
 
       _this.handleRequestClose({
@@ -678,7 +602,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       _this.focus();
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleRequestClose", function (_ref3) {
+    _defineProperty(_assertThisInitialized(_this), "handleRequestClose", function (_ref3) {
       var reason = _ref3.reason;
       var displayValue = _this.state.displayValue;
       var value = _this.state.value;
@@ -725,7 +649,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       }
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleRequestOpen", function () {
+    _defineProperty(_assertThisInitialized(_this), "handleRequestOpen", function () {
       var _this$props2 = _this.props,
           splunkTheme = _this$props2.splunkTheme,
           palette = _this$props2.palette;
@@ -759,7 +683,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       }
     });
 
-    Color_defineProperty(Color_assertThisInitialized(_this), "handleSystemColorPickerChange", Object(external_lodash_["debounce"])(function (value) {
+    _defineProperty(_assertThisInitialized(_this), "handleSystemColorPickerChange", Object(external_lodash_["debounce"])(function (value) {
       var prevValue = _this.getValue();
 
       var hasColorChanged = value !== prevValue;
@@ -813,13 +737,19 @@ var Color_Color = /*#__PURE__*/function (_Component) {
     return _this;
   }
 
-  Color_createClass(Color, [{
+  _createClass(Color, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       if (false) {}
 
       if (false) {}
     }
+  }, {
+    key: "showNull",
+    value: function showNull() {
+      var isPrisma = this.props.splunkTheme.family === 'prisma';
+      return Color.hasNull(this.props.palette) || isPrisma;
+    }
     /**
      * Standardizes the current value of the Color:
      * returns based on the input being controlled or uncontrolled
@@ -834,7 +764,16 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       };
 
       var sixDigitHex = Object(color_["expandShortHandHex"])(this.props.value);
-      return this.isControlled() ? formatValueForProp(sixDigitHex) : this.state.value;
+
+      if (this.props.value === null && !this.showNull()) {
+        return undefined;
+      }
+
+      if (this.isControlled()) {
+        return formatValueForProp(sixDigitHex);
+      }
+
+      return this.state.value;
     }
   }, {
     key: "submitValue",
@@ -895,7 +834,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       var displayValue = this.state.displayValue;
       var isPrisma = (splunkTheme === null || splunkTheme === void 0 ? void 0 : splunkTheme.family) === 'prisma';
       var showTransparent = Color.hasTransparent(this.props.palette) && Object(external_lodash_["toLower"])(displayValue) === 'transparent';
-      var showNull = (Color.hasNull(this.props.palette) || isPrisma) && Object(external_lodash_["toLower"])(displayValue) === 'n/a';
+      var showNullSwatch = this.showNull() && Object(external_lodash_["toLower"])(displayValue) === 'n/a';
       var inputSwatchValue = displayValue;
 
       if (!Object(external_lodash_["startsWith"])(displayValue, '#')) {
@@ -903,7 +842,7 @@ var Color_Color = /*#__PURE__*/function (_Component) {
       }
 
       inputSwatchValue = showTransparent ? 'transparent' : inputSwatchValue;
-      inputSwatchValue = showNull ? null : inputSwatchValue;
+      inputSwatchValue = showNullSwatch ? null : inputSwatchValue;
       return /*#__PURE__*/external_react_default.a.createElement(StyledInput, {
         $inDropdown: inDropdown
       }, /*#__PURE__*/external_react_default.a.createElement(Text_default.a, {
@@ -1105,9 +1044,9 @@ var Color_Color = /*#__PURE__*/function (_Component) {
   return Color;
 }(external_react_["Component"]);
 
-Color_defineProperty(Color_Color, "propTypes", Color_propTypes);
+_defineProperty(Color_Color, "propTypes", Color_propTypes);
 
-Color_defineProperty(Color_Color, "defaultProps", Color_defaultProps);
+_defineProperty(Color_Color, "defaultProps", defaultProps);
 
 var ColorWithTheme = Object(themes_["withSplunkTheme"])(Color_Color);
 ColorWithTheme.propTypes = Color_Color.propTypes;
@@ -1127,7 +1066,7 @@ module.exports = require("@splunk/react-ui/ScreenReaderContent");
 
 /***/ }),
 
-/***/ 16:
+/***/ 19:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/Dropdown");
@@ -1141,7 +1080,7 @@ module.exports = require("react");
 
 /***/ }),
 
-/***/ 24:
+/***/ 26:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/Text");
@@ -1155,7 +1094,7 @@ module.exports = require("styled-components");
 
 /***/ }),
 
-/***/ 30:
+/***/ 33:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/ui-utils/color");
@@ -1169,21 +1108,21 @@ module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 42:
+/***/ 44:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-icons/Check");
 
 /***/ }),
 
-/***/ 45:
+/***/ 47:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Check; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _splunk_react_icons_Check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42);
+/* harmony import */ var _splunk_react_icons_Check__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44);
 /* harmony import */ var _splunk_react_icons_Check__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_splunk_react_icons_Check__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _ThemedIcon__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var _SVG__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
@@ -1233,14 +1172,14 @@ module.exports = require("@splunk/ui-utils/i18n");
 
 /***/ }),
 
-/***/ 54:
+/***/ 56:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChevronDown; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _splunk_react_icons_ChevronDown__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55);
+/* harmony import */ var _splunk_react_icons_ChevronDown__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(57);
 /* harmony import */ var _splunk_react_icons_ChevronDown__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_splunk_react_icons_ChevronDown__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _ThemedIcon__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var _SVG__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
@@ -1283,7 +1222,7 @@ function ChevronDown(props) {
 
 /***/ }),
 
-/***/ 55:
+/***/ 57:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-icons/ChevronDown");
@@ -1433,7 +1372,7 @@ Icon.defaultProps = defaultProps;
 
 /***/ }),
 
-/***/ 72:
+/***/ 74:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/themes/SplunkThemeProvider");