Issue: #531

enter, shift enter

Author: mhandsteiner

Diff for: src/main/components/editors/linked/UIEditorLinked.tsx

@@ -275,8 +275,7 @@ export function getDisplayValue(
     dataProvider: string,
     dataTypeIdentifier?: DataTypeIdentifier,
     linkedColumnMetaData?: ColumnDescription,
-    context?: AppContextType,
-) {
+    context?: AppContextType) {
     if (value) {
         const index = linkReference.columnNames.findIndex(colName => colName === columnName);
         if (isDisplayRefColNameOrConcat) {
@@ -322,6 +321,8 @@ export function getDisplayValue(
     return ""
 };
 
+
+
 /**
  * This component displays an input field with a button which provides a dropdownlist with values of a databook
  * when text is entered into the inputfield, the dropdownlist gets filtered
@@ -646,7 +647,7 @@ const UIEditorLinked: FC<IEditorLinked & IExtendableLinkedEditor & IComponentCon
                 props.stopCellEditing(event);
             } else if (event.key === "Escape") {
                 props.stopCellEditing(event)
-            } else if(event.key === "Enter" && !linkedRef.current?.getOverlay().querySelector('.p-autocomplete-item.p-highlight')) {
+            } else if(event.key === "Enter" && !linkedRef.current?.getOverlay()?.querySelector('.p-autocomplete-item.p-highlight')) {
                 linkedRef.current?.hide();
                 handleEnterKey(event, event.target, props.name, props.stopCellEditing);
             }
@@ -658,6 +659,7 @@ const UIEditorLinked: FC<IEditorLinked & IExtendableLinkedEditor & IComponentCon
                     const index = Math.max(0, el ? parseInt(el.getAttribute("index") ?? "-1") : -1);
                     handleSelect(suggestions[index]);
                 }
+                handleEnterKey(event, event.target, props.name, props.stopCellEditing);
             }
         }
     });
@@ -1020,10 +1022,10 @@ const UIEditorLinked: FC<IEditorLinked & IExtendableLinkedEditor & IComponentCon
     }
 
     // focus the input field when entering keys
-    useEventHandler(linkedInput.current && props.isCellEditor ? linkedInput.current : undefined, "keydown", () => {
+    useEventHandler(linkedInput.current && props.isCellEditor ? linkedInput.current : undefined, "keydown", (event: KeyboardEvent) => {
         setTimeout(() => linkedInput.current.focus(), 0);
     })
-
+    
     const handleDropdownClick = useCallback(() => {
         if(linkedRef.current?.getOverlay()) {
             linkedRef.current?.hide();

Diff for: src/main/util/html-util/GetFocusComponent.ts

@@ -21,8 +21,17 @@
 export function getFocusComponent(name:string, next:boolean):HTMLElement|undefined {
     //get all focusable elements, filter out negativ tabindex/disabled/td's sort by tabindex
     let focusable = Array.from(document.getElementById("reactUI-main")!.querySelectorAll("a, button, input, select, textarea, [tabindex], [contenteditable], #" + name)).filter((e: any) => {
-        if (e.disabled || (e.getAttribute("tabindex") && parseInt(e.getAttribute("tabindex")) < 0) || e.tagName === "TD" || e.tagName === "TH" || e.classList.contains("designer-button") || e.classList.contains("navtable")) return false
-        return true;
+        if (e.disabled || (e instanceof HTMLInputElement && e.readOnly)
+            || (e.getAttribute("tabindex") && parseInt(e.getAttribute("tabindex")) < 0) 
+            || e.tagName === "TD" || e.tagName === "TH" 
+            || e.classList.contains("designer-button") 
+            || e.classList.contains("navtable")) {
+            return false;                
+        }
+        else
+        {
+            return true;
+        }
     }).sort((a: any, b: any) => {
         return (parseFloat(a.getAttribute("tabindex") || 99999) || 99999) - (parseFloat(b.getAttribute("tabindex") || 99999) || 99999);
     })

Diff for: src/main/util/other-util/HandleEnterKey.ts

@@ -30,10 +30,10 @@ export function handleEnterKey(event:any, elem:any, name:string, stopEditing?:Fu
         }
         else {
             if (event.shiftKey) {
-                getFocusComponent(name, false);
+                getFocusComponent(name, false)?.focus();
             }
             else {
-                getFocusComponent(name, true)
+                getFocusComponent(name, true)?.focus();
             }
         }
     }