mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	Replace coloris with vanilla-colorful (#30201)
Found [a better color picker](https://github.com/web-padawan/vanilla-colorful) that [does not rely](https://github.com/mdbassit/Coloris/issues/139) on `querySelectorAll` or a global shared instance, and is also around a third of the size of the previous one. The popover is handled by tippy.js for which I introduced a new "bare" theme and it uses a new sibling-based mechanism which should prove useful later to create tippy popovers via HTML only. <img width="846" alt="Screenshot 2024-03-31 at 04 03 38" src="https://github.com/go-gitea/gitea/assets/115237/7639b911-a2d7-4f5c-bffd-a9d84561e747">
This commit is contained in:
		| @@ -1,31 +1,66 @@ | ||||
| export async function initColorPickers(selector = '.js-color-picker-input input', opts = {}) { | ||||
|   const inputEls = document.querySelectorAll(selector); | ||||
|   if (!inputEls.length) return; | ||||
| import {createTippy} from '../modules/tippy.js'; | ||||
|  | ||||
|   const [{coloris, init}] = await Promise.all([ | ||||
|     import(/* webpackChunkName: "colorpicker" */'@melloware/coloris'), | ||||
| export async function initColorPickers() { | ||||
|   const els = document.getElementsByClassName('js-color-picker-input'); | ||||
|   if (!els.length) return; | ||||
|  | ||||
|   await Promise.all([ | ||||
|     import(/* webpackChunkName: "colorpicker" */'vanilla-colorful/hex-color-picker.js'), | ||||
|     import(/* webpackChunkName: "colorpicker" */'../../css/features/colorpicker.css'), | ||||
|   ]); | ||||
|  | ||||
|   init(); | ||||
|   coloris({ | ||||
|     el: selector, | ||||
|     alpha: false, | ||||
|     focusInput: true, | ||||
|     selectInput: false, | ||||
|     ...opts, | ||||
|   }); | ||||
|  | ||||
|   for (const inputEl of inputEls) { | ||||
|     const parent = inputEl.closest('.js-color-picker-input'); | ||||
|     // prevent tabbing on the color preview `button` inside the input | ||||
|     parent.querySelector('button').tabIndex = -1; | ||||
|     // init precolors | ||||
|     for (const el of parent.querySelectorAll('.precolors .color')) { | ||||
|       el.addEventListener('click', (e) => { | ||||
|         inputEl.value = e.target.getAttribute('data-color-hex'); | ||||
|         inputEl.dispatchEvent(new Event('input', {bubbles: true})); | ||||
|       }); | ||||
|     } | ||||
|   for (const el of els) { | ||||
|     initPicker(el); | ||||
|   } | ||||
| } | ||||
|  | ||||
| function updateSquare(el, newValue) { | ||||
|   el.style.color = /#[0-9a-f]{6}/i.test(newValue) ? newValue : 'transparent'; | ||||
| } | ||||
|  | ||||
| function updatePicker(el, newValue) { | ||||
|   el.setAttribute('color', newValue); | ||||
| } | ||||
|  | ||||
| function initPicker(el) { | ||||
|   const input = el.querySelector('input'); | ||||
|  | ||||
|   const square = document.createElement('div'); | ||||
|   square.classList.add('preview-square'); | ||||
|   updateSquare(square, input.value); | ||||
|   el.append(square); | ||||
|  | ||||
|   const picker = document.createElement('hex-color-picker'); | ||||
|   picker.addEventListener('color-changed', (e) => { | ||||
|     input.value = e.detail.value; | ||||
|     input.focus(); | ||||
|     updateSquare(square, e.detail.value); | ||||
|   }); | ||||
|  | ||||
|   input.addEventListener('input', (e) => { | ||||
|     updateSquare(square, e.target.value); | ||||
|     updatePicker(picker, e.target.value); | ||||
|   }); | ||||
|  | ||||
|   createTippy(input, { | ||||
|     trigger: 'focus click', | ||||
|     theme: 'bare', | ||||
|     hideOnClick: true, | ||||
|     content: picker, | ||||
|     placement: 'bottom-start', | ||||
|     interactive: true, | ||||
|     onShow() { | ||||
|       updatePicker(picker, input.value); | ||||
|     }, | ||||
|   }); | ||||
|  | ||||
|   // init precolors | ||||
|   for (const colorEl of el.querySelectorAll('.precolors .color')) { | ||||
|     colorEl.addEventListener('click', (e) => { | ||||
|       const newValue = e.target.getAttribute('data-color-hex'); | ||||
|       input.value = newValue; | ||||
|       input.dispatchEvent(new Event('input', {bubbles: true})); | ||||
|       updateSquare(square, newValue); | ||||
|     }); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -3,11 +3,12 @@ import {isDocumentFragmentOrElementNode} from '../utils/dom.js'; | ||||
| import {formatDatetime} from '../utils/time.js'; | ||||
|  | ||||
| const visibleInstances = new Set(); | ||||
| const arrowSvg = `<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>`; | ||||
|  | ||||
| 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, role, theme, ...other} = opts; | ||||
|   const {onHide, onShow, onDestroy, role, theme, arrow, ...other} = opts; | ||||
|  | ||||
|   const instance = tippy(target, { | ||||
|     appendTo: document.body, | ||||
| @@ -35,9 +36,9 @@ export function createTippy(target, opts = {}) { | ||||
|       visibleInstances.add(instance); | ||||
|       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>`, | ||||
|     arrow: arrow || (theme === 'bare' ? false : arrowSvg), | ||||
|     role: role || 'menu', // HTML role attribute | ||||
|     theme: theme || role || 'menu', // CSS theme, either "tooltip", "menu" or "box-with-header" | ||||
|     theme: theme || role || 'menu', // CSS theme, either "tooltip", "menu", "box-with-header" or "bare" | ||||
|     plugins: [followCursor], | ||||
|     ...other, | ||||
|   }); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user