@zohodesk/dot 1.0.0-temp-203.5 → 1.0.0-temp-203.6

package/lib/ChannelIcon/ChannelIcon.js

@@ -29,6 +29,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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); } }
@@ -85,7 +87,14 @@ var ChannelIcon = /*#__PURE__*/function (_Component) {
           renderIconOnly = _this$props.renderIconOnly,
           iconName = _this$props.iconName,
           title = _this$props.title,
-          dataSelectorId = _this$props.dataSelectorId;
+          dataSelectorId = _this$props.dataSelectorId,
+          customProps = _this$props.customProps;
+      var _customProps$avatarPr = customProps.avatarProps,
+          avatarProps = _customProps$avatarPr === void 0 ? {} : _customProps$avatarPr,
+          _customProps$avatarIc = customProps.avatarIconProps,
+          avatarIconProps = _customProps$avatarIc === void 0 ? {} : _customProps$avatarIc,
+          _customProps$iconProp = customProps.iconProps,
+          iconProps = _customProps$iconProp === void 0 ? {} : _customProps$iconProp;
       var defaultChannelObj = name && !iconName && (0, _ChannelIconMapping.getChannelMappingObj)()[name.toUpperCase()];
       var customizedChannelName = null;
 
@@ -98,7 +107,7 @@ var ChannelIcon = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: _ChannelIconModule["default"].container,
         "data-selector-id": dataSelectorId
-      }, customizedChannelName ? /*#__PURE__*/_react["default"].createElement(_Avatar["default"], {
+      }, customizedChannelName ? /*#__PURE__*/_react["default"].createElement(_Avatar["default"], _extends({
         name: customizedChannelName,
         size: size,
         palette: palette,
@@ -107,7 +116,7 @@ var ChannelIcon = /*#__PURE__*/function (_Component) {
         dataId: dataId,
         needTitle: title,
         title: title
-      }) : !renderIconOnly ? iconName ? /*#__PURE__*/_react["default"].createElement(_AvatarIcon["default"], {
+      }, avatarProps)) : !renderIconOnly ? iconName ? /*#__PURE__*/_react["default"].createElement(_AvatarIcon["default"], _extends({
         name: iconName,
         iconSize: iconSize,
         size: size,
@@ -116,7 +125,7 @@ var ChannelIcon = /*#__PURE__*/function (_Component) {
         className: className,
         iconColor: iconColor,
         title: iconTitle
-      }) : /*#__PURE__*/_react["default"].createElement(_Avatar["default"], {
+      }, avatarIconProps)) : /*#__PURE__*/_react["default"].createElement(_Avatar["default"], _extends({
         name: name,
         size: size,
         palette: palette,
@@ -125,13 +134,13 @@ var ChannelIcon = /*#__PURE__*/function (_Component) {
         dataId: dataId,
         needTitle: title,
         title: title
-      }) : /*#__PURE__*/_react["default"].createElement(_icons.Icon, {
+      }, avatarProps)) : /*#__PURE__*/_react["default"].createElement(_icons.Icon, _extends({
         name: iconName,
         size: iconSize,
         iconClass: "".concat(iconClass ? iconClass : '', " ").concat(_ChannelIconModule["default"].iconStyle, " ").concat(name && action ? _ChannelIconModule["default"]["".concat(name.toLowerCase(), "_").concat(action.toLowerCase())] : ''),
         title: iconTitle,
         dataId: dataId
-      }), topicIcon ? /*#__PURE__*/_react["default"].createElement("span", {
+      }, iconProps)), topicIcon ? /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(_ChannelIconModule["default"].thread, " ").concat(needTopicBorder ? _ChannelIconModule["default"].threadBorder : '', " ").concat(topicClass ? topicClass : ''),
         "data-title": topicIconTitle
       }, /*#__PURE__*/_react["default"].createElement(_icons.Icon, {

package/lib/ChannelIcon/props/defaultProps.js

@@ -9,6 +9,7 @@ var defaultProps = {
   name: 'phone',
   needTopicBorder: true,
   renderIconOnly: false,
-  dataSelectorId: 'channelIcon'
+  dataSelectorId: 'channelIcon',
+  customProps: {}
 };
 exports.defaultProps = defaultProps;

package/lib/ChannelIcon/props/propTypes.js

@@ -7,6 +7,12 @@ exports.propTypes = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _propTypes2 = require("@zohodesk/components/es/Avatar/props/propTypes");
+
+var _propTypes3 = require("../../avatar/AvatarIcon/props/propTypes");
+
+var _propTypes4 = require("@zohodesk/icons/es/Icon/props/propTypes");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var propTypes = {
@@ -31,6 +37,11 @@ var propTypes = {
   topicIconColor: _propTypes["default"].string,
   topicIconSize: _propTypes["default"].string,
   topicIconTitle: _propTypes["default"].string,
-  dataSelectorId: _propTypes["default"].string
+  dataSelectorId: _propTypes["default"].string,
+  customProps: _propTypes["default"].shape({
+    avatarProps: _propTypes["default"].exact(_propTypes2.propTypes),
+    avatarIconProps: _propTypes["default"].exact(_propTypes3.propTypes),
+    iconProps: _propTypes["default"].exact(_propTypes4.IconProps)
+  })
 };
 exports.propTypes = propTypes;

package/lib/Loader/Loader.module.css

@@ -11,19 +11,20 @@
 .loader {
   width: 100% ;
   /*  Variable:Ignore  */
-  height: 3px;
-  background-image: var(--zdt_loader_gradient_bg);
-  background-size: 200% auto;
+  height: 5px;
+  background-size: 50% auto;
 }
 [dir=ltr] .loader {
+  background-image: linear-gradient(to right, var(--zdt_loader_bg) 30%, var(--dot_solitude) 50%, var(--zdt_loader_bg) 90%);
   background-position: 0 100%;
-  animation:  loading-ltr 3s infinite;
+  animation:  loading-ltr 2s infinite;
   animation-fill-mode: forwards;
   animation-timing-function: linear;
 }
 [dir=rtl] .loader {
+  background-image: linear-gradient(to left, var(--zdt_loader_bg) 30%, var(--dot_solitude) 50%, var(--zdt_loader_bg) 90%);
   background-position: 100% 100%;
-  animation:  loading-rtl 3s infinite;
+  animation:  loading-rtl 2s infinite;
   animation-fill-mode: forwards;
   animation-timing-function: linear;
 }
@@ -33,7 +34,7 @@
     background-position: 0 0;
   }
   100% {
-    background-position: -200% 0;
+    background-position: 200% 0;
   }
 }
 
@@ -42,6 +43,6 @@
     background-position: 100% 0;
   }
   100% {
-    background-position: 300% 0;
+    background-position: -100% 0;
   }
 }

package/lib/PlusIcon/PlusIcon.js

@@ -61,7 +61,8 @@ var PlusIcon = /*#__PURE__*/function (_React$Component) {
           size = _this$props.size,
           onClick = _this$props.onClick,
           title = _this$props.title,
-          customClass = _this$props.customClass;
+          customClass = _this$props.customClass,
+          customProps = _this$props.customProps;
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: _PlusIconModule["default"].container,
         onClick: onClick,
@@ -73,7 +74,8 @@ var PlusIcon = /*#__PURE__*/function (_React$Component) {
         iconClass: "".concat(iconClass, " ").concat(_PlusIconModule["default"].icon),
         iconSize: iconSize,
         size: size,
-        className: "".concat(customClass, " ").concat(_PlusIconModule["default"].plusIcon)
+        className: "".concat(customClass, " ").concat(_PlusIconModule["default"].plusIcon),
+        customProps: customProps
       }));
     }
   }]);

