@pega/dx-component-builder-sdk 23.1.14 → 24.1.10

package/tests/assets/sdk-r/components/createAll/override-sdk/field/Decimal/Decimal.tsx

@@ -1,12 +1,13 @@
-import CurrencyTextField from '@unicef/material-ui-currency-textfield';
-
+import { TextField } from '@material-ui/core';
+import { NumericFormat } from 'react-number-format';
+import { useState } from 'react';
 import { getCurrencyCharacters, getCurrencyOptions } from '@pega/react-sdk-components/lib/components/field/Currency/currency-utils';
 import handleEvent from '@pega/react-sdk-components/lib/components/helpers/event-utils';
 import { format } from '@pega/react-sdk-components/lib/components/helpers/formatters';
 import { getComponentFromMap } from '@pega/react-sdk-components/lib/bridge/helpers/sdk_component_map';
 import { PConnFieldProps } from '@pega/react-sdk-components/lib/types/PConnProps';
 
-/* Using @unicef/material-ui-currency-textfield component here, since it allows formatting decimal values,
+/* Using react-number-format component here, since it allows formatting decimal values,
 as per the locale.
 */
 
@@ -14,7 +15,8 @@ interface DecimalProps extends PConnFieldProps {
   // If any, enter additional props that only exist on Decimal here
   currencyISOCode?: string;
   decimalPrecision?: number;
-  showGroupSeparators?: string;
+  showGroupSeparators?: boolean;
+  formatter?: string;
 }
 
 export default function Decimal(props: DecimalProps) {
@@ -35,12 +37,15 @@ export default function Decimal(props: DecimalProps) {
     displayMode,
     hideLabel,
     currencyISOCode = 'USD',
-    decimalPrecision = 2,
-    showGroupSeparators = true,
+    decimalPrecision,
+    showGroupSeparators,
     testId,
-    placeholder
+    placeholder,
+    formatter
   } = props;
 
+  const [values, setValues] = useState(value.toString());
+
   const pConn = getPConnect();
   const actions = pConn.getActionsApi();
   const propName = (pConn.getStateProps() as any).value;
@@ -49,9 +54,22 @@ export default function Decimal(props: DecimalProps) {
   const theSymbols = getCurrencyCharacters(currencyISOCode);
   const theCurrDec = theSymbols.theDecimalIndicator;
   const theCurrSep = theSymbols.theDigitGroupSeparator;
+  const theCurrSym = theSymbols.theCurrencySymbol;
 
   const theCurrencyOptions = getCurrencyOptions(currencyISOCode);
-  const formattedValue = format(value, pConn.getComponentName().toLowerCase(), theCurrencyOptions);
+
+  let readOnlyProp = {}; // Note: empty if NOT ReadOnly
+
+  if (readOnly) {
+    readOnlyProp = { readOnly: true };
+  }
+
+  let formattedValue = '';
+  if (formatter === 'Currency') {
+    formattedValue = format(value, formatter.toLowerCase(), theCurrencyOptions);
+  } else {
+    formattedValue = format(value, pConn.getComponentName().toLowerCase(), theCurrencyOptions);
+  }
 
   if (displayMode === 'LABELS_LEFT') {
     return <FieldValueList name={hideLabel ? '' : label} value={formattedValue} />;
@@ -65,12 +83,17 @@ export default function Decimal(props: DecimalProps) {
     'data-test-id': testId
   };
 
-  function decimalOnBlur(event, inValue) {
-    handleEvent(actions, 'changeNblur', propName, inValue !== '' ? Number(inValue) : inValue);
+  function decimalOnBlur() {
+    handleEvent(actions, 'changeNblur', propName, values);
   }
 
+  const handleChange = val => {
+    setValues(val.value);
+  };
+
   return (
-    <CurrencyTextField
+    <NumericFormat
+      valueIsNumericString
       fullWidth
       variant={readOnly ? 'standard' : 'outlined'}
       helperText={helperTextToDisplay}
@@ -80,17 +103,17 @@ export default function Decimal(props: DecimalProps) {
       disabled={disabled}
       error={status === 'error'}
       label={label}
-      value={value}
-      readOnly={!!readOnly}
-      type='text'
-      outputFormat='number'
-      textAlign='left'
-      InputProps={{ inputProps: { ...testProp } }}
-      currencySymbol=''
-      decimalCharacter={theCurrDec}
-      digitGroupSeparator={showGroupSeparators ? theCurrSep : ''}
-      decimalPlaces={decimalPrecision}
+      value={values}
+      onValueChange={val => {
+        handleChange(val);
+      }}
       onBlur={!readOnly ? decimalOnBlur : undefined}
+      prefix={readOnly && formatter === 'Currency' ? theCurrSym : ''}
+      decimalSeparator={theCurrDec}
+      thousandSeparator={showGroupSeparators ? theCurrSep : ''}
+      decimalScale={readOnly && formatter === 'Currency' ? undefined : decimalPrecision}
+      InputProps={{ ...readOnlyProp, inputProps: { ...testProp } }}
+      customInput={TextField}
     />
   );
 }

package/tests/assets/sdk-r/components/createAll/override-sdk/field/Multiselect/Multiselect.tsx

@@ -0,0 +1,244 @@
+import { Checkbox, TextField } from '@material-ui/core';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank';
+import CheckBoxIcon from '@material-ui/icons/CheckBox';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { doSearch, getDisplayFieldsMetaData, useDeepMemo, preProcessColumns, getGroupDataForItemsTree } from './utils';
+import { insertInstruction, deleteInstruction } from '@pega/react-sdk-components/lib/components/helpers/instructions-utils';
+import { debounce } from 'throttle-debounce';
+
+const icon = <CheckBoxOutlineBlankIcon fontSize='small' />;
+const checkedIcon = <CheckBoxIcon fontSize='small' />;
+
+export default function Multiselect(props) {
+  const {
+    getPConnect,
+    label,
+    placeholder,
+    referenceList,
+    selectionKey,
+    primaryField,
+    initialCaseClass,
+    showSecondaryInSearchOnly = false,
+    listType = '',
+    isGroupData = false,
+    referenceType,
+    secondaryFields,
+    groupDataSource = [],
+    parameters = {},
+    matchPosition = 'contains',
+    maxResultsDisplay,
+    groupColumnsConfig = [{}],
+    selectionList,
+    value
+  } = props;
+  let { datasource = [], columns = [{}] } = props;
+
+  if (referenceList.length > 0) {
+    datasource = referenceList;
+    columns = [
+      {
+        value: primaryField,
+        display: 'true',
+        useForSearch: true,
+        primary: 'true'
+      },
+      {
+        value: selectionKey,
+        setProperty: selectionKey,
+        key: 'true'
+      }
+    ];
+    let secondaryColumns: any = [];
+    if (secondaryFields) {
+      secondaryColumns = secondaryFields.map(secondaryField => ({
+        value: secondaryField,
+        display: 'true',
+        secondary: 'true',
+        useForSearch: 'true'
+      }));
+    } else {
+      secondaryColumns = [
+        {
+          value: selectionKey,
+          display: 'true',
+          secondary: 'true',
+          useForSearch: 'true'
+        }
+      ];
+    }
+    if (referenceType === 'Case') {
+      columns = [...columns, ...secondaryColumns];
+    }
+  }
+  const [inputValue, setInputValue] = useState(value);
+  const [selectedItems, setSelectedItems] = useState([]);
+
+  const dataConfig = useDeepMemo(() => {
+    return {
+      dataSource: datasource,
+      groupDataSource,
+      isGroupData,
+      showSecondaryInSearchOnly,
+      parameters,
+      matchPosition,
+      listType,
+      maxResultsDisplay: maxResultsDisplay || '100',
+      columns: preProcessColumns(columns),
+      groupColumnsConfig: preProcessColumns(groupColumnsConfig)
+    };
+  }, [
+    datasource,
+    groupDataSource,
+    isGroupData,
+    showSecondaryInSearchOnly,
+    parameters,
+    matchPosition,
+    listType,
+    maxResultsDisplay,
+    columns,
+    groupColumnsConfig
+  ]);
+  const groupsDisplayFieldMeta = useMemo(
+    () => (listType !== 'associated' ? getDisplayFieldsMetaData(dataConfig.groupColumnsConfig) : null),
+    [dataConfig.groupColumnsConfig]
+  );
+
+  const itemsTreeBaseData = getGroupDataForItemsTree(groupDataSource, groupsDisplayFieldMeta, showSecondaryInSearchOnly) || [];
+
+  const [itemsTree, setItemsTree] = useState(
+    isGroupData ? getGroupDataForItemsTree(groupDataSource, groupsDisplayFieldMeta, showSecondaryInSearchOnly) : []
+  );
+
+  const displayFieldMeta = listType !== 'associated' ? getDisplayFieldsMetaData(dataConfig.columns) : null;
+  const getCaseListBasedOnParamsDebounced: any = useRef();
+  const pConn = getPConnect();
+  const contextName = pConn.getContextName();
+  const listActions = pConn.getListActions();
+  const dataApiObj: any = useRef();
+
+  // main search function trigger
+  const getCaseListBasedOnParams = async (searchText, group, selectedRows, currentItemsTree, isTriggeredFromSearch = false) => {
+    if (referenceList && referenceList.length > 0) {
+      selectedRows = await listActions.getSelectedRows(true);
+
+      selectedRows =
+        selectedRows &&
+        selectedRows.map(item => {
+          return {
+            id: item[selectionKey.startsWith('.') ? selectionKey.substring(1) : selectionKey],
+            primary: item[primaryField.startsWith('.') ? primaryField.substring(1) : primaryField]
+          };
+        });
+      setSelectedItems(selectedRows);
+    }
+
+    // if items tree is null or text search is triggered then always should use fresh data object, we use the original object
+    const initalItemsTree = isTriggeredFromSearch || !currentItemsTree ? [...itemsTreeBaseData] : [...currentItemsTree];
+    const res = await doSearch(
+      searchText,
+      group,
+      initialCaseClass,
+      displayFieldMeta,
+      dataApiObj.current,
+      initalItemsTree,
+      isGroupData,
+      showSecondaryInSearchOnly,
+      selectedRows || []
+    );
+    setItemsTree(res);
+  };
+
+  useEffect(() => {
+    if (referenceList && referenceList.length > 0) {
+      pConn.setReferenceList(selectionList);
+    }
+  }, [pConn]);
+
+  useEffect(() => {
+    getCaseListBasedOnParamsDebounced.current = debounce(500, getCaseListBasedOnParams);
+  }, []);
+
+  useEffect(() => {
+    if (listType !== 'associated') {
+      PCore.getDataApi()
+        ?.init(dataConfig, contextName)
+        .then(dataObj => {
+          dataApiObj.current = dataObj;
+          if (!isGroupData) {
+            getCaseListBasedOnParamsDebounced.current(inputValue ?? '', '', [...selectedItems], [...itemsTree]);
+          }
+        });
+    }
+  }, [dataConfig, listType, dataConfig.columns, inputValue, dataConfig.groupColumnsConfig, showSecondaryInSearchOnly]);
+
+  const onSearchHandler = ev => {
+    const searchText = ev.target.value;
+    setInputValue(searchText);
+    getCaseListBasedOnParamsDebounced.current(searchText, '', [...selectedItems], [...itemsTree], true);
+  };
+
+  const setSelectedItemsForReferenceList = item => {
+    // Clear error messages if any
+    const propName = pConn.getStateProps().selectionList;
+    pConn.clearErrorMessages({
+      property: propName
+    });
+    const { selected } = item;
+    if (selected) {
+      insertInstruction(pConn, selectionList, selectionKey, primaryField, item);
+    } else {
+      deleteInstruction(pConn, selectionList, selectionKey, item);
+    }
+  };
+
+  const handleChange = (event, newSelectedValues) => {
+    let clickedItem;
+    let updatedItems: any = [];
+    if (newSelectedValues && newSelectedValues.length > 0) {
+      updatedItems = newSelectedValues.map(ele => {
+        ele.selected = true;
+        return ele;
+      });
+    }
+    if (newSelectedValues.length > selectedItems.length) {
+      clickedItem = newSelectedValues.filter(item => !selectedItems.some((ele: any) => ele.id === item.id));
+    } else {
+      clickedItem = selectedItems.filter((item: any) => !newSelectedValues.some((ele: any) => ele.id === item.id));
+      clickedItem[0].selected = false;
+    }
+    itemsTree.forEach(ele => {
+      ele.selected = !!updatedItems.find(item => item.id === ele.id);
+    });
+
+    setSelectedItems(updatedItems);
+    setItemsTree(itemsTree);
+
+    setInputValue('');
+
+    // if this is a referenceList case
+    if (referenceList) setSelectedItemsForReferenceList(clickedItem[0]);
+  };
+
+  return (
+    <Autocomplete
+      multiple
+      fullWidth
+      options={itemsTree}
+      disableCloseOnSelect
+      getOptionSelected={(option: any, val: any) => option?.primary === val?.primary}
+      getOptionLabel={(option: any) => option?.primary}
+      onChange={handleChange}
+      value={selectedItems}
+      renderOption={(option: any, { selected }) => (
+        <>
+          <Checkbox icon={icon} checkedIcon={checkedIcon} style={{ marginRight: 8 }} checked={selected} />
+          {option.primary}
+        </>
+      )}
+      renderInput={params => (
+        <TextField {...params} variant='outlined' fullWidth label={label} placeholder={placeholder} size='small' onChange={onSearchHandler} />
+      )}
+    />
+  );
+}

package/tests/assets/sdk-r/components/createAll/override-sdk/field/Multiselect/index.tsx

@@ -0,0 +1 @@
+export { default } from './Multiselect';

package/tests/assets/sdk-r/components/createAll/override-sdk/field/Multiselect/utils.ts

@@ -0,0 +1,230 @@
+import { useRef } from 'react';
+import equal from 'fast-deep-equal';
+import cloneDeep from 'lodash/cloneDeep';
+import { updateNewInstuctions, insertInstruction, deleteInstruction } from '@pega/react-sdk-components/lib/components/helpers/instructions-utils';
+
+export const setVisibilityForList = (c11nEnv, visibility) => {
+  const { selectionMode, selectionList, renderMode, referenceList } = c11nEnv.getComponentConfig();
+  // usecase:multiselect, fieldgroup, editable table
+  if ((selectionMode === PCore.getConstants().LIST_SELECTION_MODE.MULTI && selectionList) || (renderMode === 'Editable' && referenceList)) {
+    c11nEnv.getListActions().setVisibility(visibility);
+  }
+};
+
+const useDeepMemo = (memoFn, key) => {
+  const ref: any = useRef();
+  if (!ref.current || !equal(key, ref.current.key)) {
+    ref.current = { key, value: memoFn() };
+  }
+  return ref.current.value;
+};
+
+const preProcessColumns = columns => {
+  return columns?.map(col => {
+    const tempColObj = { ...col };
+    tempColObj.value = col.value && col.value.startsWith('.') ? col.value.substring(1) : col.value;
+    if (tempColObj.setProperty) {
+      tempColObj.setProperty = col.setProperty && col.setProperty.startsWith('.') ? col.setProperty.substring(1) : col.setProperty;
+    }
+    return tempColObj;
+  });
+};
+
+const getDisplayFieldsMetaData = columns => {
+  const displayColumns = columns?.filter(col => col.display === 'true');
+  const metaDataObj: any = {
+    key: '',
+    primary: '',
+    secondary: []
+  };
+  const keyCol = columns?.filter(col => col.key === 'true');
+  metaDataObj.key = keyCol?.length > 0 ? keyCol[0].value : 'auto';
+  const itemsRecordsColumn = columns?.filter(col => col.itemsRecordsColumn === 'true');
+  if (itemsRecordsColumn?.length > 0) {
+    metaDataObj.itemsRecordsColumn = itemsRecordsColumn[0].value;
+  }
+  const itemsGroupKeyColumn = columns?.filter(col => col.itemsGroupKeyColumn === 'true');
+  if (itemsGroupKeyColumn?.length > 0) {
+    metaDataObj.itemsGroupKeyColumn = itemsGroupKeyColumn[0].value;
+  }
+  for (let index = 0; index < displayColumns?.length; index += 1) {
+    if (displayColumns[index].secondary === 'true') {
+      metaDataObj.secondary.push(displayColumns[index].value);
+    } else if (displayColumns[index].primary === 'true') {
+      metaDataObj.primary = displayColumns[index].value;
+    }
+  }
+  return metaDataObj;
+};
+
+const createSingleTreeObejct = (entry, displayFieldMeta, showSecondaryData, selected) => {
+  const secondaryArr: any = [];
+  displayFieldMeta.secondary.forEach(col => {
+    secondaryArr.push(entry[col]);
+  });
+  const isSelected = selected.some(item => item.id === entry[displayFieldMeta.key]);
+
+  return {
+    id: entry[displayFieldMeta.key],
+    primary: entry[displayFieldMeta.primary],
+    secondary: showSecondaryData ? secondaryArr : [],
+    selected: isSelected
+  };
+};
+
+const putItemsDataInItemsTree = (listObjData, displayFieldMeta, itemsTree, showSecondaryInSearchOnly, selected) => {
+  let newTreeItems = itemsTree.slice();
+  const showSecondaryData = !showSecondaryInSearchOnly;
+  for (const obj of listObjData) {
+    const items = obj[displayFieldMeta.itemsRecordsColumn].map(entry => createSingleTreeObejct(entry, displayFieldMeta, showSecondaryData, selected));
+
+    newTreeItems = newTreeItems.map(caseObject => {
+      if (caseObject.id === obj[displayFieldMeta.itemsGroupKeyColumn]) {
+        caseObject.items = [...items];
+      }
+      return caseObject;
+    });
+  }
+  return newTreeItems;
+};
+
+const prepareSearchResults = (listObjData, displayFieldMeta) => {
+  const searchResults: any = [];
+  for (const obj of listObjData) {
+    searchResults.push(...obj[displayFieldMeta.itemsRecordsColumn]);
+  }
+  return searchResults;
+};
+
+const doSearch = async (
+  searchText,
+  clickedGroup,
+  initialCaseClass,
+  displayFieldMeta,
+  dataApiObj, // deep clone of the dataApiObj
+  itemsTree,
+  isGroupData,
+  showSecondaryInSearchOnly,
+  selected
+) => {
+  let searchTextForUngroupedData = '';
+  if (dataApiObj) {
+    // creating dataApiObject in grouped data cases
+    if (isGroupData) {
+      dataApiObj = cloneDeep(dataApiObj);
+      dataApiObj.fetchedNQData = false;
+      dataApiObj.cache = {};
+
+      // if we have no search text and no group selected, return the original tree
+      if (searchText === '' && clickedGroup === '') {
+        return itemsTree;
+      }
+
+      // setting the inital search text & search classes in ApiObject
+      dataApiObj.parameters[Object.keys(dataApiObj.parameters)[1]] = searchText;
+      dataApiObj.parameters[Object.keys(dataApiObj.parameters)[0]] = initialCaseClass;
+
+      // if we have a selected group
+      if (clickedGroup) {
+        // check if the data for this group is already present and no search text
+        if (searchText === '') {
+          const containsData = itemsTree.find(item => item.id === clickedGroup);
+          // do not make API call when items of respective group are already fetched
+          if (containsData?.items?.length) return itemsTree;
+        }
+
+        dataApiObj.parameters[Object.keys(dataApiObj.parameters)[0]] = JSON.stringify([clickedGroup]);
+      }
+    } else {
+      searchTextForUngroupedData = searchText;
+    }
+
+    // search API call
+    const response = await dataApiObj.fetchData(searchTextForUngroupedData).catch(() => {
+      return itemsTree;
+    });
+
+    let listObjData = response.data;
+    let newItemsTree = [];
+    if (isGroupData) {
+      if (searchText) {
+        listObjData = prepareSearchResults(listObjData, displayFieldMeta);
+      } else {
+        newItemsTree = putItemsDataInItemsTree(listObjData, displayFieldMeta, itemsTree, showSecondaryInSearchOnly, selected);
+        return newItemsTree;
+      }
+    }
+    const showSecondaryData = showSecondaryInSearchOnly ? !!searchText : true;
+    if (listObjData !== undefined && listObjData.length > 0) {
+      newItemsTree = listObjData.map(entry => createSingleTreeObejct(entry, displayFieldMeta, showSecondaryData, selected));
+    }
+    return newItemsTree;
+  }
+
+  return itemsTree;
+};
+
+const setValuesToPropertyList = (searchText, assocProp, items, columns, actions, updatePropertyInRedux = true) => {
+  const setPropertyList = columns
+    ?.filter(col => col.setProperty)
+    .map(col => {
+      return {
+        source: col.value,
+        target: col.setProperty,
+        key: col.key,
+        primary: col.primary
+      };
+    });
+  const valueToSet: any = [];
+  if (setPropertyList.length > 0) {
+    setPropertyList.forEach(prop => {
+      items.forEach(item => {
+        if (prop.key === 'true' && item) {
+          valueToSet.push(item.id);
+        } else if (prop.primary === 'true' || !item) {
+          valueToSet.push(searchText);
+        }
+      });
+
+      if (updatePropertyInRedux) {
+        // BUG-666851 setting options so that the store values are replaced and not merged
+        const options = {
+          isArrayDeepMerge: false
+        };
+        if (prop.target === 'Associated property') {
+          actions.updateFieldValue(assocProp, valueToSet, options);
+        } else {
+          actions.updateFieldValue(`.${prop.target}`, valueToSet, options);
+        }
+      }
+    });
+  }
+  return valueToSet;
+};
+
+const getGroupDataForItemsTree = (groupDataSource, groupsDisplayFieldMeta, showSecondaryInSearchOnly) => {
+  return groupDataSource?.map(group => {
+    const secondaryArr: any = [];
+    groupsDisplayFieldMeta.secondary.forEach(col => {
+      secondaryArr.push(group[col]);
+    });
+    return {
+      id: group[groupsDisplayFieldMeta.key],
+      primary: group[groupsDisplayFieldMeta.primary],
+      secondary: showSecondaryInSearchOnly ? [] : secondaryArr,
+      items: []
+    };
+  });
+};
+
+export {
+  useDeepMemo,
+  preProcessColumns,
+  getDisplayFieldsMetaData,
+  doSearch,
+  setValuesToPropertyList,
+  getGroupDataForItemsTree,
+  updateNewInstuctions,
+  insertInstruction,
+  deleteInstruction
+};

package/tests/assets/sdk-r/components/createAll/override-sdk/field/Percentage/Percentage.tsx

@@ -1,17 +1,20 @@
-import CurrencyTextField from '@unicef/material-ui-currency-textfield';
-
+import { TextField } from '@material-ui/core';
+import { NumericFormat } from 'react-number-format';
+import { useState } from 'react';
 import { getComponentFromMap } from '@pega/react-sdk-components/lib/bridge/helpers/sdk_component_map';
 import { PConnFieldProps } from '@pega/react-sdk-components/lib/types/PConnProps';
 import { getCurrencyCharacters, getCurrencyOptions } from '@pega/react-sdk-components/lib/components/field/Currency/currency-utils';
 import handleEvent from '@pega/react-sdk-components/lib/components/helpers/event-utils';
 import { format } from '@pega/react-sdk-components/lib/components/helpers/formatters';
 
-/* Using @unicef/material-ui-currency-textfield component here, since it allows formatting decimal values,
+/* Using react-number-format component here, since it allows formatting decimal values,
 as per the locale.
 */
 interface PercentageProps extends PConnFieldProps {
   // If any, enter additional props that only exist on Percentage here
   currencyISOCode?: string;
+  showGroupSeparators?: string;
+  decimalPrecision?: number;
 }
 
 export default function Percentage(props: PercentageProps) {
@@ -34,9 +37,13 @@ export default function Percentage(props: PercentageProps) {
     helperText,
     displayMode,
     hideLabel,
-    placeholder
+    placeholder,
+    showGroupSeparators,
+    decimalPrecision
   } = props;
 
+  const [values, setValues] = useState(value.toString());
+
   const pConn = getPConnect();
   const actions = pConn.getActionsApi();
   const propName = (pConn.getStateProps() as any).value;
@@ -45,7 +52,11 @@ export default function Percentage(props: PercentageProps) {
   const theCurrencyOptions = getCurrencyOptions(currencyISOCode);
   const formattedValue = format(value, pConn.getComponentName().toLowerCase(), theCurrencyOptions);
 
-  // console.log(`Percentage: label: ${label} value: ${value}`);
+  let readOnlyProp = {}; // Note: empty if NOT ReadOnly
+
+  if (readOnly) {
+    readOnlyProp = { readOnly: true };
+  }
 
   if (displayMode === 'LABELS_LEFT') {
     return <FieldValueList name={hideLabel ? '' : label} value={formattedValue} />;
@@ -65,12 +76,17 @@ export default function Percentage(props: PercentageProps) {
   const theCurrDec = theSymbols.theDecimalIndicator;
   const theCurrSep = theSymbols.theDigitGroupSeparator;
 
-  function PercentageOnBlur(event, inValue) {
-    handleEvent(actions, 'changeNblur', propName, inValue !== '' ? Number(inValue) : inValue);
+  function PercentageOnBlur() {
+    handleEvent(actions, 'changeNblur', propName, values);
   }
 
+  const handleChange = val => {
+    setValues(val.value);
+  };
+
   return (
-    <CurrencyTextField
+    <NumericFormat
+      valueIsNumericString
       fullWidth
       variant={readOnly ? 'standard' : 'outlined'}
       helperText={helperTextToDisplay}
@@ -78,20 +94,19 @@ export default function Percentage(props: PercentageProps) {
       size='small'
       required={required}
       disabled={disabled}
-      readOnly={!!readOnly}
       error={status === 'error'}
       label={label}
-      value={value}
-      type='text'
-      outputFormat='number'
-      textAlign='left'
-      InputProps={{
-        inputProps: { ...testProp }
+      value={values}
+      onValueChange={val => {
+        handleChange(val);
       }}
-      currencySymbol=''
-      decimalCharacter={theCurrDec}
-      digitGroupSeparator={theCurrSep}
       onBlur={!readOnly ? PercentageOnBlur : undefined}
+      decimalSeparator={theCurrDec}
+      thousandSeparator={showGroupSeparators ? theCurrSep : ''}
+      decimalScale={decimalPrecision}
+      suffix='%'
+      InputProps={{ ...readOnlyProp, inputProps: { ...testProp } }}
+      customInput={TextField}
     />
   );
 }