Skip to content

Commit 6892e2b

Browse files
Use reactive store to share data between components (#23996)
Follow #23947 * Use reactive store to share data between components * Remove no-op `this.hashListener = window.addEventListener()` because `addEventListener` returns void/undefined. Reference: https://vuejs.org/guide/scaling-up/state-management.html#simple-state-management-with-reactivity-api Screenshot (the same as before): <details> <img width="565" alt="image" src="https://user-images.githubusercontent.com/2114189/230701282-bd61bfa3-7786-433b-9ad8-a88591112a02.png"> </details> --------- Co-authored-by: silverwind <[email protected]>
1 parent 1380b87 commit 6892e2b

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

web_src/js/components/DiffFileTree.vue

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>
66
<!-- only render the tree if we're visible. in many cases this is something that doesn't change very often -->
77
<div class="ui list">
8-
<DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item" :selected-file="selectedFile"/>
8+
<DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item"/>
99
</div>
1010
<div v-if="isIncomplete" id="diff-too-many-files-stats" class="gt-pt-2">
1111
<span class="gt-mr-2">{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a>
@@ -17,6 +17,7 @@
1717
import DiffFileTreeItem from './DiffFileTreeItem.vue';
1818
import {doLoadMoreFiles} from '../features/repo-diff.js';
1919
import {toggleElem} from '../utils/dom.js';
20+
import {DiffTreeStore} from '../modules/stores.js';
2021
2122
const {pageData} = window.config;
2223
const LOCAL_STORAGE_KEY = 'diff_file_tree_visible';
@@ -28,7 +29,7 @@ export default {
2829
pageData.diffFileInfo.fileTreeIsVisible = fileTreeIsVisible;
2930
return {
3031
...pageData.diffFileInfo,
31-
selectedFile: ''
32+
store: DiffTreeStore,
3233
};
3334
},
3435
computed: {
@@ -102,10 +103,10 @@ export default {
102103
document.querySelector('.diff-toggle-file-tree-button').addEventListener('click', this.toggleVisibility);
103104
104105
this.hashChangeListener = () => {
105-
this.selectedFile = window.location.hash;
106+
this.store.selectedItem = window.location.hash;
106107
};
107-
this.hashListener = window.addEventListener('hashchange', this.hashChangeListener);
108-
this.selectedFile = window.location.hash;
108+
this.hashChangeListener();
109+
window.addEventListener('hashchange', this.hashChangeListener);
109110
},
110111
unmounted() {
111112
document.querySelector('.diff-toggle-file-tree-button').removeEventListener('click', this.toggleVisibility);

web_src/js/components/DiffFileTreeItem.vue

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div v-show="show" :title="item.name">
33
<!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
4-
<div class="item" :class="[item.isFile ? 'filewrapper gt-p-1 gt-ac' : '', selectedFile === genCompleteFileHash(item.file?.NameHash) ? 'selected' : '']">
4+
<div class="item" :class="[item.isFile ? 'filewrapper gt-p-1 gt-ac' : '', store.selectedItem === '#diff-' + item.file?.NameHash ? 'selected' : '']">
55
<!-- Files -->
66
<SvgIcon
77
v-if="item.isFile"
@@ -32,14 +32,15 @@
3232
<span class="gt-ellipsis">{{ item.name }}</span>
3333
</div>
3434
<div v-show="!collapsed">
35-
<DiffFileTreeItem v-for="childItem in item.children" :key="childItem.name" :item="childItem" class="list" :selected-file="selectedFile"/>
35+
<DiffFileTreeItem v-for="childItem in item.children" :key="childItem.name" :item="childItem" class="list"/>
3636
</div>
3737
</div>
3838
</div>
3939
</template>
4040

4141
<script>
4242
import {SvgIcon} from '../svg.js';
43+
import {DiffTreeStore} from '../modules/stores.js';
4344
4445
export default {
4546
components: {SvgIcon},
@@ -53,13 +54,9 @@ export default {
5354
required: false,
5455
default: true
5556
},
56-
selectedFile: {
57-
type: String,
58-
default: '',
59-
required: true
60-
}
6157
},
6258
data: () => ({
59+
store: DiffTreeStore,
6360
collapsed: false,
6461
}),
6562
methods: {
@@ -79,9 +76,6 @@ export default {
7976
};
8077
return diffTypes[pType];
8178
},
82-
genCompleteFileHash(hash) {
83-
return `#diff-${hash}`;
84-
}
8579
},
8680
};
8781
</script>

web_src/js/modules/stores.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import {reactive} from 'vue';
2+
3+
export const DiffTreeStore = reactive({
4+
selectedItem: '',
5+
});

0 commit comments

Comments
 (0)