@zohodesk/components 1.6.7 → 1.6.8

package/es/Typography/css/Typography.module.css

@@ -177,6 +177,10 @@
   white-space: pre-wrap
 }
 
+.whiteSpace_breakSpaces {
+  white-space: break-spaces;
+}
+
 
 
 /*...............Font Size Start.........*/

package/es/Typography/css/cssJSLogic.js

@@ -7,48 +7,80 @@ export default function cssJSLogic(_ref) {
   } = _ref;
   let {
     $flag_reset,
+    shouldReset,
     $flag_dotted,
+    isDotted,
     $ui_size,
+    size,
     $ui_lineClamp,
+    lineClamp,
     $ui_lineHeight,
+    lineHeight,
     $ui_display,
+    display,
     $ui_weight,
+    weight,
     $ui_typeFace,
+    typeFace,
     $ui_textAlign,
+    textAlign,
     $ui_letterSpacing,
+    letterSpacing,
     $ui_transform,
+    transform,
     $ui_decoration,
+    decoration,
     $ui_className,
+    customClass,
     $ui_wordBreak,
+    wordBreak,
     $ui_wordWrap,
-    $ui_whiteSpace
+    wordWrap,
+    $ui_whiteSpace,
+    whiteSpace
   } = props;
+  const finalReset = shouldReset !== undefined ? shouldReset : $flag_reset;
+  const finalDotted = isDotted !== undefined ? isDotted : $flag_dotted;
+  const finalSize = size !== undefined ? size : $ui_size;
+  const finalLineClamp = lineClamp !== undefined ? lineClamp : $ui_lineClamp;
+  const finalDisplay = display !== undefined ? display : $ui_display;
+  const finalWeight = weight !== undefined ? weight : $ui_weight;
+  const finalTypeFace = typeFace !== undefined ? typeFace : $ui_typeFace;
+  const finalTextAlign = textAlign !== undefined ? textAlign : $ui_textAlign;
+  const finalTransform = transform !== undefined ? transform : $ui_transform;
+  const finalDecoration = decoration !== undefined ? decoration : $ui_decoration;
+  const finalClassName = customClass !== undefined ? customClass : $ui_className;
+  const finalWordBreak = wordBreak !== undefined ? wordBreak : $ui_wordBreak;
+  const finalWordWrap = wordWrap !== undefined ? wordWrap : $ui_wordWrap;
+  const finalWhiteSpace = whiteSpace !== undefined ? whiteSpace : $ui_whiteSpace;
+  let finalLineHeight = lineHeight !== undefined ? lineHeight : $ui_lineHeight;
+  let finalLetterSpacing = letterSpacing !== undefined ? letterSpacing : $ui_letterSpacing;
 
