Skip to content

Move async loading state to internal props #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2020
Merged

Move async loading state to internal props #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/components/TreeViewNode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
},
areChildrenLoaded() {
const tns = this.model.treeNodeSpec;
return typeof tns.loadChildrenAsync !== 'function' || tns.state.areChildrenLoaded;
return typeof tns.loadChildrenAsync !== 'function' || tns._.state.areChildrenLoaded;
},
ariaExpanded() {
return this.canExpand ? this.model.treeNodeSpec.state.expanded.toString() : false;
Expand Down Expand Up @@ -477,15 +477,19 @@
if (this.model.treeNodeSpec.state === null || typeof this.model.treeNodeSpec.state !== 'object') {
this.$set(this.model.treeNodeSpec, 'state', {});
}
if (this.model.treeNodeSpec._.state === null || typeof this.model.treeNodeSpec._.state !== 'object') {
this.$set(this.model.treeNodeSpec._, 'state', {});
}

let state = this.model.treeNodeSpec.state;
let privateState = this.model.treeNodeSpec._.state;

// areChildrenLoaded and areChildrenLoading are internal state used with asynchronous child
// node loading. Any node with asynchronously loaded children starts as not expanded.
this.$set(state, 'areChildrenLoaded', typeof this.model.treeNodeSpec.loadChildrenAsync !== 'function');
this.$set(state, 'areChildrenLoading', false);
this.$set(privateState, 'areChildrenLoaded', typeof this.model.treeNodeSpec.loadChildrenAsync !== 'function');
this.$set(privateState, 'areChildrenLoading', false);

if (typeof state.expanded !== 'boolean' || !state.areChildrenLoaded) {
if (typeof state.expanded !== 'boolean' || !privateState.areChildrenLoaded) {
this.$set(state, 'expanded', false);
}
if (typeof state.selected !== 'boolean') {
Expand Down Expand Up @@ -576,18 +580,18 @@
this.$emit(TvEvent.ExpandedChange, this.model, event);

// If children need to be loaded asynchronously, load them.
if (spec.state.expanded && !spec.state.areChildrenLoaded && !spec.state.areChildrenLoading) {
if (spec.state.expanded && !spec._.state.areChildrenLoaded && !spec._.state.areChildrenLoading) {

spec.state.areChildrenLoading = true;
spec._.state.areChildrenLoading = true;
var childrenResult = await spec.loadChildrenAsync(this.model);

if (childrenResult) {
spec.state.areChildrenLoaded = true;
spec._.state.areChildrenLoaded = true;
this.children.splice(0, this.children.length, ...childrenResult);
this.$emit(TvEvent.ChildrenLoad, this.model, event);
}

spec.state.areChildrenLoading = false;
spec._.state.areChildrenLoading = false;
}
},
/**
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/TreeViewNodeDragAndDrop.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import MimeType from '../../src/enums/mimeType';

const localVue = createLocalVue();

const serializedNodeData = '{"id":"n0","label":"Node 0","children":[],"treeNodeSpec":{"childrenProperty":"children","idProperty":"id","labelProperty":"label","loadChildrenAsync":null,"expandable":false,"selectable":true,"deletable":false,"focusable":false,"input":{"type":"checkbox","name":"n0-cbx"},"state":{"expanded":false,"selected":false,"input":{"disabled":false,"value":false},"areChildrenLoaded":true,"areChildrenLoading":false},"addChildCallback":null,"draggable":false,"allowDrop":false,"title":null,"expanderTitle":null,"addChildTitle":null,"deleteTitle":null,"customizations":{},"_":{"dragging":false}}}';
const serializedNodeData = '{"id":"n0","label":"Node 0","children":[],"treeNodeSpec":{"childrenProperty":"children","idProperty":"id","labelProperty":"label","loadChildrenAsync":null,"expandable":false,"selectable":true,"deletable":false,"focusable":false,"input":{"type":"checkbox","name":"n0-cbx"},"state":{"expanded":false,"selected":false,"input":{"disabled":false,"value":false}},"addChildCallback":null,"draggable":false,"allowDrop":false,"title":null,"expanderTitle":null,"addChildTitle":null,"deleteTitle":null,"customizations":{},"_":{"dragging":false,"state":{"areChildrenLoaded":true,"areChildrenLoading":false}}}}';

const getDefaultPropsData = function () {
return {
Expand Down