Use a general approach to show tooltip, fix temporary tooltip bug (#23574)

## TLDR

* Improve performance: lazy creating the tippy instances.
* Transparently support all "tooltip" elements, no need to call
`initTooltip` again and again.
* Fix a temporary tooltip re-entrance bug, which causes showing temp
content forever.
* Upgrade vue3-calendar-heatmap to 2.0.2 with lazy tippy init
(initHeatmap time decreases from 100ms to 50ms)

## Details

### The performance

Creating a lot of tippy tooltip instances is expensive. This PR doesn't
create all tippy tooltip instances, instead, it only adds "mouseover"
event listener to necessary elements, and then switches to the tippy
tooltip

### The general approach for all tooltips

Before, dynamically generated tooltips need to be called with
`initTooltip`.

After, use MutationObserver to:

* Attach the event listeners to newly created tooltip elements, work for
Vue (easier than before)
* Catch changed attributes and update the tooltip content (better than
before)

It does help a lot, eg:

1a4efa0ee9/web_src/js/components/PullRequestMergeForm.vue (L33-L36)

### Temporary tooltip re-entrance bug

To reproduce, on try.gitea.io, click the "copy clone url" quickly, then
the tooltip will be "Copied!" forever.

After this PR, with the help of `attachTippyTooltip`, the tooltip
content could be reset to the default correctly.

### Other changes

* `data-tooltip-content` is preferred from now on, the old
`data-content` may cause conflicts with other modules.
* `data-placement` was only used for tooltip, so it's renamed to
`data-tooltip-placement`, and removed from `createTippy`.
This commit is contained in:
wxiaoguang 2023-03-23 17:56:15 +08:00 committed by GitHub
parent e7f0bcf884
commit 9be90a5875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 111 additions and 64 deletions

12
package-lock.json generated
View File

@ -43,7 +43,7 @@
"vue": "3.2.47", "vue": "3.2.47",
"vue-bar-graph": "2.0.0", "vue-bar-graph": "2.0.0",
"vue-loader": "17.0.1", "vue-loader": "17.0.1",
"vue3-calendar-heatmap": "2.0.0", "vue3-calendar-heatmap": "2.0.2",
"webpack": "5.76.2", "webpack": "5.76.2",
"webpack-cli": "5.0.1", "webpack-cli": "5.0.1",
"workbox-routing": "6.5.4", "workbox-routing": "6.5.4",
@ -9425,17 +9425,17 @@
} }
}, },
"node_modules/vue3-calendar-heatmap": { "node_modules/vue3-calendar-heatmap": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/vue3-calendar-heatmap/-/vue3-calendar-heatmap-2.0.0.tgz", "resolved": "https://registry.npmjs.org/vue3-calendar-heatmap/-/vue3-calendar-heatmap-2.0.2.tgz",
"integrity": "sha512-BchyC33WiZryYatFINj3LWqgyE6X82Huzf7abA23tsF/IbaRZVwZzie8SmGaYvezEBiPXhJogQ3dtxIuXFjkBw==", "integrity": "sha512-ev0rNbOGhzX1YcNhFE0xSmJQUzK96wubBLdzaUKtKf0GhjYE8QAwzmWYcYrugolLgDj2vKzHQ/9gA3O9S26WOA==",
"dependencies": { "dependencies": {
"tippy.js": "^6.3.7" "tippy.js": "^6.3.7"
}, },
"engines": { "engines": {
"node": ">=12" "node": ">=16"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "^3.2.24" "vue": "^3.2.29"
} }
}, },
"node_modules/w3c-xmlserializer": { "node_modules/w3c-xmlserializer": {

View File

@ -43,7 +43,7 @@
"vue": "3.2.47", "vue": "3.2.47",
"vue-bar-graph": "2.0.0", "vue-bar-graph": "2.0.0",
"vue-loader": "17.0.1", "vue-loader": "17.0.1",
"vue3-calendar-heatmap": "2.0.0", "vue3-calendar-heatmap": "2.0.2",
"webpack": "5.76.2", "webpack": "5.76.2",
"webpack-cli": "5.0.1", "webpack-cli": "5.0.1",
"workbox-routing": "6.5.4", "workbox-routing": "6.5.4",

View File

@ -661,9 +661,9 @@
{{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}} {{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}}
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="inline field"> <div class="inline field">
<div class="ui checkbox" id="allow-edits-from-maintainers" <div class="ui checkbox tooltip" id="allow-edits-from-maintainers"
data-url="{{.Issue.Link}}" data-url="{{.Issue.Link}}"
data-prompt-tip="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}" data-tooltip-content="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
data-prompt-error="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}" data-prompt-error="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}"
> >
<label><strong>{{.locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label> <label><strong>{{.locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>

View File

@ -40,7 +40,7 @@
</div> </div>
<a class="ui segment language-stats"> <a class="ui segment language-stats">
{{range .LanguageStats}} {{range .LanguageStats}}
<div class="bar tooltip" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-placement="top" data-content={{.Language}}>&nbsp;</div> <div class="bar tooltip" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-tooltip-placement="top" data-tooltip-content={{.Language}}>&nbsp;</div>
{{end}} {{end}}
</a> </a>
{{end}} {{end}}

View File

@ -147,7 +147,6 @@
<script> <script>
import {createApp, nextTick} from 'vue'; import {createApp, nextTick} from 'vue';
import $ from 'jquery'; import $ from 'jquery';
import {initTooltip} from '../modules/tippy.js';
import {SvgIcon} from '../svg.js'; import {SvgIcon} from '../svg.js';
const {appSubUrl, assetUrlPrefix, pageData} = window.config; const {appSubUrl, assetUrlPrefix, pageData} = window.config;
@ -238,9 +237,6 @@ const sfc = {
mounted() { mounted() {
const el = document.getElementById('dashboard-repo-list'); const el = document.getElementById('dashboard-repo-list');
this.changeReposFilter(this.reposFilter); this.changeReposFilter(this.reposFilter);
for (const elTooltip of el.querySelectorAll('.tooltip')) {
initTooltip(elTooltip);
}
$(el).find('.dropdown').dropdown(); $(el).find('.dropdown').dropdown();
nextTick(() => { nextTick(() => {
this.$refs.search.focus(); this.$refs.search.focus();

View File

@ -21,7 +21,6 @@
</template> </template>
<script> <script>
import {initTooltip} from '../modules/tippy.js';
import {doLoadMoreFiles} from '../features/repo-diff.js'; import {doLoadMoreFiles} from '../features/repo-diff.js';
const {pageData} = window.config; const {pageData} = window.config;
@ -30,17 +29,6 @@ export default {
data: () => { data: () => {
return pageData.diffFileInfo; return pageData.diffFileInfo;
}, },
watch: {
fileListIsVisible(newValue) {
if (newValue === true) {
this.$nextTick(() => {
for (const el of this.$refs.root.querySelectorAll('.tooltip')) {
initTooltip(el);
}
});
}
}
},
mounted() { mounted() {
document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList); document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList);
}, },

View File

@ -1,5 +1,5 @@
<template> <template>
<div v-show="show" class="tooltip" :title="item.name"> <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"--> <!--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' : ''">
<!-- Files --> <!-- Files -->

View File

@ -5,7 +5,6 @@ import {createDropzone} from './dropzone.js';
import {initCompColorPicker} from './comp/ColorPicker.js'; import {initCompColorPicker} from './comp/ColorPicker.js';
import {showGlobalErrorMessage} from '../bootstrap.js'; import {showGlobalErrorMessage} from '../bootstrap.js';
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js'; import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
import {initTooltip} from '../modules/tippy.js';
import {svg} from '../svg.js'; import {svg} from '../svg.js';
import {hideElem, showElem, toggleElem} from '../utils/dom.js'; import {hideElem, showElem, toggleElem} from '../utils/dom.js';
@ -66,12 +65,6 @@ export function initGlobalButtonClickOnEnter() {
}); });
} }
export function initGlobalTooltips() {
for (const el of document.getElementsByClassName('tooltip')) {
initTooltip(el);
}
}
export function initGlobalCommon() { export function initGlobalCommon() {
// Undo Safari emoji glitch fix at high enough zoom levels // Undo Safari emoji glitch fix at high enough zoom levels
if (navigator.userAgent.match('Safari')) { if (navigator.userAgent.match('Safari')) {

View File

@ -30,6 +30,7 @@ export function initContextPopups() {
createTippy(this, { createTippy(this, {
content: el, content: el,
placement: 'top-start',
interactive: true, interactive: true,
interactiveBorder: 5, interactiveBorder: 5,
onShow: () => { onShow: () => {

View File

@ -3,7 +3,6 @@ import {initCompReactionSelector} from './comp/ReactionSelector.js';
import {initRepoIssueContentHistory} from './repo-issue-content.js'; import {initRepoIssueContentHistory} from './repo-issue-content.js';
import {validateTextareaNonEmpty} from './comp/EasyMDE.js'; import {validateTextareaNonEmpty} from './comp/EasyMDE.js';
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles} from './pull-view-file.js'; import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles} from './pull-view-file.js';
import {initTooltip} from '../modules/tippy.js';
const {csrfToken} = window.config; const {csrfToken} = window.config;
@ -60,10 +59,6 @@ export function initRepoDiffConversationForm() {
const $newConversationHolder = $(await $.post($form.attr('action'), formDataString)); const $newConversationHolder = $(await $.post($form.attr('action'), formDataString));
const {path, side, idx} = $newConversationHolder.data(); const {path, side, idx} = $newConversationHolder.data();
$newConversationHolder.find('.tooltip').each(function () {
initTooltip(this);
});
$form.closest('.conversation-holder').replaceWith($newConversationHolder); $form.closest('.conversation-holder').replaceWith($newConversationHolder);
if ($form.closest('tr').data('line-type') === 'same') { if ($form.closest('tr').data('line-type') === 'same') {
$(`[data-path="${path}"] a.add-code-comment[data-idx="${idx}"]`).addClass('invisible'); $(`[data-path="${path}"] a.add-code-comment[data-idx="${idx}"]`).addClass('invisible');

View File

@ -4,7 +4,7 @@ import {attachTribute} from './tribute.js';
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js'; import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
import {initEasyMDEImagePaste} from './comp/ImagePaste.js'; import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js'; import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
import {initTooltip, showTemporaryTooltip, createTippy} from '../modules/tippy.js'; import {showTemporaryTooltip, createTippy} from '../modules/tippy.js';
import {hideElem, showElem, toggleElem} from '../utils/dom.js'; import {hideElem, showElem, toggleElem} from '../utils/dom.js';
import {setFileFolding} from './file-fold.js'; import {setFileFolding} from './file-fold.js';
@ -280,10 +280,7 @@ export function initRepoPullRequestAllowMaintainerEdit() {
const $checkbox = $('#allow-edits-from-maintainers'); const $checkbox = $('#allow-edits-from-maintainers');
if (!$checkbox.length) return; if (!$checkbox.length) return;
const promptTip = $checkbox.attr('data-prompt-tip');
const promptError = $checkbox.attr('data-prompt-error'); const promptError = $checkbox.attr('data-prompt-error');
initTooltip($checkbox[0], {content: promptTip});
$checkbox.checkbox({ $checkbox.checkbox({
'onChange': () => { 'onChange': () => {
const checked = $checkbox.checkbox('is checked'); const checked = $checkbox.checkbox('is checked');

View File

@ -56,7 +56,6 @@ import {
initGlobalFormDirtyLeaveConfirm, initGlobalFormDirtyLeaveConfirm,
initGlobalLinkActions, initGlobalLinkActions,
initHeadNavbarContentToggle, initHeadNavbarContentToggle,
initGlobalTooltips,
} from './features/common-global.js'; } from './features/common-global.js';
import {initRepoTopicBar} from './features/repo-home.js'; import {initRepoTopicBar} from './features/repo-home.js';
import {initAdminEmails} from './features/admin/emails.js'; import {initAdminEmails} from './features/admin/emails.js';
@ -91,6 +90,7 @@ import {initCaptcha} from './features/captcha.js';
import {initRepositoryActionView} from './components/RepoActionView.vue'; import {initRepositoryActionView} from './components/RepoActionView.vue';
import {initAriaCheckboxPatch} from './modules/aria/checkbox.js'; import {initAriaCheckboxPatch} from './modules/aria/checkbox.js';
import {initAriaDropdownPatch} from './modules/aria/dropdown.js'; import {initAriaDropdownPatch} from './modules/aria/dropdown.js';
import {initGlobalTooltips} from './modules/tippy.js';
// Run time-critical code as soon as possible. This is safe to do because this // Run time-critical code as soon as possible. This is safe to do because this
// script appears at the end of <body> and rendered HTML is accessible at that point. // script appears at the end of <body> and rendered HTML is accessible at that point.

View File

@ -3,7 +3,6 @@ import tippy from 'tippy.js';
export function createTippy(target, opts = {}) { export function createTippy(target, opts = {}) {
const instance = tippy(target, { const instance = tippy(target, {
appendTo: document.body, appendTo: document.body,
placement: target.getAttribute('data-placement') || 'top-start',
animation: false, animation: false,
allowHTML: false, allowHTML: false,
hideOnClick: false, hideOnClick: false,
@ -25,38 +24,116 @@ export function createTippy(target, opts = {}) {
return instance; return instance;
} }
export function initTooltip(el, props = {}) { /**
const content = el.getAttribute('data-content') || props.content; * Attach a tooltip tippy to the given target element.
* If the target element already has a tooltip tippy attached, the tooltip will be updated with the new content.
* If the target element has no content, then no tooltip will be attached, and it returns null.
*
* Note: "tooltip" doesn't equal to "tippy". "tooltip" means a auto-popup content, it just uses tippy as the implementation.
*
* @param target {HTMLElement}
* @param content {null|string}
* @returns {null|tippy}
*/
function attachTooltip(target, content = null) {
content = content ?? getTooltipContent(target);
if (!content) return null; if (!content) return null;
if (!el.hasAttribute('aria-label')) el.setAttribute('aria-label', content);
return createTippy(el, { const props = {
content, content,
delay: 100, delay: 100,
role: 'tooltip', role: 'tooltip',
...(el.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}), placement: target.getAttribute('data-tooltip-placement') || 'top-start',
...props, ...(target.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}),
};
if (!target._tippy) {
createTippy(target, props);
} else {
target._tippy.setProps(props);
}
return target._tippy;
}
/**
* Creating tooltip tippy instance is expensive, so we only create it when the user hovers over the element
* According to https://www.w3.org/TR/DOM-Level-3-Events/#events-mouseevent-event-order , mouseover event is fired before mouseenter event
* Some old browsers like Pale Moon doesn't support "mouseenter(capture)"
* The tippy by default uses "mouseenter" event to show, so we use "mouseover" event to switch to tippy
* @param e {Event}
*/
function lazyTooltipOnMouseHover(e) {
e.target.removeEventListener('mouseover', lazyTooltipOnMouseHover, true);
attachTooltip(this);
}
function getTooltipContent(target) {
// prefer to always use the "[data-tooltip-content]" attribute
// for backward compatibility, we also support the ".tooltip[data-content]" attribute
// in next PR, refactor all the ".tooltip[data-content]" to "[data-tooltip-content]"
let content = target.getAttribute('data-tooltip-content');
if (!content && target.classList.contains('tooltip')) {
content = target.getAttribute('data-content');
}
return content;
}
/**
* Activate the tooltip for all children elements
* And if the element has no aria-label, use the tooltip content as aria-label
* @param target {HTMLElement}
*/
function attachChildrenLazyTooltip(target) {
// the selector must match the logic in getTippyTooltipContent
for (const el of target.querySelectorAll('[data-tooltip-content], .tooltip[data-content]')) {
el.addEventListener('mouseover', lazyTooltipOnMouseHover, true);
// meanwhile, if the element has no aria-label, use the tooltip content as aria-label
if (!el.hasAttribute('aria-label')) {
const content = getTooltipContent(el);
if (content) {
el.setAttribute('aria-label', content);
}
}
}
}
export function initGlobalTooltips() {
// use MutationObserver to detect new elements added to the DOM, or attributes changed
const observer = new MutationObserver((mutationList) => {
for (const mutation of mutationList) {
if (mutation.type === 'childList') {
// mainly for Vue components and AJAX rendered elements
for (const el of mutation.addedNodes) {
// handle all "tooltip" elements in added nodes which have 'querySelectorAll' method, skip non-related nodes (eg: "#text")
if ('querySelectorAll' in el) {
attachChildrenLazyTooltip(el);
}
}
} else if (mutation.type === 'attributes') {
// sync the tooltip content if the attributes change
attachTooltip(mutation.target);
}
}
}); });
observer.observe(document, {
subtree: true,
childList: true,
attributeFilter: ['data-tooltip-content', 'data-content'],
});
attachChildrenLazyTooltip(document.documentElement);
} }
export function showTemporaryTooltip(target, content) { export function showTemporaryTooltip(target, content) {
let tippy, oldContent; const tippy = target._tippy ?? attachTooltip(target, content);
if (target._tippy) {
tippy = target._tippy;
oldContent = tippy.props.content;
} else {
tippy = initTooltip(target, {content});
}
tippy.setContent(content); tippy.setContent(content);
if (!tippy.state.isShown) tippy.show(); if (!tippy.state.isShown) tippy.show();
tippy.setProps({ tippy.setProps({
onHidden: (tippy) => { onHidden: (tippy) => {
if (oldContent) { // reset the default tooltip content, if no default, then this temporary tooltip could be destroyed
tippy.setContent(oldContent); if (!attachTooltip(target)) {
tippy.setProps({onHidden: undefined});
} else {
tippy.destroy(); tippy.destroy();
// after destroy, the `_tippy` is detached, it can't do "setProps (etc...)" anymore
} }
}, },
}); });