-  if ($ui_letterSpacing) {
-    $ui_letterSpacing = letterspacingMapping[$ui_letterSpacing];
+  if (finalLetterSpacing) {
+    finalLetterSpacing = letterspacingMapping[finalLetterSpacing];
   }
 
-  if ($ui_lineHeight) {
-    $ui_lineHeight = lineheightMapping[$ui_lineHeight];
+  if (finalLineHeight) {
+    finalLineHeight = lineheightMapping[finalLineHeight];
   }
 
   let typographyClass = compileClassNames({
-    [style.reset]: $flag_reset,
-    [style.dotted]: $flag_dotted,
-    [style[`size${$ui_size}`]]: !!$ui_size,
-    [style[`lineclamp_${$ui_lineClamp}`]]: !!$ui_lineClamp,
-    [style[`lineheight_${$ui_lineHeight}`]]: !!$ui_lineHeight,
-    [style[`display_${$ui_display}`]]: !!$ui_display,
-    [style[`font_${$ui_weight}`]]: !!$ui_weight,
-    [style[`fontStyles_${$ui_typeFace}`]]: !!$ui_typeFace,
-    [style[`textalign_${$ui_textAlign}`]]: !!$ui_textAlign,
-    [style[`letterspacing_${$ui_letterSpacing}`]]: !!$ui_letterSpacing,
-    [style[`transform_${$ui_transform}`]]: !!$ui_transform,
-    [style[`decoration_${$ui_decoration}`]]: !!$ui_decoration,
-    [$ui_className]: !!$ui_className,
-    [style[`wordBreak_${$ui_wordBreak}`]]: !!$ui_wordBreak,
-    [style[`wordWrap_${$ui_wordWrap}`]]: !!$ui_wordWrap,
-    [style[`whiteSpace_${$ui_whiteSpace}`]]: !!$ui_whiteSpace
+    [style.reset]: finalReset,
+    [style.dotted]: finalDotted,
+    [style[`size${finalSize}`]]: !!finalSize,
+    [style[`lineclamp_${finalLineClamp}`]]: !!finalLineClamp,
+    [style[`lineheight_${finalLineHeight}`]]: !!finalLineHeight,
+    [style[`display_${finalDisplay}`]]: !!finalDisplay,
+    [style[`font_${finalWeight}`]]: !!finalWeight,
+    [style[`fontStyles_${finalTypeFace}`]]: !!finalTypeFace,
+    [style[`textalign_${finalTextAlign}`]]: !!finalTextAlign,
+    [style[`letterspacing_${finalLetterSpacing}`]]: !!finalLetterSpacing,
+    [style[`transform_${finalTransform}`]]: !!finalTransform,
+    [style[`decoration_${finalDecoration}`]]: !!finalDecoration,
+    [finalClassName]: !!finalClassName,
+    [style[`wordBreak_${finalWordBreak}`]]: !!finalWordBreak,
+    [style[`wordWrap_${finalWordWrap}`]]: !!finalWordWrap,
+    [style[`whiteSpace_${finalWhiteSpace}`]]: !!finalWhiteSpace
   });
   return {
     typographyClass

package/es/Typography/props/defaultProps.js

@@ -1,9 +1,10 @@
+import { DUMMY_OBJECT } from '@zohodesk/dotkit/es/utils/constants';
 export const defaultProps = {
   $ui_className: '',
   $ui_tagName: 'div',
   $flag_reset: false,
   $flag_dotted: false,
-  $tagAttributes_text: {},
-  $a11yAttributes_text: {},
-  $ui_highlightConfig: {}
+  $tagAttributes_text: DUMMY_OBJECT,
+  $a11yAttributes_text: DUMMY_OBJECT,
+  $ui_highlightConfig: DUMMY_OBJECT
 };

package/es/Typography/props/propTypes.js

@@ -1,46 +1,88 @@
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types'; // Define prop types once to avoid duplication
+
+const propTypeDefinitions = {
+  shouldReset: PropTypes.bool,
+  display: PropTypes.oneOf(['block', 'inlineBlock', 'inline', 'initial']),
+  weight: PropTypes.oneOf(['regular', 'light', 'semibold', 'bold']),
+  isDotted: PropTypes.bool,
+  textAlign: PropTypes.oneOf(['left', 'right', 'center', 'justify']),
+  transform: PropTypes.oneOf(['default', 'upper', 'lower', 'capital']),
+  lineClamp: PropTypes.oneOf(['1', '2', '3', '4', '5']),
+  typeFace: PropTypes.oneOf(['normal', 'italic']),
+  decoration: PropTypes.oneOf(['default', 'underline', 'strike', 'overline']),
+  size: PropTypes.oneOf(['7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '24', '25', '26', '28', '29', '30', '32', '34', '35', '36', '40', '50', 'inherit']),
+  lineHeight: PropTypes.oneOf(['0', '0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '2', 'normal', 'initial', 'inherit']),
+  letterSpacing: PropTypes.oneOf(['0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '2', 'inherit']),
+  wordBreak: PropTypes.oneOf(['breakAll', 'keepAll', 'breakWord']),
+  wordWrap: PropTypes.oneOf(['normal', 'break']),
+  whiteSpace: PropTypes.oneOf(['normal', 'noWrap', 'pre', 'preLine', 'preWrap', 'breakSpaces']),
+  customClass: PropTypes.string
+};
 const typoStyleProps = {
-  $flag_reset: PropTypes.bool,
-  $flag_dotted: PropTypes.bool,
-  $ui_display: PropTypes.oneOf(['block', 'inlineBlock', 'inline', 'initial']),
-  $ui_weight: PropTypes.oneOf(['regular', 'light', 'semibold', 'bold']),
-  $ui_textAlign: PropTypes.oneOf(['left', 'right', 'center', 'justify']),
-  $ui_transform: PropTypes.oneOf(['default', 'upper', 'lower', 'capital']),
-  $ui_lineClamp: PropTypes.oneOf(['1', '2', '3', '4', '5']),
-  $ui_typeFace: PropTypes.oneOf(['normal', 'italic']),
-  $ui_decoration: PropTypes.oneOf(['default', 'underline', 'strike', 'overline']),
-  $ui_size: PropTypes.oneOf(['7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '24', '25', '26', '28', '29', '30', '32', '34', '35', '36', '40', '50', 'inherit']),
-  $ui_lineHeight: PropTypes.oneOf(['0', '0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '2', 'normal', 'initial', 'inherit']),
-  $ui_letterSpacing: PropTypes.oneOf(['0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9', '1', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '2', 'inherit']),
-  $ui_wordBreak: PropTypes.oneOf(['breakAll', 'keepAll', 'breakWord']),
-  $ui_wordWrap: PropTypes.oneOf(['normal', 'break']),
-  $ui_whiteSpace: PropTypes.oneOf(['normal', 'noWrap', 'pre', 'preLine', 'preWrap']),
-  $ui_className: PropTypes.string
+  $flag_reset: propTypeDefinitions.shouldReset,
+  shouldReset: propTypeDefinitions.shouldReset,
+  $flag_dotted: propTypeDefinitions.isDotted,
+  isDotted: propTypeDefinitions.isDotted,
+  $ui_display: propTypeDefinitions.display,
+  display: propTypeDefinitions.display,
+  $ui_weight: propTypeDefinitions.weight,
+  weight: propTypeDefinitions.weight,
+  $ui_textAlign: propTypeDefinitions.textAlign,
+  textAlign: propTypeDefinitions.textAlign,
+  $ui_transform: propTypeDefinitions.transform,
+  transform: propTypeDefinitions.transform,
+  $ui_lineClamp: propTypeDefinitions.lineClamp,
+  lineClamp: propTypeDefinitions.lineClamp,
+  $ui_typeFace: propTypeDefinitions.typeFace,
+  typeFace: propTypeDefinitions.typeFace,
+  $ui_decoration: propTypeDefinitions.decoration,
+  decoration: propTypeDefinitions.decoration,
+  $ui_size: propTypeDefinitions.size,
+  size: propTypeDefinitions.size,
+  $ui_lineHeight: propTypeDefinitions.lineHeight,
+  lineHeight: propTypeDefinitions.lineHeight,
+  $ui_letterSpacing: propTypeDefinitions.letterSpacing,
+  letterSpacing: propTypeDefinitions.letterSpacing,
+  $ui_wordBreak: propTypeDefinitions.wordBreak,
+  wordBreak: propTypeDefinitions.wordBreak,
+  $ui_wordWrap: propTypeDefinitions.wordWrap,
+  wordWrap: propTypeDefinitions.wordWrap,
+  $ui_whiteSpace: propTypeDefinitions.whiteSpace,
+  whiteSpace: propTypeDefinitions.whiteSpace,
+  $ui_className: propTypeDefinitions.customClass,
+  customClass: propTypeDefinitions.customClass
 };
 const highlightProps = {
   customStyle: PropTypes.object,
   shouldExcludeIndices: PropTypes.bool,
   isCaseSensitive: PropTypes.bool,
   isWholeWord: PropTypes.bool,
-  tagName: PropTypes.string,
+  as: PropTypes.string,
   renderHighlight: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
   styleConfiguration: PropTypes.shape(typoStyleProps)
 };
+const highlightDataItemShape = PropTypes.shape({
+  text: PropTypes.string,
+  index: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.number]),
+  ...highlightProps
+});
+const highlightConfigShape = PropTypes.shape({
+  data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, highlightDataItemShape])),
+  ...highlightProps
+});
 export const propTypes = { ...typoStyleProps,
   children: PropTypes.node,
   $ui_tagName: PropTypes.string,
+  as: PropTypes.string,
   $i18n_dataTitle: PropTypes.string,
+  dataTitle: PropTypes.string,
   testId: PropTypes.string,
   customId: PropTypes.string,
   customStyle: PropTypes.object,
   $a11yAttributes_text: PropTypes.object,
+  a11yAttributes: PropTypes.object,
   $tagAttributes_text: PropTypes.object,
-  $ui_highlightConfig: PropTypes.shape({
-    data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
-      text: PropTypes.string,
-      index: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.number]),
-      ...highlightProps
-    })])),
-    ...highlightProps
-  })
+  tagAttributes: PropTypes.object,
+  $ui_highlightConfig: highlightConfigShape,
+  highlightConfig: highlightConfigShape
 };

package/es/Typography/utils/textHighlighter.js

@@ -11,9 +11,11 @@ export function highlightText(config) {
     shouldExcludeIndices = false,
     isCaseSensitive: enableCaseSensitiveMatch = false,
     isWholeWord: matchWholeWordOnly = false,
-    tagName: wrapperTagName = 'span',
+    as: asTag,
+    tagName: tagNameLegacy,
     renderHighlight: customRenderer
   } = config;
+  const wrapperTagName = asTag ?? tagNameLegacy ?? 'span';
 
   if (!sourceText || !highlightData?.length) {
     return sourceText;
@@ -55,7 +57,7 @@ export function highlightText(config) {
       shouldExcludeIndices: itemConfiguration.shouldExcludeIndices !== undefined ? itemConfiguration.shouldExcludeIndices : shouldExcludeIndices,
       isCaseSensitive: itemConfiguration.isCaseSensitive !== undefined ? itemConfiguration.isCaseSensitive : enableCaseSensitiveMatch,
       matchWholeWordOnly: itemConfiguration.isWholeWord !== undefined ? itemConfiguration.isWholeWord : matchWholeWordOnly,
-      wrapperTagName: itemConfiguration.tagName !== undefined ? itemConfiguration.tagName : wrapperTagName,
+      wrapperTagName: itemConfiguration.as !== undefined ? itemConfiguration.as : itemConfiguration.tagName !== undefined ? itemConfiguration.tagName : wrapperTagName,
       customStyle: customStyle,
       customRenderer: itemConfiguration.renderHighlight !== undefined ? itemConfiguration.renderHighlight : customRenderer,
       highlightClasses: typographyClass,

package/lib/Typography/Typography.js

@@ -29,16 +29,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var Typography = function Typography(props) {
   var children = props.children,
+      as = props.as,
       $ui_tagName = props.$ui_tagName,
+      dataTitle = props.dataTitle,
       $i18n_dataTitle = props.$i18n_dataTitle,
       testId = props.testId,
       customId = props.customId,
+      tagAttributes = props.tagAttributes,
       $tagAttributes_text = props.$tagAttributes_text,
+      a11yAttributes = props.a11yAttributes,
       $a11yAttributes_text = props.$a11yAttributes_text,
       customStyle = props.customStyle,
+      highlightConfig = props.highlightConfig,
       $ui_highlightConfig = props.$ui_highlightConfig;
-  var _$ui_highlightConfig$ = $ui_highlightConfig.data,
-      highlightData = _$ui_highlightConfig$ === void 0 ? [] : _$ui_highlightConfig$;
   var style = (0, _utils.mergeStyle)(_TypographyModule["default"], customStyle);
 
   var _cssJSLogic = (0, _cssJSLogic2["default"])({
@@ -47,12 +50,19 @@ var Typography = function Typography(props) {
   }),
       typographyClass = _cssJSLogic.typographyClass;
 
-  return /*#__PURE__*/_react["default"].createElement($ui_tagName, _objectSpread(_objectSpread({
+  var finalTagName = as !== undefined ? as : $ui_tagName;
+  var finalA11yAttributes = a11yAttributes !== undefined ? a11yAttributes : $a11yAttributes_text;
+  var finalTagAttributes = tagAttributes !== undefined ? tagAttributes : $tagAttributes_text;
+  var finalDataTitle = dataTitle !== undefined ? dataTitle : $i18n_dataTitle;
+  var finalHighlightConfig = highlightConfig !== undefined ? highlightConfig : $ui_highlightConfig;
+  var _finalHighlightConfig = finalHighlightConfig.data,
+      highlightData = _finalHighlightConfig === void 0 ? [] : _finalHighlightConfig;
+  return /*#__PURE__*/_react["default"].createElement(finalTagName, _objectSpread(_objectSpread({
     className: typographyClass,
-    'data-title': $i18n_dataTitle,
+    'data-title': finalDataTitle,
     'data-id': customId,
     'data-test-id': testId
-  }, $tagAttributes_text), $a11yAttributes_text), highlightData && highlightData.length > 0 && typeof children === 'string' ? (0, _textHighlighter.highlightText)(_objectSpread(_objectSpread({}, $ui_highlightConfig), {}, {
+  }, finalTagAttributes), finalA11yAttributes), highlightData && highlightData.length > 0 && typeof children === 'string' ? (0, _textHighlighter.highlightText)(_objectSpread(_objectSpread({}, finalHighlightConfig), {}, {
     text: children
   })) : children);
 };