@splunk/react-ui 4.4.1 → 4.5.2

package/RadioBar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 126);
+/******/ 	return __webpack_require__(__webpack_require__.s = 123);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,14 +101,14 @@ module.exports = require("prop-types");
 
 /***/ }),
 
-/***/ 11:
+/***/ 12:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/Clickable");
 
 /***/ }),
 
-/***/ 126:
+/***/ 123:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -133,12 +133,12 @@ var external_lodash_ = __webpack_require__(4);
 // EXTERNAL MODULE: external "@splunk/themes"
 var themes_ = __webpack_require__(0);
 
-// EXTERNAL MODULE: external "@splunk/react-ui/ButtonGroup"
-var ButtonGroup_ = __webpack_require__(91);
-var ButtonGroup_default = /*#__PURE__*/__webpack_require__.n(ButtonGroup_);
+// EXTERNAL MODULE: external "@splunk/react-ui/Box"
+var Box_ = __webpack_require__(8);
+var Box_default = /*#__PURE__*/__webpack_require__.n(Box_);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/Button"
-var Button_ = __webpack_require__(16);
+var Button_ = __webpack_require__(17);
 var Button_default = /*#__PURE__*/__webpack_require__.n(Button_);
 
 // EXTERNAL MODULE: external "styled-components"
@@ -146,7 +146,7 @@ var external_styled_components_ = __webpack_require__(3);
 var external_styled_components_default = /*#__PURE__*/__webpack_require__.n(external_styled_components_);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/Clickable"
-var Clickable_ = __webpack_require__(11);
+var Clickable_ = __webpack_require__(12);
 var Clickable_default = /*#__PURE__*/__webpack_require__.n(Clickable_);
 
 // CONCATENATED MODULE: ./src/RadioBar/OptionStyles.ts
@@ -183,6 +183,11 @@ var StyledLabel = external_styled_components_default.a.div.withConfig({
   componentId: "fyq77p-2"
 })(["flex:0 1 auto;", " &:not(:first-child){margin-left:8px;}"], themes_["mixins"].ellipsis);
 
+// CONCATENATED MODULE: ./src/RadioBar/RadioBarContext.tsx
+
+var RadioBarContext = /*#__PURE__*/Object(external_react_["createContext"])({});
+RadioBarContext.displayName = 'RadioBar';
+/* harmony default export */ var RadioBar_RadioBarContext = (RadioBarContext);
 // CONCATENATED MODULE: ./src/RadioBar/Option.tsx
 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); }
 
