diff --git a/examples/formError.js b/examples/formError.js index 02c4487..762ca0d 100644 --- a/examples/formError.js +++ b/examples/formError.js @@ -1,44 +1,43 @@ -'use strict'; import React from 'react'; import ReactDOM from 'react-dom'; import Tooltip from 'rc-tooltip'; import 'rc-tooltip/assets/bootstrap.less'; -var Test = React.createClass({ +const Test = React.createClass({ getInitialState() { return { - visible: false + visible: false, }; }, - handleDestroy(){ + handleDestroy() { this.setState({ - destroy:true + destroy: true, }); }, - handleChange(e){ + handleChange(e) { this.setState({ - visible:!e.target.value + visible: !e.target.value, }); }, render() { - if(this.state.destroy){ + if (this.state.destroy) { return null; } - return
+ return (
required!}>
-
; - } +
); + }, }); -ReactDOM.render(, document.getElementById("__react-content")); +ReactDOM.render(, document.getElementById('__react-content')); diff --git a/examples/handleVisibleChange.js b/examples/handleVisibleChange.js index b4232d9..8427175 100644 --- a/examples/handleVisibleChange.js +++ b/examples/handleVisibleChange.js @@ -1,31 +1,34 @@ -'use strict'; import React from 'react'; import ReactDOM from 'react-dom'; import Tooltip from 'rc-tooltip'; import 'rc-tooltip/assets/bootstrap.less'; -var Test = React.createClass({ +function preventDefault(e) { + e.preventDefault(); +} + +const Test = React.createClass({ getInitialState() { return { - visible: false + visible: false, }; }, handleVisibleChange(visible) { this.setState({ - visible: visible + visible: visible, }); }, - handleDestroy(){ + handleDestroy() { this.setState({ - destroy:true + destroy: true, }); }, render() { - if(this.state.destroy){ + if (this.state.destroy) { return null; } - return
+ return (
i am a tooltip}> - trigger + trigger
-
; - } +
); + }, }); -function preventDefault(e) { - e.preventDefault(); -} - -ReactDOM.render(, document.getElementById("__react-content")); +ReactDOM.render(, document.getElementById('__react-content')); diff --git a/examples/placement.js b/examples/placement.js index 23acff7..368ec30 100644 --- a/examples/placement.js +++ b/examples/placement.js @@ -1,13 +1,10 @@ -'use strict'; import React from 'react'; import ReactDOM from 'react-dom'; import Tooltip from 'rc-tooltip'; import 'rc-tooltip/assets/bootstrap.less'; const text = 提示文字; - -var A = (props)=> { - return { marginRight: '1em', marginBottom: '1em', borderRadius: '6px', - }}/> }; -var Test = React.createClass({ +const Test = React.createClass({ render() { - return
+ return (; - } +
); + }, }); -function preventDefault(e) { - e.preventDefault(); -} - -ReactDOM.render(, document.getElementById("__react-content")); +ReactDOM.render(, document.getElementById('__react-content')); diff --git a/examples/simple.js b/examples/simple.js index 5580532..86a0d74 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -1,4 +1,3 @@ -'use strict'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -9,15 +8,15 @@ import assign from 'object-assign'; // do not use rc-tooltip/lib/placements import placements from 'rc-tooltip/src/placements'; -var Test = React.createClass({ +const Test = React.createClass({ getInitialState() { - const placement='right'; + const placement = 'right'; const offset = placements[placement].offset; return { - destroyTooltipOnHide:false, + destroyTooltipOnHide: false, placement: placement, trigger: { - hover: 1 + hover: 1, }, offsetX: offset[0], offsetY: offset[1], @@ -35,66 +34,66 @@ var Test = React.createClass({ onTransitionChange(e) { this.setState({ - transitionName: e.target.checked ? e.target.value : '' + transitionName: e.target.checked ? e.target.value : '', }); }, onTriggerChange(e) { - var trigger = assign({}, this.state.trigger); + const trigger = assign({}, this.state.trigger); if (e.target.checked) { trigger[e.target.value] = 1; } else { delete trigger[e.target.value]; } this.setState({ - trigger: trigger + trigger: trigger, }); }, onOffsetXChange(e) { - var targetValue = e.target.value; + const targetValue = e.target.value; this.setState({ offsetX: targetValue ? targetValue : undefined, }); }, onOffsetYChange(e) { - var targetValue = e.target.value; + const targetValue = e.target.value; this.setState({ offsetY: targetValue ? targetValue : undefined, }); }, - preventDefault(e) { - e.preventDefault(); - }, - onVisibleChange(visible) { console.log('tooltip', visible); }, onDestroyCheck() { this.setState({ - destroyTooltipOnHide: !this.state.destroyTooltipOnHide + destroyTooltipOnHide: !this.state.destroyTooltipOnHide, }); }, + preventDefault(e) { + e.preventDefault(); + }, + render() { - var state = this.state; - var trigger = state.trigger; - return
+ const state = this.state; + const trigger = state.trigger; + return (
     @@ -102,7 +101,7 @@ var Test = React.createClass({      @@ -112,26 +111,26 @@ var Test = React.createClass({ trigger:
    
@@ -141,18 +140,18 @@ var Test = React.createClass({ destroyTooltipOnHide={this.state.destroyTooltipOnHide} trigger={Object.keys(this.state.trigger)} onVisibleChange={this.onVisibleChange} - overlay={
i am a tooltip
} + overlay={
i am a tooltip
} align={{ - offset:[this.state.offsetX, this.state.offsetY] + offset: [this.state.offsetX, this.state.offsetY], }} transitionName={this.state.transitionName}> -
trigger
+
trigger
-
; - } +
); + }, }); ReactDOM.render(
-
, document.getElementById("__react-content")); +, document.getElementById('__react-content')); diff --git a/package.json b/package.json index e98615a..78d7563 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "bootstrap": "~3.3.2", "expect.js": "~0.3.1", "jquery": "~1.11.2", + "object-assign": "~4.0.1", "precommit-hook-eslint": "3.x", "rc-server": "3.x", "rc-tools": "4.x", diff --git a/tests/index.spec.js b/tests/index.spec.js index 38aa0d9..d3a37a1 100644 --- a/tests/index.spec.js +++ b/tests/index.spec.js @@ -1,26 +1,24 @@ -'use strict'; -var expect = require('expect.js'); -var React = require('react'); -var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); -var Simulate = TestUtils.Simulate; -var $ = require('jquery'); +import '../assets/bootstrap.less'; +import expect from 'expect.js'; +import React from 'react'; +import ReactDOM from 'react-dom'; +import TestUtils from 'react-addons-test-utils'; +import $ from 'jquery'; +import Tooltip from '../index'; +import async from 'async'; window.$ = $; -require('../assets/bootstrap.less'); -var Tooltip = require('../index'); -var scryRenderedDOMComponentsWithClass = TestUtils.scryRenderedDOMComponentsWithClass; -var async = require('async'); +const Simulate = TestUtils.Simulate; function timeout(ms) { return (done)=> { setTimeout(done, ms); - } + }; } -describe('rc-tooltip', function () { +describe('rc-tooltip', function() { this.timeout(40000); - var div = document.createElement('div'); + const div = document.createElement('div'); div.style.margin = '100px'; document.body.insertBefore(div, document.body.firstChild); @@ -30,21 +28,21 @@ describe('rc-tooltip', function () { describe('trigger', ()=> { it('works', (done)=> { - var tooltip = ReactDOM.render(tooltip2}> + overlay={tooltip2}>
click
, div); - var domNode = ReactDOM.findDOMNode(tooltip); + const domNode = ReactDOM.findDOMNode(tooltip); Simulate.click(domNode); async.series([timeout(20), (next)=> { - var popupDomNode = tooltip.getPopupDomNode(); + const popupDomNode = tooltip.getPopupDomNode(); expect($(popupDomNode).find('.x-content').html()).to.be('tooltip2'); expect(popupDomNode).to.be.ok(); Simulate.click(domNode); next(); }, timeout(20), (next)=> { - var popupDomNode = tooltip.getPopupDomNode(); + const popupDomNode = tooltip.getPopupDomNode(); expect($(popupDomNode).css('display')).to.be('none'); next(); }], done);