@progress/kendo-angular-layout 7.0.1 → 7.0.3-dev.202206061201
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/bundles/kendo-angular-layout.umd.js +1 -1
- package/esm2015/package-metadata.js +1 -1
- package/esm2015/panelbar/panelbar.component.js +6 -2
- package/esm2015/tilelayout/dragging-service.js +3 -2
- package/fesm2015/kendo-angular-layout.js +9 -4
- package/package.json +1 -1
- package/tabstrip/models/scrollable-settings.d.ts +1 -1
|
@@ -9,7 +9,7 @@ export const packageMetadata = {
|
|
|
9
9
|
name: '@progress/kendo-angular-layout',
|
|
10
10
|
productName: 'Kendo UI for Angular',
|
|
11
11
|
productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
|
|
12
|
-
publishDate:
|
|
12
|
+
publishDate: 1654516822,
|
|
13
13
|
version: '',
|
|
14
14
|
licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
|
|
15
15
|
};
|
|
@@ -284,6 +284,7 @@ export class PanelBarComponent {
|
|
|
284
284
|
return;
|
|
285
285
|
}
|
|
286
286
|
let modifiedItems = new Array();
|
|
287
|
+
let selectPreventedItems = [];
|
|
287
288
|
this.allItems
|
|
288
289
|
.forEach((currentItem) => {
|
|
289
290
|
let selectedState = currentItem === item;
|
|
@@ -297,10 +298,13 @@ export class PanelBarComponent {
|
|
|
297
298
|
this.activeDescendant = focusedState ? currentItem.itemId : '';
|
|
298
299
|
modifiedItems.push(currentItem);
|
|
299
300
|
}
|
|
301
|
+
else {
|
|
302
|
+
selectPreventedItems.push(currentItem);
|
|
303
|
+
}
|
|
300
304
|
}
|
|
301
305
|
});
|
|
302
306
|
if (this.expandMode === PanelBarExpandMode.Multiple) {
|
|
303
|
-
if ((item.hasChildItems || item.hasContent) && item
|
|
307
|
+
if ((item.hasChildItems || item.hasContent) && !selectPreventedItems.includes(item)) {
|
|
304
308
|
const isEventPrevented = item.expanded ?
|
|
305
309
|
this.emitEvent('collapse', item).isDefaultPrevented() :
|
|
306
310
|
this.emitEvent('expand', item).isDefaultPrevented();
|
|
@@ -316,7 +320,7 @@ export class PanelBarComponent {
|
|
|
316
320
|
let siblings = item.parent ? item.parent.childrenItems : this.childrenItems;
|
|
317
321
|
let preventedCollapseItem;
|
|
318
322
|
let expandedItems = [];
|
|
319
|
-
if ((item.hasChildItems || item.hasContent) && item
|
|
323
|
+
if ((item.hasChildItems || item.hasContent) && !selectPreventedItems.includes(item)) {
|
|
320
324
|
siblings
|
|
321
325
|
.forEach((currentItem) => {
|
|
322
326
|
let expandedState = currentItem === item;
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { Injectable } from '@angular/core';
|
|
6
6
|
import { BehaviorSubject, Subject } from 'rxjs';
|
|
7
7
|
import { calculateCellFromPosition, getDropTarget, isRowItemPresent, normalizeValue, propsChanged, setElementStyles } from './util';
|
|
8
|
-
import { closestInScope } from '../common/dom-queries';
|
|
8
|
+
import { closestInScope, isFocusable } from '../common/dom-queries';
|
|
9
9
|
import { DRAGGED_ZINDEX, HINT_BORDERS_HEIGHT, OVERLAP_THRESHOLD, REVERSE_OVERLAP_THRESHOLD } from './constants';
|
|
10
10
|
import { TileLayoutReorderEvent } from './reorder-event';
|
|
11
11
|
import { TileLayoutResizeEvent } from './resize-event';
|
|
@@ -57,7 +57,8 @@ export class TileLayoutDraggingService {
|
|
|
57
57
|
.find(item => item.order === +closestTile.style.order);
|
|
58
58
|
});
|
|
59
59
|
const reordering = !resizing && this.reorderable.getValue() && this.draggedItem.reorderable && closestHeader;
|
|
60
|
-
|
|
60
|
+
const focusableTarget = isFocusable(originalEvent.target);
|
|
61
|
+
if (!(reordering || resizing) || focusableTarget) {
|
|
61
62
|
return;
|
|
62
63
|
}
|
|
63
64
|
else {
|
|
@@ -26,7 +26,7 @@ const packageMetadata = {
|
|
|
26
26
|
name: '@progress/kendo-angular-layout',
|
|
27
27
|
productName: 'Kendo UI for Angular',
|
|
28
28
|
productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
|
|
29
|
-
publishDate:
|
|
29
|
+
publishDate: 1654516822,
|
|
30
30
|
version: '',
|
|
31
31
|
licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
|
|
32
32
|
};
|
|
@@ -1186,6 +1186,7 @@ class PanelBarComponent {
|
|
|
1186
1186
|
return;
|
|
1187
1187
|
}
|
|
1188
1188
|
let modifiedItems = new Array();
|
|
1189
|
+
let selectPreventedItems = [];
|
|
1189
1190
|
this.allItems
|
|
1190
1191
|
.forEach((currentItem) => {
|
|
1191
1192
|
let selectedState = currentItem === item;
|
|
@@ -1199,10 +1200,13 @@ class PanelBarComponent {
|
|
|
1199
1200
|
this.activeDescendant = focusedState ? currentItem.itemId : '';
|
|
1200
1201
|
modifiedItems.push(currentItem);
|
|
1201
1202
|
}
|
|
1203
|
+
else {
|
|
1204
|
+
selectPreventedItems.push(currentItem);
|
|
1205
|
+
}
|
|
1202
1206
|
}
|
|
1203
1207
|
});
|
|
1204
1208
|
if (this.expandMode === PanelBarExpandMode.Multiple) {
|
|
1205
|
-
if ((item.hasChildItems || item.hasContent) && item
|
|
1209
|
+
if ((item.hasChildItems || item.hasContent) && !selectPreventedItems.includes(item)) {
|
|
1206
1210
|
const isEventPrevented = item.expanded ?
|
|
1207
1211
|
this.emitEvent('collapse', item).isDefaultPrevented() :
|
|
1208
1212
|
this.emitEvent('expand', item).isDefaultPrevented();
|
|
@@ -1218,7 +1222,7 @@ class PanelBarComponent {
|
|
|
1218
1222
|
let siblings = item.parent ? item.parent.childrenItems : this.childrenItems;
|
|
1219
1223
|
let preventedCollapseItem;
|
|
1220
1224
|
let expandedItems = [];
|
|
1221
|
-
if ((item.hasChildItems || item.hasContent) && item
|
|
1225
|
+
if ((item.hasChildItems || item.hasContent) && !selectPreventedItems.includes(item)) {
|
|
1222
1226
|
siblings
|
|
1223
1227
|
.forEach((currentItem) => {
|
|
1224
1228
|
let expandedState = currentItem === item;
|
|
@@ -7406,7 +7410,8 @@ class TileLayoutDraggingService {
|
|
|
7406
7410
|
.find(item => item.order === +closestTile.style.order);
|
|
7407
7411
|
});
|
|
7408
7412
|
const reordering = !resizing && this.reorderable.getValue() && this.draggedItem.reorderable && closestHeader;
|
|
7409
|
-
|
|
7413
|
+
const focusableTarget = isFocusable(originalEvent.target);
|
|
7414
|
+
if (!(reordering || resizing) || focusableTarget) {
|
|
7410
7415
|
return;
|
|
7411
7416
|
}
|
|
7412
7417
|
else {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@progress/kendo-angular-layout",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3-dev.202206061201",
|
|
4
4
|
"description": "Kendo UI for Angular Layout Package - a collection of components to create professional application layoyts",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
6
6
|
"author": "Progress",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*-------------------------------------------------------------------------------------------*/
|
|
5
5
|
import { TabStripScrollButtonsVisibility } from "./scroll-buttons-visibility";
|
|
6
6
|
/**
|
|
7
|
-
* The settings for the scrollable functionality of the TabStrip. ([see example]({% slug scrollable_tabstrip %}
|
|
7
|
+
* The settings for the scrollable functionality of the TabStrip. ([see example]({% slug scrollable_tabstrip %}))
|
|
8
8
|
*/
|
|
9
9
|
export interface TabStripScrollableSettings {
|
|
10
10
|
/**
|