Fix #4724: Autocomplete prevent error on trim() (#4741)

primefaces · Aug 4, 2023 · e695965 · e695965
1 parent 9f53c4c
commit e695965
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/components/lib/autocomplete/AutoComplete.js b/components/lib/autocomplete/AutoComplete.js
@@ -1,18 +1,17 @@
 import * as React from 'react';
-import PrimeReact, { localeOption } from '../api/Api';
-import { PrimeReactContext } from '../api/Api';
+import PrimeReact, { PrimeReactContext, localeOption } from '../api/Api';
 import { Button } from '../button/Button';
+import { useHandleStyle } from '../componentbase/ComponentBase';
 import { useMountEffect, useOverlayListener, useUnmountEffect, useUpdateEffect } from '../hooks/Hooks';
 import { ChevronDownIcon } from '../icons/chevrondown';
 import { SpinnerIcon } from '../icons/spinner';
 import { TimesCircleIcon } from '../icons/timescircle';
 import { InputText } from '../inputtext/InputText';
 import { OverlayService } from '../overlayservice/OverlayService';
 import { Tooltip } from '../tooltip/Tooltip';
-import { DomHandler, IconUtils, ObjectUtils, UniqueComponentId, ZIndexUtils, classNames, mergeProps } from '../utils/Utils';
+import { DomHandler, IconUtils, ObjectUtils, UniqueComponentId, ZIndexUtils, mergeProps } from '../utils/Utils';
 import { AutoCompleteBase } from './AutoCompleteBase';
 import { AutoCompletePanel } from './AutoCompletePanel';
-import { useHandleStyle } from '../componentbase/ComponentBase';
 
 export const AutoComplete = React.memo(
     React.forwardRef((inProps, ref) => {
@@ -398,11 +397,11 @@ export const AutoComplete = React.memo(
                 return;
             }
 
-            const inputValue = event.target.value.trim();
+            const inputValue = ObjectUtils.trim(event.target.value);
             const item = (props.suggestions || []).find((it) => {
                 const value = props.field ? ObjectUtils.resolveFieldData(it, props.field) : it;
 
-                return value && inputValue === value.trim();
+                return value && inputValue === ObjectUtils.trim(value);
             });
 
             if (item) {

diff --git a/components/lib/utils/ObjectUtils.js b/components/lib/utils/ObjectUtils.js
@@ -279,6 +279,11 @@ export default class ObjectUtils {
         return this.isNotEmpty(str) && this.isString(str) ? str[0].toUpperCase() + str.slice(1) : str;
     }
 
+    static trim(value) {
+        // trim only if the value is actually a string
+        return this.isNotEmpty(value) && this.isString(value) ? value.trim() : value;
+    }
+
     static isEmpty(value) {
         return value === null || value === undefined || value === '' || (Array.isArray(value) && value.length === 0) || (!(value instanceof Date) && typeof value === 'object' && Object.keys(value).length === 0);
     }

diff --git a/components/lib/utils/utils.d.ts b/components/lib/utils/utils.d.ts
@@ -121,6 +121,7 @@ export declare class ObjectUtils {
     static removeAccents(str: any): string;
     static toFlatCase(str: string): string;
     static toCapitalCase(str: string): string;
+    static trim(value: any): any;
     static isEmpty(value: any): boolean;
     static isNotEmpty(value: any): boolean;
     static isFunction(value: any): boolean;