Merge branch 'develop' into fb_issue53071

# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md

Author: XingY

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.44.5-fb-issue53071.1",
+  "version": "6.45.1-fb-issue53071.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -8,6 +8,11 @@ Components, models, actions, and utility functions for LabKey applications and p
   - Updated `parseTime` util to be more flexible
   - TODO
 
+### version 6.45.0
+*Released*: 2 June 2025
+- Export Loader type
+- DataTypeSelector: Fix react key error
+
 ### version 6.44.4
 *Released*: 2 June 2025
 - QueryModel: add isQueryInfoLoaded

packages/components/releaseNotes/components.md

@@ -2047,5 +2047,6 @@ export type { ImportTemplate } from './public/QueryInfo';
 export type { RequestHandler, RequestOptions } from './internal/request';
 export type { UseRequestHandler } from './internal/util/RequestHandler';
 export type { UseTimeout } from './internal/hooks';
+export type { Loader } from './internal/useLoadableState';
 export type { QueryParamValue } from './internal/url/AppURL';
 export type { NavigateFn } from './internal/url/useAppNavigate';

packages/components/src/index.ts

@@ -158,7 +158,7 @@ export const DataTypeSelectorList: FC<DataTypeSelectorListProps> = memo(props =>
                                     dataType={type}
                                     disabled={disabled}
                                     getUncheckedEntityWarning={getUncheckedEntityWarning}
-                                    key={type.rowId}
+                                    key={type.rowId ?? type.lsid}
                                     uncheckedEntities={uncheckedEntities}
                                     onChange={onChange}
                                     showUncheckedWarning={showUncheckedWarning}

packages/components/src/internal/components/entities/DataTypeSelector.tsx

@@ -14,7 +14,7 @@ interface LoadableState<T> {
     value: T;
 }
 
-type Loader<T> = () => Promise<T>;
+export type Loader<T> = () => Promise<T>;
 
 export function useLoadableState<T>(loader: Loader<T>): LoadableState<T> {
     const [error, setError] = useState<string>(undefined);