@zohodesk/dot 1.0.0-beta.227 → 1.0.0-beta.230

package/es/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -1,11 +1,10 @@
 import "core-js/modules/es.array.includes";
 
-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 _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); }
 
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import Icon from '@zohodesk/icons/lib/Icon';
-import DropBox from '@zohodesk/components/lib/DropBox/DropBox';
 import Popup from '@zohodesk/components/lib/Popup/Popup';
 import { Box, Container } from '@zohodesk/components/lib/Layout';
 import ListItem from '@zohodesk/components/lib/ListItem/ListItem';
@@ -20,6 +19,8 @@ import { scrollTo } from '@zohodesk/components/lib/utils/Common';
 import { getUniqueId } from '@zohodesk/components/lib/Provider/IdProvider';
 import btnStyle from '@zohodesk/components/lib/semantic/Button/semanticButton.module.css';
 import RippleEffect from '@zohodesk/components/lib/RippleEffect/RippleEffect';
+import ResponsiveDropBox from '@zohodesk/components/lib/ResponsiveDropBox/ResponsiveDropBox';
+import { ResponsiveReceiver } from '@zohodesk/components/lib/Responsive/CustomResponsive';
 import { shallowDiff } from '../../utils/General';
 import style from './ToggleDropDown.module.css';
 export class ToggleDropDown extends Component {
@@ -472,6 +473,17 @@ export class ToggleDropDown extends Component {
     }
   }
 