package/lib/PlusIcon/props/defaultProps.js

@@ -10,6 +10,7 @@ var defaultProps = {
   iconSize: '16',
   dataId: 'addreqNowbutton',
   iconClass: '',
-  customClass: ''
+  customClass: '',
+  customProps: {}
 };
 exports.defaultProps = defaultProps;

package/lib/PlusIcon/props/propTypes.js

@@ -7,6 +7,8 @@ exports.propTypes = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _propTypes2 = require("../../avatar/AvatarIcon/props/propTypes.js");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var propTypes = {
@@ -17,6 +19,7 @@ var propTypes = {
   onClick: _propTypes["default"].func,
   size: _propTypes["default"].oneOf(['small', 'xsmall', 'xxsmall', 'medium', 'xmedium', 'xlarge']),
   title: _propTypes["default"].string,
-  customClass: _propTypes["default"].string
+  customClass: _propTypes["default"].string,
+  customProps: _propTypes["default"].exact(_propTypes2.propTypes)
 };
 exports.propTypes = propTypes;

package/lib/utils/getCurrentTime.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = getCurrentTime;
+
+function getCurrentTime() {
+  var now = new Date();
+  var hours = now.getHours();
+  var minutes = now.getMinutes().toString().padStart(2, '0');
+  var seconds = now.getSeconds().toString().padStart(2, '0');
+  var ampm = hours >= 12 ? 'PM' : 'AM';
+  var formattedHours = hours % 12 || 12; // Convert 24-hour time to 12-hour format
+
+  return "".concat(formattedHours, ":").concat(minutes, ":").concat(seconds, " ").concat(ampm);
+}

package/lib/version2/GlobalNotification/GlobalNotification.js

@@ -21,16 +21,24 @@ var _AlertIcons = _interopRequireDefault(require("../alertIcons/AlertIcons"));
 
 var _AlertClose = _interopRequireDefault(require("../AlertClose/AlertClose"));
 
-var _v2GlobalNotificationModule = _interopRequireDefault(require("./v2GlobalNotification.module.css"));
+var _GlobalNotificationModule = _interopRequireDefault(require("./GlobalNotification.module.css"));
 
 var _Layout = require("@zohodesk/components/lib/Layout");
 
 var _Common = require("@zohodesk/components/es/utils/Common");
 
+var _getCurrentTime = _interopRequireDefault(require("../../utils/getCurrentTime"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
 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); } }
