From 8e9f7141a356cd07037c6e4d04fe3573f1cfdbad Mon Sep 17 00:00:00 2001 From: "REDMOND\\jspurlin" Date: Tue, 29 May 2018 13:32:52 -0700 Subject: [PATCH 1/3] ComboBox: Update styling so that the "selected" item does not get the "selected" look when navigating through the potential options. --- .../src/components/ComboBox/ComboBox.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx index 2ebef0ae3be2a2..836123f16b553a 100644 --- a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx +++ b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx @@ -199,7 +199,8 @@ export class ComboBox extends BaseComponent { currentOptions: this.props.options, currentPendingValueValidIndex: -1, currentPendingValue: '', - currentPendingValueValidIndexOnHover: HoverStatus.default + currentPendingValueValidIndexOnHover: HoverStatus.default, + }; } @@ -1177,7 +1178,7 @@ export class ComboBox extends BaseComponent { } let idxOfSelectedIndex = -1; - if ((index !== undefined) && this.state.selectedIndices) { + if (this.props.multiSelect && (index !== undefined) && this.state.selectedIndices) { idxOfSelectedIndex = this.state.selectedIndices.indexOf(index); } return (idxOfSelectedIndex >= 0); From 690627331853d6d122ef83d39c0936a491b5d699 Mon Sep 17 00:00:00 2001 From: "REDMOND\\jspurlin" Date: Tue, 29 May 2018 13:33:39 -0700 Subject: [PATCH 2/3] rush change --- ...xSelectedStylingSingleSelect_2018-05-29-20-33.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/office-ui-fabric-react/jspurlin-ComboBoxFixSelectedStylingSingleSelect_2018-05-29-20-33.json diff --git a/common/changes/office-ui-fabric-react/jspurlin-ComboBoxFixSelectedStylingSingleSelect_2018-05-29-20-33.json b/common/changes/office-ui-fabric-react/jspurlin-ComboBoxFixSelectedStylingSingleSelect_2018-05-29-20-33.json new file mode 100644 index 00000000000000..1195050a331b23 --- /dev/null +++ b/common/changes/office-ui-fabric-react/jspurlin-ComboBoxFixSelectedStylingSingleSelect_2018-05-29-20-33.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "ComboBox: Update styling so that the \"selected\" item does not get the \"selected\" look when navigating through the potential options.", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "jspurlin@microsoft.com" +} \ No newline at end of file From 450fc154deb022db49bc6230c8b769aff007140d Mon Sep 17 00:00:00 2001 From: "REDMOND\\jspurlin" Date: Tue, 29 May 2018 13:40:17 -0700 Subject: [PATCH 3/3] remove unneeded line change --- .../src/components/ComboBox/ComboBox.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx index 836123f16b553a..4bdc1aab726b17 100644 --- a/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx +++ b/packages/office-ui-fabric-react/src/components/ComboBox/ComboBox.tsx @@ -199,8 +199,7 @@ export class ComboBox extends BaseComponent { currentOptions: this.props.options, currentPendingValueValidIndex: -1, currentPendingValue: '', - currentPendingValueValidIndexOnHover: HoverStatus.default, - + currentPendingValueValidIndexOnHover: HoverStatus.default }; }