+  responsiveFunc(_ref3) {
+    let {
+      mediaQueryOR
+    } = _ref3;
+    return {
+      tabletMode: mediaQueryOR([{
+        maxWidth: 700
+      }])
+    };
+  }
+
   render() {
     const {
       options,
@@ -599,105 +611,180 @@ export class ToggleDropDown extends Component {
       name: "ZD-down",
       iconClass: `${'toggleDropIcon'} ${style.arrow} ${style[`${arrowIconPosition}_arrow`]}`,
       dataId: "statusdownarrow"
-    }) : null)))), isPopupOpen ? /*#__PURE__*/React.createElement(DropBox, _extends({
-      boxPosition: position,
-      isActive: isPopupReady,
-      onClick: removeClose,
-      size: boxSize,
-      right: right,
-      left: left,
-      top: top,
-      bottom: bottom,
-      isArrow: isArrow,
-      isAnimate: true,
-      getRef: getContainerRef,
-      customClass: {
-        customDropBoxWrap: style.dropBoxContainer
-      },
-      needResponsive: needResponsive,
-      isPadding: isPadding,
-      tabindex: "0",
-      a11y: {
-        role: !isSearch ? 'menu' : undefined,
-        ariaLabelledby: !isSearch ? ariaTitleId : undefined
-      },
-      palette: palette
-    }, DropBoxProps), /*#__PURE__*/React.createElement(Fragment, null, isSearch ? /*#__PURE__*/React.createElement("div", {
-      className: style.search
-    }, /*#__PURE__*/React.createElement(TextBoxIcon, _extends({
-      placeHolder: placeHolderText,
-      onChange: this.handleChange,
-      value: searchValue,
-      onClear: this.onSearchClear,
-      size: searchBoxSize,
-      inputRef: this.searchInputRef,
-      onKeyDown: this.handleKeyDown,
-      a11y: {
-        role: 'combobox',
-        ariaOwns: ariaTitleId,
-        ariaActivedescendant: allyOptionsArr[selectedIndex] && allyOptionsArr[selectedIndex][keyName],
-        ariaAutocomplete: 'list',
-        ariaHaspopup: true,
-        ariaExpanded: true
-      }
-    }, TextBoxIconProps))) : null, title && options.length != 0 && /*#__PURE__*/React.createElement("div", {
-      className: style.title
-    }, /*#__PURE__*/React.createElement(DropDownHeading, {
-      text: title,
-      htmlId: ariaTitleId,
-      palette: palette,
-      a11y: {
-        role: 'heading'
-      },
-      customClass: style.dropdown
-    })), /*#__PURE__*/React.createElement(Box, {
-      id: ariaTitleId,
-      scroll: "vertical",
-      dataId: `${dataId}_list`,
-      className: style.maxHgt,
-      eleRef: this.scrollContentRef,
-      onScroll: this.handleScroll,
-      role: isSearch ? 'listbox' : undefined,
-      "aria-labelledby": isSearch ? ariaTitleId : undefined
-    }, isDataLoaded ? options && options.length != 0 ? isGroupDropDown ? /*#__PURE__*/React.createElement(Fragment, null, options.map(group => {
-      const groupName = group[groupNameKey];
-      const groupOptions = group[groupOptionsKey];
-      const {
-        needDivider
-      } = group;
-      return /*#__PURE__*/React.createElement(Fragment, {
-        key: `index${groupName}`
-      }, needDivider && /*#__PURE__*/React.createElement("div", {
-        className: style.seperatedLine
-      }), groupName && /*#__PURE__*/React.createElement("div", {
-        className: style.groupName
+    }) : null)))), isPopupOpen ? /*#__PURE__*/React.createElement(ResponsiveReceiver, {
+      query: this.responsiveFunc,
+      responsiveId: "Helmet"
+    }, _ref4 => {
+      let {
+        tabletMode
+      } = _ref4;
+      return /*#__PURE__*/React.createElement(ResponsiveDropBox, _extends({
+        boxPosition: position,
+        isActive: isPopupReady,
+        onClick: removeClose,
+        size: boxSize,
+        right: right,
+        left: left,
+        top: top,
+        bottom: bottom,
+        isArrow: isArrow,
+        isAnimate: true,
+        getRef: getContainerRef,
+        customClass: {
+          customDropBoxWrap: style.dropBoxContainer
+        },
+        needResponsive: needResponsive,
+        isPadding: isPadding,
+        tabindex: "0",
+        a11y: {
+          role: !isSearch ? 'menu' : undefined,
+          ariaLabelledby: !isSearch ? ariaTitleId : undefined
+        },
+        palette: palette,
+        isResponsivePadding: true
+      }, DropBoxProps), /*#__PURE__*/React.createElement(Fragment, null, isSearch ? /*#__PURE__*/React.createElement(Box, {
+        className: style.search
+      }, /*#__PURE__*/React.createElement(TextBoxIcon, _extends({
+        placeHolder: placeHolderText,
+        onChange: this.handleChange,
+        value: searchValue,
+        onClear: this.onSearchClear,
+        size: searchBoxSize,
+        inputRef: this.searchInputRef,
+        onKeyDown: this.handleKeyDown,
+        a11y: {
+          role: 'combobox',
+          ariaOwns: ariaTitleId,
+          ariaActivedescendant: allyOptionsArr[selectedIndex] && allyOptionsArr[selectedIndex][keyName],
+          ariaAutocomplete: 'list',
+          ariaHaspopup: true,
+          ariaExpanded: true
+        }
+      }, TextBoxIconProps))) : null, title && options.length != 0 && /*#__PURE__*/React.createElement(Box, {
+        className: style.title
       }, /*#__PURE__*/React.createElement(DropDownHeading, {
-        text: groupName,
+        text: title,
+        htmlId: ariaTitleId,
         palette: palette,
         a11y: {
           role: 'heading'
-        }
-      })), groupOptions && groupOptions.map(item => {
+        },
+        customClass: style.dropdown
+      })), /*#__PURE__*/React.createElement(Box, {
+        id: ariaTitleId,
+        flexible: true,
+        shrink: true,
+        scroll: "vertical",
+        dataId: `${dataId}_list`,
+        className: `${tabletMode ? style.responsivemaxHgt : style.maxHgt}`,
+        eleRef: this.scrollContentRef,
+        onScroll: this.handleScroll,
+        role: isSearch ? 'listbox' : undefined,
+        "aria-labelledby": isSearch ? ariaTitleId : undefined
+      }, isDataLoaded ? options && options.length != 0 ? isGroupDropDown ? /*#__PURE__*/React.createElement(Fragment, null, options.map(group => {
+        const groupName = group[groupNameKey];
+        const groupOptions = group[groupOptionsKey];
+        const {
+          needDivider
+        } = group;
+        return /*#__PURE__*/React.createElement(Fragment, {
+          key: `index${groupName}`
+        }, needDivider && /*#__PURE__*/React.createElement("div", {
+          className: style.seperatedLine
+        }), groupName && /*#__PURE__*/React.createElement("div", {
+          className: style.groupName
+        }, /*#__PURE__*/React.createElement(DropDownHeading, {
+          text: groupName,
+          palette: palette,
+          a11y: {
+            role: 'heading'
+          }
+        })), groupOptions && groupOptions.map(item => {
+          const {
+            iconName,
+            iconSize,
+            iconClass,
+            title,
+            disableTitle = '',
+            isDisabled = false
+          } = item;
+          listIndex += 1;
+          return iconName ? /*#__PURE__*/React.createElement(ListItemWithIcon, _extends({
+            key: listIndex,
+            dataId: item[keyName],
+            value: item[keyName],
+            id: item[idName],
+            active: selectedId === item[idName],
+            onClick: this.onSelect.bind(this, item),
+            index: listIndex,
+            highlight: selectedIndex === listIndex,
+            disableTitle: disableTitle,
+            isDisabled: isDisabled,
+            iconName: iconName,
+            iconClass: iconClass,
+            iconSize: iconSize,
+            needTick: needTick,
+            needBorder: false,
+            onMouseEnter: this.handleMouseEnter,
+            getRef: this.itemRef,
+            title: title ? title : item[keyName],
+            palette: palette,
+            a11y: {
+              role: isSearch ? 'option' : 'menuitem',
+              ariaSelected: selectedId === item[idName]
+            }
+          }, ListItemWithIconProps)) : /*#__PURE__*/React.createElement(ListItem, _extends({
+            key: listIndex,
+            dataId: item[keyName],
+            value: item[keyName],
+            id: item[idName],
+            active: selectedId === item[idName],
+            onClick: this.onSelect.bind(this, item),
+            isDisabled: isDisabled,
+            disableTitle: disableTitle,
+            index: listIndex,
+            highlight: selectedIndex === listIndex,
+            needTick: needTick,
+            needBorder: false,
+            onMouseEnter: this.handleMouseEnter,
+            getRef: this.itemRef,
+            title: title ? title : item[keyName],
+            palette: palette,
+            a11y: {
+              role: isSearch ? 'option' : 'menuitem',
+              ariaSelected: selectedId === item[idName]
+            }
+          }, ListItemProps));
+        }));
+      })) : /*#__PURE__*/React.createElement(Fragment, null, options.map((item, i) => {
         const {
           iconName,
           iconSize,
           iconClass,
           title,
-          disableTitle = '',
-          isDisabled = false
+          needDivider,
+          isDisabled = false,
+          disableTitle = ''
         } = item;
-        listIndex += 1;
-        return iconName ? /*#__PURE__*/React.createElement(ListItemWithIcon, _extends({
-          key: listIndex,
+
+        if (!needDivider) {
+          listIndex += 1;
+        }
+
+        return /*#__PURE__*/React.createElement(Fragment, {
+          key: i
+        }, needDivider ? /*#__PURE__*/React.createElement("div", {
+          className: style.seperatedLine
+        }) : iconName ? /*#__PURE__*/React.createElement(ListItemWithIcon, _extends({
           dataId: item[keyName],
           value: item[keyName],
           id: item[idName],
           active: selectedId === item[idName],
           onClick: this.onSelect.bind(this, item),
           index: listIndex,
-          highlight: selectedIndex === listIndex,
           disableTitle: disableTitle,
           isDisabled: isDisabled,
+          highlight: selectedIndex === listIndex,
           iconName: iconName,
           iconClass: iconClass,
           iconSize: iconSize,
@@ -706,6 +793,7 @@ export class ToggleDropDown extends Component {
           onMouseEnter: this.handleMouseEnter,
           getRef: this.itemRef,
           title: title ? title : item[keyName],
+          key: listIndex,
           palette: palette,
           a11y: {
             role: isSearch ? 'option' : 'menuitem',
@@ -716,10 +804,10 @@ export class ToggleDropDown extends Component {
           dataId: item[keyName],
           value: item[keyName],
           id: item[idName],
+          disableTitle: disableTitle,
+          isDisabled: isDisabled,
           active: selectedId === item[idName],
           onClick: this.onSelect.bind(this, item),
-          isDisabled: isDisabled,
-          disableTitle: disableTitle,
           index: listIndex,
           highlight: selectedIndex === listIndex,
           needTick: needTick,
@@ -732,82 +820,17 @@ export class ToggleDropDown extends Component {
             role: isSearch ? 'option' : 'menuitem',
             ariaSelected: selectedId === item[idName]
           }
-        }, ListItemProps));
-      }));
-    })) : /*#__PURE__*/React.createElement(Fragment, null, options.map((item, i) => {
-      const {
-        iconName,
-        iconSize,
-        iconClass,
-        title,
-        needDivider,
-        isDisabled = false,
-        disableTitle = ''
-      } = item;
-
-      if (!needDivider) {
-        listIndex += 1;
-      }
-
-      return /*#__PURE__*/React.createElement(Fragment, {
-        key: i
-      }, needDivider ? /*#__PURE__*/React.createElement("div", {
-        className: style.seperatedLine
-      }) : iconName ? /*#__PURE__*/React.createElement(ListItemWithIcon, _extends({
-        dataId: item[keyName],
-        value: item[keyName],
-        id: item[idName],
-        active: selectedId === item[idName],
-        onClick: this.onSelect.bind(this, item),
-        index: listIndex,
-        disableTitle: disableTitle,
-        isDisabled: isDisabled,
-        highlight: selectedIndex === listIndex,
-        iconName: iconName,
-        iconClass: iconClass,
-        iconSize: iconSize,
-        needTick: needTick,
-        needBorder: false,
-        onMouseEnter: this.handleMouseEnter,
-        getRef: this.itemRef,
-        title: title ? title : item[keyName],
-        key: listIndex,
-        palette: palette,
-        a11y: {
-          role: isSearch ? 'option' : 'menuitem',
-          ariaSelected: selectedId === item[idName]
-        }
-      }, ListItemWithIconProps)) : /*#__PURE__*/React.createElement(ListItem, _extends({
-        key: listIndex,
-        dataId: item[keyName],
-        value: item[keyName],
-        id: item[idName],
-        disableTitle: disableTitle,
-        isDisabled: isDisabled,
-        active: selectedId === item[idName],
-        onClick: this.onSelect.bind(this, item),
-        index: listIndex,
-        highlight: selectedIndex === listIndex,
-        needTick: needTick,
-        needBorder: false,
-        onMouseEnter: this.handleMouseEnter,
-        getRef: this.itemRef,
-        title: title ? title : item[keyName],
-        palette: palette,
-        a11y: {
-          role: isSearch ? 'option' : 'menuitem',
-          ariaSelected: selectedId === item[idName]
-        }
-      }, ListItemProps)));
-    })) : /*#__PURE__*/React.createElement(CommonEmptyState, {
-      className: style.svgWrapper,
-      description: searchEmptyHint,
-      title: searchErrorText || 'No results',
-      size: "small",
-      getEmptyState: this.emptySearchSVG
-    }) : /*#__PURE__*/React.createElement("div", {
-      className: style.loader
-    }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement("div", null, getFooter()) : null)) : null);
+        }, ListItemProps)));
+      })) : /*#__PURE__*/React.createElement(CommonEmptyState, {
+        className: style.svgWrapper,
+        description: searchEmptyHint,
+        title: searchErrorText || 'No results',
+        size: "small",
+        getEmptyState: this.emptySearchSVG
+      }) : /*#__PURE__*/React.createElement("div", {
+        className: style.loader
+      }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(Box, null, getFooter()) : null));
+    }) : null);
   }
 
 }

