support following area tags
This commit is contained in:
parent
2c600786c8
commit
14241ca842
3 changed files with 104 additions and 10 deletions
|
@ -3,17 +3,18 @@ import Hint from './hint';
|
|||
import * as dom from 'shared/utils/dom';
|
||||
|
||||
const TARGET_SELECTOR = [
|
||||
'a', 'button', 'input', 'textarea',
|
||||
'a', 'button', 'input', 'textarea', 'area',
|
||||
'[contenteditable=true]', '[contenteditable=""]', '[tabindex]'
|
||||
].join(',');
|
||||
|
||||
|
||||
const inViewport = (win, element, viewSize, framePosition) => {
|
||||
let {
|
||||
top, left, bottom, right
|
||||
} = element.getBoundingClientRect();
|
||||
let doc = win.doc;
|
||||
let frameWidth = win.innerWidth || doc.documentElement.clientWidth;
|
||||
let frameHeight = win.innerHeight || doc.documentElement.clientHeight;
|
||||
} = dom.viewportRect(element);
|
||||
let doc = win.document;
|
||||
let frameWidth = doc.documentElement.clientWidth;
|
||||
let frameHeight = doc.documentElement.clientHeight;
|
||||
|
||||
if (right < 0 || bottom < 0 || top > frameHeight || left > frameWidth) {
|
||||
// out of frame
|
||||
|
@ -115,6 +116,7 @@ export default class Follow {
|
|||
let element = hint.target;
|
||||
switch (element.tagName.toLowerCase()) {
|
||||
case 'a':
|
||||
case 'area':
|
||||
return this.openLink(element);
|
||||
case 'input':
|
||||
switch (element.type) {
|
||||
|
@ -162,7 +164,9 @@ export default class Follow {
|
|||
let all = win.document.querySelectorAll(TARGET_SELECTOR);
|
||||
let filtered = Array.prototype.filter.call(all, (element) => {
|
||||
let style = win.getComputedStyle(element);
|
||||
return style.display !== 'none' &&
|
||||
|
||||
// AREA's 'display' in Browser style is 'none'
|
||||
return (element.tagName === 'AREA' || style.display !== 'none') &&
|
||||
style.visibility !== 'hidden' &&
|
||||
element.type !== 'hidden' &&
|
||||
element.offsetHeight > 0 &&
|
||||
|
|
|
@ -1,4 +1,18 @@
|
|||
import './hint.css';
|
||||
import * as dom from 'shared/utils/dom';
|
||||
|
||||
const hintPosition = (element) => {
|
||||
let { left, top, right, bottom } = dom.viewportRect(element);
|
||||
|
||||
if (element.tagName !== 'AREA') {
|
||||
return { x: left, y: top };
|
||||
}
|
||||
|
||||
return {
|
||||
x: (left + right) / 2,
|
||||
y: (top + bottom) / 2,
|
||||
};
|
||||
};
|
||||
|
||||
export default class Hint {
|
||||
constructor(target, tag) {
|
||||
|
@ -9,14 +23,14 @@ export default class Hint {
|
|||
this.target = target;
|
||||
|
||||
let doc = target.ownerDocument;
|
||||
let { top, left } = target.getBoundingClientRect();
|
||||
let { x, y } = hintPosition(target);
|
||||
let { scrollX, scrollY } = window;
|
||||
|
||||
this.element = doc.createElement('span');
|
||||
this.element.className = 'vimvixen-hint';
|
||||
this.element.textContent = tag;
|
||||
this.element.style.left = left + scrollX + 'px';
|
||||
this.element.style.top = top + scrollY + 'px';
|
||||
this.element.style.left = x + scrollX + 'px';
|
||||
this.element.style.top = y + scrollY + 'px';
|
||||
|
||||
this.show();
|
||||
doc.body.append(this.element);
|
||||
|
|
Reference in a new issue