@progress/kendo-angular-utils 12.0.1 → 12.0.2-develop.1
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/drag-and-drop/dragtarget-container.directive.d.ts +1 -0
- package/esm2020/drag-and-drop/dragtarget-container.directive.mjs +6 -3
- package/esm2020/package-metadata.mjs +2 -2
- package/fesm2015/progress-kendo-angular-utils.mjs +8 -5
- package/fesm2020/progress-kendo-angular-utils.mjs +8 -5
- package/package.json +3 -3
|
@@ -153,6 +153,7 @@ export declare class DragTargetContainerDirective implements AfterViewInit {
|
|
|
153
153
|
private getDragIndex;
|
|
154
154
|
private initializeDragTargets;
|
|
155
155
|
private isDragHandle;
|
|
156
|
+
private get isHandleSelectorValid();
|
|
156
157
|
private setCursorStyle;
|
|
157
158
|
private queryHost;
|
|
158
159
|
private clearPreviousTargets;
|
|
@@ -177,7 +177,7 @@ export class DragTargetContainerDirective {
|
|
|
177
177
|
return this.queryHost(this.dragTargetFilter);
|
|
178
178
|
}
|
|
179
179
|
get dragHandles() {
|
|
180
|
-
return this.queryHost(this.dragHandle);
|
|
180
|
+
return this.isHandleSelectorValid ? this.queryHost(this.dragHandle) : null;
|
|
181
181
|
}
|
|
182
182
|
get hintTemplate() {
|
|
183
183
|
return isPresent(this.hint) && typeof this.hint === 'object' ? this.hint.hintTemplate : null;
|
|
@@ -190,7 +190,7 @@ export class DragTargetContainerDirective {
|
|
|
190
190
|
!this.dragDisabled && this.initializeDragTargets();
|
|
191
191
|
}
|
|
192
192
|
onPointerDown(event) {
|
|
193
|
-
if (isPresent(this.dragHandles) &&
|
|
193
|
+
if (isPresent(this.dragHandles) && !this.isDragHandle(event.target)) {
|
|
194
194
|
return;
|
|
195
195
|
}
|
|
196
196
|
const action = getAction(event, this.currentDragTarget);
|
|
@@ -357,7 +357,7 @@ export class DragTargetContainerDirective {
|
|
|
357
357
|
this.pointerDownSubscription = merge(...pointerDownStreams)
|
|
358
358
|
.pipe(filter(() => this.dragTargetFilter !== ''))
|
|
359
359
|
.subscribe((e) => {
|
|
360
|
-
const filterElement = closestBySelector(e.target, this.dragTargetFilter);
|
|
360
|
+
const filterElement = closestBySelector(e.target, this.isHandleSelectorValid ? this.dragHandle : this.dragTargetFilter);
|
|
361
361
|
if (filterElement) {
|
|
362
362
|
this.onPointerDown(e);
|
|
363
363
|
}
|
|
@@ -508,6 +508,9 @@ export class DragTargetContainerDirective {
|
|
|
508
508
|
isDragHandle(el) {
|
|
509
509
|
return this.dragHandles.some(dh => contains(dh, el, true));
|
|
510
510
|
}
|
|
511
|
+
get isHandleSelectorValid() {
|
|
512
|
+
return isPresent(this.dragHandle) && this.dragHandle !== '';
|
|
513
|
+
}
|
|
511
514
|
setCursorStyle() {
|
|
512
515
|
if (!isDocumentAvailable()) {
|
|
513
516
|
return;
|
|
@@ -9,7 +9,7 @@ export const packageMetadata = {
|
|
|
9
9
|
name: '@progress/kendo-angular-utils',
|
|
10
10
|
productName: 'Kendo UI for Angular',
|
|
11
11
|
productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
|
|
12
|
-
publishDate:
|
|
13
|
-
version: '12.0.1',
|
|
12
|
+
publishDate: 1683200876,
|
|
13
|
+
version: '12.0.2-develop.1',
|
|
14
14
|
licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
|
|
15
15
|
};
|
|
@@ -19,8 +19,8 @@ const packageMetadata = {
|
|
|
19
19
|
name: '@progress/kendo-angular-utils',
|
|
20
20
|
productName: 'Kendo UI for Angular',
|
|
21
21
|
productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
|
|
22
|
-
publishDate:
|
|
23
|
-
version: '12.0.1',
|
|
22
|
+
publishDate: 1683200876,
|
|
23
|
+
version: '12.0.2-develop.1',
|
|
24
24
|
licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
|
|
25
25
|
};
|
|
26
26
|
|
|
@@ -1231,7 +1231,7 @@ class DragTargetContainerDirective {
|
|
|
1231
1231
|
return this.queryHost(this.dragTargetFilter);
|
|
1232
1232
|
}
|
|
1233
1233
|
get dragHandles() {
|
|
1234
|
-
return this.queryHost(this.dragHandle);
|
|
1234
|
+
return this.isHandleSelectorValid ? this.queryHost(this.dragHandle) : null;
|
|
1235
1235
|
}
|
|
1236
1236
|
get hintTemplate() {
|
|
1237
1237
|
return isPresent(this.hint) && typeof this.hint === 'object' ? this.hint.hintTemplate : null;
|
|
@@ -1244,7 +1244,7 @@ class DragTargetContainerDirective {
|
|
|
1244
1244
|
!this.dragDisabled && this.initializeDragTargets();
|
|
1245
1245
|
}
|
|
1246
1246
|
onPointerDown(event) {
|
|
1247
|
-
if (isPresent(this.dragHandles) &&
|
|
1247
|
+
if (isPresent(this.dragHandles) && !this.isDragHandle(event.target)) {
|
|
1248
1248
|
return;
|
|
1249
1249
|
}
|
|
1250
1250
|
const action = getAction(event, this.currentDragTarget);
|
|
@@ -1412,7 +1412,7 @@ class DragTargetContainerDirective {
|
|
|
1412
1412
|
this.pointerDownSubscription = merge(...pointerDownStreams)
|
|
1413
1413
|
.pipe(filter(() => this.dragTargetFilter !== ''))
|
|
1414
1414
|
.subscribe((e) => {
|
|
1415
|
-
const filterElement = closestBySelector(e.target, this.dragTargetFilter);
|
|
1415
|
+
const filterElement = closestBySelector(e.target, this.isHandleSelectorValid ? this.dragHandle : this.dragTargetFilter);
|
|
1416
1416
|
if (filterElement) {
|
|
1417
1417
|
this.onPointerDown(e);
|
|
1418
1418
|
}
|
|
@@ -1563,6 +1563,9 @@ class DragTargetContainerDirective {
|
|
|
1563
1563
|
isDragHandle(el) {
|
|
1564
1564
|
return this.dragHandles.some(dh => contains(dh, el, true));
|
|
1565
1565
|
}
|
|
1566
|
+
get isHandleSelectorValid() {
|
|
1567
|
+
return isPresent(this.dragHandle) && this.dragHandle !== '';
|
|
1568
|
+
}
|
|
1566
1569
|
setCursorStyle() {
|
|
1567
1570
|
if (!isDocumentAvailable()) {
|
|
1568
1571
|
return;
|
|
@@ -19,8 +19,8 @@ const packageMetadata = {
|
|
|
19
19
|
name: '@progress/kendo-angular-utils',
|
|
20
20
|
productName: 'Kendo UI for Angular',
|
|
21
21
|
productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
|
|
22
|
-
publishDate:
|
|
23
|
-
version: '12.0.1',
|
|
22
|
+
publishDate: 1683200876,
|
|
23
|
+
version: '12.0.2-develop.1',
|
|
24
24
|
licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
|
|
25
25
|
};
|
|
26
26
|
|
|
@@ -1229,7 +1229,7 @@ class DragTargetContainerDirective {
|
|
|
1229
1229
|
return this.queryHost(this.dragTargetFilter);
|
|
1230
1230
|
}
|
|
1231
1231
|
get dragHandles() {
|
|
1232
|
-
return this.queryHost(this.dragHandle);
|
|
1232
|
+
return this.isHandleSelectorValid ? this.queryHost(this.dragHandle) : null;
|
|
1233
1233
|
}
|
|
1234
1234
|
get hintTemplate() {
|
|
1235
1235
|
return isPresent(this.hint) && typeof this.hint === 'object' ? this.hint.hintTemplate : null;
|
|
@@ -1242,7 +1242,7 @@ class DragTargetContainerDirective {
|
|
|
1242
1242
|
!this.dragDisabled && this.initializeDragTargets();
|
|
1243
1243
|
}
|
|
1244
1244
|
onPointerDown(event) {
|
|
1245
|
-
if (isPresent(this.dragHandles) &&
|
|
1245
|
+
if (isPresent(this.dragHandles) && !this.isDragHandle(event.target)) {
|
|
1246
1246
|
return;
|
|
1247
1247
|
}
|
|
1248
1248
|
const action = getAction(event, this.currentDragTarget);
|
|
@@ -1409,7 +1409,7 @@ class DragTargetContainerDirective {
|
|
|
1409
1409
|
this.pointerDownSubscription = merge(...pointerDownStreams)
|
|
1410
1410
|
.pipe(filter(() => this.dragTargetFilter !== ''))
|
|
1411
1411
|
.subscribe((e) => {
|
|
1412
|
-
const filterElement = closestBySelector(e.target, this.dragTargetFilter);
|
|
1412
|
+
const filterElement = closestBySelector(e.target, this.isHandleSelectorValid ? this.dragHandle : this.dragTargetFilter);
|
|
1413
1413
|
if (filterElement) {
|
|
1414
1414
|
this.onPointerDown(e);
|
|
1415
1415
|
}
|
|
@@ -1560,6 +1560,9 @@ class DragTargetContainerDirective {
|
|
|
1560
1560
|
isDragHandle(el) {
|
|
1561
1561
|
return this.dragHandles.some(dh => contains(dh, el, true));
|
|
1562
1562
|
}
|
|
1563
|
+
get isHandleSelectorValid() {
|
|
1564
|
+
return isPresent(this.dragHandle) && this.dragHandle !== '';
|
|
1565
|
+
}
|
|
1563
1566
|
setCursorStyle() {
|
|
1564
1567
|
if (!isDocumentAvailable()) {
|
|
1565
1568
|
return;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@progress/kendo-angular-utils",
|
|
3
|
-
"version": "12.0.1",
|
|
3
|
+
"version": "12.0.2-develop.1",
|
|
4
4
|
"description": "Kendo UI Angular utils component",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
6
6
|
"author": "Progress",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"@angular/core": "13 - 16",
|
|
24
24
|
"@angular/platform-browser": "13 - 16",
|
|
25
25
|
"@progress/kendo-licensing": "^1.0.2",
|
|
26
|
-
"@progress/kendo-angular-common": "12.0.1",
|
|
26
|
+
"@progress/kendo-angular-common": "12.0.2-develop.1",
|
|
27
27
|
"rxjs": "^6.5.3 || ^7.0.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"tslib": "^2.3.1",
|
|
31
|
-
"@progress/kendo-angular-schematics": "12.0.1",
|
|
31
|
+
"@progress/kendo-angular-schematics": "12.0.2-develop.1",
|
|
32
32
|
"@progress/kendo-draggable-common": "^0.2.3"
|
|
33
33
|
},
|
|
34
34
|
"schematics": "./schematics/collection.json",
|