@@ -194,44 +199,40 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+
 var propTypes = {
-  /** @private */
-  appearance: external_prop_types_default.a.oneOf(['default', 'pill', 'prisma']),
   disabled: external_prop_types_default.a.bool,
   icon: external_prop_types_default.a.node,
   label: external_prop_types_default.a.string,
 
-  /** @private Set by `RadioBar`. */
-  onClick: external_prop_types_default.a.func,
-
   /** @private Set by `RadioBar`. */
   selected: external_prop_types_default.a.bool,
 
   /** The value of the `Option`. */
-  value: external_prop_types_default.a.any.isRequired,
-
-  /** @private Set by `RadioBar`. */
-  error: external_prop_types_default.a.bool
+  value: external_prop_types_default.a.any.isRequired
 };
 
 function Option(_ref) {
-  var appearance = _ref.appearance,
-      disabled = _ref.disabled,
+  var disabled = _ref.disabled,
       label = _ref.label,
       icon = _ref.icon,
-      onClick = _ref.onClick,
       selected = _ref.selected,
       value = _ref.value,
-      otherProps = _objectWithoutProperties(_ref, ["appearance", "disabled", "label", "icon", "onClick", "selected", "value"]);
+      otherProps = _objectWithoutProperties(_ref, ["disabled", "label", "icon", "selected", "value"]);
 
   // @docs-props-type OptionPropsBase
-  if (appearance === 'prisma') {
+  var _useContext = Object(external_react_["useContext"])(RadioBar_RadioBarContext),
+      onClickContext = _useContext.onClick,
+      appearanceContext = _useContext.appearance,
+      errorContext = _useContext.error;
+
+  if (appearanceContext === 'prisma') {
     return /*#__PURE__*/external_react_default.a.createElement(StyledClickable, _extends({
       "data-test": "option",
       "data-test-value": value
     }, otherProps, {
       onClick: selected ? undefined : function (e) {
-        return onClick === null || onClick === void 0 ? void 0 : onClick(e, {
+        return onClickContext === null || onClickContext === void 0 ? void 0 : onClickContext(e, {
           value: value,
           label: label
         });
@@ -241,21 +242,22 @@ function Option(_ref) {
       $selected: selected,
       tabIndex: selected ? -1 : undefined,
       disabled: disabled
-    }), icon && /*#__PURE__*/external_react_default.a.createElement(StyledIcon, null, icon), /*#__PURE__*/external_react_default.a.createElement(StyledLabel, null, label));
+    }), icon && /*#__PURE__*/external_react_default.a.createElement(StyledIcon, null, icon), label && /*#__PURE__*/external_react_default.a.createElement(StyledLabel, null, label));
   }
 
   return /*#__PURE__*/external_react_default.a.createElement(Button_default.a, _extends({
     "data-test": "option",
     "data-test-value": value,
-    appearance: appearance,
+    appearance: appearanceContext,
     disabled: disabled,
     label: label,
     icon: icon,
     selected: selected,
-    value: value
+    value: value,
+    error: errorContext
   }, otherProps, {
     onClick: selected ? undefined : function (e) {
-      return onClick === null || onClick === void 0 ? void 0 : onClick(e, {
+      return onClickContext === null || onClickContext === void 0 ? void 0 : onClickContext(e, {
         value: value,
         label: label
       });
@@ -268,10 +270,6 @@ function Option(_ref) {
 
 Option.propTypes = propTypes;
 /* harmony default export */ var RadioBar_Option = (Option);
-// EXTERNAL MODULE: external "@splunk/react-ui/Box"
-var Box_ = __webpack_require__(8);
-var Box_default = /*#__PURE__*/__webpack_require__.n(Box_);
-
 // CONCATENATED MODULE: ./src/RadioBar/RadioBarStyles.ts
 
 
@@ -329,6 +327,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
+/** @public */
+
 var RadioBar_propTypes = {
   appearance: external_prop_types_default.a.oneOf(['default', 'pill', 'flat']),
   children: external_prop_types_default.a.node,
@@ -415,8 +416,6 @@ var RadioBar_RadioBar = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
-
       var _this$props2 = this.props,
           appearance = _this$props2.appearance,
           children = _this$props2.children,
@@ -428,45 +427,40 @@ var RadioBar_RadioBar = /*#__PURE__*/function (_Component) {
           otherProps = RadioBar_objectWithoutProperties(_this$props2, ["appearance", "children", "describedBy", "error", "labelledBy", "splunkTheme", "value"]);
 
       var selectedValue = this.isControlled() ? value : this.state.value;
-      var isPrisma = splunkTheme.family === 'prisma';
+      var isPrisma = splunkTheme.isPrisma;
       var disabled = true;
-      var childrenFormatted = external_react_["Children"].toArray(children).filter(external_react_["isValidElement"]).map(function (item, i) {
+      var contextValue = {
+        appearance: isPrisma ? 'prisma' : appearance,
+        onClick: this.handleClick,
+        error: isPrisma ? false : error
+      };
+      var childrenFormatted = external_react_["Children"].toArray(children).filter(external_react_["isValidElement"]).map(function (item, i, _ref) {
+        var length = _ref.length;
+
         if (item.props && !item.props.disabled) {
           disabled = false;
         }
 
         return /*#__PURE__*/Object(external_react_["cloneElement"])(item, {
-          appearance: isPrisma ? 'prisma' : appearance,
-          key: item.key || i,
-          onClick: _this2.handleClick,
-          role: 'radio',
           selected: item.props.value === selectedValue,
-          disabled: item.props.disabled,
-          error: isPrisma ? false : error
+          key: item.key || i,
+          append: i < length - 1,
+          prepend: i > 0
         });
       });
-
-      if (isPrisma) {
-        return /*#__PURE__*/external_react_default.a.createElement(StyledRadioBar, RadioBar_extends({
-          $disabled: disabled,
-          $error: error,
-          "data-test": "radio-bar",
-          "data-test-value": selectedValue,
-          role: "radiogroup",
-          "aria-labelledby": labelledBy,
-          "aria-describedby": describedBy,
-          flex: true
-        }, Object(external_lodash_["omit"])(otherProps, 'onChange')), childrenFormatted);
-      }
-
-      return /*#__PURE__*/external_react_default.a.createElement(ButtonGroup_default.a, RadioBar_extends({
-        "aria-describedby": describedBy,
-        "aria-labelledby": labelledBy,
+      var RadioBarTag = isPrisma ? StyledRadioBar : Box_default.a;
+      return /*#__PURE__*/external_react_default.a.createElement(RadioBarTag, RadioBar_extends({
+        $disabled: disabled,
+        $error: error,
         "data-test": "radio-bar",
         "data-test-value": selectedValue,
-        flex: true,
-        role: "radiogroup"
-      }, Object(external_lodash_["omit"])(otherProps, 'onChange')), childrenFormatted);
+        role: "radiogroup",
+        "aria-labelledby": labelledBy,
+        "aria-describedby": describedBy,
+        flex: true
+      }, Object(external_lodash_["omit"])(otherProps, 'onChange')), /*#__PURE__*/external_react_default.a.createElement(RadioBar_RadioBarContext.Provider, {
+        value: contextValue
+      }, childrenFormatted));
     }
   }]);
 
@@ -491,7 +485,7 @@ RadioBarWithThemeOption.Option = RadioBar_Option;
 
 /***/ }),
 
-/***/ 16:
+/***/ 17:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/Button");
@@ -524,13 +518,6 @@ module.exports = require("lodash");
 
 module.exports = require("@splunk/react-ui/Box");
 
-/***/ }),
-
-/***/ 91:
-/***/ (function(module, exports) {
-
-module.exports = require("@splunk/react-ui/ButtonGroup");
-
 /***/ })
 
 /******/ });

package/RadioList.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 119);
+/******/ 	return __webpack_require__(__webpack_require__.s = 124);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -108,7 +108,7 @@ module.exports = require("@splunk/ui-utils/id");
 
 /***/ }),
 
-/***/ 119:
+/***/ 124:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/Resize.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 157);
+/******/ 	return __webpack_require__(__webpack_require__.s = 159);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,7 +101,7 @@ module.exports = require("prop-types");
 
 /***/ }),
 
