Skip to content

Add multiSelect capability for ComboBox #3906

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
jspurlin merged 21 commits into from
Mar 23, 2018
Merged

Add multiSelect capability for ComboBox #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ec3516c
Add multiSelect for ComboBox
Feb 6, 2018
86d985a
Merge from master
Feb 6, 2018
17f52e1
Unbreak a unit test
Feb 7, 2018
7155aa8
rush change
Feb 7, 2018
fee97bd
Merge from upstream
Mar 6, 2018
f81f595
bug fixes
Mar 15, 2018
bd787a3
Merge from upstream
Mar 15, 2018
7cd611f
Merge from upstream and resolve local build issues
Mar 15, 2018
b15187c
Fix merge styles
Mar 16, 2018
abc9efd
Fix pending background
Mar 16, 2018
78395cb
Unbreak unit test cases
Mar 16, 2018
13897db
Merge from upstream
Mar 19, 2018
558252d
Fix the merge
Mar 19, 2018
bc79fab
Add controled multi-select in the example page to make sure onChanged…
Mar 20, 2018
634d9a8
Resolve conflicts from upstream
Mar 20, 2018
09a52e7
Remove trailing white spaces
Mar 20, 2018
22c8e08
Fix bug: enter key will not trigger onChanged
Mar 20, 2018
94753a9
Dummy change to trigger another build
Mar 21, 2018
6934c24
Merge upstream and resolve conflict
Mar 22, 2018
143e5ea
refactor
Mar 22, 2018
da6751a
Fix some minor bugs
Mar 22, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/stanleyy-fillin_2018-02-07-00-36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Add multiSelect capability for ComboBox",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
5 changes: 3 additions & 2 deletions packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ const getListOptionHighContrastStyles = memoizeFunction((theme: ITheme): IRawSty
export const getOptionStyles = memoizeFunction((
theme: ITheme,
customStylesForAllOptions?: Partial<IComboBoxOptionStyles>,
customOptionStylesForCurrentOption?: Partial<IComboBoxOptionStyles>
customOptionStylesForCurrentOption?: Partial<IComboBoxOptionStyles>,
isPending?: boolean
): Partial<IComboBoxOptionStyles> => {

const { semanticColors, palette } = theme;
Expand All @@ -67,7 +68,7 @@ export const getOptionStyles = memoizeFunction((
const optionStyles: IComboBoxOptionStyles = {
root: [
{
backgroundColor: 'transparent',
backgroundColor: isPending ? ComboBoxOptionBackgroundHovered : 'transparent',
boxSizing: 'border-box',
cursor: 'pointer',
display: 'block',
Expand Down
Loading