mirror of
https://github.com/nasa/openmct.git
synced 2025-02-21 01:42:31 +00:00
[Navigation Tree] Simplify logic (#3474)
* added new navigation method for tracking, lots of optimizations * updated indicator logic, tweaked objectPath/navigationPath, removed old code * added temporary ancestors variable to be used while building new tree ui during navigation * removed observer for ancestors, all handled in composition watch now * updates from PR comments * fixing testing errors * checking for older format of saved path, update if old
This commit is contained in:
parent
0e6ce7f58b
commit
5646a252f7
@ -26,6 +26,10 @@
|
||||
overflow: hidden;
|
||||
transition: all;
|
||||
|
||||
.c-tree__item-h {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&__scrollable-children {
|
||||
overflow: auto;
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<li
|
||||
<div
|
||||
ref="me"
|
||||
:style="{
|
||||
'top': virtualScroll ? itemTop : 'auto',
|
||||
@ -24,7 +24,7 @@
|
||||
<object-label
|
||||
:domain-object="node.object"
|
||||
:object-path="node.objectPath"
|
||||
:navigate-to-path="navigateToPath"
|
||||
:navigate-to-path="navigationPath"
|
||||
:style="{ paddingLeft: leftOffset }"
|
||||
/>
|
||||
<view-control
|
||||
@ -34,7 +34,7 @@
|
||||
:enabled="hasComposition && showDown"
|
||||
/>
|
||||
</div>
|
||||
</li>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@ -83,18 +83,14 @@ export default {
|
||||
virtualScroll: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
shouldEmitHeight: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
this.navigateToPath = this.buildPathString(this.node.navigateToParent);
|
||||
this.navigationPath = this.node.navigationPath;
|
||||
|
||||
return {
|
||||
hasComposition: false,
|
||||
navigated: this.navigateToPath === this.openmct.router.currentLocation.path,
|
||||
navigated: this.isNavigated(),
|
||||
expanded: false
|
||||
};
|
||||
},
|
||||
@ -122,9 +118,6 @@ export default {
|
||||
mounted() {
|
||||
let objectComposition = this.openmct.composition.get(this.node.object);
|
||||
|
||||
// only reliable way to get final item height
|
||||
this.readyStateCheck();
|
||||
|
||||
this.domainObject = this.node.object;
|
||||
let removeListener = this.openmct.objects.observe(this.domainObject, '*', (newObject) => {
|
||||
this.domainObject = newObject;
|
||||
@ -139,30 +132,13 @@ export default {
|
||||
},
|
||||
destroyed() {
|
||||
this.openmct.router.off('change:path', this.highlightIfNavigated);
|
||||
document.removeEventListener('readystatechange', this.emitHeight);
|
||||
},
|
||||
methods: {
|
||||
readyStateCheck() {
|
||||
if (document.readyState !== 'complete') {
|
||||
document.addEventListener('readystatechange', this.emitHeight);
|
||||
} else {
|
||||
this.emitHeight();
|
||||
}
|
||||
isNavigated() {
|
||||
return this.navigationPath === this.openmct.router.currentLocation.path;
|
||||
},
|
||||
emitHeight() {
|
||||
if (this.shouldEmitHeight && document.readyState === 'complete') {
|
||||
this.$emit('emittedHeight', this.$el.offsetHeight);
|
||||
}
|
||||
},
|
||||
buildPathString(parentPath) {
|
||||
return [parentPath, this.openmct.objects.makeKeyString(this.node.object.identifier)].join('/');
|
||||
},
|
||||
highlightIfNavigated(newPath, oldPath) {
|
||||
if (newPath === this.navigateToPath) {
|
||||
this.navigated = true;
|
||||
} else if (oldPath === this.navigateToPath) {
|
||||
this.navigated = false;
|
||||
}
|
||||
highlightIfNavigated() {
|
||||
this.navigated = this.isNavigated();
|
||||
},
|
||||
resetTreeHere() {
|
||||
this.$emit('resetTree', this.node);
|
||||
|
Loading…
x
Reference in New Issue
Block a user