fix: Correct handling of focus for Intellisense fields

Composer/packages/adaptive-form/src/components/SchemaField.tsx

@@ -51,7 +51,6 @@ export const SchemaField: React.FC<FieldProps> = (props) => {
       typeof uiOptions?.serializer?.set === 'function' ? uiOptions.serializer.set(newValue) : newValue;
 
     onChange(serializedValue);
-    setFieldFocused(true);
   };
 
   useEffect(() => {

Composer/packages/adaptive-form/src/components/fields/IntellisenseFields.tsx

@@ -36,9 +36,18 @@ export const IntellisenseTextField: React.FC<FieldProps<string>> = (props) => {
       onBlur={props.onBlur}
       onChange={onChange}
     >
-      {({ textFieldValue, focused, onValueChanged, onKeyDownTextField, onKeyUpTextField, onClickTextField }) => (
+      {({
+        textFieldValue,
+        focused,
+        cursorPosition,
+        onValueChanged,
+        onKeyDownTextField,
+        onKeyUpTextField,
+        onClickTextField,
+      }) => (
         <StringField
           {...props}
+          cursorPosition={cursorPosition}
           focused={focused}
           id={id}
           value={textFieldValue}
@@ -84,9 +93,18 @@ export const IntellisenseExpressionField: React.FC<FieldProps<string>> = (props)
       onBlur={props.onBlur}
       onChange={onChange}
     >
-      {({ textFieldValue, focused, onValueChanged, onKeyDownTextField, onKeyUpTextField, onClickTextField }) => (
+      {({
+        textFieldValue,
+        focused,
+        cursorPosition,
+        onValueChanged,
+        onKeyDownTextField,
+        onKeyUpTextField,
+        onClickTextField,
+      }) => (
         <StringField
           {...props}
+          cursorPosition={cursorPosition}
           focused={focused}
           id={id}
           value={textFieldValue}

Composer/packages/adaptive-form/src/components/fields/StringField.tsx

@@ -41,6 +41,7 @@ export const StringField: React.FC<FieldProps<string>> = function StringField(pr
     uiOptions,
     required,
     focused,
+    cursorPosition,
   } = props;
 
   const textFieldRef = React.createRef<ITextField>();
@@ -49,7 +50,13 @@ export const StringField: React.FC<FieldProps<string>> = function StringField(pr
     if (focused && textFieldRef.current) {
       textFieldRef.current.focus();
     }
-  }, [focused, textFieldRef.current]);
+  }, [focused, textFieldRef.current, value]);
+
+  useEffect(() => {
+    if (cursorPosition !== undefined && cursorPosition > -1 && textFieldRef.current) {
+      textFieldRef.current.setSelectionRange(cursorPosition, cursorPosition);
+    }
+  }, [cursorPosition]);
 
   const handleFocus = (e: React.FocusEvent<HTMLInputElement>) => {
     if (typeof onFocus === 'function') {

Composer/packages/extension-client/src/types/form.ts

@@ -36,6 +36,7 @@ export interface FieldProps<T = any> {
   value?: T;
   focused?: boolean;
   style?: React.CSSProperties;
+  cursorPosition?: number;
 
   onChange: ChangeHandler<T>;
   onFocus?: (id: string, value?: T) => void;

Composer/packages/intellisense/src/components/Intellisense.tsx

@@ -23,6 +23,7 @@ export const Intellisense = React.memo(
     children: (renderProps: {
       textFieldValue: any;
       focused?: boolean;
+      cursorPosition?: number;
       onValueChanged: (newValue: any) => void;
       onKeyDownTextField: (event: React.KeyboardEvent<HTMLInputElement>) => void;
       onKeyUpTextField: (event: React.KeyboardEvent<HTMLInputElement>) => void;
@@ -141,6 +142,7 @@ export const Intellisense = React.memo(
             selectedSuggestion +
             textFieldValue.substr(range.end.character);
           onValueChanged(newValue);
+          setCursorPosition(range.start.character + selectedSuggestion.length);
         } else {
           onValueChanged(selectedSuggestion);
         }
@@ -197,7 +199,15 @@ export const Intellisense = React.memo(
 
     return (
       <div onKeyUp={onKeyUpMainComponent} ref={mainContainerRef} style={{ position: 'relative' }}>
-        {children({ textFieldValue, focused, onValueChanged, onKeyDownTextField, onKeyUpTextField, onClickTextField })}
+        {children({
+          textFieldValue,
+          focused,
+          cursorPosition,
+          onValueChanged,
+          onKeyDownTextField,
+          onKeyUpTextField,
+          onClickTextField,
+        })}
 
         {completionListOverride || showCompletionList ? (
           <CompletionList