diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx index e13c98c5473..e0383d82558 100644 --- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx +++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx @@ -86,7 +86,7 @@ const getSelect = () => screen.getByRole('combobox', { name: new RegExp(ARIA_LABEL, 'i') }); const selectAllButtonText = (length: number) => `Select all (${length})`; -const deselectAllButtonText = (length: number) => `Deselect all (${length})`; +const deselectAllButtonText = (length: number) => `Clear (${length})`; const findSelectOption = (text: string) => waitFor(() => diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx index 3f6ecb379b2..222ba643bcd 100644 --- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx +++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx @@ -523,7 +523,7 @@ const Select = forwardRef( handleDeselectAll(); }} > - {`${t('Deselect all')} (${bulkSelectCounts.deselectable})`} + {`${t('Clear')} (${bulkSelectCounts.deselectable})`} ), @@ -777,6 +777,7 @@ const Select = forwardRef( options={visibleOptions} optionRender={option => {option.label || option.value}} oneLine={oneLine} + popupMatchSelectWidth={selectAllEnabled ? 168 : true} css={props.css} dropdownAlign={DROPDOWN_ALIGN_BOTTOM} {...props} diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx index 8eaa5d1eeff..eedbd1fd3b6 100644 --- a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx +++ b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx @@ -142,5 +142,6 @@ export const StyledBulkActionsContainer = styled(Flex)` ${({ theme }) => ` padding: ${theme.sizeUnit}px; border-top: 1px solid ${theme.colorSplit}; + gap: ${theme.sizeUnit * 2}px; `} `;