clean

Author: XingY

packages/components/src/internal/components/forms/input/SelectInput.tsx

@@ -273,6 +273,7 @@ export interface SelectInputProps {
     valueKey?: string;
     valueRenderer?: any;
     warning?: ReactNode;
+    sortValues?: boolean;
 }
 
 type SelectInputImplProps = FormsyInjectedProps<any> & SelectInputProps;
@@ -317,6 +318,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         showIndicatorSeparator: true,
         tabSelectsValue: false, // Issue 52310
         valueKey: 'value',
+        sortValues: false,
     };
 
     private readonly _id: string;
@@ -468,7 +470,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
     };
 
     _setOptionsAndValue(options: any): any {
-        const { autoValue, delimiter, formsy, skipJoinValues, multiple, setValue, valueKey } = this.props;
+        const { sortValues, autoValue, delimiter, formsy, skipJoinValues, multiple, setValue, valueKey } = this.props;
         let selectedOptions;
 
         if (options === undefined || options === null || (Array.isArray(options) && options.length === 0)) {
@@ -478,7 +480,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         }
 
         if (autoValue) {
-            if (Array.isArray(selectedOptions))
+            if (sortValues && Array.isArray(selectedOptions))
                 selectedOptions.sort((a, b) => {
                     const aValue = valueKey ? a[valueKey] : a.value;
                     const bValue = valueKey ? b[valueKey] : b.value;

packages/components/src/internal/components/forms/input/TextChoiceInput.tsx

@@ -21,6 +21,7 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 required={queryColumn.required}
                 {...selectInputProps}
                 multiple={queryColumn.isMultiChoice}
+                sortValues={true}
                 options={options}
                 skipJoinValues={true}
             />

packages/components/src/internal/components/search/FilterFacetedSelector.tsx

@@ -1,4 +1,4 @@
-import React, { FC, memo, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Filter, Query } from '@labkey/api';
 
@@ -260,7 +260,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
 
             const filterType = resolveFilterType(newActiveFilterType?.value, field);
             let updatedFilterValues = fieldFilters[0]?.getValue();
-            if (updatedFilterValues && multiChoices && !filterType.isMultiValued()) updatedFilterValues = null;
+            const shouldClearUpdatedFilterValues = updatedFilterValues && multiChoices && !filterType.isMultiValued();
+            if (shouldClearUpdatedFilterValues) updatedFilterValues = null;
 
             newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType), null];
 

packages/components/src/internal/renderers/MultiValueRenderer.tsx

@@ -33,7 +33,7 @@ export const MultiValueRenderer: FC<MultiValueRendererProps> = memo(({ data, col
     }
 
     let valueArray = data;
-    if (col?.isMultiChoice) {
+    if (col?.isMultiChoice && Map.isMap(data) && data.has('value')) {
         valueArray = data.get('value');
     }