Skip to content

fix: fill dropdown selector UI to avoid text shrink #6910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2021
Merged

fix: fill dropdown selector UI to avoid text shrink #6910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/client/src/components/ads/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ const SelectedDropDownHolder = styled.div`
display: flex;
align-items: center;
min-width: 0;
width: 100%;
overflow: hidden;

& ${Text} {
Expand Down
11 changes: 10 additions & 1 deletion app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ export const CONNECT_NEW_DATASOURCE_OPTION_ID = _.uniqueId();

// ---------- Styles ----------

const OptionWrapper = styled.div<{ disabled?: boolean; selected?: boolean }>`
const OptionWrapper = styled.div<{
disabled?: boolean;
selected?: boolean;
width?: string;
}>`
padding: ${(props) =>
props.selected
? `${props.theme.spaces[1]}px 0px`
Expand All @@ -25,6 +29,7 @@ const OptionWrapper = styled.div<{ disabled?: boolean; selected?: boolean }>`
display: flex;
align-items: center;
user-select: none;
width: ${(props) => props.width};

&&& svg {
rect {
Expand Down Expand Up @@ -67,6 +72,7 @@ const OptionWrapper = styled.div<{ disabled?: boolean; selected?: boolean }>`

const CreateIconWrapper = styled.div`
margin: 0px 8px 0px 0px;
cursor: pointer;
`;

const ImageWrapper = styled.div`
Expand All @@ -84,6 +90,7 @@ const DatasourceImage = styled.img`

interface DataSourceOptionType extends RenderDropdownOptionType {
cypressSelector: string;
optionWidth?: string;
}

function DataSourceOption({
Expand All @@ -92,6 +99,7 @@ function DataSourceOption({
isSelectedNode,
option: dropdownOption,
optionClickHandler,
optionWidth,
}: DataSourceOptionType) {
const { label } = dropdownOption;
const { routeToCreateNewDatasource = () => null } = extraProps;
Expand Down Expand Up @@ -131,6 +139,7 @@ function DataSourceOption({
}
}}
selected={isSelectedNode}
width={optionWidth}
>
{isConnectNewDataSourceBtn ? (
<CreateIconWrapper>
Expand Down
1 change: 1 addition & 0 deletions app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ function GeneratePageForm() {
key={option.id}
option={option}
optionClickHandler={optionClickHandler}
optionWidth={DROPDOWN_DIMENSION.WIDTH}
/>
)}
selected={selectedDatasource}
Expand Down