Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

Commit 2520247

Browse files
frenautvhAxelPeter
authored andcommitted
hotfix(oui-criteria-adder): fix dropdown closed when select input was clicked (#231)
* fix(oui-criteria-adder): fix dropdown * fix(oui-criteria-adder): minor code review changes
1 parent 1e06d09 commit 2520247

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

packages/oui-criteria-adder/src/criteria-adder.controller.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export default class {
3131

3232
this.selectableOperators = this.filterSelectableOperators();
3333
this.operatorModel = this.selectableOperators[0];
34+
35+
this.resetValueModel();
3436
}
3537

3638
$postLink () {

packages/oui-criteria-adder/src/criteria-adder.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
ng-attr-id="{{::$ctrl.id}}Column"
1616
name="{{::$ctrl.name}}Column"
1717
model="$ctrl.columnModel"
18+
ng-click="$event.stopPropagation()"
1819
items="$ctrl.properties"
1920
match="title"
2021
on-change="$ctrl.onColumnChange()">
@@ -29,6 +30,7 @@
2930
ng-attr-id="{{::$ctrl.id}}Operator"
3031
name="{{::$ctrl.name}}Operator"
3132
model="$ctrl.operatorModel"
33+
ng-click="$event.stopPropagation()"
3234
items="$ctrl.selectableOperators"
3335
match="title">
3436
<span ng-bind="$item.title"></span>
@@ -65,6 +67,7 @@
6567
<oui-select
6668
name="{{::$ctrl.name}}Value"
6769
model="$ctrl.valueModel['boolean']"
70+
ng-click="$event.stopPropagation()"
6871
items="$ctrl.booleanChoices"
6972
match="name"
7073
data-align="start">
@@ -80,6 +83,7 @@
8083
<oui-select
8184
name="{{::$ctrl.name}}Value"
8285
model="$ctrl.valueModel['options']"
86+
ng-click="$event.stopPropagation()"
8387
items="$ctrl.optionsChoices"
8488
match="name"
8589
data-align="start">

0 commit comments

Comments
 (0)