From 5117535465f8983c3617945a4d266f8ca2538c9f Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 14:48:58 -0700
Subject: [PATCH 01/50] Auto-link to study input field labels

---
 .../domainproperties/AutoLinkToStudyDropdown.tsx      | 11 +++++++++--
 .../domainproperties/assay/AssayPropertiesInput.tsx   |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx b/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
index f457321e15..2c338942b7 100644
--- a/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
+++ b/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
@@ -4,16 +4,23 @@ import { Container } from '../base/models/Container';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 
 interface Props {
+    ariaLabelledBy: string;
     autoLinkTarget: string;
     containers: Container[];
     onChange: (evt: any) => void;
     value: string;
 }
 
-export const AutoLinkToStudyDropdown: FC<Props> = memo(({ autoLinkTarget, containers, onChange, value }) => {
+export const AutoLinkToStudyDropdown: FC<Props> = memo(({ ariaLabelledBy, autoLinkTarget, containers, onChange, value }) => {
     if (containers === undefined) return <LoadingSpinner />;
     return (
-        <select className="form-control" id={autoLinkTarget} onChange={onChange} value={value || ''}>
+            <select
+                aria-labelledby={ariaLabelledBy}
+                className="form-control"
+                id={autoLinkTarget}
+                onChange={onChange}
+                value={value || ''}
+            >
             <option value={null} />
             {containers.map(container => (
                 <option key={container.id} value={container.id}>
diff --git a/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx b/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
index d24bd7e97b..4ec9de9885 100644
--- a/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
+++ b/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
@@ -358,9 +358,11 @@ export class AutoLinkDataInput extends React.PureComponent<InputProps, AutoLinkD
                         </p>
                     </>
                 }
+                id="auto-link-data-input"
                 label="Auto-Link Data to Study"
             >
                 <AutoLinkToStudyDropdown
+                    ariaLabelledBy="auto-link-data-input"
                     autoLinkTarget={FORM_IDS.AUTO_LINK_TARGET}
                     containers={containers}
                     onChange={onChange}

From 3ca1385df9fdbf2ea301f5b220728dd1eb9be4ac Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 14:49:37 -0700
Subject: [PATCH 02/50] Remove tabIndex value from DomainRow component

---
 .../src/internal/components/domainproperties/DomainRow.tsx       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index e601e1d45f..b0380dfa6d 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -412,7 +412,6 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                         className={this.getRowCssClasses(expanded, dragging, selected, fieldError)}
                         {...provided.draggableProps}
                         ref={provided.innerRef}
-                        tabIndex={index}
                     >
                         <div
                             className="row domain-row-container"

From e4bfeceb70dbd934e3ca4752f85690fac0ca0d87 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 14:56:50 -0700
Subject: [PATCH 03/50] Auto-link to study input field labels

---
 .../domainproperties/samples/SampleTypePropertiesPanel.tsx      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx b/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
index fdb01af8da..77ad37e629 100644
--- a/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
+++ b/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
@@ -547,12 +547,14 @@ class SampleTypePropertiesPanelImpl extends PureComponent<InjectedDomainProperti
                         <div className="row margin-top">
                             <div className="col-xs-2">
                                 <DomainFieldLabel
+                                    id="linked-study-label"
                                     helpTipBody={<AutoLinkDataToStudyHelpTip />}
                                     label="Auto-Link Data to Study"
                                 />
                             </div>
                             <div className="col-xs-5">
                                 <AutoLinkToStudyDropdown
+                                    ariaLabelledBy="linked-study-label"
                                     autoLinkTarget={ENTITY_FORM_IDS.AUTO_LINK_TARGET}
                                     containers={containers}
                                     onChange={this.onFormChange}

From e49b72c6e41646b18be924661514da266a7a3f39 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 14:57:19 -0700
Subject: [PATCH 04/50] Add labels for text choice input fields

---
 .../components/domainproperties/TextChoiceOptions.tsx         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
index f34e1989f2..12b6f42700 100644
--- a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
@@ -247,6 +247,7 @@ export const TextChoiceOptionsImpl: FC<ImplProps> = memo(props => {
                         <div className="list-group domain-text-choices-list">
                             {validValues.length > MIN_VALUES_FOR_SEARCH_COUNT && (
                                 <input
+                                    aria-label="Search for a value"
                                     autoFocus
                                     className="form-control domain-text-choices-search"
                                     onChange={onSearchChange}
@@ -319,10 +320,11 @@ export const TextChoiceOptionsImpl: FC<ImplProps> = memo(props => {
                         {selectedIndex !== undefined && (!currentInUse || !isMultiChoiceField) && (
                             <>
                                 <div className="domain-field-label">
-                                    <DomainFieldLabel label="Value" />
+                                    <DomainFieldLabel id="text-choice-value-label" label="Value" />
                                 </div>
                                 <div className="domain-field-padding-bottom">
                                     <DisableableInput
+                                        aria-labelledby="text-choice-value-label"
                                         className="form-control full-width"
                                         disabledMsg={currentLocked ? LOCKED_TIP : undefined}
                                         name="value"

From 367b1a80fd48a1085eb376da123a3a838777dd97 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 16:00:15 -0700
Subject: [PATCH 05/50] Use button instead of i for expandable container
 chevrons

---
 .../src/internal/components/ExpandableContainer.tsx         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/ExpandableContainer.tsx b/packages/components/src/internal/components/ExpandableContainer.tsx
index 77072f4927..7028142aea 100644
--- a/packages/components/src/internal/components/ExpandableContainer.tsx
+++ b/packages/components/src/internal/components/ExpandableContainer.tsx
@@ -101,12 +101,14 @@ export const ExpandableContainer: FC<Props> = memo(props => {
                         'text-muted': !isExpandable,
                     })}
                 >
-                    <i
+                    <button
                         onClick={hasOnClick || isExpandable ? handleClick : undefined}
-                        className={classNames('fa', {
+                        className={classNames('clickable-text', 'fa', {
                             'fa-chevron-down': visible,
                             'fa-chevron-right': !visible,
                         })}
+                        title={visible ? 'Collapse' : 'Expand'}
+                        type="button"
                     />
                 </div>
                 <div className="container-expandable-heading">

From 7aab2144795596bbfedc2a09a3fd2c2ea3c5db6a Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 May 2026 16:01:01 -0700
Subject: [PATCH 06/50] Return null for label if showLabel is false

---
 .../src/internal/components/forms/input/TextInput.tsx         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index a47281b0c1..530806f46b 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -90,6 +90,10 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             return renderFieldLabel(queryColumn);
         }
 
+        if (!showLabel) {
+            return null;
+        }
+
         return (
             <FieldLabel
                 column={queryColumn}

From 05baa51f9ae9a07cebbc1f1ba1fc309ad17fbb6e Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 07:59:23 -0700
Subject: [PATCH 07/50] Reset positive tabIndex to 0

---
 packages/components/src/internal/components/EditInlineField.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/EditInlineField.tsx b/packages/components/src/internal/components/EditInlineField.tsx
index 32afb584ea..1c1f03b69f 100644
--- a/packages/components/src/internal/components/EditInlineField.tsx
+++ b/packages/components/src/internal/components/EditInlineField.tsx
@@ -315,7 +315,7 @@ export const EditInlineField: FC<Props> = memo(props => {
                         className={classNames({ 'edit-inline-field__toggle': allowEdit, 'ws-pre-wrap': isTextArea })}
                         onClick={toggleEdit}
                         onKeyDown={toggleKeyDown}
-                        tabIndex={1}
+                        tabIndex={0}
                     >
                         {allowEdit && pullRight && <i className="fa fa-pencil pull-right" />}
                         {!isUser && displayValue}

From 45b58a9723476f3570997b61b02857d7c1561b23 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 07:59:56 -0700
Subject: [PATCH 08/50] Add text area label references

---
 .../components/labelPrinting/LabelsConfigurationPanel.tsx      | 3 ++-
 .../internal/components/samples/ManageSampleStatusesPanel.tsx  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
index 4a81cb20e9..03d7051f54 100644
--- a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
+++ b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
@@ -259,10 +259,11 @@ export const LabelTemplateDetails: FC<LabelTemplateDetailsProps> = memo(props =>
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel label="Description" />
+                            <DomainFieldLabel label="Description" id="description-label"/>
                         </div>
                         <div className="col-sm-8">
                             <textarea
+                                aria-labelledby="description-label"
                                 className="form-control"
                                 name="description"
                                 onChange={onFormChange}
diff --git a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
index c842b13cea..f64e16cbbb 100644
--- a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
+++ b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
@@ -252,10 +252,11 @@ export const SampleStatusDetail: FC<SampleStatusDetailProps> = memo(props => {
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel label="Description" />
+                            <DomainFieldLabel id="description-label" label="Description" />
                         </div>
                         <div className="col-sm-8">
                             <textarea
+                                aria-labelledby="description-label"
                                 className="form-control"
                                 disabled={saving || !updatedState.isLocal}
                                 name="description"

From 1c39505702695cf8d56442077cd147fbe3b90099 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 09:51:01 -0700
Subject: [PATCH 09/50] Add aria-label

---
 .../components/src/internal/components/search/FindByIdsModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/internal/components/search/FindByIdsModal.tsx b/packages/components/src/internal/components/search/FindByIdsModal.tsx
index a3b96b305d..af6077f85b 100644
--- a/packages/components/src/internal/components/search/FindByIdsModal.tsx
+++ b/packages/components/src/internal/components/search/FindByIdsModal.tsx
@@ -127,6 +127,7 @@ export const FindByIdsModal: FC<Props> = memo(props => {
                 onFieldChange={onFieldTypeChange}
             />
             <textarea
+                aria-label="Ids"
                 className="form-control textarea-fullwidth"
                 cols={50}
                 onChange={onIdTextChange}

From ccb46d8e19e829ef53281b3016314d9fa40839a6 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 09:51:31 -0700
Subject: [PATCH 10/50] add ariaLabelledBy for DatePickerInput

---
 .../src/internal/components/forms/input/DatePickerInput.tsx    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/components/src/internal/components/forms/input/DatePickerInput.tsx b/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
index c417e25cfd..75672d832e 100644
--- a/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
+++ b/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
@@ -288,6 +288,9 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
                 : (placeholderText ?? `Select ${queryColumn.caption.toLowerCase()}`);
         const picker = (
             <DatePicker
+                ariaLabelledBy={
+                    !showLabel && !renderFieldLabel ? queryColumn.labelId : undefined
+                }
                 autoComplete="off"
                 autoFocus={autoFocus}
                 className={inputClassName}

From da83c186e81a08e6d2badb047fda2844514680cf Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 09:53:26 -0700
Subject: [PATCH 11/50] Add labelId method to QueryColumn and use it for tying
 labels and input fields in detail editing forms

---
 .../src/internal/components/forms/LabelOverlay.tsx        | 2 +-
 .../src/internal/components/forms/input/TextAreaInput.tsx | 8 +++++++-
 .../src/internal/components/forms/input/TextInput.tsx     | 1 +
 packages/components/src/public/QueryColumn.ts             | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 0d9184dfc6..87791c3865 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -113,7 +113,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             // classes applied as well as not needing to handle 'required' display
             // TODO: remove space for required-symbol after *
             return (
-                <span>
+                <span id={column?.labelId}>
                     {label}&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
diff --git a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
index 9d03db256c..cd615b91cf 100644
--- a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
@@ -23,6 +23,7 @@ import { INPUT_LABEL_CLASS_NAME, INPUT_WRAPPER_CLASS_NAME, MIXED_VALUE_DISPLAY }
 
 import { DisableableInput, DisableableInputProps, DisableableInputState } from './DisableableInput';
 import { FormsyTextArea, FormsyTextAreaProps } from './FormsyReactComponents';
+import { stringToHtmlId } from '../../../util/utils';
 
 interface TextAreaInputProps extends DisableableInputProps, Omit<FormsyTextAreaProps, 'onChange'> {
     addLabelAsterisk?: boolean;
@@ -62,6 +63,10 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
             return renderFieldLabel(queryColumn);
         }
 
+        if (!showLabel) {
+            return null;
+        }
+
         return (
             <FieldLabel
                 column={queryColumn}
@@ -96,7 +101,8 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
 
         return (
             <FormsyTextArea
-                id={queryColumn.fieldKey}
+                aria-label={showLabel ? undefined : queryColumn.caption}
+                id={stringToHtmlId(queryColumn.fieldKey)}
                 name={queryColumn.fieldKey}
                 placeholder={
                     hasMixedValue && this.state.isDisabled
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index 530806f46b..982e664d1a 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -143,6 +143,7 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
         return (
             <>
                 <FormsyInput
+                    aria-labelledby={!showLabel ? queryColumn.labelId : undefined}
                     id={queryColumn.fieldKey}
                     name={queryColumn.fieldKey}
                     placeholder={
diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts
index fa0e7eb99a..da76b37386 100644
--- a/packages/components/src/public/QueryColumn.ts
+++ b/packages/components/src/public/QueryColumn.ts
@@ -20,6 +20,7 @@ import { SchemaQuery } from './SchemaQuery';
 import { IQueryColumn } from './IQueryColumn';
 import { PropDescType } from '../internal/components/domainproperties/PropDescType';
 import { SortDirection } from './QuerySort';
+import { stringToHtmlId } from '../internal/util/utils';
 
 export enum Operation {
     insert = 'insert',
@@ -416,6 +417,10 @@ export class QueryColumn implements IQueryColumn {
         return fieldKey;
     }
 
+    get labelId(): string {
+        return stringToHtmlId(this.fieldKey) + '-label';
+    }
+
     get lookupKey(): string {
         if (!this.lookup) return undefined;
 

From a3c3f42d2eca346831b96781c91a14ecdaa21690 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 09:53:40 -0700
Subject: [PATCH 12/50] release notes

---
 packages/components/releaseNotes/components.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 980662d135..9df6535732 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,16 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version TBD
+*Released*: TBD
+- Misc. accessibility improvements
+  - Auto-link to study input field labels
+  - Remove tabIndex value from `DomainRow`
+  - Add labels for text choice input fields
+  - Use button instead of i for expandable container chevrons
+  - Update LabelOverlay and DetailEditor with ids for labeling elements
+  - Add `labelId` getter method in `QueryColumn`
+
 ### version 7.37.0
 *Released*: 15 May 2026
 - Calculated Column Assistant

From a089d842cc3c4202eb443a51466aa7af46041d23 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 10:47:15 -0700
Subject: [PATCH 13/50] Don't render as label if no inputId is provided

---
 .../src/internal/components/forms/LabelOverlay.tsx    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 87791c3865..3d409141ff 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -111,7 +111,6 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
         if (isFormsy) {
             // when being used as a label for a formsy component directly this will use just a span without the
             // classes applied as well as not needing to handle 'required' display
-            // TODO: remove space for required-symbol after *
             return (
                 <span id={column?.labelId}>
                     {label}&nbsp;
@@ -121,7 +120,15 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             );
         }
 
-        // TODO: remove space for required-symbol after *
+        if (!inputId) {
+            return (
+                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId} >
+                    <span>{label}</span>&nbsp;
+                    {overlay}
+                    {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
+                </span>
+            );
+        }
         return (
             <label className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} htmlFor={inputId}>
                 <span>{label}</span>&nbsp;

From 092effa929d29fad50776659a1a7e00150b4267d Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 10:48:03 -0700
Subject: [PATCH 14/50] bold font for label, even if not in a <label> element

---
 packages/components/src/theme/form.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index eff33566ac..99e20f4340 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -384,6 +384,7 @@ textarea.form-control {
 }
 .query-info-form .control-label {
     padding-top: 7px;
+    font-weight: bold;
     .toggle-group-icon, &.textarea-control-label {
         padding-top: 0;
     }

From 54fb71f14b2cc1e7bb15a57dbd554dac27c8b1bd Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 12:56:31 -0700
Subject: [PATCH 15/50] Add aria-labelledby for CheckboxInput when no label is
 provided

---
 .../src/internal/components/forms/input/CheckboxInput.tsx        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
index 65dea1ccdd..729fa39aee 100644
--- a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
+++ b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
@@ -147,6 +147,7 @@ class CheckboxInputImpl extends DisableableInput<CheckboxInputImplProps, Checkbo
                     ) : (
                         <input
                             aria-label={label}
+                            aria-labelledby={label ? undefined : queryColumn.labelId}
                             checked={checked}
                             disabled={isDisabled}
                             id={queryColumn.fieldKey}

From 6750ab95346e4688ec2f79b39562c4ebc542911a Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 13:20:26 -0700
Subject: [PATCH 16/50] Space

---
 .../components/src/internal/components/forms/LabelOverlay.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 3d409141ff..6b5fe72365 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -122,7 +122,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
 
         if (!inputId) {
             return (
-                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId} >
+                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
                     <span>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}

From 38c635d8761b6c850babf03cd9a6b6d2fe4b3768 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 13:20:43 -0700
Subject: [PATCH 17/50] Font weight update for control-label

---
 packages/components/src/theme/form.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index 99e20f4340..d459df020f 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -384,7 +384,6 @@ textarea.form-control {
 }
 .query-info-form .control-label {
     padding-top: 7px;
-    font-weight: bold;
     .toggle-group-icon, &.textarea-control-label {
         padding-top: 0;
     }
@@ -395,6 +394,10 @@ textarea.form-control {
     }
 }
 
+.control-label {
+    font-weight: 700;
+}
+
 .framed-input__container {
     display: flex;
 }

From 2bccb1694ed66e65782d22b1450fc976934e7742 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 13:26:02 -0700
Subject: [PATCH 18/50] Remove inputId for SelectInput labelOverlayProps to
 avoid orphaned label

---
 .../src/internal/components/forms/input/SelectInput.tsx          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 9e20e140b9..d1b3c01685 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -551,7 +551,6 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         id={this.getId()}
                         isDisabled={isDisabled}
                         labelOverlayProps={{
-                            inputId: name,
                             description: description_,
                             label,
                             addLabelAsterisk,

From 3ec468dc016f0cee9129912995fd6120f70ebcf7 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 19 May 2026 13:37:14 -0700
Subject: [PATCH 19/50] @labkey/components v7.37.1-moreAccessibility.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 9f846b2f8b..b1e0ff2276 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.0",
+  "version": "7.37.1-moreAccessibility.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.37.0",
+      "version": "7.37.1-moreAccessibility.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 64d6ad0a61..ee57daea34 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.0",
+  "version": "7.37.1-moreAccessibility.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 81ba82166c68776e11af47153c838a5f79a2efa0 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 20 May 2026 09:55:35 -0700
Subject: [PATCH 20/50] Add `data-fieldkey` to some labels to help with
 locators

---
 packages/components/releaseNotes/components.md  |  1 +
 .../internal/components/forms/LabelOverlay.tsx  | 17 +++++++++++++----
 .../components/forms/input/SelectInput.tsx      |  5 +++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 9df6535732..bcb8acfb04 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -10,6 +10,7 @@ Components, models, actions, and utility functions for LabKey applications and p
   - Use button instead of i for expandable container chevrons
   - Update LabelOverlay and DetailEditor with ids for labeling elements
   - Add `labelId` getter method in `QueryColumn`
+  - Add `data-fieldkey` to some labels to help with locators
 
 ### version 7.37.0
 *Released*: 15 May 2026
diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 6b5fe72365..2f8a74eb81 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -29,6 +29,7 @@ import { DOMAIN_FIELD, DomainFieldHelpTipContents } from './DomainFieldHelpTipCo
 export interface LabelOverlayProps extends PropsWithChildren {
     addLabelAsterisk?: boolean;
     column?: QueryColumn;
+    dataKey?: string;
     description?: string;
     helpTipRenderer?: string;
     inputId?: string;
@@ -103,7 +104,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
     }
 
     render(): ReactNode {
-        const { column, inputId, isFormsy, labelClass, required, addLabelAsterisk } = this.props;
+        const { column, dataKey, inputId, isFormsy, labelClass, required, addLabelAsterisk } = this.props;
         const label = this.props.label ? this.props.label : column ? column.caption : null;
 
         const overlay = this.getOverlay();
@@ -112,7 +113,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             // when being used as a label for a formsy component directly this will use just a span without the
             // classes applied as well as not needing to handle 'required' display
             return (
-                <span id={column?.labelId}>
+                <span data-fieldKey={dataKey ?? column?.fieldKey} id={column?.labelId}>
                     {label}&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
@@ -122,7 +123,11 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
 
         if (!inputId) {
             return (
-                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
+                <span
+                    className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
+                    data-fieldKey={dataKey ?? column?.fieldKey}
+                    id={column?.labelId}
+                >
                     <span>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
@@ -130,7 +135,11 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             );
         }
         return (
-            <label className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} htmlFor={inputId}>
+            <label
+                className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
+                data-fieldKey={dataKey ?? column?.fieldKey}
+                htmlFor={inputId}
+            >
                 <span>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index d1b3c01685..606265b817 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -538,10 +538,10 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
 
                 if (renderFieldLabel) {
                     return (
-                        <label className={labelClass} htmlFor={name}>
+                        <span className={labelClass} data-fieldKey={name}>
                             {renderFieldLabel(undefined, label, description_)}
                             {required && <span className="required-symbol"> *</span>}
-                        </label>
+                        </span>
                     );
                 }
 
@@ -551,6 +551,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         id={this.getId()}
                         isDisabled={isDisabled}
                         labelOverlayProps={{
+                            dataKey: name,
                             description: description_,
                             label,
                             addLabelAsterisk,

From 02486e183f44c585af70187ea897869a4b2fa819 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 20 May 2026 09:59:25 -0700
Subject: [PATCH 21/50] @labkey/components v7.37.1-moreAccessibility.1

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index b1e0ff2276..ecdf776fe7 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.1-moreAccessibility.0",
+  "version": "7.37.1-moreAccessibility.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.37.1-moreAccessibility.0",
+      "version": "7.37.1-moreAccessibility.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index ee57daea34..53c677b827 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.1-moreAccessibility.0",
+  "version": "7.37.1-moreAccessibility.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From bf0c757f67d2d9d5509b1a5a4d0f6ad21ff3c061 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 20 May 2026 11:54:08 -0700
Subject: [PATCH 22/50] @labkey/components v7.37.2-moreAccessibility.2

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 459de9fb64..8fea9d3d44 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.1",
+  "version": "7.37.2-moreAccessibility.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.37.2-moreAccessibility.1",
+      "version": "7.37.2-moreAccessibility.2",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 04034b99d9..5fa42e0e2e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.1",
+  "version": "7.37.2-moreAccessibility.2",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From e91de93e58afcb6bd78d5e74e8259c5171136aac Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 20 May 2026 15:04:57 -0700
Subject: [PATCH 23/50] Update snapshot

---
 .../__snapshots__/ExpandableContainer.test.tsx.snap  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap b/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
index 6986c0ff47..59d0542843 100644
--- a/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
+++ b/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
@@ -19,8 +19,10 @@ exports[`<ExpandableContainer/> custom props 1`] = `
       <div
         class="pull-right container-expandable-child__chevron text-muted"
       >
-        <i
-          class="fa fa-chevron-down"
+        <button
+          class="clickable-text fa fa-chevron-down"
+          title="Collapse"
+          type="button"
         />
       </div>
       <div
@@ -62,8 +64,10 @@ exports[`<ExpandableContainer/> default props 1`] = `
       <div
         class="pull-right container-expandable-child__chevron"
       >
-        <i
-          class="fa fa-chevron-right"
+        <button
+          class="clickable-text fa fa-chevron-right"
+          title="Expand"
+          type="button"
         />
       </div>
       <div

From c092c0c94f7c82093a00ff56f1f0437511424a3a Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 06:41:03 -0700
Subject: [PATCH 24/50] put data-fieldKey attribute on inner span for
 consistency

---
 .../src/internal/components/forms/LabelOverlay.tsx          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 2f8a74eb81..bee64e6a16 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -125,10 +125,9 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             return (
                 <span
                     className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
-                    data-fieldKey={dataKey ?? column?.fieldKey}
                     id={column?.labelId}
                 >
-                    <span>{label}</span>&nbsp;
+                    <span data-fieldKey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
                 </span>
@@ -137,10 +136,9 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
         return (
             <label
                 className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
-                data-fieldKey={dataKey ?? column?.fieldKey}
                 htmlFor={inputId}
             >
-                <span>{label}</span>&nbsp;
+                <span data-fieldKey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
             </label>

From 9396acf51fe6fc1a47170d9f0dbd24e86c244ab6 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 06:42:52 -0700
Subject: [PATCH 25/50] @labkey/components v7.37.2-moreAccessibility.3

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 8fea9d3d44..12d44aa82d 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.2",
+  "version": "7.37.2-moreAccessibility.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.37.2-moreAccessibility.2",
+      "version": "7.37.2-moreAccessibility.3",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 5fa42e0e2e..2f0edbb4bc 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.2",
+  "version": "7.37.2-moreAccessibility.3",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From b0cf2cd1b12d2c297563c4931155fe44140bcb55 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 07:26:15 -0700
Subject: [PATCH 26/50] Data key instead of inputId for labelOverlayProps

---
 .../src/internal/components/forms/LabelOverlay.tsx   | 12 +++---------
 .../internal/components/forms/input/FileInput.tsx    |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index bee64e6a16..16d81fab19 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -123,10 +123,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
 
         if (!inputId) {
             return (
-                <span
-                    className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
-                    id={column?.labelId}
-                >
+                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
                     <span data-fieldKey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
@@ -134,11 +131,8 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             );
         }
         return (
-            <label
-                className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
-                htmlFor={inputId}
-            >
-                <span data-fieldKey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
+            <label className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} htmlFor={inputId}>
+                <span data-fieldKey={inputId}>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
             </label>
diff --git a/packages/components/src/internal/components/forms/input/FileInput.tsx b/packages/components/src/internal/components/forms/input/FileInput.tsx
index 1dfe943221..909bda163e 100644
--- a/packages/components/src/internal/components/forms/input/FileInput.tsx
+++ b/packages/components/src/internal/components/forms/input/FileInput.tsx
@@ -280,7 +280,7 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
 
         const labelOverlayProps = {
             addLabelAsterisk,
-            inputId,
+            dataKey: inputId,
             // While this component supports binding Formsy it does not use a Formsy component
             // to render the associated label. As such, the label overlay is always configured as isFormsy={false}.
             isFormsy: false,

From 0a2486b7eed0121ca3ae0d813655b778d699b53f Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 07:39:51 -0700
Subject: [PATCH 27/50] Add id to label as well to avoid broken aria references

---
 .../src/internal/components/forms/LabelOverlay.tsx          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 16d81fab19..91a875d857 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -131,7 +131,11 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             );
         }
         return (
-            <label className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} htmlFor={inputId}>
+            <label
+                className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
+                htmlFor={inputId}
+                id={column?.labelId}
+            >
                 <span data-fieldKey={inputId}>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}

From 61fa30fe809e5b85e61c67d2a5177798a01262ce Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 07:40:56 -0700
Subject: [PATCH 28/50] @labkey/components v7.37.2-moreAccessibility.4

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 12d44aa82d..ee0aec0e21 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.3",
+  "version": "7.37.2-moreAccessibility.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.37.2-moreAccessibility.3",
+      "version": "7.37.2-moreAccessibility.4",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 2f0edbb4bc..133aaf984f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.37.2-moreAccessibility.3",
+  "version": "7.37.2-moreAccessibility.4",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 538746292cd010452182949b6886fb571b467dc9 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 21 May 2026 07:54:25 -0700
Subject: [PATCH 29/50] Add data-fieldkey for amount and units fields

---
 .../internal/components/forms/input/AmountUnitInput.tsx    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
index d7330080ae..3b5c2e23b6 100644
--- a/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
@@ -69,9 +69,12 @@ export const AmountUnitInput: FC<InputRendererProps> = memo(props => {
                     id={id}
                     isDisabled={disabled}
                     label={
-                        <div className={inputLabelClass + ' bold-text text__truncate-and-wrap'}>
+                        <span
+                            className={inputLabelClass + ' bold-text text__truncate-and-wrap'}
+                            data-fieldkey={amountCol.name}
+                        >
                             Amount and Units
-                        </div>
+                        </span>
                     }
                     labelOverlayProps={{
                         description: 'The amount and units of this sample currently on hand.',

From f1bed9c8876eec1d4e7c768b0f2914f4e6b50f9b Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 09:12:00 -0700
Subject: [PATCH 30/50] Casing updates for data-fieldkey attribute

---
 .../src/internal/components/forms/LabelOverlay.tsx   | 12 ++++++++----
 .../internal/components/forms/input/SelectInput.tsx  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 91a875d857..4f52b3c962 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -113,7 +113,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             // when being used as a label for a formsy component directly this will use just a span without the
             // classes applied as well as not needing to handle 'required' display
             return (
-                <span data-fieldKey={dataKey ?? column?.fieldKey} id={column?.labelId}>
+                <span data-fieldkey={dataKey ?? column?.fieldKey} id={column?.labelId}>
                     {label}&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
@@ -123,8 +123,12 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
 
         if (!inputId) {
             return (
-                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
-                    <span data-fieldKey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
+                <span
+                    className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
+                    data-fieldkey={dataKey ?? column?.fieldKey}
+                    id={column?.labelId}
+                >
+                    <span data-fieldkey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
                 </span>
@@ -136,7 +140,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
                 htmlFor={inputId}
                 id={column?.labelId}
             >
-                <span data-fieldKey={inputId}>{label}</span>&nbsp;
+                <span data-fieldkey={inputId}>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
             </label>
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 606265b817..97048cc43e 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -538,7 +538,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
 
                 if (renderFieldLabel) {
                     return (
-                        <span className={labelClass} data-fieldKey={name}>
+                        <span className={labelClass} data-fieldkey={name}>
                             {renderFieldLabel(undefined, label, description_)}
                             {required && <span className="required-symbol"> *</span>}
                         </span>

From af80d50895a54205cd7dbc5991f143e6dff8d781 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 09:12:08 -0700
Subject: [PATCH 31/50] Test updates

---
 .../components/forms/LabelOverlay.test.tsx       | 16 ++++++++--------
 .../forms/input/AmountUnitInput.test.tsx         | 12 ++++--------
 .../components/forms/input/SelectInput.test.tsx  |  4 ++--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.test.tsx b/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
index 0489905123..4de4f0a48d 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
@@ -5,51 +5,51 @@ import { LabelOverlay } from './LabelOverlay';
 describe('LabelOverlay', () => {
     it('renders label with overlay, not formsy', () => {
         render(<LabelOverlay isFormsy={false} label="Test Label" />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required symbol when required, not formsy', () => {
         render(<LabelOverlay isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required, but addLabelAsterisk = false, not formsy', () => {
         render(<LabelOverlay addLabelAsterisk={false} isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay, required = false, and addLabelAsterisk = true, not formsy', () => {
         render(<LabelOverlay addLabelAsterisk={true} isFormsy={false} label="Test Label" required={false} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with no overlay and required symbol when required, not formsy', () => {
         render(<LabelOverlay helpTipRenderer="NONE" isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(0);
     });
 
     it('renders label with overlay, isFormsy = true (default)', () => {
         render(<LabelOverlay label="Test Label" />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required', () => {
         render(<LabelOverlay isFormsy={true} label="Test Label" required={true} />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and addLabelAsterisk', () => {
         render(<LabelOverlay addLabelAsterisk={true} isFormsy={true} label="Test Label" />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
index 16f64c6af2..c16ada4106 100644
--- a/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
@@ -77,8 +77,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(1);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
         const inputs = document.querySelectorAll('input');
@@ -105,8 +104,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(1);
         const inputs = document.querySelectorAll('input');
@@ -133,8 +131,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(1);
         const inputs = document.querySelectorAll('input');
@@ -161,8 +158,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
         const inputs = document.querySelectorAll('input');
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.test.tsx b/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
index 92285587f5..1b32f1787b 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
@@ -81,9 +81,9 @@ describe('SelectInput', () => {
 
     function validateFieldLabel(component: any, labelText?: string): void {
         if (labelText !== undefined) {
-            expect(document.querySelector('label').textContent).toBe(labelText);
+            expect(document.querySelector('.control-label').textContent).toBe(labelText);
         } else {
-            expect(document.querySelectorAll('label')).toHaveLength(0);
+            expect(document.querySelectorAll('.control-label')).toHaveLength(0);
         }
     }
 

From 194a0ed4f917f7f70065d970b0cfd66d56c16562 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 09:13:59 -0700
Subject: [PATCH 32/50] @labkey/components v7.38.1-moreAccessibility.6

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 415a47710f..e781099ff0 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.5",
+  "version": "7.38.1-moreAccessibility.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.1-moreAccessibility.5",
+      "version": "7.38.1-moreAccessibility.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 4a3be3320c..ba9b357c0b 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.5",
+  "version": "7.38.1-moreAccessibility.6",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 66930491d1113a78b8f370a40e24acb684bb657c Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:11:59 -0700
Subject: [PATCH 33/50] Empty button

---
 .../src/internal/components/forms/detail/DetailPanelHeader.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
index 9c8b613edd..de5dff42ba 100644
--- a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import React, { FC, memo } from 'react';
+import { Icon } from '../../../Icon';
 
 interface DetailPanelHeaderProps {
     editing?: boolean;
@@ -50,7 +51,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
                 {isEditable && (
                     <>
                         <button className="clickable-text detail__edit-button" onClick={onClick} type="button">
-                            <i className="fa fa-pencil-square-o" />
+                            <Icon iconClass="fa fa-pencil-square-o" srText="Edit Details" />
                         </button>
                         <div className="clearfix" />
                     </>

From 9cce6c45623b78243081d0b37a5312f51157ea7c Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:12:34 -0700
Subject: [PATCH 34/50] Remove redundant (I hope) data-fieldkey attribute

---
 .../src/internal/components/forms/LabelOverlay.tsx          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 4f52b3c962..27c30d2013 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -123,11 +123,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
 
         if (!inputId) {
             return (
-                <span
-                    className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
-                    data-fieldkey={dataKey ?? column?.fieldKey}
-                    id={column?.labelId}
-                >
+                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
                     <span data-fieldkey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}

From a57e4b77fa9b63816c89dc7c0106b5b77efaab90 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:12:54 -0700
Subject: [PATCH 35/50] Unique ids for description fields

---
 .../components/labelPrinting/LabelsConfigurationPanel.tsx     | 4 ++--
 .../internal/components/samples/ManageSampleStatusesPanel.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
index 03d7051f54..f7caa25e82 100644
--- a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
+++ b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
@@ -259,11 +259,11 @@ export const LabelTemplateDetails: FC<LabelTemplateDetailsProps> = memo(props =>
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel label="Description" id="description-label"/>
+                            <DomainFieldLabel id="label-description-label" label="Description" />
                         </div>
                         <div className="col-sm-8">
                             <textarea
-                                aria-labelledby="description-label"
+                                aria-labelledby="label-description-label"
                                 className="form-control"
                                 name="description"
                                 onChange={onFormChange}
diff --git a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
index f64e16cbbb..ae19ec93fd 100644
--- a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
+++ b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
@@ -252,11 +252,11 @@ export const SampleStatusDetail: FC<SampleStatusDetailProps> = memo(props => {
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel id="description-label" label="Description" />
+                            <DomainFieldLabel id="status-description-label" label="Description" />
                         </div>
                         <div className="col-sm-8">
                             <textarea
-                                aria-labelledby="description-label"
+                                aria-labelledby="status-description-label"
                                 className="form-control"
                                 disabled={saving || !updatedState.isLocal}
                                 name="description"

From 5be9ccdbafe7001272db70a9321554c9f452a413 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:14:25 -0700
Subject: [PATCH 36/50] Fix empty toggle buttons

---
 .../src/internal/components/buttons/ToggleButtons.tsx     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/buttons/ToggleButtons.tsx b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
index fd3cb7aeee..b087bbcc92 100644
--- a/packages/components/src/internal/components/buttons/ToggleButtons.tsx
+++ b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
@@ -105,10 +105,14 @@ export const ToggleIcon: FC<Props> = memo(props => {
     const body = (
         <>
             {firstActive && (
-                <button className="clickable-text fa fa-toggle-on" onClick={secondBtnClick} type="button" />
+                <button className="clickable-text fa fa-toggle-on" onClick={secondBtnClick} type="button">
+                    <span className="sr-only">Toggle On {inputFieldName}</span>
+                </button>
             )}
             {secondActive && (
-                <button className="clickable-text fa fa-toggle-off" onClick={firstBtnClick} type="button" />
+                <button className="clickable-text fa fa-toggle-off" onClick={firstBtnClick} type="button">
+                    <span className="sr-only">Toggle Off {inputFieldName}</span>
+                </button>
             )}
         </>
     );

From 6fef7a1992abcc4d1b1fa8bd814916d98c9feece Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:16:03 -0700
Subject: [PATCH 37/50] Fix styling for control-labels that are spans in
 content-form

---
 packages/components/src/theme/form.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index d459df020f..c03d42c581 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -313,6 +313,9 @@ textarea.form-control {
     label {
         font-weight: normal;
     }
+    span.control-label {
+        font-weight: normal;
+    }
 }
 
 .required-symbol {

From 652fec06e8bf53b57761b5fd21efadcbf0cff8d2 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:16:39 -0700
Subject: [PATCH 38/50] Use aria-label instead of labelledby for more
 consistent display

---
 .../src/internal/components/forms/input/TextInput.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index 982e664d1a..fe7efe6a73 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -143,7 +143,7 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
         return (
             <>
                 <FormsyInput
-                    aria-labelledby={!showLabel ? queryColumn.labelId : undefined}
+                    aria-label={showLabel ? undefined : queryColumn.caption}
                     id={queryColumn.fieldKey}
                     name={queryColumn.fieldKey}
                     placeholder={

From f5d3dac2ce28dea8f5e4abffe5f410cb061bfe39 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:18:06 -0700
Subject: [PATCH 39/50] @labkey/components v7.38.1-moreAccessibility.7

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index e781099ff0..0d453a5dda 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.6",
+  "version": "7.38.1-moreAccessibility.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.1-moreAccessibility.6",
+      "version": "7.38.1-moreAccessibility.7",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index ba9b357c0b..4043eff58b 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.6",
+  "version": "7.38.1-moreAccessibility.7",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 0a4f3f198fdab584dde81fd6374742b21fe471c5 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:56:28 -0700
Subject: [PATCH 40/50] Add aria-pressed attribut for toggle buttons

---
 .../internal/components/buttons/ToggleButtons.tsx  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/buttons/ToggleButtons.tsx b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
index b087bbcc92..5050da8068 100644
--- a/packages/components/src/internal/components/buttons/ToggleButtons.tsx
+++ b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
@@ -105,12 +105,22 @@ export const ToggleIcon: FC<Props> = memo(props => {
     const body = (
         <>
             {firstActive && (
-                <button className="clickable-text fa fa-toggle-on" onClick={secondBtnClick} type="button">
+                <button
+                    aria-pressed="true"
+                    className="clickable-text fa fa-toggle-on"
+                    onClick={secondBtnClick}
+                    type="button"
+                >
                     <span className="sr-only">Toggle On {inputFieldName}</span>
                 </button>
             )}
             {secondActive && (
-                <button className="clickable-text fa fa-toggle-off" onClick={firstBtnClick} type="button">
+                <button
+                    aria-pressed="true"
+                    className="clickable-text fa fa-toggle-off"
+                    onClick={firstBtnClick}
+                    type="button"
+                >
                     <span className="sr-only">Toggle Off {inputFieldName}</span>
                 </button>
             )}

From 0c7c412be21b5bd05f5d19c690fdadbbd31dcd2d Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:56:49 -0700
Subject: [PATCH 41/50] Explicitly set aria-label to undefined when label is
 falsy

---
 .../src/internal/components/forms/input/CheckboxInput.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
index 729fa39aee..9e649e430c 100644
--- a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
+++ b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
@@ -146,7 +146,7 @@ class CheckboxInputImpl extends DisableableInput<CheckboxInputImplProps, Checkbo
                         />
                     ) : (
                         <input
-                            aria-label={label}
+                            aria-label={label || undefined}
                             aria-labelledby={label ? undefined : queryColumn.labelId}
                             checked={checked}
                             disabled={isDisabled}

From 6dacdb616b57d39137719376aa8f74670f3493b0 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:57:06 -0700
Subject: [PATCH 42/50] Make ids unique

---
 .../components/domainproperties/TextChoiceOptions.tsx    | 4 ++--
 .../labelPrinting/LabelsConfigurationPanel.tsx           | 9 ++++++---
 .../components/samples/ManageSampleStatusesPanel.tsx     | 7 +++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
index 12b6f42700..388b042e48 100644
--- a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
@@ -320,11 +320,11 @@ export const TextChoiceOptionsImpl: FC<ImplProps> = memo(props => {
                         {selectedIndex !== undefined && (!currentInUse || !isMultiChoiceField) && (
                             <>
                                 <div className="domain-field-label">
-                                    <DomainFieldLabel id="text-choice-value-label" label="Value" />
+                                    <DomainFieldLabel id={'text-choice-value-label-' + selectedIndex} label="Value" />
                                 </div>
                                 <div className="domain-field-padding-bottom">
                                     <DisableableInput
-                                        aria-labelledby="text-choice-value-label"
+                                        aria-labelledby={'text-choice-value-label-' + selectedIndex}
                                         className="form-control full-width"
                                         disabledMsg={currentLocked ? LOCKED_TIP : undefined}
                                         name="value"
diff --git a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
index f7caa25e82..e9faaf0b4b 100644
--- a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
+++ b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
@@ -259,15 +259,18 @@ export const LabelTemplateDetails: FC<LabelTemplateDetailsProps> = memo(props =>
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel id="label-description-label" label="Description" />
+                            <DomainFieldLabel
+                                id={'label-description-label-' + updatedTemplate.rowId}
+                                label="Description"
+                            />
                         </div>
                         <div className="col-sm-8">
                             <textarea
-                                aria-labelledby="label-description-label"
+                                aria-labelledby={'label-description-label-' + updatedTemplate.rowId}
                                 className="form-control"
+                                disabled={saving}
                                 name="description"
                                 onChange={onFormChange}
-                                disabled={saving}
                                 value={updatedTemplate.description ?? ''}
                             />
                         </div>
diff --git a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
index ae19ec93fd..50adfe47b0 100644
--- a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
+++ b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
@@ -252,11 +252,14 @@ export const SampleStatusDetail: FC<SampleStatusDetailProps> = memo(props => {
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel id="status-description-label" label="Description" />
+                            <DomainFieldLabel
+                                id={'status-description-label-' + updatedState.rowId}
+                                label="Description"
+                            />
                         </div>
                         <div className="col-sm-8">
                             <textarea
-                                aria-labelledby="status-description-label"
+                                aria-labelledby={'status-description-label-' + updatedState.rowId}
                                 className="form-control"
                                 disabled={saving || !updatedState.isLocal}
                                 name="description"

From a86e1f90b6ee2989b46ddbc3aa81c1ca04447416 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Fri, 22 May 2026 11:58:54 -0700
Subject: [PATCH 43/50] @labkey/components v7.38.1-moreAccessibility.8

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 0d453a5dda..e703271010 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.7",
+  "version": "7.38.1-moreAccessibility.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.1-moreAccessibility.7",
+      "version": "7.38.1-moreAccessibility.8",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 4043eff58b..b03326b5f8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.7",
+  "version": "7.38.1-moreAccessibility.8",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From a4fceeee441c54686e01d1270955e4612843b8fa Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 07:57:21 -0700
Subject: [PATCH 44/50] Add span for ease of locating

---
 .../internal/components/forms/detail/DetailPanelHeader.tsx    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
index de5dff42ba..66717afd8b 100644
--- a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
@@ -31,7 +31,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
     if (editing) {
         return (
             <h2 className="panel-heading">
-                {verb} {title}
+                <span>{verb} {title}</span>
                 <span className="detail__edit--heading">
                     {warning !== undefined && (
                         <span>
@@ -46,7 +46,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
 
     return (
         <h2 className="panel-heading">
-            {title}
+            <span>{title}</span>
             <span className="detail__edit--heading">
                 {isEditable && (
                     <>

From eb2ba56fc930f695afb67f02f844896014e3a1e9 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 08:05:09 -0700
Subject: [PATCH 45/50] Remove redundant null return

---
 .../src/internal/components/forms/input/TextAreaInput.tsx     | 4 ----
 .../src/internal/components/forms/input/TextInput.tsx         | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
index cd615b91cf..c79dd3184c 100644
--- a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
@@ -63,10 +63,6 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
             return renderFieldLabel(queryColumn);
         }
 
-        if (!showLabel) {
-            return null;
-        }
-
         return (
             <FieldLabel
                 column={queryColumn}
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index fe7efe6a73..79dfde6081 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -90,10 +90,6 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             return renderFieldLabel(queryColumn);
         }
 
-        if (!showLabel) {
-            return null;
-        }
-
         return (
             <FieldLabel
                 column={queryColumn}

From cb2a1538757b29607aa0282d90d6c660f928a708 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 08:06:43 -0700
Subject: [PATCH 46/50] @labkey/components v7.38.1-moreAccessibility.9

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index e703271010..6a4b596b37 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.8",
+  "version": "7.38.1-moreAccessibility.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.1-moreAccessibility.8",
+      "version": "7.38.1-moreAccessibility.9",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index b03326b5f8..8091b9211e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.8",
+  "version": "7.38.1-moreAccessibility.9",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From c9b64019d5d2e77956d576f16a1f4fd37feb4de2 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 13:27:07 -0700
Subject: [PATCH 47/50] Update SR text to be more descriptive

---
 .../internal/components/forms/detail/DetailPanelHeader.tsx  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
index 66717afd8b..e102f5ab43 100644
--- a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
@@ -31,7 +31,9 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
     if (editing) {
         return (
             <h2 className="panel-heading">
-                <span>{verb} {title}</span>
+                <span>
+                    {verb} {title}
+                </span>
                 <span className="detail__edit--heading">
                     {warning !== undefined && (
                         <span>
@@ -51,7 +53,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
                 {isEditable && (
                     <>
                         <button className="clickable-text detail__edit-button" onClick={onClick} type="button">
-                            <Icon iconClass="fa fa-pencil-square-o" srText="Edit Details" />
+                            <Icon iconClass="fa fa-pencil-square-o" srText={'Edit ' + title} />
                         </button>
                         <div className="clearfix" />
                     </>

From f2e4de160b0e6c56add52484ac321c41ad2cf930 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 13:42:47 -0700
Subject: [PATCH 48/50] Restore showLab

---
 .../src/internal/components/forms/input/TextAreaInput.tsx   | 5 +++++
 .../src/internal/components/forms/input/TextInput.tsx       | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
index c79dd3184c..9e4219436f 100644
--- a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
@@ -63,6 +63,11 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
             return renderFieldLabel(queryColumn);
         }
 
+        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // in place of sending showLabel=false???
+        if (showLabel === false) {
+            return null;
+        }
         return (
             <FieldLabel
                 column={queryColumn}
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index 79dfde6081..5202708428 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -90,6 +90,12 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             return renderFieldLabel(queryColumn);
         }
 
+        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // in place of sending showLabel=false???
+        if (showLabel === false) {
+            return null;
+        }
+
         return (
             <FieldLabel
                 column={queryColumn}

From f8a87dc944db0ef4408dec6a0f8ceaee7b90e5c3 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 25 May 2026 13:43:54 -0700
Subject: [PATCH 49/50] @labkey/components v7.38.1-moreAccessibility.11

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 6a4b596b37..ba2c99754a 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.9",
+  "version": "7.38.1-moreAccessibility.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.1-moreAccessibility.9",
+      "version": "7.38.1-moreAccessibility.11",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 8091b9211e..def4bdbd30 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.1-moreAccessibility.9",
+  "version": "7.38.1-moreAccessibility.11",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 209045ea974598499fc798b7a8febd5a5416a069 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 26 May 2026 08:43:06 -0700
Subject: [PATCH 50/50] Remove FIXME

---
 .../src/internal/components/forms/input/TextAreaInput.tsx       | 2 +-
 .../src/internal/components/forms/input/TextInput.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
index 9e4219436f..57f7e83bef 100644
--- a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
@@ -63,7 +63,7 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
             return renderFieldLabel(queryColumn);
         }
 
-        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // This is here (at least for now) because of the use of the hide-label class below
         // in place of sending showLabel=false???
         if (showLabel === false) {
             return null;
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index 5202708428..6404faef59 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -90,7 +90,7 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             return renderFieldLabel(queryColumn);
         }
 
-        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // This is here (at least for now) because of the use of the hide-label class below
         // in place of sending showLabel=false???
         if (showLabel === false) {
             return null;