Skip to content

Commit 483d06d

Browse files
author
pipeline
committed
v20.3.49 is released
1 parent 6938980 commit 483d06d

File tree

5,946 files changed

+72503
-20054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,946 files changed

+72503
-20054
lines changed

‎controls/base/CHANGELOG.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,23 @@
22

33
## [Unreleased]
44

5-
## 20.3.48 (2022-10-05)
5+
## 20.3.49 (2022-10-11)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#SF395268`, `#SF395314` - The issue "Drag area is not getting properly when setting a value for `margin-top`" has been resolved.
12+
13+
## 20.3.47 (2022-09-29)
14+
15+
### Common
16+
17+
#### Bug Fixes
18+
19+
- The issue with the "React template element is not getting in the Grid `queryCellInfo` event" has been resolved.
20+
21+
## 20.3.47 (2022-09-29)
622

723
### Common
824

‎controls/base/src/component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export abstract class Component<ElementType extends HTMLElement> extends Base<El
372372
}
373373

374374
//tslint:disable-next-line
375-
protected renderReactTemplates(): void {
375+
protected renderReactTemplates(callback?: any): void {
376376
//No Code
377377
}
378378

‎controls/base/src/draggable.ts

+19-12
Original file line numberDiff line numberDiff line change
@@ -739,11 +739,11 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
739739
let draEleLeft: number;
740740
if (this.dragArea) {
741741
this.dragLimit.top = this.clone ? this.dragLimit.top : 0;
742-
draEleTop = (top - iTop) < 0 ? this.dragLimit.top : (top - iTop);
743-
draEleLeft = (left - iLeft) < 0 ? this.dragElePosition.left : (left - iLeft);
742+
draEleTop = (top - iTop) < 0 ? this.dragLimit.top : (top - this.borderWidth.top);
743+
draEleLeft = (left - iLeft) < 0 ? this.dragLimit.left : (left - this.borderWidth.left);
744744
} else {
745-
draEleTop = top - iTop;
746-
draEleLeft = left - iLeft;
745+
draEleTop = top - this.borderWidth.top;
746+
draEleLeft = left - this.borderWidth.left;
747747
}
748748
let marginTop: number = parseFloat(getComputedStyle(this.element).marginTop);
749749
// when drag-element has margin-top
@@ -773,6 +773,13 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
773773
}
774774
}
775775
}
776+
777+
if (this.dragArea) {
778+
let helperHeight: number = helperElement.offsetHeight + (parseFloat(styles.marginTop)
779+
+ parseFloat(styles.marginBottom));
780+
draEleTop = (draEleTop + helperHeight) > this.dragLimit.bottom ? (this.dragLimit.bottom - helperHeight) : draEleTop;
781+
}
782+
776783
/* istanbul ignore next */
777784
// if(this.eleTop > 0) {
778785
// draEleTop += this.eleTop;
@@ -835,16 +842,16 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
835842
}
836843
private getScrollPosition(nodeEle: HTMLElement, draEleTop: number): void {
837844
if (nodeEle && nodeEle === document.scrollingElement) {
838-
if ((nodeEle.clientHeight - nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight) < draEleTop
839-
&& nodeEle.getBoundingClientRect().height > draEleTop) {
845+
if ((nodeEle.clientHeight + document.scrollingElement.scrollTop - this.helperElement.clientHeight) < draEleTop
846+
&& nodeEle.getBoundingClientRect().height + this.parentClientRect.top > draEleTop) {
840847
nodeEle.scrollTop += this.helperElement.clientHeight;
841-
}else if (nodeEle.scrollHeight - nodeEle.clientHeight > draEleTop) {
848+
}else if (nodeEle.scrollTop > draEleTop - this.helperElement.clientHeight) {
842849
nodeEle.scrollTop -= this.helperElement.clientHeight;
843850
}
844851
}else if (nodeEle && nodeEle !== document.scrollingElement) {
845-
if ((nodeEle.clientHeight + nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight) < draEleTop) {
852+
if ((nodeEle.clientHeight + nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight + document.scrollingElement.scrollTop - this.borderWidth.top - this.borderWidth.bottom) <= draEleTop) {
846853
nodeEle.scrollTop += this.helperElement.clientHeight;
847-
}else if (nodeEle.getBoundingClientRect().top > (draEleTop - this.helperElement.clientHeight)) {
854+
}else if (nodeEle.getBoundingClientRect().top > (draEleTop - this.helperElement.clientHeight - document.scrollingElement.scrollTop)) {
848855
nodeEle.scrollTop -= this.helperElement.clientHeight;
849856
}
850857
}
@@ -952,7 +959,7 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
952959
if (ele) {
953960
let elementArea: ClientRect = ele.getBoundingClientRect();
954961
eleWidthBound = ele.scrollWidth ? ele.scrollWidth : elementArea.right - elementArea.left;
955-
eleHeightBound = ele.scrollHeight ? ele.scrollHeight : elementArea.bottom - elementArea.top;
962+
eleHeightBound = ele.scrollHeight ? (this.dragArea && this.helperElement.classList.contains('e-treeview')) ? ele.clientHeight : ele.scrollHeight : elementArea.bottom - elementArea.top;
956963
let keys: string[] = ['Top', 'Left', 'Bottom', 'Right'];
957964
let styles: any = getComputedStyle(ele);
958965
for (let i: number = 0; i < keys.length; i++) {
@@ -963,7 +970,7 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
963970
(<any>this.borderWidth)[lowerKey] = isNaN(parseFloat(tborder)) ? 0 : parseFloat(tborder);
964971
(<any>this.padding)[lowerKey] = isNaN(parseFloat(tpadding)) ? 0 : parseFloat(tpadding);
965972
}
966-
top = elementArea.top;
973+
top = elementArea.top + document.scrollingElement.scrollTop;
967974
left = elementArea.left;
968975
this.dragLimit.left = left + this.borderWidth.left + this.padding.left;
969976
this.dragLimit.top = ele.offsetTop + this.borderWidth.top + this.padding.top;
@@ -1072,4 +1079,4 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
10721079
this.toggleEvents(true);
10731080
super.destroy();
10741081
}
1075-
}
1082+
}

‎controls/base/themestudio/styles/dropdowns/multi-select/_bootstrap-dark-definition.scss

+6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ $ddl-closer-margin-top-bigger: -4em !default;
3838
$ddl-chip-close-top: 9px !default;
3939
$ddl-chip-close-left: 10px !default;
4040
$ddl-chip-close-margin: 0 0 0 !default;
41+
$ddl-chip-close-rtl-margin: 0 0 0 !default;
4142
$ddl-chip-close-square: 30px !default;
43+
$ddl-chip-close-width: 30px !default;
4244
$ddl-chip-close-font: 10px !default;
4345
$ddl-chip-height: 28px !default;
4446
$ddl-chip-mobile-height: 32px !default;
@@ -53,6 +55,7 @@ $ddl-delimviewheight: 32px !default;
5355
$ddl-closer-hooker-font: 10px !default;
5456
$ddl-closer-hooker-color: $grey-dark-font !default;
5557
$ddl-chip-hooker-square: 40px !default;
58+
$ddl-chip-hooker-width: 40px !default;
5659
$ddl-sel-hover-chip-bg-color: $grey-99 !default;
5760
$ddl-sel-chip-hover-font-color: $grey-dark-font !default;
5861
$ddl-chip-hooker-right: 0 !default;
@@ -136,19 +139,22 @@ $ddl-select-all-height-small: 22px !default;
136139
$ddl-small-chip-height: 22px !default;
137140
$ddl-chip-small-font-size: 13px !default;
138141
$ddl-small-chip-close-square: 24px !default;
142+
$ddl-small-chip-close-width: 24px !default;
139143
$ddl-small-chip-close-font: 8px !default;
140144
$ddl-control-small-height: 24px !default;
141145
$ddl-small-input-height: 26px !default;
142146
$ddl-delim-small-font-size: 13px !default;
143147
$ddl-small-closer-margin-top: -3.5em !default;
144148
$ddl-chip-close-hooker-small-left: 8px !default;
149+
$ddl-chip-close-hooker-small-bigger-left: 8px !default;
145150
$ddl-delimviewheight-small: 26px !default;
146151

147152
// Touch Small size
148153
$ddl-select-all-height-bigger-small: 34px !default;
149154
$ddl-bigger-small-chip-height: 28px !default;
150155
$ddl-chip-bigger-small-font-size: 15px !default;
151156
$ddl-bigger-small-chip-close-square: 30px !default;
157+
$ddl-bigger-small-chip-close-width: 30px !default;
152158
$ddl-bigger-small-chip-close-font: 10px !default;
153159
$ddl-control-bigger-small-height: 30px !default;
154160
$ddl-bigger-small-input-height: 34px !default;

‎controls/base/themestudio/styles/dropdowns/multi-select/_bootstrap-definition.scss

+6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ $ddl-closer-margin-top-bigger: -4em !default;
3737
$ddl-chip-close-top: 9px !default;
3838
$ddl-chip-close-left: 10px !default;
3939
$ddl-chip-close-margin: 0 0 0 !default;
40+
$ddl-chip-close-rtl-margin: 0 0 0 !default;
4041
$ddl-chip-close-square: 30px !default;
42+
$ddl-chip-close-width: 30px !default;
4143
$ddl-chip-close-font: 10px !default;
4244
$ddl-chip-height: 28px !default;
4345
$ddl-chip-mobile-height: 32px !default;
@@ -52,6 +54,7 @@ $ddl-delimviewheight: 32px !default;
5254
$ddl-closer-hooker-font: 10px !default;
5355
$ddl-closer-hooker-color: $grey-light-font !default;
5456
$ddl-chip-hooker-square: 40px !default;
57+
$ddl-chip-hooker-width: 40px !default;
5558
$ddl-sel-hover-chip-bg-color: $grey-dd !default;
5659
$ddl-sel-chip-hover-font-color: $grey-light-font !default;
5760
$ddl-chip-hooker-right: 0 !default;
@@ -134,19 +137,22 @@ $ddl-select-all-height-small: 22px !default;
134137
$ddl-small-chip-height: 22px !default;
135138
$ddl-chip-small-font-size: 13px !default;
136139
$ddl-small-chip-close-square: 24px !default;
140+
$ddl-small-chip-close-width: 24px !default;
137141
$ddl-small-chip-close-font: 8px !default;
138142
$ddl-control-small-height: 24px !default;
139143
$ddl-small-input-height: 26px !default;
140144
$ddl-delim-small-font-size: 13px !default;
141145
$ddl-small-closer-margin-top: -3.5em !default;
142146
$ddl-chip-close-hooker-small-left: 8px !default;
147+
$ddl-chip-close-hooker-small-bigger-left: 8px !default;
143148
$ddl-delimviewheight-small: 26px !default;
144149

145150
// Touch Small size
146151
$ddl-select-all-height-bigger-small: 34px !default;
147152
$ddl-bigger-small-chip-height: 28px !default;
148153
$ddl-chip-bigger-small-font-size: 15px !default;
149154
$ddl-bigger-small-chip-close-square: 30px !default;
155+
$ddl-bigger-small-chip-close-width: 30px !default;
150156
$ddl-bigger-small-chip-close-font: 10px !default;
151157
$ddl-control-bigger-small-height: 30px !default;
152158
$ddl-bigger-small-input-height: 34px !default;

‎controls/base/themestudio/styles/dropdowns/multi-select/_bootstrap4-definition.scss

+14-7
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ $ddl-icon-margin-top-bigger: -2.25em !default;
3535
$ddl-clear-margin-top: -2.9em !default;
3636
$ddl-closer-margin-top-bigger: -3.5em !default;
3737
$ddl-chip-close-top: 8px !default;
38-
$ddl-chip-close-left: 10px !default;
39-
$ddl-chip-close-margin: 0 0 0 !default;
38+
$ddl-chip-close-left: 0 !default;
39+
$ddl-chip-close-margin: 10px 10px 10px 0 !default;
40+
$ddl-chip-close-rtl-margin: 8px 0 8px 20px !default;
4041
$ddl-chip-close-square: 24px !default;
42+
$ddl-chip-close-width: auto !default;
4143
$ddl-chip-close-font: 8px !default;
4244
$ddl-chip-height: 24px !default;
4345
$ddl-chip-mobile-height: 28px !default;
@@ -52,6 +54,7 @@ $ddl-delimviewheight: 29px !default;
5254
$ddl-closer-hooker-font: 10px !default;
5355
$ddl-closer-hooker-font-bigger: 12px !default;
5456
$ddl-chip-hooker-square: 29px !default;
57+
$ddl-chip-hooker-width: auto !default;
5558
$ddl-sel-hover-chip-bg-color: $gray-600 !default;
5659
$ddl-sel-chip-hover-font-color: $white !default;
5760
$ddl-chip-hooker-right: 0 !default;
@@ -74,7 +77,7 @@ $ddl-rtl-mob-sel-chip-content-padding: 12px 4px !default;
7477
$ddl-rtl-chip-padding: 0 8px 0 0 !default;
7578
$ddl-rtl-mob-sel-chip-padding: 0 8px 0 4px !default;
7679
$ddl-rtl-mob-chip-padding: 0 4px 0 8px !default;
77-
$ddl-overall-close-left: 10px !default;
80+
$ddl-overall-close-left: 0 !default;
7881
$ddl-overall-close-top: 10px !default;
7982

8083
//$ddl-overall-bigger-close-top: 15px !default;
@@ -126,6 +129,7 @@ $ddl-chip-close-rtl-left: -15px !default;
126129
$ddl-close-icon-color: $gray-700 !default;
127130
$ddl-bigger-chip-close-font: 10px !default;
128131
$ddl-bigger-chip-close-square: 30px !default;
132+
$ddl-bigger-chip-close-width: auto !default;
129133
$ddl-bigger-close-top: 9px !default;
130134
$ddl-multi-checkbox-bgcolor: $primary-font !default;
131135
$ddl-multi-checkbox-border-color: $primary-font !default;
@@ -144,15 +148,17 @@ $ddl-select-all-height-small: 22px !default;
144148
$ddl-small-chip-height: 20px !default;
145149
$ddl-chip-small-font-size: 12px !default;
146150
$ddl-small-chip-close-square: 18px !default;
151+
$ddl-small-chip-close-width: auto !default;
147152
$ddl-small-chip-close-font: 8px !default;
148153
$ddl-control-small-height: 22px !default;
149154
$ddl-small-input-height: 22px !default;
150155
$ddl-delim-small-font-size: 12px !default;
151156
$ddl-small-closer-margin-top: -2.4em !default;
152157
$ddl-chip-small-content-padding: 0 8px 0 8px !default;
153-
$ddl-chip-close-small-left: 6px !default;
158+
$ddl-chip-close-small-left: 0 !default;
154159
$ddl-chip-close-small-top: 5px !default;
155160
$ddl-chip-close-hooker-small-left: 4px !default;
161+
$ddl-chip-close-hooker-small-bigger-left: 4px !default;
156162
$ddl-chip-close-hooker-small-top: 7px !default;
157163
$ddl-delimviewheight-small: 22px !default;
158164

@@ -161,15 +167,16 @@ $ddl-select-all-height-bigger-small: 34px !default;
161167
$ddl-bigger-small-chip-height: 30px !default;
162168
$ddl-chip-bigger-small-font-size: 15px !default;
163169
$ddl-bigger-small-chip-close-square: 24px !default;
170+
$ddl-bigger-small-chip-close-width: auto !default;
164171
$ddl-bigger-small-chip-close-font: 10px !default;
165172
$ddl-control-bigger-small-height: 30px !default;
166173
$ddl-bigger-small-input-height: 34px !default;
167174
$ddl-delim-bigger-small-font-size: 14px !default;
168-
$ddl-chip-close-bigger-left: 13px !default;
175+
$ddl-chip-close-bigger-left: 0 !default;
169176
$ddl-chip-close-bigger-top: 11px !default;
170177
$ddl-chip-bigger-content-padding: 7px 8px 7px 12px !default;
171178
$ddl-delimviewheight-bigger-small: 34px !default;
172-
$ddl-closer-margin-top-bigger-small: -2.9em !default;
179+
$ddl-closer-margin-top-bigger-small: -2.5em !default;
173180
$multiselect-closer-bigger-height: 36px !default;
174181
$multiselect-closer--bigger-margin-top: -3em !default;
175182
$multiselect-closer-bigger-width: 0 !default;
@@ -198,7 +205,7 @@ $multiselect-dropicon-closer-bigger-width: 34px !default;
198205

199206
.e-bigger .e-multi-select-wrapper .e-chips-close {
200207
height: $ddl-bigger-chip-close-square;
201-
width: $ddl-bigger-chip-close-square;
208+
width: $ddl-bigger-chip-close-width;
202209
}
203210

204211
.e-popup.e-multi-select-list-wrapper .e-list-item.e-active.e-item-focus.e-hover {

‎controls/base/themestudio/styles/dropdowns/multi-select/_bootstrap5-definition.scss

+7
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ $ddl-chip-padding: 0 6px 0 8px !default;
2020
$ddl-chip-close-top: 0 !default;
2121
$ddl-chip-close-left: 0 !default;
2222
$ddl-chip-close-margin: 0 0 0 !default;
23+
$ddl-chip-close-rtl-margin: 0 0 0 !default;
2324
$ddl-chip-close-square: 14px !default;
25+
$ddl-chip-close-width: 14px !default;
2426
$ddl-chip-hooker-square: 24px !default;
27+
$ddl-chip-hooker-width: 24px !default;
2528
$ddl-chip-close-font: 14px !default;
2629
$ddl-chip-height: 24px !default;
2730
$ddl-chip-mobile-height: 30px !default;
@@ -122,12 +125,14 @@ $ddl-select-all-height-small: 26px !default;
122125
$ddl-small-chip-height: 20px !default;
123126
$ddl-chip-small-font-size: 12px !default;
124127
$ddl-small-chip-close-square: 12px !default;
128+
$ddl-small-chip-close-width: 12px !default;
125129
$ddl-small-chip-close-font: 12px !default;
126130
$ddl-control-small-height: 24px !default;
127131
$ddl-small-input-height: 24px !default;
128132
$ddl-delim-small-font-size: 12px !default;
129133
$ddl-small-closer-margin-top: -2em !default;
130134
$ddl-chip-close-hooker-small-left: 0 !default;
135+
$ddl-chip-close-hooker-small-bigger-left: 0 !default;
131136
$ddl-delimviewheight-small: 24px !default;
132137
$ddl-multiselect-filled-input-min-height-small: 32px !default;
133138
$ddl-multiselect-filled-float-input-min-height-small: 22px !default;
@@ -140,12 +145,14 @@ $ddl-multiselect-filled-float-input-min-height-bigger: 36px !default;
140145
$ddl-multiselect-filled-floatlabel-fontsize-bigger: 12px !default;
141146
$ddl-bigger-chip-close-font: 14px !default;
142147
$ddl-bigger-chip-close-square: 14px !default;
148+
$ddl-bigger-chip-close-width: 14px !default;
143149

144150
// Touch Small size
145151
$ddl-select-all-height-bigger-small: 40px !default;
146152
$ddl-bigger-small-chip-height: 26px !default;
147153
$ddl-chip-bigger-small-font-size: 13px !default;
148154
$ddl-bigger-small-chip-close-square: 14px !default;
155+
$ddl-bigger-small-chip-close-width: 14px !default;
149156
$ddl-bigger-small-chip-close-font: 14px !default;
150157
$ddl-control-bigger-small-height: 28px !default;
151158
$ddl-bigger-small-input-height: 32px !default;

‎controls/base/themestudio/styles/dropdowns/multi-select/_fabric-dark-definition.scss

+10-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ $ddl-chip-mobile-content-padding: 4px 8px 6px 0 !default;
3232
$ddl-rtl-chip-mobile-content-padding: 6px 0 6px 8px !default;
3333
$ddl-chip-padding: 0 0 0 8px !default;
3434
$ddl-chip-close-top: 8px !default;
35-
$ddl-chip-close-left: 8px !default;
36-
$ddl-chip-close-margin: 0 !default;
35+
$ddl-chip-close-left: 0 !default;
36+
$ddl-chip-close-margin: 8px 8px 8px 8px !default;
37+
$ddl-chip-close-rtl-margin: 8px 0 8px 20px !default;
3738
$ddl-chip-mobile-close-margin: 3px 0 0 !default;
3839
$ddl-chip-close-square: 26px !default;
40+
$ddl-chip-close-width: auto !default;
3941
$ddl-chip-hooker-square: 30px !default;
42+
$ddl-chip-hooker-width: auto !default;
4043
$ddl-chip-close-font: 10px !default;
4144
$ddl-chip-close-mobile-top: 0 !default;
4245
$ddl-chip-height: 26px !default;
@@ -77,7 +80,7 @@ $ddl-rtl-hooker-left: -4px !default;
7780
$ddl-chip-close-mob-top: 0 !default;
7881
$ddl-control-placholder-padding: 0 32px 0 2px !default;
7982
$ddl-overall-close-top: 10px !default;
80-
$ddl-overall-close-left: 10px !default;
83+
$ddl-overall-close-left: 0 !default;
8184
$ddl-sel-chip-close-mobile-top: 0 !default;
8285
$ddl-sel-chip-close-mobile-left: 12px !default;
8386
$ddl-chip-sel-mobile-close-height: 26px !default;
@@ -133,19 +136,22 @@ $ddl-select-all-height-small: 26px !default;
133136
$ddl-small-chip-height: 20px !default;
134137
$ddl-chip-small-font-size: 12px !default;
135138
$ddl-small-chip-close-square: 22px !default;
139+
$ddl-small-chip-close-width: auto !default;
136140
$ddl-small-chip-close-font: 8px !default;
137141
$ddl-control-small-height: 24px !default;
138142
$ddl-small-input-height: 24px !default;
139143
$ddl-delim-small-font-size: 13px !default;
140-
$ddl-small-closer-margin-top: -2.8em !default;
144+
$ddl-small-closer-margin-top: -3em !default;
141145
$ddl-chip-close-hooker-small-left: 7px !default;
146+
$ddl-chip-close-hooker-small-bigger-left: -35px !default;
142147
$ddl-delimviewheight-small: 24px !default;
143148

144149
// Touch Small size
145150
$ddl-select-all-height-bigger-small: 40px !default;
146151
$ddl-bigger-small-chip-height: 26px !default;
147152
$ddl-chip-bigger-small-font-size: 12px !default;
148153
$ddl-bigger-small-chip-close-square: 26px !default;
154+
$ddl-bigger-small-chip-close-width: auto !default;
149155
$ddl-bigger-small-chip-close-font: 10px !default;
150156
$ddl-control-bigger-small-height: 26px !default;
151157
$ddl-bigger-small-input-height: 34px !default;

0 commit comments

Comments
 (0)