@@ -67,31 +75,65 @@ var GlobalNotification = /*#__PURE__*/function (_React$Component) {
       shadowClose: true
     };
     _this.onClose = _this.onClose.bind(_assertThisInitialized(_this));
+    _this.getNotiifcationData = _this.getNotiifcationData.bind(_assertThisInitialized(_this));
+    _this.handleStatusChange = _this.handleStatusChange.bind(_assertThisInitialized(_this));
     return _this;
   }
 
   _createClass(GlobalNotification, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _this2 = this;
+
       var _this$props = this.props,
           hideMessage = _this$props.hideMessage,
           hideTime = _this$props.hideTime,
           id = _this$props.id,
           needAutoClose = _this$props.needAutoClose;
+      this.handleStatusChange('mounted');
 
       if (needAutoClose) {
         this.hideMessageTimer = setTimeout(function () {
           hideMessage(id);
+
+          _this2.handleStatusChange('dismissing');
         }, hideTime);
       }
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.id !== this.props.id && (prevProps.message !== this.props.message || prevProps.type !== this.props.type)) {
+        this.handleStatusChange('updated');
+      }
+    }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       if (this.hideMessageTimer) {
         clearTimeout(this.hideMessageTimer);
       }
+
+      this.handleStatusChange('unmounted');
     }
+  }, {
+    key: "handleStatusChange",
+    value: function handleStatusChange(status) {
+      var onStatusChange = this.props.onStatusChange;
+      var notificationData = this.getNotiifcationData();
+      var currentTime = (0, _getCurrentTime["default"])();
+
+      if (typeof onStatusChange == 'function') {
+        onStatusChange(_objectSpread(_objectSpread({
+          status: status
+        }, notificationData), {}, {
+          time: currentTime
+        }));
+      }
+    }
+  }, {
+    key: "handleNotificationClose",
+    value: function handleNotificationClose() {}
   }, {
     key: "onClose",
     value: function onClose(e) {
@@ -102,42 +144,51 @@ var GlobalNotification = /*#__PURE__*/function (_React$Component) {
       this.setState({
         shadowClose: false
       });
+      this.handleStatusChange('dismissing');
       hideMessage && hideMessage(id);
       onClose && onClose(e);
     }
   }, {
-    key: "render",
-    value: function render() {
+    key: "getNotiifcationData",
+    value: function getNotiifcationData() {
       var _this$props3 = this.props,
-          type = _this$props3.type,
-          message = _this$props3.message,
-          hideMessage = _this$props3.hideMessage,
-          onClick = _this$props3.onClick,
-          _this$props3$i18nKeys = _this$props3.i18nKeys,
-          i18nKeys = _this$props3$i18nKeys === void 0 ? {} : _this$props3$i18nKeys,
-          customProps = _this$props3.customProps,
-          dataSelectorId = _this$props3.dataSelectorId,
           id = _this$props3.id,
-          needShadow = _this$props3.needShadow,
-          shadowCount = _this$props3.shadowCount,
-          eleRef = _this$props3.eleRef;
+          type = _this$props3.type,
+          message = _this$props3.message;
+      return {
+        id: id,
+        type: type,
+        message: message
+      };
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props4 = this.props,
+          hideMessage = _this$props4.hideMessage,
+          onClick = _this$props4.onClick,
+          _this$props4$i18nKeys = _this$props4.i18nKeys,
+          i18nKeys = _this$props4$i18nKeys === void 0 ? {} : _this$props4$i18nKeys,
+          customProps = _this$props4.customProps,
+          dataSelectorId = _this$props4.dataSelectorId,
+          needShadow = _this$props4.needShadow,
+          shadowCount = _this$props4.shadowCount,
+          eleRef = _this$props4.eleRef;
       var shadowClose = this.state.shadowClose;
       var _i18nKeys$closeTitle = i18nKeys.closeTitle,
           closeTitle = _i18nKeys$closeTitle === void 0 ? 'Close' : _i18nKeys$closeTitle;
-      return /*#__PURE__*/_react["default"].createElement(GlobalNotificationUI, {
-        type: type,
-        message: message,
+      var notificationData = this.getNotiifcationData();
+      return /*#__PURE__*/_react["default"].createElement(GlobalNotificationUI, _extends({}, notificationData, {
         hideMessage: hideMessage,
         onClick: onClick,
         closeTitle: closeTitle,
         customProps: customProps,
         dataSelectorId: dataSelectorId,
-        id: id,
         shadowCount: shadowCount,
         onClose: this.onClose,
         needShadow: shadowClose && needShadow,
         eleRef: eleRef
-      });
+      }));
     }
   }]);
 
@@ -176,26 +227,26 @@ function GlobalNotificationUI(props) {
       ExtraProps = _customProps$ExtraPro === void 0 ? {} : _customProps$ExtraPro;
   return /*#__PURE__*/_react["default"].createElement("div", _extends({
     ref: eleRef,
-    className: " ".concat(_v2GlobalNotificationModule["default"].message, " \n        ").concat(needShadow && shadowCount >= 2 ? shadowCount > 2 ? "".concat(_v2GlobalNotificationModule["default"].stackShadowTwo, " ").concat(_v2GlobalNotificationModule["default"].stackShadowOne) : _v2GlobalNotificationModule["default"].stackShadowOne : '', "\n        ").concat(type ? _v2GlobalNotificationModule["default"][type] : '', "\n      "),
+    className: " ".concat(_GlobalNotificationModule["default"].message, " \n        ").concat(needShadow && shadowCount >= 2 ? shadowCount > 2 ? "".concat(_GlobalNotificationModule["default"].stackShadowTwo, " ").concat(_GlobalNotificationModule["default"].stackShadowOne) : _GlobalNotificationModule["default"].stackShadowOne : '', "\n        ").concat(type ? _GlobalNotificationModule["default"][type] : '', "\n      "),
     "data-id": "show_".concat(type, "_message"),
     "data-test-id": "show_".concat(type, "_message"),
     tabIndex: 0,
     "data-selector-id": dataSelectorId
   }, ExtraProps), /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
-    className: "".concat(_v2GlobalNotificationModule["default"].container),
+    className: "".concat(_GlobalNotificationModule["default"].container),
     alignBox: "row",
     isCover: false,
     align: "vertical",
     isInline: true
   }, /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
-    className: _v2GlobalNotificationModule["default"].icon
+    className: _GlobalNotificationModule["default"].icon
   }, /*#__PURE__*/_react["default"].createElement(_AlertIcons["default"], {
     type: type,
     variant: "secondary"
   })), /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
     flexible: true
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _v2GlobalNotificationModule["default"].text,
+    className: _GlobalNotificationModule["default"].text,
     onClick: onClick,
     "data-id": "infoMessage",
     "data-test-id": "infoMessage",
@@ -203,7 +254,7 @@ function GlobalNotificationUI(props) {
       __html: message
     }
   })), /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
-    className: _v2GlobalNotificationModule["default"].close
+    className: _GlobalNotificationModule["default"].close
   }, /*#__PURE__*/_react["default"].createElement(_AlertClose["default"], {
     dataId: "close_".concat(type, "_message"),
     dataTitle: closeTitle,

package/lib/version2/notification/DesktopNotificationHeader/DesktopNotificationHeader.js

@@ -21,7 +21,7 @@ var _AlertIcons = _interopRequireDefault(require("../../alertIcons/AlertIcons"))
 
 var _CustomResponsive = require("@zohodesk/components/lib/Responsive/CustomResponsive");
 
-var _Typography = _interopRequireDefault(require("@zohodesk/components/es/v1/Typography/Typography"));
+var _Typography = _interopRequireDefault(require("@zohodesk/components/es/Typography/Typography"));
 
 var _DesktopNotificationHeaderModule = _interopRequireDefault(require("./DesktopNotificationHeader.module.css"));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/dot",
-  "version": "1.0.0-temp-203.5",
+  "version": "1.0.0-temp-203.6",
   "main": "lib/index",
   "module": "es/index.js",
   "private": false,
@@ -62,9 +62,8 @@
     "@zohodesk-private/css-variable-migrator": "^1.0.7",
     "@zohodesk-private/node-plugins": "1.1.8",
     "@zohodesk-private/react-prop-validator": "1.2.3",
-    "@zohodesk/a11y": "2.2.6",
-    "@zohodesk/components": "1.2.53",
-    "@zohodesk/dotkit": "1.0.0-temp-0.5",
+    "@zohodesk/a11y": "2.2.7",
+    "@zohodesk/components": "1.2.55",
     "@zohodesk/hooks": "2.0.5",
     "@zohodesk/icons": "1.0.70",
     "@zohodesk/svg": "1.1.22",
@@ -72,20 +71,18 @@
     "@zohodesk/variables": "1.0.0",
     "@zohodesk/virtualizer": "1.0.3",
     "react-sortable-hoc": "^0.8.3",
-    "velocity-react": "1.4.3",
-    "react-transition-group": "^4.4.5"
+    "velocity-react": "1.4.3"
   },
   "peerDependencies": {
     "velocity-react": "1.4.3",
     "@zohodesk/variables": "1.0.0",
-    "@zohodesk/components": "1.2.53",
+    "@zohodesk/components": "1.2.55",
     "@zohodesk/icons": "1.0.70",
     "@zohodesk/svg": "1.1.22",
     "@zohodesk/virtualizer": "1.0.3",
     "react-sortable-hoc": "^0.8.3",
     "@zohodesk/hooks": "2.0.5",
     "@zohodesk/utils": "1.3.14",
-    "@zohodesk/a11y": "2.2.6",
-    "react-transition-group": "^4.4.5"
+    "@zohodesk/a11y": "2.2.7"
   }
 }

package/propValidationArg.json

@@ -7,6 +7,6 @@
     "need_report": true,
     "prop_validation_strict_mode": true,
     "prop_validation_log": false,
-    "prop_unification_strict_mode": true,
+    "prop_unification_strict_mode": false,
     "prop_unification_log": false
 }