@zohodesk/dot 1.0.0-temp-88 → 1.0.0-temp.30

package/es/form/fields/SelectField/SelectField.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 Select from '@zohodesk/components/lib/Select/Select';
 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';
@@ -94,7 +96,8 @@ export default class SelectField extends PureComponent {
       children,
       onFocus,
       iconOnHover,
-      customProps
+      customProps,
+      renderLabelProps
     } = this.props;
     const {
       LabelProps = {},
@@ -106,8 +109,11 @@ export default class SelectField 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',
@@ -115,17 +121,7 @@ export default class SelectField 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}`] : ''} ${fieldClass ? fieldClass : ''}`
     }, /*#__PURE__*/React.createElement(Select, _extends({
       options: options,
@@ -176,7 +172,6 @@ export default class SelectField extends PureComponent {
 SelectField.propTypes = {
   animationStyle: PropTypes.string,
   borderColor: PropTypes.oneOf(['transparent', 'default']),
-  dataId: PropTypes.string,
   emptyMessage: PropTypes.string,
   errorType: PropTypes.oneOf(['primary', 'secondary']),
   excludeOptions: PropTypes.array,
@@ -185,17 +180,11 @@ SelectField.propTypes = {
   getNextOptions: PropTypes.func,
   getRef: PropTypes.func,
   id: PropTypes.string,
-  infoText: PropTypes.string,
-  isDisabled: PropTypes.bool,
   isFocusOnLabelClick: PropTypes.bool,
-  isLocked: PropTypes.bool,
-  isMandatory: PropTypes.bool,
   isNextOptions: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   labelCustomClass: PropTypes.string,
   labelName: PropTypes.string,
   labelPalette: PropTypes.string,
-  lockedInfoText: PropTypes.string,
   needLocalSearch: PropTypes.bool,
   needSearch: PropTypes.bool,
   onChange: PropTypes.func,
@@ -225,25 +214,24 @@ SelectField.propTypes = {
     SelectProps: PropTypes.object,
     ValidationMessageProps1: PropTypes.object,
     ValidationMessageProps2: PropTypes.object
-  })
+  }),
+  ...FieldCommonPropTypes()
 };
 SelectField.defaultProps = {
   errorType: 'primary',
-  isMandatory: false,
   needSearch: false,
   searchBoxSize: 'small',
   textBoxSize: 'xmedium',
   textBoxVariant: 'primary',
   borderColor: 'default',
-  isDisabled: false,
-  isReadOnly: false,
   fieldSize: 'medium',
   isFocusOnLabelClick: true,
   labelPalette: 'default',
   labelCustomClass: '',
   isDefaultSelectValue: true,
   placeHolder: '',
-  customProps: {}
+  customProps: {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {

package/es/form/fields/SelectField/docs/SelectField__default.docs.js

@@ -44,7 +44,14 @@ export default class SelectField__default extends Component {
       textBoxSize: "xmedium",
       textBoxVariant: "primary",
       searchBoxSize: "xmedium",
-      validationMessage: "Invalid Input"
+      validationMessage: "Invalid Input",
+      infoText: "infoText",
+      isLocked: true,
+      ePhiData: {
+        ePhiTitle: 'ePhiTitle',
+        ePhiText: 'ePhiText',
+        ePhiStatus: true
+      }
     });
   }
 

package/es/form/fields/TagsMultiSelect/TagsMultiSelect.js

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { Container, Box } from '@zohodesk/components/lib/Layout';
 import Tag from '@zohodesk/components/lib/Tag/Tag';
 import TextBoxIcon from '@zohodesk/components/lib/TextBoxIcon/TextBoxIcon';
-import EmptySearch from '@zohodesk/svg/lib/svg/EmptySearch';
+import EmptySearch from '@zohodesk/svg/lib/emptystate/version3/EmptySearch';
 import ListItem from '@zohodesk/components/lib/ListItem/ListItem';
-import Loader from '@zohodesk/svg/lib/svg/Loader';
+import Loader from '@zohodesk/svg/lib/Loader/Loader';
 import DropDownSeparator from '@zohodesk/components/lib/DropDown/DropDownSeparator';
 import CommonEmptyState from '../../../emptystate/CommonEmptyState/CommonEmptyState';
 import ResponsiveDropBox from '@zohodesk/components/lib/ResponsiveDropBox/ResponsiveDropBox';
@@ -137,7 +137,8 @@ export default class TagsMultiSelect extends React.Component {
       getTextBoxChildren,
       htmlId,
       boxSize,
-      onSelectTag
+      onSelectTag,
+      clickableTag
     } = this.props;
     let {
       showAll
@@ -170,7 +171,7 @@ export default class TagsMultiSelect extends React.Component {
         text: name,
         onRemove: isReadOnly ? null : deleteTag.bind(this, name),
         closeTitle: i18nKeys.deleteText,
-        palette: tagType === 'SYSTEM' ? 'primary' : 'default',
+        palette: clickableTag ? 'defaultLink' : tagType === 'SYSTEM' ? 'primary' : 'default',
         isReadOnly: isReadOnly,
         onSelectTag: onSelectTag ? onSelectTag : undefined
       })) : null;
@@ -210,7 +211,7 @@ export default class TagsMultiSelect extends React.Component {
         tabletMode
       } = _ref2;
       return /*#__PURE__*/React.createElement(ResponsiveDropBox, {
-        isAnimate: true,
+        isAnimate: false,
         isActive: isPopupReady,
         isArrow: false,
         getRef: getContainerRef,
@@ -318,7 +319,8 @@ TagsMultiSelect.propTypes = {
   getTextBoxChildren: PropTypes.func,
   htmlId: PropTypes.string,
   boxSize: PropTypes.string,
-  onSelectTag: PropTypes.func
+  onSelectTag: PropTypes.func,
+  clickableTag: PropTypes.bool
 };
 TagsMultiSelect.defaultProps = {
   className: '',
@@ -327,7 +329,8 @@ TagsMultiSelect.defaultProps = {
   borderColor: 'default',
   needBorder: true,
   dataId: '',
-  boxSize: 'default'
+  boxSize: 'default',
+  clickableTag: false
 };
 
 if (false) {

package/es/form/fields/TagsMultiSelectField/TagsMultiSelectField.js

@@ -1,12 +1,19 @@
-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, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Container, Box } from '@zohodesk/components/lib/Layout';
+import { Box } from '@zohodesk/components/lib/Layout';
 import Label from '@zohodesk/components/lib/Label/Label';
 import Popup from '@zohodesk/components/lib/Popup/Popup';
 import ValidationMessage from '../ValidationMessage/ValidationMessage';
 import TagsMultiSelect from '../TagsMultiSelect/TagsMultiSelect';
+import FieldContainer from '../FieldContainer/FieldContainer';
+/**** props ****/
+
+import { FieldCommonDefaultProps } from '../props/FieldCommonDefaultProps';
+import { FieldCommonPropTypes } from '../props/FieldCommonPropTypes';
+/**** css ****/
+
 import fieldStyle from '../Fields.module.css';
 import style from './TagsMultiSelectField.module.css';
 
@@ -36,7 +43,8 @@ const TagsMultiSelectField = props => {
     getTextBoxChildren,
     children,
     ePhiData,
-    customProps
+    customProps,
+    clickableTag
   } = props;
   const {
     LabelProps = {},
@@ -71,11 +79,6 @@ const TagsMultiSelectField = props => {
     validationMessage,
     options
   } = fieldProperties;
-  let {
-    ePhiTitle = '',
-    ePhiText = '',
-    ePhiStatus = false
-  } = ePhiData;
   options = options || [];
 
   const handleKeyUp = event => {
@@ -173,6 +176,10 @@ const TagsMultiSelectField = props => {
     changeSearchValue('');
   };
 
+  const renderEnd = () => {
+    return children ? children : null;
+  };
+
   useEffect(() => {
     window.addEventListener('click', documentClick);
     return () => {
@@ -180,12 +187,14 @@ const TagsMultiSelectField = props => {
     };
   }, []);
   return /*#__PURE__*/React.createElement("div", {
-    className: `${style.container} ${isDisabled ? fieldStyle.disabled : isReadOnly ? fieldStyle.readonly : ''}`
-  }, /*#__PURE__*/React.createElement(Container, {
-    alignBox: "row",
-    align: "baseline",
-    isCover: false
-  }, labelName && /*#__PURE__*/React.createElement(Label, _extends({
+    className: `${isDisabled ? fieldStyle.disabled : isReadOnly ? fieldStyle.readonly : ''}`
+  }, labelName && /*#__PURE__*/React.createElement(FieldContainer, {
+    ePhiData: ePhiData,
+    alignContainer: "baseline",
+    renderProps: {
+      end: renderEnd
+    }
+  }, /*#__PURE__*/React.createElement(Label, _extends({
     text: labelName,
     title: labelName,
     id: id,
@@ -197,11 +206,7 @@ const TagsMultiSelectField = props => {
   }, LabelProps)), selectedValueCount ? /*#__PURE__*/React.createElement(Box, {
     dataId: `${dataId}_tagCount`,
     className: style.count
-  }, `(${selectedValueCount})`) : null, ePhiStatus ? /*#__PURE__*/React.createElement("span", {
-    "data-title": ePhiTitle,
-    "data-id": `${dataId}_ePHI`,
-    className: fieldStyle.ePhiTag
-  }, ePhiText) : null, children ? children : null), /*#__PURE__*/React.createElement(TagsMultiSelect, _extends({
+  }, `(${selectedValueCount})`) : null), /*#__PURE__*/React.createElement(TagsMultiSelect, _extends({
     addTag: handleAdd,
     deleteTag: onDelete,
     handleChange: handleChange,
@@ -232,7 +237,9 @@ const TagsMultiSelectField = props => {
     htmlId: htmlId,
     getTextBoxChildren: getTextBoxChildren,
     className: containerClass
-  }, TagsMultiSelectProps)), validationMessage && /*#__PURE__*/React.createElement(ValidationMessage, _extends({
+  }, TagsMultiSelectProps, {
+    clickableTag: clickableTag
+  })), validationMessage && /*#__PURE__*/React.createElement(ValidationMessage, _extends({
     text: validationMessage,
     palette: validationPalette,
     type: errorType,
@@ -252,7 +259,8 @@ TagsMultiSelectField.propTypes = {
     value: PropTypes.string,
     selectedValueCount: PropTypes.string,
     validationMessage: PropTypes.string,
-    options: PropTypes.array
+    options: PropTypes.array,
+    clickableTag: PropTypes.bool
   }),
   styleProperties: PropTypes.shape({
     labelSize: PropTypes.string,
@@ -284,16 +292,12 @@ TagsMultiSelectField.propTypes = {
   position: PropTypes.string,
   getContainerRef: PropTypes.func,
   getTargetRef: PropTypes.func,
-  ePhiData: PropTypes.shape({
-    ePhiTitle: PropTypes.string,
-    ePhiText: PropTypes.string,
-    ePhiStatus: PropTypes.bool
-  }),
   customProps: PropTypes.shape({
     LabelProps: PropTypes.object,
     TagsMultiSelectProps: PropTypes.object,
     ValidationMessageProps: PropTypes.object
-  })
+  }),
+  ...FieldCommonPropTypes()
 };
 TagsMultiSelectField.defaultProps = {
   fieldProperties: {
@@ -309,8 +313,8 @@ TagsMultiSelectField.defaultProps = {
   isNewNeeded: false,
   i18nKeys: {},
   numberOfDisplayedValues: '5',
-  ePhiData: {},
-  customProps: {}
+  customProps: {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {

package/es/form/fields/TextBoxField/TextBoxField.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 TextBoxIcon from '@zohodesk/components/lib/TextBoxIcon/TextBoxIcon';
 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';
@@ -82,7 +84,8 @@ export default class TextBoxField extends PureComponent {
       onFocus,
       ePhiData,
       children,
-      customProps
+      customProps,
+      renderLabelProps
     } = this.props;
     const {
       LabelProps = {},
@@ -90,17 +93,17 @@ export default class TextBoxField extends PureComponent {
       ValidationMessageProps1 = {},
       ValidationMessageProps2 = {}
     } = customProps;
-    let {
-      ePhiTitle = '',
-      ePhiText = '',
-      ePhiStatus = false
-    } = ePhiData;
     let uniqueId = htmlId ? htmlId : this.getNextId();
     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,
+      ePhiData: ePhiData,
+      dataId: dataId,
+      renderProps: renderLabelProps
     }, /*#__PURE__*/React.createElement(Label, _extends({
       text: labelName,
       size: fieldSize === 'small' ? 'small' : 'medium',
@@ -108,21 +111,7 @@ export default class TextBoxField 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, ePhiStatus ? /*#__PURE__*/React.createElement("span", {
-      "data-title": ePhiTitle,
-      "data-id": `${dataId}_ePHI`,
-      className: style.ePhiTag
-    }, ePhiText) : null), /*#__PURE__*/React.createElement("div", {
+    }, LabelProps))), /*#__PURE__*/React.createElement("div", {
       className: `${style.fieldContainer} ${labelName ? style[`fieldMargin_${fieldSize}`] : ''}`
     }, /*#__PURE__*/React.createElement(TextBoxIcon, _extends({
       htmlId: uniqueId,
@@ -163,16 +152,11 @@ export default class TextBoxField extends PureComponent {
 }
 TextBoxField.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,
   // isFocusOnLabelClick: PropTypes.bool,
-  isMandatory: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   labelCustomClass: PropTypes.string,
   labelName: PropTypes.string.isRequired,
   labelPalette: PropTypes.string,
@@ -190,40 +174,31 @@ TextBoxField.propTypes = {
   validationRuleMessage: PropTypes.string,
   validationRulePalette: PropTypes.string,
   value: PropTypes.string,
-  lockedInfoText: PropTypes.string,
-  isLocked: PropTypes.bool,
   isClickable: PropTypes.bool,
   needReadOnlyStyle: PropTypes.bool,
-  ePhiData: PropTypes.shape({
-    ePhiTitle: PropTypes.string,
-    ePhiText: PropTypes.string,
-    ePhiStatus: PropTypes.bool
-  }),
   children: PropTypes.node,
   customProps: PropTypes.shape({
     LabelProps: PropTypes.object,
     TextBoxIconProps: PropTypes.object,
     ValidationMessageProps1: PropTypes.object,
     ValidationMessageProps2: PropTypes.object
-  })
+  }),
+  ...FieldCommonPropTypes()
 };
 TextBoxField.defaultProps = {
   errorType: 'primary',
-  isMandatory: false,
   textBoxSize: 'xmedium',
   textBoxType: 'text',
   textBoxVariant: 'primary',
   borderColor: 'default',
-  isDisabled: false,
-  isReadOnly: false,
   fieldSize: 'medium',
   // isFocusOnLabelClick: true,
   labelPalette: 'default',
   labelCustomClass: '',
   isClickable: false,
   needReadOnlyStyle: true,
-  ePhiData: {},
-  customProps: {}
+  customProps: {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {

package/es/form/fields/TextBoxField/docs/TextBoxField__default.docs.js

@@ -6,6 +6,21 @@ import Icon from '@zohodesk/icons/lib/Icon';
 export default class TextBoxField__default extends Component {
   constructor(props) {
     super(props);
+    this.renderStart = this.renderStart.bind(this);
+    this.renderMiddle = this.renderMiddle.bind(this);
+    this.renderEnd = this.renderEnd.bind(this);
+  }
+
+  renderStart() {
+    return 'Start';
+  }
+
+  renderMiddle() {
+    return 'Middle';
+  }
+
+  renderEnd() {
+    return 'End';
   }
 
   render() {
@@ -23,7 +38,19 @@ export default class TextBoxField__default extends Component {
       labelName: "Contact Name",
       textBoxSize: "xmedium",
       textBoxVariant: "primary",
-      validationMessage: "Invalid Input"
+      validationMessage: "Invalid Input",
+      infoText: "infoText",
+      isLocked: true,
+      ePhiData: {
+        ePhiTitle: 'ePhiTitle',
+        ePhiText: 'ePhiText',
+        ePhiStatus: true
+      },
+      renderLabelProps: {
+        start: this.renderStart,
+        middle: this.renderMiddle,
+        end: this.renderEnd
+      }
     }, /*#__PURE__*/React.createElement(Container, {
       align: "both",
       style: {

package/es/form/fields/TextEditorField/TextEditorField.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';
@@ -6,12 +6,13 @@ import PropTypes from 'prop-types';
 /**** Components ****/
 
 import Label from '@zohodesk/components/lib/Label/Label';
-import { Container, Box } from '@zohodesk/components/lib/Layout';
 import ValidationMessage from '../ValidationMessage/ValidationMessage';
 import TextEditorWrapper from '../TextEditorWrapper/TextEditorWrapper';
-/**** 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';
@@ -21,6 +22,7 @@ export default class TextEditorField extends PureComponent {
     this.handleChange = this.handleChange.bind(this);
     this.handleGetRef = this.handleGetRef.bind(this);
     this.handleLabelClick = this.handleLabelClick.bind(this);
+    this.renderEnd = this.renderEnd.bind(this);
   }
 
   handleChange(value) {
@@ -52,6 +54,13 @@ export default class TextEditorField extends PureComponent {
     }
   }
 
+  renderEnd() {
+    let {
+      children
+    } = this.props;
+    return children ? children : null;
+  }
+
   render() {
     let {
       labelName,
@@ -102,18 +111,18 @@ export default class TextEditorField extends PureComponent {
       TextEditorWrapperProps = {},
       ValidationMessageProps = {}
     } = customProps;
-    let {
-      ePhiTitle = '',
-      ePhiText = '',
-      ePhiStatus = false
-    } = ePhiData;
     return /*#__PURE__*/React.createElement("div", {
       className: `${style.container} ${isDisabled ? style.disabled : isReadOnly ? style.readonly : ''} ${className || ''}`
-    }, /*#__PURE__*/React.createElement(Container, {
-      isCover: false,
-      alignBox: "row",
-      align: "vertical"
-    }, labelName && /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(Label, _extends({
+    }, labelName && /*#__PURE__*/React.createElement(FieldContainer, {
+      infoText: infoText,
+      isLocked: isLocked,
+      lockedInfoText: lockedInfoText,
+      ePhiData: ePhiData,
+      dataId: dataId,
+      renderProps: {
+        end: this.renderEnd
+      }
+    }, /*#__PURE__*/React.createElement(Label, _extends({
       text: labelName,
       size: fieldSize === 'small' ? 'small' : 'medium',
       htmlFor: !isReadOnly && !isDisabled ? id : undefined,
@@ -121,21 +130,7 @@ export default class TextEditorField extends PureComponent {
       onClick: this.handleLabelClick,
       customClass: `${style.fieldLabel} ${labelCustomClass} ${isMandatory ? style.labelMandatory : ''}`,
       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, ePhiStatus ? /*#__PURE__*/React.createElement("span", {
-      "data-title": ePhiTitle,
-      "data-id": `${dataId}_ePHI`,
-      className: style.ePhiTag
-    }, ePhiText) : null, children ? children : null), /*#__PURE__*/React.createElement("div", {
+    }, LabelProps))), /*#__PURE__*/React.createElement("div", {
       className: `${style.fieldContainer} ${labelName ? style[`fieldMargin_${fieldSize}`] : ''}`
     }, /*#__PURE__*/React.createElement(TextEditorWrapper, _extends({
       needEditor: needEditor,
@@ -181,10 +176,7 @@ TextEditorField.propTypes = {
   fieldSize: PropTypes.oneOf(['small', 'medium']),
   getRef: PropTypes.func,
   id: PropTypes.string,
-  isDisabled: PropTypes.bool,
   isFocusOnLabelClick: PropTypes.bool,
-  isMandatory: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   labelCustomClass: PropTypes.string,
   labelName: PropTypes.string,
   labelPalette: PropTypes.string,
@@ -196,9 +188,6 @@ TextEditorField.propTypes = {
   validationMessage: PropTypes.string,
   validationPalette: PropTypes.string,
   value: PropTypes.string,
-  infoText: PropTypes.string,
-  isLocked: PropTypes.bool,
-  lockedInfoText: PropTypes.string,
   errorType: PropTypes.string,
   EDITORURL: PropTypes.string,
   editorMode: PropTypes.string,
@@ -219,23 +208,17 @@ TextEditorField.propTypes = {
   setInlineAttachmentInProgress: PropTypes.func,
   handleEditorDropUpload: PropTypes.func,
   children: PropTypes.node,
-  ePhiData: PropTypes.shape({
-    ePhiTitle: PropTypes.string,
-    ePhiText: PropTypes.string,
-    ePhiStatus: PropTypes.bool
-  }),
   needInlineAttachment: PropTypes.bool,
   customProps: PropTypes.shape({
     LabelProps: PropTypes.object,
     TextEditorWrapperProps: PropTypes.object,
     ValidationMessageProps: PropTypes.object
-  })
+  }),
+  ...FieldCommonPropTypes()
 };
 TextEditorField.defaultProps = {
   errorType: 'primary',
   needEditor: true,
-  isDisabled: false,
-  isReadOnly: false,
   isFocusOnLabelClick: true,
   fieldSize: 'medium',
   textBoxSize: 'xsmall',
@@ -243,8 +226,8 @@ TextEditorField.defaultProps = {
   labelPalette: 'default',
   labelCustomClass: '',
   className: '',
-  ePhiData: {},
-  customProps: {}
+  customProps: {},
+  ...FieldCommonDefaultProps()
 };
 
 if (false) {