Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion packages/devextreme-angular/src/ui/tree-view/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
export { ExplicitTypes } from 'devextreme/ui/tree_view';

import DataSource from 'devextreme/data/data_source';
import { dxTreeViewNode, dxTreeViewItem, TreeViewExpandEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemHoldEvent, ItemRenderedEvent, ItemSelectionChangedEvent, OptionChangedEvent, SelectAllValueChangedEvent, SelectionChangedEvent, TreeViewCheckBoxMode } from 'devextreme/ui/tree_view';
import { dxTreeViewNode, dxTreeViewItem, DisabledNodeSelectionMode, TreeViewExpandEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemHoldEvent, ItemRenderedEvent, ItemSelectionChangedEvent, OptionChangedEvent, SelectAllValueChangedEvent, SelectionChangedEvent, TreeViewCheckBoxMode } from 'devextreme/ui/tree_view';
import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
import { DataStructure, ScrollDirection, SearchMode, SingleOrMultiple } from 'devextreme/common';
Expand Down Expand Up @@ -207,6 +207,19 @@ export class DxTreeViewComponent<TItem = any, TKey = any> extends DxComponent im
}


/**
* [descr:dxTreeViewOptions.disabledNodeSelectionMode]

*/
@Input()
get disabledNodeSelectionMode(): DisabledNodeSelectionMode {
return this._getOption('disabledNodeSelectionMode');
}
set disabledNodeSelectionMode(value: DisabledNodeSelectionMode) {
this._setOption('disabledNodeSelectionMode', value);
}


/**
* [descr:HierarchicalCollectionWidgetOptions.displayExpr]

Expand Down Expand Up @@ -880,6 +893,13 @@ export class DxTreeViewComponent<TItem = any, TKey = any> extends DxComponent im
*/
@Output() disabledExprChange: EventEmitter<Function | string>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() disabledNodeSelectionModeChange: EventEmitter<DisabledNodeSelectionMode>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.
Expand Down Expand Up @@ -1188,6 +1208,7 @@ export class DxTreeViewComponent<TItem = any, TKey = any> extends DxComponent im
{ emit: 'dataStructureChange' },
{ emit: 'disabledChange' },
{ emit: 'disabledExprChange' },
{ emit: 'disabledNodeSelectionModeChange' },
{ emit: 'displayExprChange' },
{ emit: 'elementAttrChange' },
{ emit: 'expandAllEnabledChange' },
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme-vue/src/tree-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import DataSource from "devextreme/data/data_source";
import {
dxTreeViewNode,
dxTreeViewItem,
DisabledNodeSelectionMode,
TreeViewExpandEvent,
ContentReadyEvent,
DisposingEvent,
Expand Down Expand Up @@ -85,6 +86,7 @@ type AccessibleOptions = Pick<Properties,
"dataStructure" |
"disabled" |
"disabledExpr" |
"disabledNodeSelectionMode" |
"displayExpr" |
"elementAttr" |
"expandAllEnabled" |
Expand Down Expand Up @@ -154,6 +156,7 @@ const componentConfig = {
dataStructure: String as PropType<DataStructure>,
disabled: Boolean,
disabledExpr: [Function, String] as PropType<((() => void)) | string>,
disabledNodeSelectionMode: String as PropType<DisabledNodeSelectionMode>,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
elementAttr: Object as PropType<Record<string, any>>,
expandAllEnabled: Boolean,
Expand Down Expand Up @@ -219,6 +222,7 @@ const componentConfig = {
"update:dataStructure": null,
"update:disabled": null,
"update:disabledExpr": null,
"update:disabledNodeSelectionMode": null,
"update:displayExpr": null,
"update:elementAttr": null,
"update:expandAllEnabled": null,
Expand Down
8 changes: 8 additions & 0 deletions packages/devextreme/js/ui/tree_view.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ export {
export type TreeViewCheckBoxMode = 'none' | 'normal' | 'selectAll';
/** @public */
export type TreeViewExpandEvent = 'dblclick' | 'click';
/** @public */
export type DisabledNodeSelectionMode = 'recursiveAndAll' | 'never';

/**
* @docid _ui_tree_view_ContentReadyEvent
Expand Down Expand Up @@ -210,6 +212,12 @@ export interface dxTreeViewOptions<TItem extends ItemLike = any, TKey = any>
* @public
*/
dataStructure?: DataStructure;
/**
* @docid
* @default 'recursiveAndAll'
* @public
*/
disabledNodeSelectionMode?: DisabledNodeSelectionMode;
/**
* @docid
* @default false
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme/js/ui/tree_view_types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export {
ScrollDirection,
TreeViewCheckBoxMode,
TreeViewExpandEvent,
DisabledNodeSelectionMode,
ContentReadyEvent,
DisposingEvent,
InitializedEvent,
Expand Down
5 changes: 5 additions & 0 deletions packages/devextreme/ts/dx.all.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32303,6 +32303,7 @@ declare module DevExpress.ui {
TItem extends ItemLike = any,
TKey = any
> = DevExpress.common.core.events.EventInfo<dxTreeView<TItem, TKey>>;
export type DisabledNodeSelectionMode = 'recursiveAndAll' | 'never';
/**
* [descr:_ui_tree_view_DisposingEvent]
*/
Expand Down Expand Up @@ -32594,6 +32595,10 @@ declare module DevExpress.ui {
* [descr:dxTreeViewOptions.dataStructure]
*/
dataStructure?: DevExpress.common.DataStructure;
/**
* [descr:dxTreeViewOptions.disabledNodeSelectionMode]
*/
disabledNodeSelectionMode?: DevExpress.ui.dxTreeView.DisabledNodeSelectionMode;
/**
* [descr:dxTreeViewOptions.expandAllEnabled]
*/
Expand Down
Loading