#572

eez-open · Oct 9, 2024 · dd06a11 · dd06a11
1 parent 9c4b966
commit dd06a11
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/packages/eez-studio-ui/_stylesheets/project-editor.less b/packages/eez-studio-ui/_stylesheets/project-editor.less
@@ -520,10 +520,8 @@
     border-radius: 4px;
     overflow: hidden;
 
-    div:nth-child(1) {
-        .EezStudio_SearchInput {
-            border-bottom: 1px solid @borderColor;
-        }
+    .EezStudio_SearchInput_Container {
+        border-bottom: 1px solid @borderColor;
     }
 
     div:nth-child(2) {

diff --git a/packages/eez-studio-ui/search-input.tsx b/packages/eez-studio-ui/search-input.tsx
@@ -7,6 +7,7 @@ export class SearchInput extends React.Component<{
     onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
     onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
     onClear: () => void;
+    disableSpellcheck?: boolean;
 }> {
     render() {
         return (
@@ -20,6 +21,11 @@ export class SearchInput extends React.Component<{
                     value={this.props.searchText}
                     onChange={this.props.onChange}
                     onKeyDown={this.props.onKeyDown}
+                    spellCheck={
+                        this.props.disableSpellcheck === true
+                            ? false
+                            : undefined
+                    }
                 />
                 {this.props.searchText && (
                     <IconAction

diff --git a/packages/project-editor/ui-components/PropertyGrid/ObjectReferenceInput.tsx b/packages/project-editor/ui-components/PropertyGrid/ObjectReferenceInput.tsx
@@ -56,9 +56,16 @@ export const ObjectReferenceInput = observer(
 
             if (!propertyInfo.referencedObjectCollectionPath) {
                 if (propertyInfo.enumItems) {
-                    return getEnumItems(this.props.objects, propertyInfo).map(
-                        enumItem => enumItem.id
-                    );
+                    return getEnumItems(this.props.objects, propertyInfo)
+                        .filter(
+                            enumItem =>
+                                (enumItem.label || enumItem.id.toString())
+                                    .toLowerCase()
+                                    .indexOf(
+                                        this.searchText.trim().toLowerCase()
+                                    ) != -1
+                        )
+                        .map(enumItem => enumItem.id);
                 }
                 return [];
             }
@@ -83,7 +90,7 @@ export const ObjectReferenceInput = observer(
                         !this.searchText ||
                         objectName
                             .toLowerCase()
-                            .indexOf(this.searchText.toLowerCase()) != -1
+                            .indexOf(this.searchText.trim().toLowerCase()) != -1
                 )
                 .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
         }
@@ -93,7 +100,7 @@ export const ObjectReferenceInput = observer(
         };
 
         onSearchChange(event: any) {
-            this.searchText = ($(event.target).val() as string).trim();
+            this.searchText = $(event.target).val() as string;
         }
 
         setDropDownOpen(open: boolean) {
@@ -196,6 +203,7 @@ export const ObjectReferenceInput = observer(
                             })}
                             onChange={this.onSearchChange}
                             onKeyDown={this.onSearchChange}
+                            disableSpellcheck={true}
                         />
                     </div>
                     <div>