mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	Add <overflow-menu>, rename webcomponents (#29400)
				
					
				
			1. Add `<overflow-menu>` web component 2. Rename `<gitea-origin-url>` to `<origin-url>` and make filenames match. <img width="439" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/2fbe4ca4-110b-4ad2-8e17-c1e116ccbd74"> <img width="444" alt="Screenshot 2024-03-02 at 21 36 52" src="https://github.com/go-gitea/gitea/assets/115237/aa8f786e-dc8c-4030-b12d-7cfb74bdfd6e"> <img width="537" alt="Screenshot 2024-03-03 at 03 05 06" src="https://github.com/go-gitea/gitea/assets/115237/fddd50aa-adf1-4b4b-bd7f-caf30c7b2245">   TODO: - [x] Check if removal of `requestAnimationFrame` is possible to avoid flash of content. Likely needs a `MutationObserver`. - [x] Hide tippy when button is removed from DOM. - [x] ~~Implement right-aligned items (https://github.com/go-gitea/gitea/pull/28976)~~. Not going to do it. - [x] Clean up CSS so base element has no background and add background via tailwind instead. - [x] Use it for org and user page. --------- Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -384,28 +384,30 @@ export default sfc; // activate the IDE's Vue plugin | ||||
|             </div> | ||||
|           </div> | ||||
|         </div> | ||||
|         <div class="ui secondary tiny pointing borderless menu center grid repos-filter"> | ||||
|           <a class="item" :class="{active: reposFilter === 'all'}" @click="changeReposFilter('all')"> | ||||
|             {{ textAll }} | ||||
|             <div v-show="reposFilter === 'all'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|           </a> | ||||
|           <a class="item" :class="{active: reposFilter === 'sources'}" @click="changeReposFilter('sources')"> | ||||
|             {{ textSources }} | ||||
|             <div v-show="reposFilter === 'sources'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|           </a> | ||||
|           <a class="item" :class="{active: reposFilter === 'forks'}" @click="changeReposFilter('forks')"> | ||||
|             {{ textForks }} | ||||
|             <div v-show="reposFilter === 'forks'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|           </a> | ||||
|           <a class="item" :class="{active: reposFilter === 'mirrors'}" @click="changeReposFilter('mirrors')" v-if="isMirrorsEnabled"> | ||||
|             {{ textMirrors }} | ||||
|             <div v-show="reposFilter === 'mirrors'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|           </a> | ||||
|           <a class="item" :class="{active: reposFilter === 'collaborative'}" @click="changeReposFilter('collaborative')"> | ||||
|             {{ textCollaborative }} | ||||
|             <div v-show="reposFilter === 'collaborative'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|           </a> | ||||
|         </div> | ||||
|         <overflow-menu class="ui secondary pointing tabular borderless menu repos-filter"> | ||||
|           <div class="overflow-menu-items tw-justify-center"> | ||||
|             <a class="item" tabindex="0" :class="{active: reposFilter === 'all'}" @click="changeReposFilter('all')"> | ||||
|               {{ textAll }} | ||||
|               <div v-show="reposFilter === 'all'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|             </a> | ||||
|             <a class="item" tabindex="0" :class="{active: reposFilter === 'sources'}" @click="changeReposFilter('sources')"> | ||||
|               {{ textSources }} | ||||
|               <div v-show="reposFilter === 'sources'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|             </a> | ||||
|             <a class="item" tabindex="0" :class="{active: reposFilter === 'forks'}" @click="changeReposFilter('forks')"> | ||||
|               {{ textForks }} | ||||
|               <div v-show="reposFilter === 'forks'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|             </a> | ||||
|             <a class="item" tabindex="0" :class="{active: reposFilter === 'mirrors'}" @click="changeReposFilter('mirrors')" v-if="isMirrorsEnabled"> | ||||
|               {{ textMirrors }} | ||||
|               <div v-show="reposFilter === 'mirrors'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|             </a> | ||||
|             <a class="item" tabindex="0" :class="{active: reposFilter === 'collaborative'}" @click="changeReposFilter('collaborative')"> | ||||
|               {{ textCollaborative }} | ||||
|               <div v-show="reposFilter === 'collaborative'" class="ui circular mini grey label">{{ repoTypeCount }}</div> | ||||
|             </a> | ||||
|           </div> | ||||
|         </overflow-menu> | ||||
|       </div> | ||||
|       <div v-if="repos.length" class="ui attached table segment gt-rounded-bottom"> | ||||
|         <ul class="repo-owner-name-list"> | ||||
| @@ -501,6 +503,22 @@ ul li:not(:last-child) { | ||||
|   border-bottom: 1px solid var(--color-secondary); | ||||
| } | ||||
|  | ||||
| .repos-search { | ||||
|   padding-bottom: 0 !important; | ||||
| } | ||||
|  | ||||
| .repos-filter { | ||||
|   padding-top: 0 !important; | ||||
|   margin-top: 0 !important; | ||||
|   border-bottom-width: 0 !important; | ||||
|   margin-bottom: 2px !important; | ||||
| } | ||||
|  | ||||
| .repos-filter .item { | ||||
|   padding-left: 6px !important; | ||||
|   padding-right: 6px !important; | ||||
| } | ||||
|  | ||||
| .repo-list-link { | ||||
|   min-width: 0; /* for text truncation */ | ||||
|   display: flex; | ||||
|   | ||||
| @@ -7,7 +7,8 @@ const visibleInstances = new Set(); | ||||
| export function createTippy(target, opts = {}) { | ||||
|   // the callback functions should be destructured from opts, | ||||
|   // because we should use our own wrapper functions to handle them, do not let the user override them | ||||
|   const {onHide, onShow, onDestroy, ...other} = opts; | ||||
|   const {onHide, onShow, onDestroy, role, theme, ...other} = opts; | ||||
|  | ||||
|   const instance = tippy(target, { | ||||
|     appendTo: document.body, | ||||
|     animation: false, | ||||
| @@ -35,17 +36,14 @@ export function createTippy(target, opts = {}) { | ||||
|       return onShow?.(instance); | ||||
|     }, | ||||
|     arrow: `<svg width="16" height="7"><path d="m0 7 8-7 8 7Z" class="tippy-svg-arrow-outer"/><path d="m0 8 8-7 8 7Z" class="tippy-svg-arrow-inner"/></svg>`, | ||||
|     role: 'menu', // HTML role attribute, only tooltips should use "tooltip" | ||||
|     theme: other.role || 'menu', // CSS theme, either "tooltip", "menu" or "box-with-header" | ||||
|     role: role || 'menu', // HTML role attribute | ||||
|     theme: theme || role || 'menu', // CSS theme, either "tooltip", "menu" or "box-with-header" | ||||
|     plugins: [followCursor], | ||||
|     ...other, | ||||
|   }); | ||||
|  | ||||
|   // for popups where content refers to a DOM element, we use the 'tippy-target' class | ||||
|   // to initially hide the content, now we can remove it as the content has been removed | ||||
|   // from the DOM by tippy | ||||
|   if (other.content instanceof Element) { | ||||
|     other.content.classList.remove('tippy-target'); | ||||
|   if (role === 'menu') { | ||||
|     target.setAttribute('aria-haspopup', 'true'); | ||||
|   } | ||||
|  | ||||
|   return instance; | ||||
|   | ||||
| @@ -6,7 +6,6 @@ https://developer.mozilla.org/en-US/docs/Web/Web_Components | ||||
|  | ||||
| # Guidelines | ||||
|  | ||||
| * These components are loaded in `<head>` (before DOM body), | ||||
|   so they should have their own dependencies and should be very light, | ||||
|   then they won't affect the page loading time too much. | ||||
| * If the component is not a public one, it's suggested to have its own `Gitea` or `gitea-` prefix to avoid conflicts. | ||||
| * These components are loaded in `<head>` (before DOM body) in a separate entry point, they need to be lightweight to not affect the page loading time too much. | ||||
| * Do not import `svg.js` into a web component because that file is currently not tree-shakeable, import svg files individually insteat. | ||||
| * All our components must be added to `webpack.config.js` so they work correctly in Vue. | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| window.customElements.define('gitea-absolute-date', class extends HTMLElement { | ||||
| window.customElements.define('absolute-date', class extends HTMLElement { | ||||
|   static observedAttributes = ['date', 'year', 'month', 'weekday', 'day']; | ||||
| 
 | ||||
|   update = () => { | ||||
							
								
								
									
										5
									
								
								web_src/js/webcomponents/index.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								web_src/js/webcomponents/index.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | ||||
| import './polyfills.js'; | ||||
| import '@github/relative-time-element'; | ||||
| import './origin-url.js'; | ||||
| import './overflow-menu.js'; | ||||
| import './absolute-date.js'; | ||||
| @@ -15,7 +15,7 @@ export function toOriginUrl(urlStr) { | ||||
|   return urlStr; | ||||
| } | ||||
| 
 | ||||
| window.customElements.define('gitea-origin-url', class extends HTMLElement { | ||||
| window.customElements.define('origin-url', class extends HTMLElement { | ||||
|   connectedCallback() { | ||||
|     this.textContent = toOriginUrl(this.getAttribute('data-url')); | ||||
|   } | ||||
| @@ -1,4 +1,4 @@ | ||||
| import {toOriginUrl} from './GiteaOriginUrl.js'; | ||||
| import {toOriginUrl} from './origin-url.js'; | ||||
| 
 | ||||
| test('toOriginUrl', () => { | ||||
|   const oldLocation = window.location; | ||||
							
								
								
									
										179
									
								
								web_src/js/webcomponents/overflow-menu.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										179
									
								
								web_src/js/webcomponents/overflow-menu.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,179 @@ | ||||
| import {throttle} from 'throttle-debounce'; | ||||
| import {createTippy} from '../modules/tippy.js'; | ||||
| import {isDocumentFragmentOrElementNode} from '../utils/dom.js'; | ||||
| import octiconKebabHorizontal from '../../../public/assets/img/svg/octicon-kebab-horizontal.svg'; | ||||
|  | ||||
| window.customElements.define('overflow-menu', class extends HTMLElement { | ||||
|   updateItems = throttle(100, () => { | ||||
|     if (!this.tippyContent) { | ||||
|       const div = document.createElement('div'); | ||||
|       div.classList.add('tippy-target'); | ||||
|       div.tabIndex = '-1'; // for initial focus, programmatic focus only | ||||
|       div.addEventListener('keydown', (e) => { | ||||
|         if (e.key === 'Tab') { | ||||
|           const items = this.tippyContent.querySelectorAll('[role="menuitem"]'); | ||||
|           if (e.shiftKey) { | ||||
|             if (document.activeElement === items[0]) { | ||||
|               e.preventDefault(); | ||||
|               items[items.length - 1].focus(); | ||||
|             } | ||||
|           } else { | ||||
|             if (document.activeElement === items[items.length - 1]) { | ||||
|               e.preventDefault(); | ||||
|               items[0].focus(); | ||||
|             } | ||||
|           } | ||||
|         } else if (e.key === 'Escape') { | ||||
|           e.preventDefault(); | ||||
|           e.stopPropagation(); | ||||
|           this.button._tippy.hide(); | ||||
|           this.button.focus(); | ||||
|         } else if (e.key === ' ' || e.code === 'Enter') { | ||||
|           if (document.activeElement?.matches('[role="menuitem"]')) { | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|             document.activeElement.click(); | ||||
|           } | ||||
|         } else if (e.key === 'ArrowDown') { | ||||
|           if (document.activeElement?.matches('.tippy-target')) { | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|             document.activeElement.querySelector('[role="menuitem"]:first-of-type').focus(); | ||||
|           } else if (document.activeElement?.matches('[role="menuitem"]')) { | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|             document.activeElement.nextElementSibling?.focus(); | ||||
|           } | ||||
|         } else if (e.key === 'ArrowUp') { | ||||
|           if (document.activeElement?.matches('.tippy-target')) { | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|             document.activeElement.querySelector('[role="menuitem"]:last-of-type').focus(); | ||||
|           } else if (document.activeElement?.matches('[role="menuitem"]')) { | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|             document.activeElement.previousElementSibling?.focus(); | ||||
|           } | ||||
|         } | ||||
|       }); | ||||
|       this.append(div); | ||||
|       this.tippyContent = div; | ||||
|     } | ||||
|  | ||||
|     // move items in tippy back into the menu items for subsequent measurement | ||||
|     for (const item of this.tippyItems || []) { | ||||
|       this.menuItemsEl.append(item); | ||||
|     } | ||||
|  | ||||
|     // measure which items are partially outside the element and move them into the button menu | ||||
|     this.tippyItems = []; | ||||
|     const menuRight = this.offsetLeft + this.offsetWidth; | ||||
|     const menuItems = this.menuItemsEl.querySelectorAll('.item'); | ||||
|     for (const item of menuItems) { | ||||
|       const itemRight = item.offsetLeft + item.offsetWidth; | ||||
|       if (menuRight - itemRight < 38) { // roughly the width of .overflow-menu-button | ||||
|         this.tippyItems.push(item); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     // if there are no overflown items, remove any previously created button | ||||
|     if (!this.tippyItems?.length) { | ||||
|       const btn = this.querySelector('.overflow-menu-button'); | ||||
|       btn?._tippy?.destroy(); | ||||
|       btn?.remove(); | ||||
|       return; | ||||
|     } | ||||
|  | ||||
|     // remove aria role from items that moved from tippy to menu | ||||
|     for (const item of menuItems) { | ||||
|       if (!this.tippyItems.includes(item)) { | ||||
|         item.removeAttribute('role'); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     // move all items that overflow into tippy | ||||
|     for (const item of this.tippyItems) { | ||||
|       item.setAttribute('role', 'menuitem'); | ||||
|       this.tippyContent.append(item); | ||||
|     } | ||||
|  | ||||
|     // update existing tippy | ||||
|     if (this.button?._tippy) { | ||||
|       this.button._tippy.setContent(this.tippyContent); | ||||
|       return; | ||||
|     } | ||||
|  | ||||
|     // create button initially | ||||
|     const btn = document.createElement('button'); | ||||
|     btn.classList.add('overflow-menu-button', 'btn', 'tw-px-2', 'hover:tw-text-text-dark'); | ||||
|     btn.setAttribute('aria-label', window.config.i18n.more_items); | ||||
|     btn.innerHTML = octiconKebabHorizontal; | ||||
|     this.append(btn); | ||||
|     this.button = btn; | ||||
|  | ||||
|     createTippy(btn, { | ||||
|       trigger: 'click', | ||||
|       hideOnClick: true, | ||||
|       interactive: true, | ||||
|       placement: 'bottom-end', | ||||
|       role: 'menu', | ||||
|       content: this.tippyContent, | ||||
|       onShow: () => { // FIXME: onShown doesn't work (never be called) | ||||
|         setTimeout(() => { | ||||
|           this.tippyContent.focus(); | ||||
|         }, 0); | ||||
|       }, | ||||
|     }); | ||||
|   }); | ||||
|  | ||||
|   init() { | ||||
|     // ResizeObserver triggers on initial render, so we don't manually call `updateItems` here which | ||||
|     // also avoids a full-page FOUC in Firefox that happens when `updateItems` is called too soon. | ||||
|     this.resizeObserver = new ResizeObserver((entries) => { | ||||
|       for (const entry of entries) { | ||||
|         const newWidth = entry.contentBoxSize[0].inlineSize; | ||||
|         if (newWidth !== this.lastWidth) { | ||||
|           requestAnimationFrame(() => { | ||||
|             this.updateItems(); | ||||
|           }); | ||||
|           this.lastWidth = newWidth; | ||||
|         } | ||||
|       } | ||||
|     }); | ||||
|     this.resizeObserver.observe(this); | ||||
|   } | ||||
|  | ||||
|   connectedCallback() { | ||||
|     this.setAttribute('role', 'navigation'); | ||||
|  | ||||
|     // check whether the mandatory `.overflow-menu-items` element is present initially which happens | ||||
|     // with Vue which renders differently than browsers. If it's not there, like in the case of browser | ||||
|     // template rendering, wait for its addition. | ||||
|     // The eslint rule is not sophisticated enough or aware of this problem, see | ||||
|     // https://github.com/43081j/eslint-plugin-wc/pull/130 | ||||
|     const menuItemsEl = this.querySelector('.overflow-menu-items'); // eslint-disable-line wc/no-child-traversal-in-connectedcallback | ||||
|     if (menuItemsEl) { | ||||
|       this.menuItemsEl = menuItemsEl; | ||||
|       this.init(); | ||||
|     } else { | ||||
|       this.mutationObserver = new MutationObserver((mutations) => { | ||||
|         for (const mutation of mutations) { | ||||
|           for (const node of mutation.addedNodes) { | ||||
|             if (!isDocumentFragmentOrElementNode(node)) continue; | ||||
|             if (node.classList.contains('overflow-menu-items')) { | ||||
|               this.menuItemsEl = node; | ||||
|               this.mutationObserver?.disconnect(); | ||||
|               this.init(); | ||||
|             } | ||||
|           } | ||||
|         } | ||||
|       }); | ||||
|       this.mutationObserver.observe(this, {childList: true}); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   disconnectedCallback() { | ||||
|     this.mutationObserver?.disconnect(); | ||||
|     this.resizeObserver?.disconnect(); | ||||
|   } | ||||
| }); | ||||
| @@ -1,6 +0,0 @@ | ||||
| import '@webcomponents/custom-elements'; // polyfill for some browsers like PaleMoon | ||||
| import './polyfill.js'; | ||||
|  | ||||
| import '@github/relative-time-element'; | ||||
| import './GiteaOriginUrl.js'; | ||||
| import './GiteaAbsoluteDate.js'; | ||||
		Reference in New Issue
	
	Block a user