Merge branch 'bugs/fix-resize-10'

Author: kuy

examples/content/app.js

@@ -38,16 +38,17 @@ class App extends Component {
         <h1>Content Example</h1>
 
         <p>
-          If you provide a <Origin className="target custom" content="This is a custom content.">custom</Origin> content of tooltip via props,
-          it will be used instead of a <Origin className="target default">default</Origin> content of Tooltip component.
+          If you provide a <Origin className="target custom" content="This is a custom content.">custom</Origin> content via Origin component's prop,
+          it will overwrite a <Origin className="target default">default</Origin> content of Tooltip component.
         </p>
 
         <p>
           What time is it <Origin className="target" place="right" onHover={this.handleHover} onLeave={this.handleLeave}>now</Origin>?
         </p>
 
         <Tooltip>
-          This is a default content.
+          This is a default content.<br />
+          It's a second line.
         </Tooltip>
       </div>
     );

src/tooltip.js

@@ -1,4 +1,5 @@
 import React, { Component, PropTypes } from 'react';
+import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import { adjust, resolve } from './utils';
 import * as styles from './styles';
@@ -38,60 +39,62 @@ class Tooltip extends Component {
 
   constructor(props) {
     super(props);
-
     this.state = {};
   }
 
-  componentWillUpdate(nextProps) {
-    const { el, place } = nextProps;
-    if (el && (this.props.el != el || this.props.place !== place)) {
+  componentWillReceiveProps(nextProps) {
+    const { el, place, content } = nextProps;
+    if (el && (this.props.el != el || this.props.place !== place || this.props.content !== content)) {
       this.updatePosition(nextProps);
     }
   }
 
-  componentDidUpdate(prevProps) {
-    const { content } = prevProps;
-    if (this.props.content !== content) {
-      this.updatePosition(this.props);
-    }
+  updatePosition(props) {
+    // Setup hidden DOM element to determine size of the content
+    const content = this.children(props);
+    ReactDOM.render(<div>{content}</div>, this.refs.shadow, () => {
+      const state = adjust(this.refs.shadow, props);
+      this.setState(state);
+    });
   }
 
-  updatePosition(props) {
-    const state = adjust(this.refs.tooltip, props);
-    this.setState(state);
+  children(props) {
+    if (typeof props === 'undefined') {
+      props = this.props;
+    }
+    const { content } = props;
+    return content ? content : props.children;
   }
 
   render () {
-    const { content, onHover, onLeave } = this.props;
+    const { onHover, onLeave } = this.props;
     const { place, offset } = this.state;
+    const content = this.children();
     const visibility = (this.props.el && this.props.show) ? 'visible' : 'hidden';
     const style = {
       base: { ...styles.base, ...themes.simple.base, visibility, ...offset },
       content: { ...styles.content, ...themes.simple.content },
       arrow: { ...styles.arrow },
       border: { ...styles.border.base, ...styles.border[place], ...themes.simple.border },
     };
-
-    let children;
-    if (content) {
-      children = content;
-    } else {
-      children = this.props.children;
-    }
+    style.shadow = { ...style.content, visibility: 'hidden', position: 'absolute' };
 
     return (
-      <div
-        ref="tooltip"
-        style={style.base}
-        onMouseEnter={onHover}
-        onMouseLeave={onLeave}
-      >
-        <div ref="content" style={style.content}>
-          {children}
-        </div>
-        <div style={style.arrow} key={`a-${place}`}>
-          <span ref="border" style={style.border} key={`b-${place}`}></span>
+      <div>
+        <div
+          ref="tooltip"
+          style={style.base}
+          onMouseEnter={onHover}
+          onMouseLeave={onLeave}
+        >
+          <div ref="content" style={style.content}>
+            {content}
+          </div>
+          <div style={style.arrow} key={`a-${place}`}>
+            <span ref="border" style={style.border} key={`b-${place}`}></span>
+          </div>
         </div>
+        <div ref="shadow" style={style.shadow} />
       </div>
     );
   }

src/utils.js

@@ -1,3 +1,8 @@
+function dimension(el) {
+  const rect = el.getBoundingClientRect();
+  return { width: rect.width, height: rect.height };
+}
+
 /**
  * Returns a position of given DOM element.
  *
@@ -25,29 +30,29 @@ export function position(el) {
  * Calculates a position of the tooltip.
  *
  * @param {string} place - 'top', 'right', 'bottom', or 'left'.
- * @param {Object} tooltip - DOM element.
+ * @param {Object} content - DOM element that contains a content.
  * @param {Object} origin - DOM element.
  * @return {Object} contains 'top', 'left', and extra keys.
  */
-export function placement(place, tooltip, origin) {
+export function placement(place, content, origin) {
   const gap = 12;
-  const tip = position(tooltip);
+  const dim = dimension(content);
   const pos = position(origin);
 
-  let offset = { width: tip.width, height: tip.height };
+  let offset = { width: dim.width, height: dim.height };
 
   switch(place) {
   case 'top': case 'bottom':
-    offset.left = `${pos.left + (pos.width * 0.5) - (tip.width * 0.5)}px`;
+    offset.left = `${pos.left + (pos.width * 0.5) - (dim.width * 0.5)}px`;
     break;
   case 'left': case 'right':
-    offset.top = `${pos.top + (pos.height * 0.5) - (tip.height * 0.5)}px`;
+    offset.top = `${pos.top + (pos.height * 0.5) - (dim.height * 0.5)}px`;
     break;
   }
 
   switch(place) {
   case 'top':
-    offset.top = `${pos.top - tip.height - gap}px`;
+    offset.top = `${pos.top - dim.height - gap}px`;
     break;
   case 'right':
     offset.left = `${pos.right + gap}px`;
@@ -56,7 +61,7 @@ export function placement(place, tooltip, origin) {
     offset.top = `${pos.top + pos.height + gap}px`;
     break;
   case 'left':
-    offset.left = `${pos.left - tip.width - gap}px`;
+    offset.left = `${pos.left - dim.width - gap}px`;
     break;
   }
 
@@ -185,12 +190,11 @@ export function overDirs(tip, el) {
 /**
  * Places and adjusts a tooltip.
  *
- * @param {Object} tooltip - DOM element.
- * @param {string|Array} place
- * @param {Object} origin - DOM element.
+ * @param {Object} content - DOM element which contans a content.
+ * @param {Object} props
  * @return {Object} 'offset': style data to locate, 'place': final direction of the tooltip
  */
-export function adjust(tooltip, props) {
+export function adjust(content, props) {
   const { el: origin, auto, within } = props;
   let { place } = props;
   if (typeof place === 'string') {
@@ -204,7 +208,7 @@ export function adjust(tooltip, props) {
   const tries = [ ...place ];
   while (0 < tries.length) {
     current = tries.shift();
-    pos = placement(current, tooltip, origin);
+    pos = placement(current, content, origin);
     if (typeof first === 'undefined') {
       first = { offset: pos, place: current };
     }

tests/feature/content.js

@@ -38,7 +38,7 @@ describe('Content Example', () => {
 
       const tooltip = firstComponent(tree, Tooltip.WrappedComponent).refs.tooltip;
       assert(getStyleValue(tooltip, 'visibility') === 'visible');
-      assert(tooltip.innerText === 'This is a default content.\n', 'should be default content');
+      assert(tooltip.innerText === "This is a default content.\nIt's a second line.\n", 'should be default content');
     });
   });
 
@@ -52,6 +52,25 @@ describe('Content Example', () => {
       assert(getStyleValue(tooltip, 'visibility') === 'visible');
       assert(tooltip.innerText === 'This is a custom content.\n', 'should be custom content');
     });
+
+    it('should be resized', () => {
+      // Mouseover on custom
+      const custom = firstComponent(tree, Origin.WrappedComponent, { className: 'target custom' }).refs.wrapper;
+      TestUtils.Simulate.mouseEnter(custom);
+
+      const tooltip = firstComponent(tree, Tooltip.WrappedComponent).refs.tooltip;
+      const customPos = position(tooltip);
+      TestUtils.Simulate.mouseLeave(custom);
+
+      // Mouseover on default
+      const origin = firstComponent(tree, Origin.WrappedComponent, { className: 'target default' }).refs.wrapper;
+      TestUtils.Simulate.mouseEnter(origin);
+
+      const defaultPos = position(tooltip);
+      TestUtils.Simulate.mouseLeave(origin);
+ 
+      assert(customPos.height < defaultPos.height, "default's height is higher than custom's height");
+    });
   });
 
   describe('continuous updating content', () => {