diff --git a/packages/react-schema-editor/src/components/FieldEditor.tsx b/packages/react-schema-editor/src/components/FieldEditor.tsx
index ab0f585ccc1..f877491bc90 100644
--- a/packages/react-schema-editor/src/components/FieldEditor.tsx
+++ b/packages/react-schema-editor/src/components/FieldEditor.tsx
@@ -59,12 +59,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
 
   const componentPropsValue = getComponentPropsValue({ schema, propsKey })
 
-  const handleXComponentPropsValueChange = (
-    value,
-    property,
-    schema,
-    propsKey
-  ) => {
+  const handleXComponentPropsValueChange = (value, property) => {
     const newSchema = { ...schema }
     if (propsKey === ComponentPropsTypes.X_RULES) {
       const newRules = _.map(schema[propsKey], rule => {
@@ -83,10 +78,10 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
     onChange(newSchema)
   }
 
-  const handleInputTypeChange = (inputType, property, schema, propsKey) => {
+  const handleInputTypeChange = (value, property) => {
     const newSchema = { ...schema }
     let defaultValue
-    switch (inputType) {
+    switch (value) {
       case InputTypes.INPUT: {
         defaultValue = ''
         break
@@ -230,7 +225,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
                   handlePropertyChange(value, property)
                 }}
               >
-                {componentPropsData.options.map(({ label, value }) => (
+                {_.map(componentPropsData.options, ({ label, value }) => (
                   <SelectOption value={value} key={value}>
                     {label}
                   </SelectOption>
@@ -245,10 +240,10 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
               <Select
                 value={inputType}
                 onChange={value => {
-                  handleInputTypeChange(value, property, schema, propsKey)
+                  handleInputTypeChange(value, property)
                 }}
               >
-                {inputTypeData.options.map(({ label, value }) => (
+                {_.map(inputTypeData.options, ({ label, value }) => (
                   <SelectOption value={value} key={value}>
                     {label}
                   </SelectOption>
@@ -266,9 +261,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
                   onChange={event => {
                     handleXComponentPropsValueChange(
                       event.target.value,
-                      property,
-                      schema,
-                      propsKey
+                      property
                     )
                   }}
                 />
@@ -283,12 +276,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
                 <InputNumber
                   value={value}
                   onChange={value => {
-                    handleXComponentPropsValueChange(
-                      value,
-                      property,
-                      schema,
-                      propsKey
-                    )
+                    handleXComponentPropsValueChange(value, property)
                   }}
                 />
               </FormItem>
@@ -304,9 +292,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
                   onChange={event => {
                     handleXComponentPropsValueChange(
                       event.target.checked,
-                      property,
-                      schema,
-                      propsKey
+                      property
                     )
                   }}
                 />
@@ -327,12 +313,7 @@ const FormItemGroup: React.FC<IFormItemGroupProps> = ({
                     try {
                       value = JSON.parse(value)
                     } catch (error) {}
-                    handleXComponentPropsValueChange(
-                      value,
-                      property,
-                      schema,
-                      propsKey
-                    )
+                    handleXComponentPropsValueChange(value, property)
                   }}
                 />
               </FormItem>
@@ -409,7 +390,7 @@ const FieldEditor: React.FC<IFieldEditorProps> = ({
                 })
               }}
             >
-              {fieldTypeData.options.map(({ label, value }) => (
+              {_.map(fieldTypeData.options, ({ label, value }) => (
                 <SelectOption value={value} key={value}>
                   {label}
                 </SelectOption>
@@ -431,7 +412,7 @@ const FieldEditor: React.FC<IFieldEditorProps> = ({
                 })
               }}
             >
-              {xComponentData.options.map(({ label, value }) => (
+              {_.map(xComponentData.options, ({ label, value }) => (
                 <SelectOption value={value} key={value}>
                   {label}
                 </SelectOption>
diff --git a/packages/react-schema-editor/src/utils/fieldEditorHelpers.ts b/packages/react-schema-editor/src/utils/fieldEditorHelpers.ts
index 069b20075d7..e7d81a3b6ed 100644
--- a/packages/react-schema-editor/src/utils/fieldEditorHelpers.ts
+++ b/packages/react-schema-editor/src/utils/fieldEditorHelpers.ts
@@ -40,7 +40,7 @@ const convertKeysToSelectData = keys => {
 }
 
 export const getXComponentData = components => {
-  return convertKeysToSelectData(_.keys(components))
+  return convertKeysToSelectData(_.map(components, ({ name }) => name))
 }
 
 export const getRemainingKeys = (allKeys, usedKeys) => {