Skip to content

Fix/select widget placeholder #6677

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 4 commits into from
Aug 25, 2021
Merged

Fix/select widget placeholder #6677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffe8fe3
fix: add placeholder to select widget
Tooluloope Aug 18, 2021
08114a8
fix: add placeholder to property pane
Tooluloope Aug 18, 2021
66672cf
fix: consistency between select widgets
Tooluloope Aug 23, 2021
99ab75f
Merge branch 'release' into fix/select-widget-placeholder
Tooluloope Aug 23, 2021
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/designSystems/appsmith/MultiSelectComponent/index.styled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ export const MultiSelectContainer = styled.div`
height: 100%;
display: flex;
align-items: center;
fill: ${Colors.SLATE_GRAY};
}
.rc-select-arrow-icon {
&::after {
Expand Down
11 changes: 9 additions & 2 deletions app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const FUSE_OPTIONS = {
};

const SingleDropDown = Select.ofType<DropdownOption>();
const StyledSingleDropDown = styled(SingleDropDown)`
const StyledSingleDropDown = styled(SingleDropDown)<{ isSelected: boolean }>`
div {
flex: 1 1 auto;
}
Expand Down Expand Up @@ -60,6 +60,8 @@ const StyledSingleDropDown = styled(SingleDropDown)`
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
color: ${(props) =>
props.isSelected ? Colors.SELECT_COLOR : Colors.SELECT_PLACEHOLDER};
}
&& {
.${Classes.ICON} {
Expand Down Expand Up @@ -171,6 +173,11 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
className={this.props.isLoading ? Classes.SKELETON : ""}
disabled={this.props.disabled}
filterable={this.props.isFilterable}
isSelected={
!_.isEmpty(this.props.options) &&
this.props.selectedIndex !== undefined &&
this.props.selectedIndex > -1
}
itemListPredicate={
!this.props.serverSideFiltering
? this.itemListPredicate
Expand Down Expand Up @@ -202,7 +209,7 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
this.props.selectedIndex !== undefined &&
this.props.selectedIndex > -1
? this.props.options[this.props.selectedIndex].label
: "-- Select --"
: this.props.placeholder || "-- Select --"
}
/>
</StyledSingleDropDown>
Expand Down
2 changes: 2 additions & 0 deletions app/client/src/constants/Colors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,7 @@ export const Colors = {
BOX_SHADOW_DEFAULT_VARIANT4: "rgba(0, 0, 0, 0.25)",
BOX_SHADOW_DEFAULT_VARIANT5: "rgba(0, 0, 0, 0.25)",
SELECT_DISABLED: "#ced9e080",
SELECT_PLACEHOLDER: "#bfbfbf",
SELECT_COLOR: "#182026",
};
export type Color = typeof Colors[keyof typeof Colors];
9 changes: 9 additions & 0 deletions app/client/src/widgets/DropdownWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
},
dependencies: ["selectionType"],
},
{
propertyName: "placeholderText",
label: "Placeholder",
controlType: "INPUT_TEXT",
placeholderText: "Enter placeholder text",
isBindProperty: true,
isTriggerProperty: false,
validation: { type: ValidationTypes.TEXT },
},
{
propertyName: "isFilterable",
label: "Filterable",
Expand Down