@syncfusion/ej2-multicolumn-combobox 26.1.38 → 26.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ej2-multicolumn-combobox.umd.min.js +2 -2
- package/dist/ej2-multicolumn-combobox.umd.min.js.map +1 -1
- package/dist/es6/ej2-multicolumn-combobox.es2015.js +99 -41
- package/dist/es6/ej2-multicolumn-combobox.es2015.js.map +1 -1
- package/dist/es6/ej2-multicolumn-combobox.es5.js +99 -41
- package/dist/es6/ej2-multicolumn-combobox.es5.js.map +1 -1
- package/dist/global/ej2-multicolumn-combobox.min.js +2 -2
- package/dist/global/ej2-multicolumn-combobox.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/hotfix/26.1.35_Vol2.txt +1 -0
- package/package.json +7 -7
- package/src/multicolumn-combobox/multi-column-combo-box.d.ts +3 -0
- package/src/multicolumn-combobox/multi-column-combo-box.js +99 -41
- package/styles/fluent2.css +5 -5
- package/styles/multicolumn-combobox/fluent2.css +5 -5
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-multicolumn-combobox@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-multicolumn-combobox@
|
|
3
|
+
"_id": "@syncfusion/ej2-multicolumn-combobox@26.1.39",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512
|
|
5
|
+
"_integrity": "sha512-+t8bdzi7eaott07aVWjXAdzCtyU5YHP8wzNQ8kEzy9p8AcUNiFcUi+9hH0oXQUuVMFfD0i7H9A9CMqsPZ/3sJA==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-multicolumn-combobox",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-multicolumn-combobox",
|
|
24
24
|
"/@syncfusion/ej2-vue-multicolumn-combobox"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-multicolumn-combobox/-/ej2-multicolumn-combobox-
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-multicolumn-combobox/-/ej2-multicolumn-combobox-26.1.39.tgz",
|
|
27
|
+
"_shasum": "fee7825568de558ee64d28e59a1ef6643cba23bf",
|
|
28
28
|
"_spec": "@syncfusion/ej2-multicolumn-combobox@*",
|
|
29
29
|
"_where": "/jenkins/workspace/elease-automation_release_26.1.1/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
},
|
|
36
36
|
"bundleDependencies": false,
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@syncfusion/ej2-base": "~26.
|
|
39
|
-
"@syncfusion/ej2-grids": "~26.
|
|
38
|
+
"@syncfusion/ej2-base": "~26.2.4",
|
|
39
|
+
"@syncfusion/ej2-grids": "~26.2.4"
|
|
40
40
|
},
|
|
41
41
|
"deprecated": false,
|
|
42
42
|
"description": "Essential JS 2 Component",
|
|
@@ -57,6 +57,6 @@
|
|
|
57
57
|
"url": "git+https://github.com/syncfusion/ej2-multicolumn-combobox-component.git"
|
|
58
58
|
},
|
|
59
59
|
"typings": "index.d.ts",
|
|
60
|
-
"version": "26.
|
|
60
|
+
"version": "26.2.4",
|
|
61
61
|
"sideEffects": false
|
|
62
62
|
}
|
|
@@ -708,6 +708,7 @@ export declare class MultiColumnComboBox extends Component<HTMLElement> implemen
|
|
|
708
708
|
private matchedRowEle;
|
|
709
709
|
private matchedContent;
|
|
710
710
|
private isDataFiltered;
|
|
711
|
+
private isInitialRender;
|
|
711
712
|
/**
|
|
712
713
|
* *Constructor for creating the component
|
|
713
714
|
*
|
|
@@ -781,6 +782,7 @@ export declare class MultiColumnComboBox extends Component<HTMLElement> implemen
|
|
|
781
782
|
private updateGridDataSource;
|
|
782
783
|
private wireEvents;
|
|
783
784
|
private unWireEvents;
|
|
785
|
+
private preventBlur;
|
|
784
786
|
private dropDownClick;
|
|
785
787
|
private onMouseClick;
|
|
786
788
|
private onDocumentClick;
|
|
@@ -791,6 +793,7 @@ export declare class MultiColumnComboBox extends Component<HTMLElement> implemen
|
|
|
791
793
|
private keyActionHandler;
|
|
792
794
|
private gridKeyActionHandler;
|
|
793
795
|
private updateSelectedItem;
|
|
796
|
+
private updateClearIconState;
|
|
794
797
|
/**
|
|
795
798
|
* Sets the focus to the component for interaction.component for interaction.
|
|
796
799
|
*
|
|
@@ -365,6 +365,10 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
365
365
|
MultiColumnComboBox.prototype.getGridColumns = function () {
|
|
366
366
|
var _this = this;
|
|
367
367
|
return this.columns.map(function (column) {
|
|
368
|
+
var changeType;
|
|
369
|
+
if (column.displayAsCheckBox && !column.format) {
|
|
370
|
+
changeType = 'boolean';
|
|
371
|
+
}
|
|
368
372
|
return {
|
|
369
373
|
field: column.field,
|
|
370
374
|
headerText: column.header,
|
|
@@ -375,7 +379,7 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
375
379
|
template: column.template,
|
|
376
380
|
headerTemplate: column.headerTemplate,
|
|
377
381
|
customAttributes: column.customAttributes,
|
|
378
|
-
type:
|
|
382
|
+
type: changeType
|
|
379
383
|
};
|
|
380
384
|
});
|
|
381
385
|
};
|
|
@@ -414,6 +418,13 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
414
418
|
this.popupDiv.removeChild(noRecordEle);
|
|
415
419
|
}
|
|
416
420
|
}
|
|
421
|
+
if (this.isInitialRender) {
|
|
422
|
+
var rowHeight = !this.popupDiv.classList.contains(NODATA) ? this.popupDiv.querySelector('.e-gridcontent tr').getBoundingClientRect().height : this.popupDiv.getBoundingClientRect().height;
|
|
423
|
+
this.popupRowHeight = rowHeight;
|
|
424
|
+
this.popupObj.hide();
|
|
425
|
+
this.popupEle.style.visibility = 'unset';
|
|
426
|
+
this.isInitialRender = false;
|
|
427
|
+
}
|
|
417
428
|
};
|
|
418
429
|
MultiColumnComboBox.prototype.onActionFailure = function (args) {
|
|
419
430
|
this.trigger('actionFailure', args);
|
|
@@ -432,6 +443,9 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
432
443
|
this.inputEle.setAttribute('aria-expanded', 'false');
|
|
433
444
|
this.inputEle.setAttribute('aria-readOnly', this.readonly.toString());
|
|
434
445
|
this.inputEle.setAttribute('aria-disabled', this.disabled.toString());
|
|
446
|
+
this.inputEle.setAttribute('autocomplete', 'off');
|
|
447
|
+
this.inputEle.setAttribute('autocapitalize', 'off');
|
|
448
|
+
this.inputEle.setAttribute('spellcheck', 'false');
|
|
435
449
|
this.inputEle.setAttribute('tabindex', '0');
|
|
436
450
|
}
|
|
437
451
|
else {
|
|
@@ -641,9 +655,9 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
641
655
|
popupHeight = formatUnit(parseInt(popupHeight, 10) - height + 'px');
|
|
642
656
|
}
|
|
643
657
|
this.popupDiv.style.maxHeight = popupHeight;
|
|
644
|
-
this.popupRowHeight = this.popupDiv.querySelector('.e-gridcontent tr').getBoundingClientRect().height;
|
|
645
658
|
this.updateGridHeight();
|
|
646
|
-
this.
|
|
659
|
+
this.popupEle.style.visibility = 'hidden';
|
|
660
|
+
this.isInitialRender = true;
|
|
647
661
|
};
|
|
648
662
|
MultiColumnComboBox.prototype.updateGridHeight = function (isFilter, autoHeight, dataSourceCount) {
|
|
649
663
|
var height;
|
|
@@ -678,6 +692,10 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
678
692
|
if (!Browser.isDevice) {
|
|
679
693
|
_this.hidePopup();
|
|
680
694
|
}
|
|
695
|
+
},
|
|
696
|
+
open: function () {
|
|
697
|
+
_this.inputEle.focus();
|
|
698
|
+
_this.updateClearIconState();
|
|
681
699
|
}
|
|
682
700
|
});
|
|
683
701
|
};
|
|
@@ -786,8 +804,8 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
786
804
|
cancel: false
|
|
787
805
|
};
|
|
788
806
|
var selectedRecords = this.gridObj.getSelectedRecords()[0];
|
|
789
|
-
var fieldText = selectedRecords ? selectedRecords[this.fields.text].toString() :
|
|
790
|
-
var fieldValue = selectedRecords ? selectedRecords[this.fields.value].toString() :
|
|
807
|
+
var fieldText = selectedRecords ? selectedRecords[this.fields.text].toString() : '';
|
|
808
|
+
var fieldValue = selectedRecords ? selectedRecords[this.fields.value].toString() : '';
|
|
791
809
|
var ChangeEventArgs = {
|
|
792
810
|
isInteracted: e ? true : false,
|
|
793
811
|
item: selectedRecords,
|
|
@@ -802,11 +820,13 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
802
820
|
this.trigger('select', eventArgs, function (eventArgs) {
|
|
803
821
|
if (!eventArgs.cancel && eventArgs.itemData) {
|
|
804
822
|
var selectedRecord = eventArgs.itemData;
|
|
805
|
-
|
|
823
|
+
var event_1 = e;
|
|
824
|
+
var isUpdateVal = event_1.key === 'Enter' || event_1.key === 'Tab' || event_1.shiftKey && event_1.key === 'Tab' || event_1.altKey && event_1.key === 'ArrowUp';
|
|
825
|
+
if (!isKeyNav || (isKeyNav && isUpdateVal)) {
|
|
806
826
|
_this.updateValues(selectedRecord[_this.fields.value], selectedRecord[_this.fields.text], _this.gridObj.selectedRowIndex, ChangeEventArgs);
|
|
807
827
|
}
|
|
808
828
|
Input.setValue(selectedRecord[_this.fields.text], _this.inputEle, _this.floatLabelType, _this.showClearButton);
|
|
809
|
-
if (!isKeyNav || (isKeyNav &&
|
|
829
|
+
if (!isKeyNav || (isKeyNav && isUpdateVal)) {
|
|
810
830
|
_this.hidePopup(e);
|
|
811
831
|
}
|
|
812
832
|
}
|
|
@@ -834,6 +854,7 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
834
854
|
MultiColumnComboBox.prototype.inputHandler = function (e) {
|
|
835
855
|
var _this = this;
|
|
836
856
|
this.showPopup(null, true);
|
|
857
|
+
this.updateClearIconState();
|
|
837
858
|
if (this.allowFiltering) {
|
|
838
859
|
var inputValue_1 = e.target.value.toLowerCase();
|
|
839
860
|
var customFiltering_1 = false;
|
|
@@ -950,15 +971,16 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
950
971
|
this.updateGridHeight(true, autoHeight, dataSource.length);
|
|
951
972
|
};
|
|
952
973
|
MultiColumnComboBox.prototype.wireEvents = function () {
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
974
|
+
if (!isNOU(this.inputObj.buttons[0])) {
|
|
975
|
+
EventHandler.add(this.inputObj.buttons[0], 'mousedown', this.preventBlur, this);
|
|
976
|
+
EventHandler.add(this.inputObj.buttons[0], 'mousedown', this.dropDownClick, this);
|
|
977
|
+
}
|
|
956
978
|
EventHandler.add(document, 'mousedown', this.onDocumentClick, this);
|
|
957
979
|
EventHandler.add(this.gridEle, 'click', this.onMouseClick, this);
|
|
958
980
|
EventHandler.add(this.inputEle, 'input', this.inputHandler, this);
|
|
959
|
-
EventHandler.add(this.
|
|
960
|
-
if (
|
|
961
|
-
EventHandler.add(
|
|
981
|
+
EventHandler.add(this.inputEle, 'focus', this.focusIn, this);
|
|
982
|
+
if (this.showClearButton) {
|
|
983
|
+
EventHandler.add(this.inputObj.clearButton, 'mousedown', this.clearText, this);
|
|
962
984
|
}
|
|
963
985
|
EventHandler.add(window, 'resize', this.windowResize, this);
|
|
964
986
|
this.keyboardModule = new KeyboardEvents(this.inputWrapper, {
|
|
@@ -973,21 +995,25 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
973
995
|
});
|
|
974
996
|
};
|
|
975
997
|
MultiColumnComboBox.prototype.unWireEvents = function () {
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
998
|
+
if (!isNOU(this.inputObj.buttons[0])) {
|
|
999
|
+
EventHandler.remove(this.inputObj.buttons[0], 'mousedown', this.preventBlur);
|
|
1000
|
+
EventHandler.remove(this.inputObj.buttons[0], 'mousedown', this.dropDownClick);
|
|
1001
|
+
}
|
|
979
1002
|
EventHandler.remove(document, 'mousedown', this.onDocumentClick);
|
|
980
1003
|
EventHandler.remove(this.inputEle, 'input', this.inputHandler);
|
|
981
1004
|
EventHandler.remove(this.inputWrapper, 'focus', this.focusIn);
|
|
982
1005
|
EventHandler.remove(window, 'resize', this.windowResize);
|
|
983
1006
|
EventHandler.remove(this.gridEle, 'click', this.onMouseClick);
|
|
984
|
-
if (
|
|
985
|
-
EventHandler.remove(
|
|
1007
|
+
if (this.showClearButton) {
|
|
1008
|
+
EventHandler.remove(this.inputObj.clearButton, 'mousedown', this.clearText);
|
|
986
1009
|
}
|
|
987
1010
|
if (this.keyboardModule) {
|
|
988
1011
|
this.keyboardModule.destroy();
|
|
989
1012
|
}
|
|
990
1013
|
};
|
|
1014
|
+
MultiColumnComboBox.prototype.preventBlur = function (e) {
|
|
1015
|
+
e.preventDefault();
|
|
1016
|
+
};
|
|
991
1017
|
MultiColumnComboBox.prototype.dropDownClick = function (e) {
|
|
992
1018
|
if (this.disabled || this.readonly) {
|
|
993
1019
|
return;
|
|
@@ -1034,9 +1060,6 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1034
1060
|
this.updateValuesOnInput(e);
|
|
1035
1061
|
}
|
|
1036
1062
|
}
|
|
1037
|
-
if (!closest(target, '.e-multicolumn-list')) {
|
|
1038
|
-
this.inputWrapper.tabIndex = -1;
|
|
1039
|
-
}
|
|
1040
1063
|
};
|
|
1041
1064
|
MultiColumnComboBox.prototype.updateValuesOnInput = function (mouseEvent, keyEvent, isClearValues) {
|
|
1042
1065
|
var _this = this;
|
|
@@ -1111,6 +1134,9 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1111
1134
|
if (this.isPopupOpen) {
|
|
1112
1135
|
this.hidePopup(e);
|
|
1113
1136
|
}
|
|
1137
|
+
else {
|
|
1138
|
+
this.focusOut();
|
|
1139
|
+
}
|
|
1114
1140
|
break;
|
|
1115
1141
|
case 'altDown':
|
|
1116
1142
|
if (!this.isPopupOpen) {
|
|
@@ -1120,7 +1146,7 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1120
1146
|
break;
|
|
1121
1147
|
case 'moveDown':
|
|
1122
1148
|
case 'moveUp':
|
|
1123
|
-
this.updateSelectedItem(e);
|
|
1149
|
+
this.updateSelectedItem(e, true, true);
|
|
1124
1150
|
break;
|
|
1125
1151
|
case 'enter':
|
|
1126
1152
|
this.updateValuesOnInput(null, e);
|
|
@@ -1146,6 +1172,15 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1146
1172
|
else if (e.key === 'Home') {
|
|
1147
1173
|
e.action = 'home';
|
|
1148
1174
|
}
|
|
1175
|
+
else if (e.key === 'Tab') {
|
|
1176
|
+
e.action = 'tab';
|
|
1177
|
+
}
|
|
1178
|
+
else if (e.key === 'Escape') {
|
|
1179
|
+
e.action = 'escape';
|
|
1180
|
+
}
|
|
1181
|
+
if (e.shiftKey && e.key === 'Tab') {
|
|
1182
|
+
e.action = 'shiftTab';
|
|
1183
|
+
}
|
|
1149
1184
|
if (e.altKey && e.key === 'ArrowUp') {
|
|
1150
1185
|
e.action = 'altUp';
|
|
1151
1186
|
}
|
|
@@ -1157,6 +1192,9 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1157
1192
|
case 'altUp':
|
|
1158
1193
|
if (this.isPopupOpen) {
|
|
1159
1194
|
e.preventDefault();
|
|
1195
|
+
if (e.action !== 'escape') {
|
|
1196
|
+
this.updateSelectedItem(e);
|
|
1197
|
+
}
|
|
1160
1198
|
this.hidePopup(e);
|
|
1161
1199
|
}
|
|
1162
1200
|
break;
|
|
@@ -1168,7 +1206,7 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1168
1206
|
break;
|
|
1169
1207
|
}
|
|
1170
1208
|
};
|
|
1171
|
-
MultiColumnComboBox.prototype.updateSelectedItem = function (e, isUpdateIndex) {
|
|
1209
|
+
MultiColumnComboBox.prototype.updateSelectedItem = function (e, isUpdateIndex, isInputTarget) {
|
|
1172
1210
|
if (isUpdateIndex === void 0) { isUpdateIndex = true; }
|
|
1173
1211
|
if (this.isPopupOpen) {
|
|
1174
1212
|
var index = !this.fields.groupBy ? this.gridObj.selectedRowIndex : this.gridObj.selectedRowIndex ? this.gridObj.selectedRowIndex : 0;
|
|
@@ -1178,10 +1216,10 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1178
1216
|
else if ((index >= this.gridObj.getRows().length && e.action === 'moveDown') || (e.action === 'end')) {
|
|
1179
1217
|
index = this.gridObj.getRows().length - 1;
|
|
1180
1218
|
}
|
|
1181
|
-
else if (e.action === 'moveDown' && (index >= 0 && index <= this.gridObj.getRows().length) && this.fields.groupBy) {
|
|
1219
|
+
else if (e.action === 'moveDown' && (index >= 0 && index <= this.gridObj.getRows().length) && (this.fields.groupBy || isInputTarget)) {
|
|
1182
1220
|
index += 1;
|
|
1183
1221
|
}
|
|
1184
|
-
else if (e.action === 'moveUp' && index > 0 && this.fields.groupBy) {
|
|
1222
|
+
else if (e.action === 'moveUp' && index > 0 && (this.fields.groupBy) || isInputTarget) {
|
|
1185
1223
|
index -= 1;
|
|
1186
1224
|
}
|
|
1187
1225
|
this.gridObj.selectRow(index);
|
|
@@ -1195,6 +1233,12 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1195
1233
|
}
|
|
1196
1234
|
}
|
|
1197
1235
|
};
|
|
1236
|
+
MultiColumnComboBox.prototype.updateClearIconState = function () {
|
|
1237
|
+
var clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
|
|
1238
|
+
if (clearIconEle) {
|
|
1239
|
+
clearIconEle.style.display = this.inputEle.value === '' ? 'none' : 'flex';
|
|
1240
|
+
}
|
|
1241
|
+
};
|
|
1198
1242
|
/**
|
|
1199
1243
|
* Sets the focus to the component for interaction.component for interaction.
|
|
1200
1244
|
*
|
|
@@ -1206,12 +1250,8 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1206
1250
|
return;
|
|
1207
1251
|
}
|
|
1208
1252
|
addClass([this.inputWrapper], [INPUTFOCUS]);
|
|
1209
|
-
this.
|
|
1210
|
-
this.
|
|
1211
|
-
var clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
|
|
1212
|
-
if (clearIconEle && (this.value && this.value.toString() !== '' || this.text && this.text !== '')) {
|
|
1213
|
-
clearIconEle.classList.remove('e-clear-icon-hide');
|
|
1214
|
-
}
|
|
1253
|
+
this.inputEle.focus();
|
|
1254
|
+
this.updateClearIconState();
|
|
1215
1255
|
this.trigger('focus', e);
|
|
1216
1256
|
if (this.floatLabelType !== 'Never') {
|
|
1217
1257
|
Input.calculateWidth(this.inputEle, this.inputWrapper);
|
|
@@ -1227,12 +1267,13 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1227
1267
|
if (this.disabled || this.readonly) {
|
|
1228
1268
|
return;
|
|
1229
1269
|
}
|
|
1230
|
-
this.
|
|
1270
|
+
if (this.isPopupOpen) {
|
|
1271
|
+
this.hidePopup(e);
|
|
1272
|
+
}
|
|
1231
1273
|
removeClass([this.inputWrapper], [INPUTFOCUS]);
|
|
1232
|
-
this.inputWrapper.tabIndex = -1;
|
|
1233
1274
|
var clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
|
|
1234
1275
|
if (clearIconEle) {
|
|
1235
|
-
clearIconEle.
|
|
1276
|
+
clearIconEle.style.display = 'none';
|
|
1236
1277
|
}
|
|
1237
1278
|
if (this.floatLabelType !== 'Never') {
|
|
1238
1279
|
Input.calculateWidth(this.inputEle, this.inputWrapper);
|
|
@@ -1263,6 +1304,16 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1263
1304
|
}
|
|
1264
1305
|
_this.focusIn(e);
|
|
1265
1306
|
}
|
|
1307
|
+
var contentEle = _this.gridObj.getContent();
|
|
1308
|
+
if (contentEle) {
|
|
1309
|
+
var activeRow = contentEle.querySelector('.e-rowcell.e-active');
|
|
1310
|
+
if (activeRow) {
|
|
1311
|
+
_this.inputEle.setAttribute('aria-activedescendant', activeRow.parentElement.getAttribute('data-uid'));
|
|
1312
|
+
}
|
|
1313
|
+
else if (contentEle.querySelector('.e-row')) {
|
|
1314
|
+
_this.inputEle.setAttribute('aria-activedescendant', contentEle.querySelector('.e-row').getAttribute('data-uid'));
|
|
1315
|
+
}
|
|
1316
|
+
}
|
|
1266
1317
|
_this.popupObj.show(new Animation(eventArgs.animation), _this.popupEle);
|
|
1267
1318
|
}
|
|
1268
1319
|
});
|
|
@@ -1286,16 +1337,18 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1286
1337
|
_this.inputEle.value = _this.text ? _this.text.toString() : '';
|
|
1287
1338
|
if (e) {
|
|
1288
1339
|
var target = e.target;
|
|
1289
|
-
if (target.classList.contains('e-multicolumn-list-icon') || target.classList.contains('e-rowcell')) {
|
|
1340
|
+
if (target && (target.classList.contains('e-multicolumn-list-icon') || target.classList.contains('e-rowcell'))) {
|
|
1290
1341
|
if (!_this.value) {
|
|
1291
1342
|
_this.gridObj.refreshColumns();
|
|
1292
1343
|
}
|
|
1293
|
-
_this.focusIn(e);
|
|
1344
|
+
setTimeout(function () { _this.focusIn(e); });
|
|
1294
1345
|
}
|
|
1295
1346
|
else {
|
|
1296
1347
|
_this.focusOut();
|
|
1297
1348
|
}
|
|
1298
1349
|
}
|
|
1350
|
+
_this.inputEle.removeAttribute('aria-owns');
|
|
1351
|
+
_this.inputEle.removeAttribute('aria-activedescendant');
|
|
1299
1352
|
}
|
|
1300
1353
|
});
|
|
1301
1354
|
setTimeout(function () {
|
|
@@ -1360,18 +1413,23 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
|
|
|
1360
1413
|
this.gridObj.destroy();
|
|
1361
1414
|
detach(this.gridObj.element);
|
|
1362
1415
|
}
|
|
1363
|
-
if (this.popupObj) {
|
|
1364
|
-
this.popupObj.destroy();
|
|
1365
|
-
detach(this.popupObj.element);
|
|
1366
|
-
}
|
|
1367
1416
|
if (this.inputEle) {
|
|
1368
|
-
var attrArray = ['placeholder', 'aria-expanded', 'spellcheck', 'aria-label', 'role', '
|
|
1417
|
+
var attrArray = ['placeholder', 'aria-expanded', 'spellcheck', 'aria-label', 'role', 'type',
|
|
1418
|
+
'aria-owns', 'aria-controls', 'aria-readonly', 'autocomplete', 'autocapitalize', 'spellcheck', 'aria-activedescendant'];
|
|
1369
1419
|
for (var i = 0; i < attrArray.length; i++) {
|
|
1370
1420
|
this.inputEle.removeAttribute(attrArray[i]);
|
|
1371
1421
|
}
|
|
1372
1422
|
this.inputEle.classList.remove('e-input');
|
|
1373
1423
|
Input.setValue('', this.inputEle, this.floatLabelType, this.showClearButton);
|
|
1374
1424
|
}
|
|
1425
|
+
if (this.popupEle) {
|
|
1426
|
+
this.popupEle.removeAttribute('aria-label');
|
|
1427
|
+
this.popupEle.removeAttribute('role');
|
|
1428
|
+
}
|
|
1429
|
+
if (this.popupObj) {
|
|
1430
|
+
this.popupObj.destroy();
|
|
1431
|
+
detach(this.popupObj.element);
|
|
1432
|
+
}
|
|
1375
1433
|
if (this.element.tagName !== this.getDirective()) {
|
|
1376
1434
|
this.inputWrapper.parentElement.insertBefore(this.element, this.inputWrapper);
|
|
1377
1435
|
}
|
package/styles/fluent2.css
CHANGED
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
--color-sf-info-outline: var(--color-sf-info-border-color);
|
|
208
208
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
209
209
|
--color-sf-tooltip-border: var(--color-sf-content-bg-color-alt1);
|
|
210
|
-
--color-sf-
|
|
210
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
211
211
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
212
212
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
|
|
213
213
|
--color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
|
|
@@ -478,7 +478,7 @@
|
|
|
478
478
|
--color-sf-success-bg-color: #218c21;
|
|
479
479
|
--color-sf-success-border-color: var(--color-sf-success-bg-color);
|
|
480
480
|
--color-sf-success-text: var(--color-sf-primary-text-color);
|
|
481
|
-
--color-sf-success-bg-color-hover:
|
|
481
|
+
--color-sf-success-bg-color-hover: #0e700e;
|
|
482
482
|
--color-sf-success-border-color-hover: var(--color-sf-success-bg-color-hover);
|
|
483
483
|
--color-sf-success-text-hover: var(--color-sf-primary-text-color);
|
|
484
484
|
--color-sf-success-bg-color-pressed: #052505;
|
|
@@ -496,7 +496,7 @@
|
|
|
496
496
|
--color-sf-warning-bg-color: #f87528;
|
|
497
497
|
--color-sf-warning-border-color: var(--color-sf-warning-bg-color);
|
|
498
498
|
--color-sf-warning-text: #242424;
|
|
499
|
-
--color-sf-warning-bg-color-hover:
|
|
499
|
+
--color-sf-warning-bg-color-hover: #de590b;
|
|
500
500
|
--color-sf-warning-border-color-hover: var(--color-sf-warning-bg-color-hover);
|
|
501
501
|
--color-sf-warning-text-hover: var(--color-sf-primary-text-color);
|
|
502
502
|
--color-sf-warning-bg-color-pressed: #4a1e04;
|
|
@@ -555,7 +555,7 @@
|
|
|
555
555
|
--color-sf-info-outline: #0099bc;
|
|
556
556
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
557
557
|
--color-sf-tooltip-border: var(--color-sf-tooltip-bg-color);
|
|
558
|
-
--color-sf-
|
|
558
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
559
559
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
560
560
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
|
|
561
561
|
--color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
|
|
@@ -897,7 +897,7 @@
|
|
|
897
897
|
--color-sf-info-outline: #0099bc;
|
|
898
898
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
899
899
|
--color-sf-tooltip-border: var(--color-sf-border-light);
|
|
900
|
-
--color-sf-
|
|
900
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
901
901
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
902
902
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color);
|
|
903
903
|
--color-sf-appbar-bg-color-alt1: #fff;
|
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
--color-sf-info-outline: var(--color-sf-info-border-color);
|
|
208
208
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
209
209
|
--color-sf-tooltip-border: var(--color-sf-content-bg-color-alt1);
|
|
210
|
-
--color-sf-
|
|
210
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
211
211
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
212
212
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
|
|
213
213
|
--color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
|
|
@@ -478,7 +478,7 @@
|
|
|
478
478
|
--color-sf-success-bg-color: #218c21;
|
|
479
479
|
--color-sf-success-border-color: var(--color-sf-success-bg-color);
|
|
480
480
|
--color-sf-success-text: var(--color-sf-primary-text-color);
|
|
481
|
-
--color-sf-success-bg-color-hover:
|
|
481
|
+
--color-sf-success-bg-color-hover: #0e700e;
|
|
482
482
|
--color-sf-success-border-color-hover: var(--color-sf-success-bg-color-hover);
|
|
483
483
|
--color-sf-success-text-hover: var(--color-sf-primary-text-color);
|
|
484
484
|
--color-sf-success-bg-color-pressed: #052505;
|
|
@@ -496,7 +496,7 @@
|
|
|
496
496
|
--color-sf-warning-bg-color: #f87528;
|
|
497
497
|
--color-sf-warning-border-color: var(--color-sf-warning-bg-color);
|
|
498
498
|
--color-sf-warning-text: #242424;
|
|
499
|
-
--color-sf-warning-bg-color-hover:
|
|
499
|
+
--color-sf-warning-bg-color-hover: #de590b;
|
|
500
500
|
--color-sf-warning-border-color-hover: var(--color-sf-warning-bg-color-hover);
|
|
501
501
|
--color-sf-warning-text-hover: var(--color-sf-primary-text-color);
|
|
502
502
|
--color-sf-warning-bg-color-pressed: #4a1e04;
|
|
@@ -555,7 +555,7 @@
|
|
|
555
555
|
--color-sf-info-outline: #0099bc;
|
|
556
556
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
557
557
|
--color-sf-tooltip-border: var(--color-sf-tooltip-bg-color);
|
|
558
|
-
--color-sf-
|
|
558
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
559
559
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
560
560
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
|
|
561
561
|
--color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
|
|
@@ -897,7 +897,7 @@
|
|
|
897
897
|
--color-sf-info-outline: #0099bc;
|
|
898
898
|
--color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
|
|
899
899
|
--color-sf-tooltip-border: var(--color-sf-border-light);
|
|
900
|
-
--color-sf-
|
|
900
|
+
--color-sf-tooltip-text-color: var(--color-sf-content-text-color);
|
|
901
901
|
--color-sf-toast-text-color: var(--color-sf-content-text-color);
|
|
902
902
|
--color-sf-toast-alt-text-color: var(--color-sf-content-text-color);
|
|
903
903
|
--color-sf-appbar-bg-color-alt1: #fff;
|