Skip to content

fix(pf4): use custom divs for dual list select #467

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 3 commits into from
May 4, 2020
Merged

fix(pf4): use custom divs for dual list select #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f4019c
fix(renderer): useFieldApi do not return isEqual
rvsia May 4, 2020
f9f87f0
fix(pf4): use custom divs for dual list select
rvsia May 4, 2020
9615b32
Add missing variable for active color
rvsia May 4, 2020
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
40 changes: 21 additions & 19 deletions packages/pf4-component-mapper/src/files/dual-list-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,27 @@ const getOptionsGroup = (value, lastClicked, options) => {
return [...options.slice(startIndex, endIndex).map(({ value }) => value.toString())];
};

const List = ({ value, optionClick, noOptionsTitle, filterValue, filterValueText, ...rest }) => (
<select className="pf-c-form-control pf-u-pr-sm ddorg__pf4-component-mapper__dual-list-select" multiple {...rest}>
const List = ({ value, optionClick, noOptionsTitle, filterValue, filterValueText, selectedValues, ...rest }) => (
<div className="pf-c-form-control pf-u-pr-sm ddorg__pf4-component-mapper__dual-list-select" {...rest}>
{value.length < 1 && (
<option className="ddorg__pf4-component-mapper__dual-list-select-option" disabled>
<div className="ddorg__pf4-component-mapper__dual-list-select-option-text ddorg__pf4-component-mapper__dual-list-select-option-disabled">
{filterValue ? filterValueText : noOptionsTitle}
</option>
</div>
)}
{value.length > 0 &&
value.map(({ value, label }) => (
<option onClick={optionClick} key={value} value={value}>
<div
onClick={(e) => optionClick(e, value)}
key={value}
value={value}
className={`ddorg__pf4-component-mapper__dual-list-select-option ${
selectedValues.includes(value) ? 'ddorg__pf4-component-mapper__dual-list-select-option-selected' : ''
}`}
>
{label}
</option>
</div>
))}
</select>
</div>
);

List.propTypes = {
Expand All @@ -67,7 +74,8 @@ List.propTypes = {
optionClick: PropTypes.func.isRequired,
noOptionsTitle: PropTypes.node,
filterValue: PropTypes.string,
filterValueText: PropTypes.node
filterValueText: PropTypes.node,
selectedValues: PropTypes.array
};

List.defaultProps = {
Expand Down Expand Up @@ -181,7 +189,6 @@ const DualList = (props) => {
moveLeftTitle,
options,
rightTitle,
size,
label,
isRequired,
helperText,
Expand All @@ -199,10 +206,7 @@ const DualList = (props) => {

const showError = touched && error;

const handleOptionClicked = (event, options, isRight) => {
const {
target: { value }
} = event;
const handleOptionClicked = (event, value, options, isRight) => {
const selectedKey = isRight ? 'selectedLeftValues' : 'selectedRightValues';
const lastKey = isRight ? 'lastLeftClicked' : 'lastRightClicked';
if (event.shiftKey && state[lastKey]) {
Expand Down Expand Up @@ -266,12 +270,12 @@ const DualList = (props) => {
</GridItem>
<GridItem md={12}>
<List
size={size}
optionClick={(event) => handleOptionClicked(event, leftValues, true)}
optionClick={(event, value) => handleOptionClicked(event, value, leftValues, true)}
value={leftValues}
noOptionsTitle={noOptionsTitle}
filterValue={state.filterOptions}
filterValueText={filterOptionsText}
selectedValues={state.selectedLeftValues}
/>
</GridItem>
</Grid>
Expand Down Expand Up @@ -341,12 +345,12 @@ const DualList = (props) => {
</GridItem>
<GridItem md={12}>
<List
size={size}
optionClick={(event) => handleOptionClicked(event, rightValues, false)}
optionClick={(event, value) => handleOptionClicked(event, value, rightValues, false)}
value={rightValues}
noOptionsTitle={noValueTitle}
filterValue={state.filterValue}
filterValueText={filterValueText}
selectedValues={state.selectedRightValues}
/>
</GridItem>
</Grid>
Expand All @@ -366,7 +370,6 @@ DualList.propTypes = {
),
leftTitle: PropTypes.node,
rightTitle: PropTypes.node,
size: PropTypes.number,
moveLeftTitle: PropTypes.node,
moveRightTitle: PropTypes.node,
clearRightValue: PropTypes.bool,
Expand All @@ -387,7 +390,6 @@ DualList.propTypes = {
DualList.defaultProps = {
leftTitle: 'Options',
rightTitle: 'Selected',
size: 15,
moveLeftTitle: 'Move selected to left',
moveRightTitle: 'Move selected to right',
moveAllRightTitle: 'Move all to right',
Expand Down
17 changes: 16 additions & 1 deletion packages/pf4-component-mapper/src/files/dual-list-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,23 @@
.ddorg__pf4-component-mapper__dual-list-select {
height: 300px !important;
background: none !important;
overflow: auto !important;
}

.ddorg__pf4-component-mapper__dual-list-select-option {
.ddorg__pf4-component-mapper__dual-list-select-option-text {
height: 100% !important;
}

.ddorg__pf4-component-mapper__dual-list-select-option {
cursor: pointer;
user-select: none;
}

.ddorg__pf4-component-mapper__dual-list-select-option-disabled {
color: var(--pf-global--disabled-color--100)
}

.ddorg__pf4-component-mapper__dual-list-select-option-selected {
background-color: var(--pf-global--active-color--400);
color: white
}
Loading