Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(select): md-select-header closes on mouse click when not using multiple #11970

Merged
merged 1 commit into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/select/demoBasicUsage/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
md-input-container {
margin-right: 10px;
margin-right: 10px;
}
12 changes: 6 additions & 6 deletions src/components/select/demoSelectHeader/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ <h1 class="md-title">Pick a vegetable below</h1>
<label>Vegetables</label>
<md-select ng-model="selectedVegetables"
md-on-close="clearSearchTerm()"
data-md-container-class="selectdemoSelectHeader"
md-container-class="selectdemoSelectHeader"
multiple>
<md-select-header class="demo-select-header">
<input ng-model="searchTerm"
type="search"
placeholder="Search for a vegetable.."
<input ng-model="searchTerm" aria-label="Vegetable filter"
type="search" placeholder="Ex. Onions"
class="demo-header-searchbox md-text">
</md-select-header>
<md-optgroup label="vegetables">
<md-option ng-value="vegetable" ng-repeat="vegetable in vegetables |
filter:searchTerm">{{vegetable}}</md-option>
<md-option ng-value="vegetable" ng-repeat="vegetable in vegetables | filter:searchTerm">
{{vegetable}}
</md-option>
</md-optgroup>
</md-select>
</md-input-container>
Expand Down
28 changes: 15 additions & 13 deletions src/components/select/demoSelectHeader/script.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
angular
.module('selectDemoSelectHeader', ['ngMaterial'])
.controller('SelectHeaderController', function($scope, $element) {
$scope.vegetables = ['Corn' ,'Onions' ,'Kale' ,'Arugula' ,'Peas', 'Zucchini'];
$scope.searchTerm;
$scope.clearSearchTerm = function() {
$scope.searchTerm = '';
};
// The md-select directive eats keydown events for some quick select
// logic. Since we have a search input here, we don't need that logic.
$element.find('input').on('keydown', function(ev) {
ev.stopPropagation();
});
(function () {
'use strict';
angular.module('selectDemoSelectHeader', ['ngMaterial'])
.controller('SelectHeaderController', function ($scope, $element) {
$scope.vegetables = ['Corn', 'Onions', 'Kale', 'Arugula', 'Peas', 'Zucchini'];
$scope.searchTerm = '';
$scope.clearSearchTerm = function () {
$scope.searchTerm = '';
};
// The md-select directive eats keydown events for some quick select
// logic. Since we have a search input here, we don't need that logic.
$element.find('input').on('keydown', function (ev) {
ev.stopPropagation();
});
});
})();
9 changes: 4 additions & 5 deletions src/components/select/demoSelectHeader/style.css
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
/* Please note: All these selectors are only applied to children of elements with the 'selectdemoSelectHeader' class */

.demo-header-searchbox {
border: none;
outline: none;
height: 100%;
width: 100%;
padding: 0;
}

.demo-select-header {
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0,
0.14), 0 0 0 0 rgba(0, 0, 0, 0.12);
padding-left: 10.667px;
padding-left: 16px;
height: 48px;
cursor: pointer;
position: relative;
display: flex;
align-items: center;
width: auto;
}

md-content._md {
max-height: 240px;
}
md-input-container {
min-width: 112px;
}
32 changes: 23 additions & 9 deletions src/components/select/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -688,19 +688,33 @@ function SelectMenuDirective($parse, $mdUtil, $mdConstant, $mdTheming) {
element.on('click', clickListener);
element.on('keypress', keyListener);

function keyListener(e) {
if (e.keyCode === 13 || e.keyCode === 32) {
clickListener(e);
/**
* @param {KeyboardEvent} keyboardEvent
*/
function keyListener(keyboardEvent) {
if (keyboardEvent.keyCode === 13 || keyboardEvent.keyCode === 32) {
clickListener(keyboardEvent);
}
}

function clickListener(ev) {
var option = $mdUtil.getClosest(ev.target, 'md-option');
/**
* @param {Event} mouseEvent
* @return {void}
*/
function clickListener(mouseEvent) {
var option = $mdUtil.getClosest(mouseEvent.target, 'md-option');
var optionCtrl = option && angular.element(option).data('$mdOptionController');
if (!option || !optionCtrl) return;
if (option.hasAttribute('disabled')) {
ev.stopImmediatePropagation();
return false;

if (!option || !optionCtrl) {
// Avoid closing the menu when the select header's input is clicked
if (mouseEvent.target && mouseEvent.target.parentNode &&
mouseEvent.target.parentNode.tagName === 'MD-SELECT-HEADER') {
Copy link

@corvinb corvinb Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

input's are usually inside md-input-container's and this check would return false in this case. :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@corvinb can you please open a new issue with a reproduction?

mouseEvent.stopImmediatePropagation();
}
return;
} else if (option.hasAttribute('disabled')) {
mouseEvent.stopImmediatePropagation();
return;
}

var optionHashKey = selectMenuCtrl.hashGetter(optionCtrl.value);
Expand Down