-/***/ 12:
+/***/ 11:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -131,18 +131,18 @@ function updateReactRef(ref, current) {
 /***/ 14:
 /***/ (function(module, exports) {
 
-module.exports = require("@splunk/react-ui/ScreenReaderContent");
+module.exports = require("@splunk/react-ui/EventListener");
 
 /***/ }),
 
 /***/ 15:
 /***/ (function(module, exports) {
 
-module.exports = require("react-event-listener");
+module.exports = require("@splunk/react-ui/ScreenReaderContent");
 
 /***/ }),
 
-/***/ 157:
+/***/ 159:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -163,12 +163,12 @@ var external_prop_types_default = /*#__PURE__*/__webpack_require__.n(external_pr
 // EXTERNAL MODULE: external "lodash"
 var external_lodash_ = __webpack_require__(4);
 
-// EXTERNAL MODULE: external "react-event-listener"
-var external_react_event_listener_ = __webpack_require__(15);
-var external_react_event_listener_default = /*#__PURE__*/__webpack_require__.n(external_react_event_listener_);
+// EXTERNAL MODULE: external "@splunk/react-ui/EventListener"
+var EventListener_ = __webpack_require__(14);
+var EventListener_default = /*#__PURE__*/__webpack_require__.n(EventListener_);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/ScreenReaderContent"
-var ScreenReaderContent_ = __webpack_require__(14);
+var ScreenReaderContent_ = __webpack_require__(15);
 var ScreenReaderContent_default = /*#__PURE__*/__webpack_require__.n(ScreenReaderContent_);
 
 // EXTERNAL MODULE: external "@splunk/ui-utils/i18n"
@@ -267,7 +267,7 @@ var StyledResize = external_styled_components_default.a.button.withConfig({
 }));
 
 // EXTERNAL MODULE: ./src/utils/updateReactRef.ts
-var updateReactRef = __webpack_require__(12);
+var updateReactRef = __webpack_require__(11);
 
 // CONCATENATED MODULE: ./src/Resize/Resize.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); }
@@ -544,11 +544,15 @@ var Resize_Resize = /*#__PURE__*/function (_Component) {
         ref: this.handleMount
       }, Object(external_lodash_["omit"])(this.props, Object(external_lodash_["keys"])(Resize.propTypes))), /*#__PURE__*/external_react_default.a.createElement(StyledBorder, {
         $borderSides: borderSides
-      }, el && beforeHandles, children, el && afterHandles, dragDirection && /*#__PURE__*/external_react_default.a.createElement(external_react_event_listener_default.a, {
-        target: "window",
-        onMouseMove: this.handleDrag,
-        onMouseUp: this.handleDragEnd
-      })));
+      }, el && beforeHandles, children, el && afterHandles, dragDirection && /*#__PURE__*/external_react_default.a.createElement(external_react_default.a.Fragment, null, /*#__PURE__*/external_react_default.a.createElement(EventListener_default.a, {
+        target: window,
+        eventType: "mousemove",
+        listener: this.handleDrag
+      }), /*#__PURE__*/external_react_default.a.createElement(EventListener_default.a, {
+        target: window,
+        eventType: "mouseup",
+        listener: this.handleDragEnd
+      }))));
     }
   }]);
 

