mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	Diff improvements (#23553)
- Avoid flash of wrong tree toggle icon on page load by setting icon based on sync state - Avoid "pop-in" of tree on page load by leaving space based on sync state - Use the same border/box-shadow combo used on comment `:target` also for file `:target`. - Refactor `DiffFileTree.vue` to use `toggleElem` instead of hardcoded class name. - Left-align inline comment boxes and make them fit the same amount of markup content on a line as GitHub. - Fix height of `diff-file-list` Fixes: https://github.com/go-gitea/gitea/issues/23593 <img width="1250" alt="Screenshot 2023-03-18 at 00 52 04" src="https://user-images.githubusercontent.com/115237/226071392-6789a644-aead-4756-a77e-aba3642150a0.png"> <img width="1246" alt="Screenshot 2023-03-18 at 00 59 43" src="https://user-images.githubusercontent.com/115237/226071443-8bcba924-458b-48bd-b2f0-0de59cb180ac.png"> <img width="1250" alt="Screenshot 2023-03-18 at 01 27 14" src="https://user-images.githubusercontent.com/115237/226073121-ccb99f9a-d3ac-40b7-9589-43580c4a01c9.png"> <img width="1231" alt="Screenshot 2023-03-19 at 21 44 16" src="https://user-images.githubusercontent.com/115237/226207951-81bcae1b-6b41-4e39-83a7-0f37951df6be.png"> (Yes I'm aware the border-radius in bottom corners is suboptimal, but this would be notorously hard to fix without relying on `overflow: hidden`).
This commit is contained in:
		| @@ -16,6 +16,7 @@ | ||||
| <script> | ||||
| import DiffFileTreeItem from './DiffFileTreeItem.vue'; | ||||
| import {doLoadMoreFiles} from '../features/repo-diff.js'; | ||||
| import {toggleElem} from '../utils/dom.js'; | ||||
|  | ||||
| const {pageData} = window.config; | ||||
| const LOCAL_STORAGE_KEY = 'diff_file_tree_visible'; | ||||
| @@ -92,8 +93,6 @@ export default { | ||||
|     } | ||||
|   }, | ||||
|   mounted() { | ||||
|     // ensure correct buttons when we are mounted to the dom | ||||
|     this.adjustToggleButton(this.fileTreeIsVisible); | ||||
|     // replace the pageData.diffFileInfo.files with our watched data so we get updates | ||||
|     pageData.diffFileInfo.files = this.files; | ||||
|  | ||||
| @@ -109,15 +108,17 @@ export default { | ||||
|     updateVisibility(visible) { | ||||
|       this.fileTreeIsVisible = visible; | ||||
|       localStorage.setItem(LOCAL_STORAGE_KEY, this.fileTreeIsVisible); | ||||
|       this.adjustToggleButton(this.fileTreeIsVisible); | ||||
|       this.updateState(this.fileTreeIsVisible); | ||||
|     }, | ||||
|     adjustToggleButton(visible) { | ||||
|       const [toShow, toHide] = document.querySelectorAll('.diff-toggle-file-tree-button .icon'); | ||||
|       toShow.classList.toggle('gt-hidden', visible);  // hide the toShow icon if the tree is visible | ||||
|       toHide.classList.toggle('gt-hidden', !visible); // similarly | ||||
|  | ||||
|       const diffTree = document.getElementById('diff-file-tree'); | ||||
|       diffTree.classList.toggle('gt-hidden', !visible); | ||||
|     updateState(visible) { | ||||
|       const btn = document.querySelector('.diff-toggle-file-tree-button'); | ||||
|       const [toShow, toHide] = btn.querySelectorAll('.icon'); | ||||
|       const tree = document.getElementById('diff-file-tree'); | ||||
|       const newTooltip = btn.getAttribute(visible ? 'data-hide-text' : 'data-show-text'); | ||||
|       btn.setAttribute('data-tooltip-content', newTooltip); | ||||
|       toggleElem(tree, visible); | ||||
|       toggleElem(toShow, !visible); | ||||
|       toggleElem(toHide, visible); | ||||
|     }, | ||||
|     loadMoreData() { | ||||
|       this.isLoadingNewData = true; | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| <template> | ||||
|   <div v-show="show" :title="item.name"> | ||||
|     <!--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"--> | ||||
|     <div class="item" :class="item.isFile ? 'filewrapper gt-p-1' : ''"> | ||||
|     <div class="item" :class="item.isFile ? 'filewrapper gt-p-1 gt-ac' : ''"> | ||||
|       <!-- Files --> | ||||
|       <SvgIcon | ||||
|         v-if="item.isFile" | ||||
| @@ -10,7 +10,7 @@ | ||||
|       /> | ||||
|       <a | ||||
|         v-if="item.isFile" | ||||
|         class="file gt-ellipsis muted" | ||||
|         class="file gt-ellipsis" | ||||
|         :href="item.isFile ? '#diff-' + item.file.NameHash : ''" | ||||
|       >{{ item.name }}</a> | ||||
|       <SvgIcon | ||||
| @@ -20,7 +20,7 @@ | ||||
|       /> | ||||
|  | ||||
|       <!-- Directories --> | ||||
|       <div v-if="!item.isFile" class="directory gt-p-1" @click.stop="handleClick(item.isFile)"> | ||||
|       <div v-if="!item.isFile" class="directory gt-p-1 gt-ac" @click.stop="handleClick(item.isFile)"> | ||||
|         <SvgIcon | ||||
|           class="svg-icon" | ||||
|           :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" | ||||
| @@ -79,31 +79,31 @@ export default { | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
| span.svg-icon.status { | ||||
| .svg-icon.status { | ||||
|   float: right; | ||||
| } | ||||
|  | ||||
| span.svg-icon.file { | ||||
| .svg-icon.file { | ||||
|   color: var(--color-secondary-dark-7); | ||||
| } | ||||
|  | ||||
| span.svg-icon.directory { | ||||
| .svg-icon.directory { | ||||
|   color: var(--color-primary); | ||||
| } | ||||
|  | ||||
| span.svg-icon.octicon-diff-modified { | ||||
| .svg-icon.octicon-diff-modified { | ||||
|   color: var(--color-yellow); | ||||
| } | ||||
|  | ||||
| span.svg-icon.octicon-diff-added { | ||||
| .svg-icon.octicon-diff-added { | ||||
|   color: var(--color-green); | ||||
| } | ||||
|  | ||||
| span.svg-icon.octicon-diff-removed { | ||||
| .svg-icon.octicon-diff-removed { | ||||
|   color: var(--color-red); | ||||
| } | ||||
|  | ||||
| span.svg-icon.octicon-diff-renamed { | ||||
| .svg-icon.octicon-diff-renamed { | ||||
|   color: var(--color-teal); | ||||
| } | ||||
|  | ||||
| @@ -139,9 +139,11 @@ div.list { | ||||
|  | ||||
| a { | ||||
|   text-decoration: none; | ||||
|   color: var(--color-text); | ||||
| } | ||||
|  | ||||
| a:hover { | ||||
|   text-decoration: none; | ||||
|   color: var(--color-text); | ||||
| } | ||||
| </style> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user