Skip to content

Commit 48f4e93

Browse files
committed
keep using old select
1 parent e7b3e45 commit 48f4e93

File tree

8 files changed

+491
-429
lines changed

8 files changed

+491
-429
lines changed

package-lock.json

Lines changed: 479 additions & 423 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/compass-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@leafygreen-ui/radio-group": "^12.0.2",
7070
"@leafygreen-ui/search-input": "^5.0.2",
7171
"@leafygreen-ui/segmented-control": "^10.0.2",
72-
"@leafygreen-ui/select": "^16.2.0",
72+
"@leafygreen-ui/select": "^14.0.2",
7373
"@leafygreen-ui/skeleton-loader": "^2.0.11",
7474
"@leafygreen-ui/split-button": "^4.1.5",
7575
"@leafygreen-ui/table": "^13.0.1",

packages/compass-crud/src/components/crud-toolbar.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ describe('CrudToolbar Component', function () {
482482
describe('documents per page select', function () {
483483
it('should render a select to update documents fetched per page', function () {
484484
renderCrudToolbar();
485-
expect(screen.getByLabelText(/Update number of documents per page/i)).to
486-
.be.visible;
485+
expect(screen.getByLabelText('Update number of documents per page')).to.be
486+
.visible;
487487
});
488488

489489
it('should call updateDocumentsPerPage when select value changes', function () {
@@ -492,7 +492,7 @@ describe('CrudToolbar Component', function () {
492492
updateMaxDocumentsPerPage: stub,
493493
});
494494
userEvent.click(
495-
screen.getByLabelText(/Update number of documents per page/i)
495+
screen.getByLabelText('Update number of documents per page')
496496
);
497497
userEvent.click(screen.getByText('75'));
498498
expect(stub).to.be.calledWithExactly(75);

packages/compass-crud/src/components/table-view/types-dropdown.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ const TypesDropdown: React.FunctionComponent<TypesDropdownProps> = ({
3232
onChange={handleTypeChange}
3333
allowDeselect={false}
3434
value={element.currentType}
35+
readOnly={false}
36+
// NOTE: Leafygreen doesn't support aria-label and only understand "aria-labelledby" and "label" instead
37+
aria-labelledby=""
3538
aria-label="Field type"
3639
className={cx(selectStyles, 'table-view-cell-editor-types')}
3740
data-testid="table-view-types-dropdown-select"

packages/compass-import-export/src/components/import-options.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ function ImportOptions({
116116
<Select
117117
className={delimiterSelectStyles}
118118
id="import-delimiter-select"
119+
aria-labelledby="import-delimiter-label"
119120
aria-label="Delimiter"
120121
data-testid="import-delimiter-select"
121122
onChange={(delimiter: string) =>

packages/compass-import-export/src/components/import-preview.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ function SelectFieldType({
177177
}) {
178178
return (
179179
<Select
180+
// NOTE: Leafygreen gives an error with only aria-label for select.
181+
aria-labelledby={`toggle-import-field-label-${fieldPath}`}
180182
// leafygreen bases ids inside Select off this id which is why we have it in addition to data-testid
181183
id={`import-preview-field-type-select-menu-${fieldPath}`}
182184
data-testid={`import-preview-field-type-select-menu-${fieldPath}`}

packages/compass-settings/src/components/settings/settings-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function DefaultSortOrderSetting<PreferenceName extends 'defaultSortOrder'>({
188188
<Select
189189
className={inputStyles}
190190
allowDeselect={false}
191-
aria-label={`${name}-label`}
191+
aria-labelledby={`${name}-label`}
192192
id={name}
193193
name={name}
194194
data-testid={name}

packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-list-editor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function UrlOptionsListEditor({
133133
className={optionSelectStyles}
134134
placeholder="Select key"
135135
name="select-url-options-key-name"
136-
aria-label={
136+
aria-labelledby={
137137
uriOption.name ? `${uriOption.name} select` : 'new option select'
138138
}
139139
onChange={(name, event): void => {

0 commit comments

Comments
 (0)