Upgraded to react 15.3.2

diacode · Oct 22, 2016 · f9af9e2 · f9af9e2
1 parent bf295e5
commit f9af9e2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/dist/rdpicker.css b/dist/rdpicker.css
diff --git a/dist/rdpicker.js b/dist/rdpicker.js
diff --git a/example/index.html b/example/index.html
@@ -15,7 +15,8 @@ <h3>Multiple</h3>
     <div id="rdpicker_multiple"></div>
   </div>
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.3/react-with-addons.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-with-addons.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.js"></script>
   <script src="http://momentjs.com/downloads/moment-with-locales.min.js"></script>
   <link rel="stylesheet" type="text/css" href="rdpicker.css">
   <script src="rdpicker.js"></script>
@@ -24,8 +25,8 @@ <h3>Multiple</h3>
     moment.locale('en-GB');
     var minDate = moment();
     var i18n = {clearDates: 'Clear dates'};
-    var single = React.render(React.createElement(Rdpicker, {selectionType: 'single', i18n: i18n}), document.getElementById('rdpicker_single'));
-    var multiple = React.render(React.createElement(Rdpicker, {selectionType: 'multiple', i18n: i18n}), document.getElementById('rdpicker_multiple'));
+    var single = ReactDOM.render(React.createElement(Rdpicker, {selectionType: 'single', i18n: i18n}), document.getElementById('rdpicker_single'));
+    var multiple = ReactDOM.render(React.createElement(Rdpicker, {selectionType: 'multiple', i18n: i18n}), document.getElementById('rdpicker_multiple'));
   </script>
 </body>
 </html>
diff --git a/lib/calendar.cjsx b/lib/calendar.cjsx
@@ -1,11 +1,9 @@
 DayNames = require './day_names.cjsx'
 Day = require './day.cjsx'
+onClickOutside = require 'react-onclickoutside'
 
-module.exports = React.createClass
+module.exports = onClickOutside(React.createClass
   displayName: 'Calendar'
-  mixins: [
-    require 'react-onclickoutside'
-  ]
 
   handleClickOutside: ->
     @props.hideCalendar()
@@ -111,4 +109,4 @@ module.exports = React.createClass
 
       {@_renderFooter()}
     </div>
-
+)
diff --git a/lib/date_input.cjsx b/lib/date_input.cjsx
@@ -50,7 +50,7 @@ module.exports = React.createClass
           selectedDates: filteredDates
 
   getValue: ->
-    @refs.input.getDOMNode().value
+    @refs.input.value
 
   _onClick: ->
     @setState

diff --git a/lib/portal.cjsx b/lib/portal.cjsx
@@ -1,5 +1,5 @@
 CSSPropertyOperations = require 'react/lib/CSSPropertyOperations'
-shallowEqual = require 'react/lib/shallowEqual'
+shallowCompare = require 'react/lib/shallowCompare'
 
 # React portal inspired by
 # https://gist.github.com/ryanflorence/ac5174cf97dd596e949c
@@ -30,8 +30,7 @@ module.exports = React.createClass
     @closePortal()
 
   shouldComponentUpdate: (nextProps, nextState) ->
-    return !shallowEqual(@props, nextProps) ||
-           !shallowEqual(@state, nextState)
+    return shallowCompare(@, nextProps, nextState);
 
   renderPortal: (props) ->
     if !@node
@@ -41,7 +40,7 @@ module.exports = React.createClass
       if @props.style
         CSSPropertyOperations.setValueForStyles(@node, @props.style)
       document.body.appendChild(@node)
-    @portal = React.render(React.cloneElement(props.children, {closePortal: @closePortal}), @node)
+    @portal = ReactDOM.render(React.cloneElement(props.children, {closePortal: @closePortal}), @node)
 
 
   render: ->
@@ -59,7 +58,7 @@ module.exports = React.createClass
 
   closePortal: ->
     if @node
-      React.unmountComponentAtNode(@node)
+      ReactDOM.unmountComponentAtNode(@node)
       document.body.removeChild(@node)
     @portal = null
     @node = null

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rdpicker",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "rdpicker",
   "scripts": {
     "test": "./node_modules/karma/bin/karma start karma.conf.js",
@@ -25,6 +25,7 @@
     "es5-shim": "~4.1.0",
     "eslint": "^0.21.1",
     "eslint-plugin-react": "^2.3.0",
+    "extract-text-webpack-plugin": "^1.0.1",
     "jasmine": "~2.2.1",
     "jasmine-core": "~2.2.0",
     "karma": "~0.12.31",
@@ -34,14 +35,16 @@
     "karma-webpack": "~1.5.0",
     "moment": "^2.10.5",
     "node-libs-browser": "^0.5.2",
-    "react-onclickoutside": "^0.2.4",
-    "sass-loader": "~1.0.2",
+    "node-sass": "^3.10.1",
+    "react-onclickoutside": "^5.7.1",
+    "sass-loader": "^4.0.2",
     "style-loader": "~0.12.2",
-    "webpack": "^1.10.5",
-    "webpack-dev-server": "^1.9.0"
+    "webpack": "^1.13.2",
+    "webpack-dev-server": "^1.16.2"
   },
   "dependencies": {
     "classnames": "^2.1.1",
-    "react": "^0.13.3"
+    "react": "^15.3.2",
+    "react-dom": "^15.3.2"
   }
 }
diff --git a/spec/rdpicker.spec.cjsx b/spec/rdpicker.spec.cjsx
@@ -9,4 +9,4 @@ describe 'Rdpicker', ->
     )
 
   it 'should render', ->
-    expect(component.getDOMNode().className).toEqual('rdpicker')
+    expect(component.className).toEqual('rdpicker')
diff --git a/webpack.config.js b/webpack.config.js
@@ -15,6 +15,7 @@ module.exports = {
 
   externals: {
    'react': 'var React',
+   'react-dom': 'var ReactDOM',
    'react/addons': 'var React',
    'moment': 'var moment'
   },