Merge pull request #123 from ueokande/64-follow-area-tags

follow area tags

8 files changed, 44 insertions, 55 deletions

diff --git a/src/content/components/common/follow.js b/src/content/components/common/follow.js
index 4eeaaa2..83aeb0a 100644
--- a/src/content/components/common/follow.js
+++ b/src/content/components/common/follow.js
@@ -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
@@ -39,9 +40,6 @@ export default class Follow {
     messages.onMessage(this.onMessage.bind(this));
   }
 
-  update() {
-  }
-
   key(key) {
     if (Object.keys(this.hints).length === 0) {
       return false;
@@ -118,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) {
@@ -165,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 &&
diff --git a/src/content/components/common/hint.js b/src/content/components/common/hint.js
index cc46fd6..9ef9eba 100644
--- a/src/content/components/common/hint.js
+++ b/src/content/components/common/hint.js
@@ -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);
diff --git a/src/content/components/common/index.js b/src/content/components/common/index.js
index 5f5531b..4c2c1df 100644
--- a/src/content/components/common/index.js
+++ b/src/content/components/common/index.js
@@ -14,21 +14,12 @@ export default class Common {
     input.onKey(key => keymapper.key(key));
 
     this.store = store;
-    this.children = [
-      follow,
-      input,
-      keymapper,
-    ];
 
     this.reloadSettings();
 
     messages.onMessage(this.onMessage.bind(this));
   }
 
-  update() {
-    this.children.forEach(c => c.update());
-  }
-
   onMessage(message) {
     switch (message.type) {
     case messages.SETTINGS_CHANGED:
diff --git a/src/content/components/common/input.js b/src/content/components/common/input.js
index ef5af29..8b1d35d 100644
--- a/src/content/components/common/input.js
+++ b/src/content/components/common/input.js
@@ -28,9 +28,6 @@ export default class InputComponent {
     target.addEventListener('keyup', this.onKeyUp.bind(this));
   }
 
-  update() {
-  }
-
   onKey(cb) {
     this.onKeyListeners.push(cb);
   }
diff --git a/src/content/components/common/keymapper.js b/src/content/components/common/keymapper.js
index 44d8212..1da3c0d 100644
--- a/src/content/components/common/keymapper.js
+++ b/src/content/components/common/keymapper.js
@@ -7,9 +7,6 @@ export default class KeymapperComponent {
     this.store = store;
   }
 
-  update() {
-  }
-
   key(key) {
     this.store.dispatch(inputActions.keyPress(key));
 
diff --git a/src/content/components/frame-content.js b/src/content/components/frame-content.js
index 46786d2..ca999ba 100644
--- a/src/content/components/frame-content.js
+++ b/src/content/components/frame-content.js
@@ -1,16 +1,3 @@
 import CommonComponent from './common';
 
-export default class FrameContent {
-
-  constructor(win, store) {
-    this.children = [new CommonComponent(win, store)];
-  }
-
-  update() {
-    this.children.forEach(c => c.update());
-  }
-
-  onMessage(message, sender) {
-    this.children.forEach(c => c.onMessage(message, sender));
-  }
-}
+export default CommonComponent;
diff --git a/src/content/components/top-content/follow-controller.js b/src/content/components/top-content/follow-controller.js
index 7570cf8..38869e6 100644
--- a/src/content/components/top-content/follow-controller.js
+++ b/src/content/components/top-content/follow-controller.js
@@ -1,4 +1,4 @@
-import * as followActions from 'content/actions/follow';
+import * as followControllerActions from 'content/actions/follow-controller';
 import messages from 'shared/messages';
 import HintKeyProducer from 'content/hint-key-producer';
 
@@ -19,12 +19,17 @@ export default class FollowController {
     this.producer = null;
 
     messages.onMessage(this.onMessage.bind(this));
+
+    store.subscribe(() => {
+      this.update();
+    });
   }
 
   onMessage(message, sender) {
     switch (message.type) {
     case messages.FOLLOW_START:
-      return this.store.dispatch(followActions.enable(message.newTab));
+      return this.store.dispatch(
+        followControllerActions.enable(message.newTab));
     case messages.FOLLOW_RESPONSE_COUNT_TARGETS:
       return this.create(message.count, sender);
     case messages.FOLLOW_KEY_PRESS:
@@ -34,7 +39,7 @@ export default class FollowController {
 
   update() {
     let prevState = this.state;
-    this.state = this.store.getState().follow;
+    this.state = this.store.getState().followController;
 
     if (!prevState.enabled && this.state.enabled) {
       this.count();
@@ -49,7 +54,7 @@ export default class FollowController {
     let shown = this.keys.filter(key => key.startsWith(this.state.keys));
     if (shown.length === 1) {
       this.activate();
-      this.store.dispatch(followActions.disable());
+      this.store.dispatch(followControllerActions.disable());
     }
 
     broadcastMessage(this.win, {
@@ -69,18 +74,18 @@ export default class FollowController {
     switch (key) {
     case 'Enter':
       this.activate();
-      this.store.dispatch(followActions.disable());
+      this.store.dispatch(followControllerActions.disable());
       break;
     case 'Escape':
-      this.store.dispatch(followActions.disable());
+      this.store.dispatch(followControllerActions.disable());
       break;
     case 'Backspace':
     case 'Delete':
-      this.store.dispatch(followActions.backspace());
+      this.store.dispatch(followControllerActions.backspace());
       break;
     default:
       if (DEFAULT_HINT_CHARSET.includes(key)) {
-        this.store.dispatch(followActions.keyPress(key));
+        this.store.dispatch(followControllerActions.keyPress(key));
       }
       break;
     }
diff --git a/src/content/components/top-content/index.js b/src/content/components/top-content/index.js
index c4a8461..f6afbfa 100644
--- a/src/content/components/top-content/index.js
+++ b/src/content/components/top-content/index.js
@@ -9,13 +9,12 @@ export default class TopContent {
 
   constructor(win, store) {
     this.win = win;
-    this.children = [
-      new CommonComponent(win, store),
-      new FollowController(win, store),
-    ];
     this.store = store;
     this.prevBlacklist = undefined;
 
+    new CommonComponent(win, store); // eslint-disable-line no-new
+    new FollowController(win, store); // eslint-disable-line no-new
+
     // TODO make component
     consoleFrames.initialize(this.win.document);
 
@@ -28,8 +27,6 @@ export default class TopContent {
       this.disableIfBlack(blacklist);
       this.prevBlacklist = blacklist;
     }
-
-    this.children.forEach(c => c.update());
   }
 
   disableIfBlack(blacklist) {