package/es/dropdown/ToggleDropDown/ToggleDropDown.module.css

@@ -6,6 +6,9 @@
   max-height: var(--zd_size265);
   padding: var(--zd_size10) 0;
 }
+.responsivemaxHgt {
+  padding: 0;
+}
 .title {
   padding-top: var(--zd_size6);
 }

package/es/form/fields/CheckBoxField/CheckBoxField.js

@@ -1,4 +1,4 @@
-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 _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); }
 
 /**** Libraries ****/
 import React, { PureComponent } from 'react';
@@ -9,9 +9,11 @@ import Label from '@zohodesk/components/lib/Label/Label';
 import CheckBox from '@zohodesk/components/lib/CheckBox/CheckBox';
 import ValidationMessage from '../ValidationMessage/ValidationMessage';
 import { Container, Box } from '@zohodesk/components/lib/Layout';
-/**** Icons ****/
+import FieldContainer from '../FieldContainer/FieldContainer';
+/**** props ****/
 
-import Icon from '@zohodesk/icons/lib/Icon';
+import { FieldCommonDefaultProps } from '../props/FieldCommonDefaultProps';
+import { FieldCommonPropTypes } from '../props/FieldCommonPropTypes';
 /**** CSS ****/
 
 import style from '../Fields.module.css';