package/ResultsMenu.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 145);
+/******/ 	return __webpack_require__(__webpack_require__.s = 160);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,7 +101,7 @@ module.exports = require("prop-types");
 
 /***/ }),
 
-/***/ 12:
+/***/ 11:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -135,7 +135,7 @@ module.exports = require("@splunk/react-ui/Menu");
 
 /***/ }),
 
-/***/ 145:
+/***/ 160:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -160,7 +160,7 @@ var external_lodash_ = __webpack_require__(4);
 var i18n_ = __webpack_require__(5);
 
 // EXTERNAL MODULE: external "@splunk/ui-utils/userAgent"
-var userAgent_ = __webpack_require__(92);
+var userAgent_ = __webpack_require__(94);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/Menu"
 var Menu_ = __webpack_require__(13);
@@ -171,7 +171,7 @@ var external_styled_components_ = __webpack_require__(3);
 var external_styled_components_default = /*#__PURE__*/__webpack_require__.n(external_styled_components_);
 
 // EXTERNAL MODULE: external "@splunk/react-ui/WaitSpinner"
-var WaitSpinner_ = __webpack_require__(93);
+var WaitSpinner_ = __webpack_require__(95);
 var WaitSpinner_default = /*#__PURE__*/__webpack_require__.n(WaitSpinner_);
 
 // EXTERNAL MODULE: external "@splunk/themes"
@@ -232,7 +232,7 @@ var StyledLoadingMessage = external_styled_components_default.a.div.withConfig({
 }));
 
 // EXTERNAL MODULE: ./src/utils/updateReactRef.ts
-var updateReactRef = __webpack_require__(12);
+var updateReactRef = __webpack_require__(11);
 
 // CONCATENATED MODULE: ./src/ResultsMenu/ResultsMenu.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); }
@@ -537,14 +537,14 @@ module.exports = require("@splunk/ui-utils/i18n");
 
 /***/ }),
 
-/***/ 92:
+/***/ 94:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/ui-utils/userAgent");
 
 /***/ }),
 
-/***/ 93:
+/***/ 95:
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/react-ui/WaitSpinner");

package/ScreenReaderContent.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 146);
+/******/ 	return __webpack_require__(__webpack_require__.s = 161);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,7 +101,7 @@ module.exports = require("prop-types");
 
 /***/ }),
 
-/***/ 146:
+/***/ 161:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/Scroll.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 134);
+/******/ 	return __webpack_require__(__webpack_require__.s = 138);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,7 +101,7 @@ module.exports = require("prop-types");
 
 /***/ }),
 
-/***/ 12:
+/***/ 11:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -128,7 +128,7 @@ function updateReactRef(ref, current) {
 
 /***/ }),
 
-/***/ 134:
+/***/ 138:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -159,18 +159,18 @@ var external_styled_components_default = /*#__PURE__*/__webpack_require__.n(exte
 // EXTERNAL MODULE: external "@splunk/themes"
 var themes_ = __webpack_require__(0);
 
-// EXTERNAL MODULE: external "react-event-listener"
-var external_react_event_listener_ = __webpack_require__(15);
-var external_react_event_listener_default = /*#__PURE__*/__webpack_require__.n(external_react_event_listener_);
-
 // EXTERNAL MODULE: external "react-spring"
 var external_react_spring_ = __webpack_require__(18);
 
+// EXTERNAL MODULE: external "@splunk/react-ui/EventListener"
+var EventListener_ = __webpack_require__(14);
+var EventListener_default = /*#__PURE__*/__webpack_require__.n(EventListener_);
+
 // EXTERNAL MODULE: external "@splunk/react-ui/ScrollContainerContext"
 var ScrollContainerContext_ = __webpack_require__(35);
 
 // EXTERNAL MODULE: ./src/utils/updateReactRef.ts
-var updateReactRef = __webpack_require__(12);
+var updateReactRef = __webpack_require__(11);
 
 // CONCATENATED MODULE: ./src/Scroll/Inner.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); }
@@ -354,11 +354,13 @@ var Inner_Inner = /*#__PURE__*/function (_Component) {
         scrollLeft: left
       }), /*#__PURE__*/external_react_default.a.createElement(ScrollContainerContext_["ScrollContainerProvider"], {
         value: containerEl
-      }, children)), stopScrollPropagation === true && containerEl && /*#__PURE__*/external_react_default.a.createElement(external_react_event_listener_default.a, {
-        onWheel: Object(external_react_event_listener_["withOptions"])(this.handleWheel, {
+      }, children)), stopScrollPropagation === true && containerEl && /*#__PURE__*/external_react_default.a.createElement(EventListener_default.a, {
+        target: containerEl,
+        eventType: "wheel",
+        listener: this.handleWheel,
+        options: {
           passive: false
-        }),
-        target: containerEl
+        }
       }));
     }
   }]);
@@ -538,10 +540,10 @@ Scroll_defineProperty(Scroll_Scroll, "defaultProps", Scroll_defaultProps);
 
 /***/ }),
 
-/***/ 15:
+/***/ 14:
 /***/ (function(module, exports) {
 
-module.exports = require("react-event-listener");
+module.exports = require("@splunk/react-ui/EventListener");
 
 /***/ }),
 

package/ScrollContainerContext.js

@@ -82,12 +82,12 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 169);
+/******/ 	return __webpack_require__(__webpack_require__.s = 174);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 169:
+/***/ 174:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -107,13 +107,13 @@ var external_react_default = /*#__PURE__*/__webpack_require__.n(external_react_)
 
 /**
  * A React context used to manage a custom scroll container for child elements
- * that need to react to scrolling. The context type is `Element | 'window' | null | undefined`.
- * Defaults to `'window'`. Consumers of this context must gracefully handle values
+ * that need to react to scrolling. The context type is `Window | Document | HTMLElement | null | undefined`.
+ * Defaults to `window`. Consumers of this context must gracefully handle values
  * of `null` and `undefined`.
  * @public
  */
 
-var ScrollContainerContext = /*#__PURE__*/external_react_default.a.createContext('window');
+var ScrollContainerContext = /*#__PURE__*/external_react_default.a.createContext(window);
 /**
  * `ScrollContainerProvider` is an alias of `ScrollContainerContext.Provider`.
  * @public

package/Search.d.ts

@@ -0,0 +1,2 @@
+export { default } from './types/src/Search';
+export * from './types/src/Search';