Skip to content

Commit 2b3195f

Browse files
author
pipeline
committed
v20.2.39 is released
1 parent 01c4322 commit 2b3195f

File tree

725 files changed

+4678
-2856
lines changed

Some content is hidden

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

725 files changed

+4678
-2856
lines changed

controls/base/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
#### Bug Fixes
1010

11+
- `#I372767`, `#I370308` - The empty space issue in `Treeview` component while dragging the element has been resolved.
12+
13+
### Common
14+
15+
#### Bug Fixes
16+
1117
- `#I383984` - The issue with the "Unwanted swipe event trigger in Firefox browser" has been resolved.
1218

1319
## 20.2.36 (2022-06-30)

controls/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-base",
3-
"version": "20.2.36",
3+
"version": "20.2.38",
44
"description": "A common package of Essential JS 2 base libraries, methods and class definitions",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/base/src/draggable.ts

Lines changed: 60 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -781,23 +781,31 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
781781
draEleTop -= this.parentScrollY;
782782
draEleLeft -= this.parentScrollX;
783783
}
784-
if (this.helperElement.classList.contains('e-treeview')) {
785-
let body = document.body;
786-
let html = document.documentElement;
787-
let tempHeight = Math.max( body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight );
788-
let tempWidth = Math.max( body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth );
789-
if (draEleTop > tempHeight) {
790-
draEleTop = tempHeight;
791-
}
792-
if (draEleLeft > tempWidth) {
793-
draEleLeft = tempWidth;
794-
}
795-
}
796784
let dragValue: DragPosition = this.getProcessedPositionValue({ top: draEleTop + 'px', left: draEleLeft + 'px' });
797785
setStyleAttribute(helperElement, this.getDragPosition(dragValue));
798-
if (!this.elementInViewport(helperElement) && this.enableAutoScroll) {
786+
if (!this.elementInViewport(helperElement) && this.enableAutoScroll && !this.helperElement.classList.contains('e-treeview')) {
799787
this.helperElement.scrollIntoView();
800788
}
789+
790+
let elements: NodeList | Element[] = document.querySelectorAll(':hover');
791+
if (this.enableAutoScroll && this.helperElement.classList.contains('e-treeview')) {
792+
if (elements.length === 0) {
793+
elements = this.getPathElements(evt);
794+
}
795+
/* tslint:disable no-any */
796+
let scrollParent: any = this.getScrollParent(elements, false);
797+
if (this.elementInViewport(this.helperElement)) {
798+
this.getScrollPosition(scrollParent, draEleTop);
799+
}
800+
else if (!this.elementInViewport(this.helperElement)) {
801+
elements = [].slice.call(document.querySelectorAll(':hover'));
802+
if (elements.length === 0) {
803+
elements = this.getPathElements(evt);
804+
}
805+
scrollParent = this.getScrollParent(elements, true);
806+
this.getScrollPosition(scrollParent, draEleTop);
807+
}
808+
}
801809
this.dragProcessStarted = true;
802810
this.prevLeft = left;
803811
this.prevTop = top;
@@ -806,6 +814,45 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
806814
this.pageX = pagex;
807815
this.pageY = pagey;
808816
}
817+
/* tslint:disable no-any */
818+
private getScrollParent(node: any, reverse: boolean): any {
819+
/* tslint:disable no-any */
820+
const nodeEl: any = reverse ? node.reverse() : node;
821+
let hasScroll: string;
822+
for (let i: number = nodeEl.length - 1; i >= 0; i--) {
823+
hasScroll = window.getComputedStyle(nodeEl[i])['overflow-y'];
824+
if ((hasScroll === 'auto' || hasScroll === 'scroll')
825+
&& nodeEl[i].scrollHeight > nodeEl[i].clientHeight) {
826+
return nodeEl[i];
827+
}
828+
}
829+
hasScroll = window.getComputedStyle(document.scrollingElement)['overflow-y'];
830+
if (hasScroll === 'visible') {
831+
(document.scrollingElement as HTMLElement).style.overflow = 'auto';
832+
return document.scrollingElement;
833+
}
834+
}
835+
private getScrollPosition(nodeEle: HTMLElement, draEleTop: number): void {
836+
if (nodeEle && nodeEle === document.scrollingElement) {
837+
if ((nodeEle.clientHeight - nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight) < draEleTop
838+
&& nodeEle.getBoundingClientRect().height > draEleTop) {
839+
nodeEle.scrollTop += this.helperElement.clientHeight;
840+
}else if (nodeEle.scrollHeight - nodeEle.clientHeight > draEleTop) {
841+
nodeEle.scrollTop -= this.helperElement.clientHeight;
842+
}
843+
}else if (nodeEle && nodeEle !== document.scrollingElement) {
844+
if ((nodeEle.clientHeight + nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight) < draEleTop) {
845+
nodeEle.scrollTop += this.helperElement.clientHeight;
846+
}else if (nodeEle.getBoundingClientRect().top > (draEleTop - this.helperElement.clientHeight)) {
847+
nodeEle.scrollTop -= this.helperElement.clientHeight;
848+
}
849+
}
850+
}
851+
private getPathElements(evt: MouseEvent & TouchEvent): Element[] {
852+
const elementTop: number = evt.clientX > 0 ? evt.clientX : 0;
853+
const elementLeft: number = evt.clientY > 0 ? evt.clientY : 0;
854+
return document.elementsFromPoint(elementTop, elementLeft);
855+
}
809856
private triggerOutFunction(evt: MouseEvent & TouchEvent, eleObj: DropObject): void {
810857
this.hoverObject.instance.intOut(evt, eleObj.target);
811858
this.hoverObject.instance.dragData[this.scope] = null;

controls/base/themestudio/styles/buttons/button/_fluent-definition.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ $btn-bigger-icon-width: 2em !default;
4646
$btn-bigger-small-icon-width: 2em !default;
4747
$btn-round-icon-line-height: 1.5em !default;
4848
$btn-small-round-icon-line-height: 1 !default;
49-
$btn-bigger-round-icon-line-height: 0 !default;
50-
$btn-bigger-small-round-icon-line-height: 0 !default;
49+
$btn-bigger-round-icon-line-height: 1.5em !default;
50+
$btn-bigger-small-round-icon-line-height: 1.5em !default;
5151
$btn-text-line-height: 1.572em !default;
5252
$btn-bigger-text-line-height: 1.5em !default;
5353
$btn-small-text-line-height: 1.5em !default;

controls/base/themestudio/styles/pivotview/pivotfieldlist/_fusionnew-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ $field-list-back-margin: 5px !default;
7171
$field-list-sort-wrapper-padding-size: 10px !default;
7272
$field-list-border: $content-bg-color-alt3 !default;
7373
$field-list-calc-expand-icon-padding: 8px !default;
74-
$field-list-search-padding-size: 10px $field-list-header-padding-size !default;
74+
$field-list-search-padding-size: 10px $field-list-title-padding-size !default;
7575
$field-list-search-popup-table-height: 392px !default;
7676
$field-list-search-popup-axis-content-height: 162px !default;
7777
$field-list-search-popup-container-bigger-height: 575px !default;

controls/base/themestudio/styles/pivotview/pivotfieldlist/_material3-definition.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ $field-list-back-margin: 5px !default;
7171
$field-list-sort-wrapper-padding-size: 10px !default;
7272
$field-list-border: $content-bg-color-alt3 !default;
7373
$field-list-calc-expand-icon-padding: 8px !default;
74-
$field-list-search-padding-size: 10px $field-list-header-padding-size !default;
74+
$field-list-search-padding-size: 10px $field-list-title-padding-size !default;
75+
$field-list-member-prompt-padding-size: 25px 12px !default;
7576
$field-list-search-popup-table-height: 392px !default;
7677
$field-list-search-popup-axis-content-height: 162px !default;
7778
$field-list-search-popup-container-bigger-height: 565px !default;

controls/buttons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-buttons",
3-
"version": "20.2.36",
3+
"version": "20.2.38",
44
"description": "A package of feature-rich Essential JS 2 components such as Button, CheckBox, RadioButton and Switch.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/buttons/styles/button/_fluent-definition.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ $btn-bigger-icon-width: 2em !default;
4646
$btn-bigger-small-icon-width: 2em !default;
4747
$btn-round-icon-line-height: 1.5em !default;
4848
$btn-small-round-icon-line-height: 1 !default;
49-
$btn-bigger-round-icon-line-height: 0 !default;
50-
$btn-bigger-small-round-icon-line-height: 0 !default;
49+
$btn-bigger-round-icon-line-height: 1.5em !default;
50+
$btn-bigger-small-round-icon-line-height: 1.5em !default;
5151
$btn-text-line-height: 1.572em !default;
5252
$btn-bigger-text-line-height: 1.5em !default;
5353
$btn-small-text-line-height: 1.5em !default;

controls/buttons/themestudio/styles/buttons/button/_fluent-definition.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ $btn-bigger-icon-width: 2em !default;
4646
$btn-bigger-small-icon-width: 2em !default;
4747
$btn-round-icon-line-height: 1.5em !default;
4848
$btn-small-round-icon-line-height: 1 !default;
49-
$btn-bigger-round-icon-line-height: 0 !default;
50-
$btn-bigger-small-round-icon-line-height: 0 !default;
49+
$btn-bigger-round-icon-line-height: 1.5em !default;
50+
$btn-bigger-small-round-icon-line-height: 1.5em !default;
5151
$btn-text-line-height: 1.572em !default;
5252
$btn-bigger-text-line-height: 1.5em !default;
5353
$btn-small-text-line-height: 1.5em !default;
Binary file not shown.

0 commit comments

Comments
 (0)