@@ -69,7 +71,8 @@ export default class CheckBoxField extends PureComponent {
       lineClamp,
       isLocked,
       lockedInfoText,
-      customProps
+      customProps,
+      renderLabelProps
     } = this.props;
     const {
       LabelProps = {},
@@ -79,8 +82,11 @@ export default class CheckBoxField extends PureComponent {
     } = customProps;
     let removeEvent = isDisabled || isReadOnly;
     let isDirectCol = direction === 'column';
-    let labelElement = /*#__PURE__*/React.createElement("div", {
-      className: style.labelContainer
+    let labelElement = /*#__PURE__*/React.createElement(FieldContainer, {
+      isLocked: isLocked,
+      lockedInfoText: lockedInfoText,
+      infoText: infoText,
+      renderProps: renderLabelProps
     }, /*#__PURE__*/React.createElement(Label, _extends({
       text: labelName,
       id: id,
@@ -92,17 +98,7 @@ export default class CheckBoxField extends PureComponent {
       onClick: !removeEvent ? this.handleLabelClick : null,
       variant: isDirectCol ? 'default' : 'primary',
       dataId: isDisabled ? `${dataId}_label_disabled` : isMandatory ? `${dataId}_label_mandatory` : `${dataId}_label`
-    }, LabelProps)), infoText ? /*#__PURE__*/React.createElement(Icon, {
-      name: "ZD-GN-info",
-      iconClass: style.infoIcon,
-      title: infoText,
-      size: "15"
-    }) : null, isLocked ? /*#__PURE__*/React.createElement(Icon, {
-      name: "ZD-GN-lock",
-      size: "13",
-      iconClass: style.lockIcon,
-      title: lockedInfoText
-    }) : null);
+    }, LabelProps)));
     return /*#__PURE__*/React.createElement("div", {
       className: `${style.container} ${isDisabled ? style.disabled : isReadOnly ? style.readonly : ''}`,
       "data-title": isDisabled ? title : null
@@ -139,16 +135,11 @@ export default class CheckBoxField extends PureComponent {
 }
 CheckBoxField.propTypes = {
   checked: PropTypes.bool,
-  dataId: PropTypes.string,
   direction: PropTypes.oneOf(['row', 'column']),
   errorType: PropTypes.oneOf(['primary', 'secondary']),
   fieldSize: PropTypes.oneOf(['small', 'medium']),
   getRef: PropTypes.func,
   id: PropTypes.string.isRequired,
-  infoText: PropTypes.string,
-  isDisabled: PropTypes.bool,
-  isMandatory: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   labelCustomClass: PropTypes.string,
   labelName: PropTypes.string,
   labelPalette: PropTypes.string,
@@ -159,26 +150,23 @@ CheckBoxField.propTypes = {
   validationPalette: PropTypes.string,
   validationRuleMessage: PropTypes.string,
   validationRulePalette: PropTypes.string,
-  lockedInfoText: PropTypes.string,
-  isLocked: PropTypes.bool,
   customProps: PropTypes.shape({
     LabelProps: PropTypes.object,
     CheckBoxProps: PropTypes.object,
     ValidationMessageProps1: PropTypes.object,
     ValidationMessageProps2: PropTypes.object
-  })
+  }),
+  ...FieldCommonPropTypes()
 };
 CheckBoxField.defaultProps = {
-  isMandatory: false,
   errorType: 'primary',
-  isDisabled: false,
-  isReadOnly: false,
   fieldSize: 'medium',
   labelPalette: 'default',
   labelCustomClass: '',
   direction: 'row',
   lineClamp: '',
-  customProps: {}
+  customProps: {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {

package/es/form/fields/CheckBoxField/docs/CheckBoxField__default.docs.js

@@ -16,7 +16,14 @@ export default class CheckBoxField__default extends Component {
       id: "checkbox",
       validationMessage: "Invalid Input",
       isDisabled: true,
-      title: "Invalid Permission"
+      title: "Invalid Permission",
+      infoText: "infoText",
+      isLocked: true,
+      ePhiData: {
+        ePhiTitle: 'ePhiTitle',
+        ePhiText: 'ePhiText',
+        ePhiStatus: true
+      }
     }));
   }
 

package/es/form/fields/CurrencyField/CurrencyField.js

@@ -1,4 +1,4 @@
-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 _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); }
 
 /**** Libraries ****/
 import React, { PureComponent } from 'react';
@@ -9,9 +9,11 @@ import Label from '@zohodesk/components/lib/Label/Label';
 import TextBox from '@zohodesk/components/lib/TextBox/TextBox';
 import ValidationMessage from '../ValidationMessage/ValidationMessage';
 import { getUniqueId } from '@zohodesk/components/lib/Provider/IdProvider';
-/**** Icons ****/
+import FieldContainer from '../FieldContainer/FieldContainer';
+/**** props ****/
 
-import Icon from '@zohodesk/icons/lib/Icon';
+import { FieldCommonDefaultProps } from '../props/FieldCommonDefaultProps';
+import { FieldCommonPropTypes } from '../props/FieldCommonPropTypes';
 /**** CSS ****/
 
 import style from '../Fields.module.css';
@@ -81,7 +83,6 @@ export default class CurrencyField extends PureComponent {
       errorType,
       isDisabled,
       title,
-      onBlur,
       dataId,
       validationRuleMessage,
       validationRulePalette,
@@ -99,7 +100,8 @@ export default class CurrencyField extends PureComponent {
       isClickable,
       userCurrencyType,
       customProps,
-      formatCurrency
+      formatCurrency,
+      renderLabelProps
     } = this.props;
     const {
       LabelProps = {},
@@ -122,8 +124,11 @@ export default class CurrencyField extends PureComponent {
     return /*#__PURE__*/React.createElement("div", {
       className: `${style.container} ${isDisabled ? style.disabled : isReadOnly ? style.readonly : ''}`,
       "data-title": isDisabled ? title : null
-    }, labelName && /*#__PURE__*/React.createElement("div", {
-      className: style.labelContainer
+    }, labelName && /*#__PURE__*/React.createElement(FieldContainer, {
+      infoText: infoText,
+      isLocked: isLocked,
+      lockedInfoText: lockedInfoText,
+      renderProps: renderLabelProps
     }, /*#__PURE__*/React.createElement(Label, _extends({
       text: labelName,
       size: fieldSize === 'small' ? 'small' : 'medium',
@@ -131,17 +136,7 @@ export default class CurrencyField extends PureComponent {
       customClass: `${style.fieldLabel} ${labelCustomClass} ${isMandatory ? style.labelMandatory : ''}`,
       htmlFor: uniqueId,
       dataId: isDisabled ? `${dataId}_label_disabled` : isMandatory ? `${dataId}_label_mandatory` : `${dataId}_label`
-    }, LabelProps)), infoText ? /*#__PURE__*/React.createElement(Icon, {
-      name: "ZD-GN-info",
-      iconClass: style.infoIcon,
-      title: infoText,
-      size: "15"
-    }) : null, isLocked ? /*#__PURE__*/React.createElement(Icon, {
-      name: "ZD-GN-lock",
-      size: "13",
-      iconClass: style.lockIcon,
-      title: lockedInfoText
-    }) : null), /*#__PURE__*/React.createElement("div", {
+    }, LabelProps))), /*#__PURE__*/React.createElement("div", {
       className: `${style.fieldContainer} ${labelName ? style[`fieldMargin_${fieldSize}`] : ''}`
     }, /*#__PURE__*/React.createElement(TextBox, _extends({
       htmlId: uniqueId,
@@ -182,15 +177,10 @@ export default class CurrencyField extends PureComponent {
 }
 CurrencyField.propTypes = {
   borderColor: PropTypes.oneOf(['transparent', 'default']),
-  dataId: PropTypes.string,
   errorType: PropTypes.oneOf(['primary', 'secondary']),
   fieldSize: PropTypes.oneOf(['small', 'medium']),
   getRef: PropTypes.func,
   id: PropTypes.string,
-  infoText: PropTypes.string,
-  isDisabled: PropTypes.bool,
-  isMandatory: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   labelCustomClass: PropTypes.string,
   labelName: PropTypes.string.isRequired,
   labelPalette: PropTypes.string,
@@ -208,8 +198,6 @@ CurrencyField.propTypes = {
   validationRuleMessage: PropTypes.string,
   validationRulePalette: PropTypes.string,
   value: PropTypes.string,
-  lockedInfoText: PropTypes.string,
-  isLocked: PropTypes.bool,
   isClickable: PropTypes.bool,
   needReadOnlyStyle: PropTypes.bool,
   customProps: PropTypes.shape({
@@ -218,24 +206,23 @@ CurrencyField.propTypes = {
     ValidationMessageProps1: PropTypes.object,
     ValidationMessageProps2: PropTypes.object
   }),
-  formatCurrency: PropTypes.func
+  formatCurrency: PropTypes.func,
+  ...FieldCommonPropTypes()
 };
 CurrencyField.defaultProps = {
   errorType: 'primary',
-  isMandatory: false,
   textBoxSize: 'xmedium',
   textBoxType: 'text',
   textBoxVariant: 'primary',
   borderColor: 'default',
-  isDisabled: false,
-  isReadOnly: false,
   fieldSize: 'medium',
   labelPalette: 'default',
   labelCustomClass: '',
   isClickable: false,
   needReadOnlyStyle: true,
   customProps: {},
-  formatCurrency: () => {}
+  formatCurrency: () => {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {