diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a88142a..7c6d9bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v0.8.0-rc.1 (16/09/15) + +- Updated React to v0.14.0-rc1. +- Added ReactDOM v0.14.0-rc1 to peer dependencies. +- `Popup` now renders its contents using `ReactDOM.render()` and therefore supports dynamic children. + ## v0.7.0 (08/09/15) - Updated Leaflet to v0.7.5. @@ -35,11 +41,11 @@ Released v0.4. ## v0.4.0-rc.1 (11/03/15) -React 0.13.0. +React v0.13.0. ## v0.4.0-beta.1 (08/03/15) -- Updated React dependency to 0.13.0-rc2: +- Updated React dependency to v0.13.0-rc2: - Components are defined as ES6 classes. - Mixins are replaced by the base components `MapComponent`, `MapLayer`, `BaseTileLayer` and `PopupContainer`. All components extend from these. - The new [`React.cloneElement()`](https://facebook.github.io/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement) API is used instead of the deprecated `React.addons.cloneWithProps()` to pass the `map` property to the components. diff --git a/README.md b/README.md index 3dfc77e2..4600561c 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ React components for Leaflet maps. npm install react-leaflet ``` -React and Leaflet are peer dependencies, if you haven't already installed them use: +React, ReactDOM and Leaflet are peer dependencies, if you haven't already installed them use: ```bash -npm install leaflet react react-leaflet +npm install leaflet react react-dom react-leaflet ``` ## Getting started @@ -63,7 +63,6 @@ This library uses React components as an interface, but not the virtual DOM, as - Leaflet makes direct calls to the DOM when it is loaded, therefore this library is not compatible with server-side rendering. - The components exposed are abstractions for Leaflet layers, not DOM elements. Some of them have properties that can be updated directly by calling the setters exposed by Leaflet while others should be completely replaced, by setting an unique value on their `key` property so that they are properly handled by React's algorithm. -- `` contents are rendered by Leaflet calling `React.renderToStaticMarkup()`, therefore the rendered components have a different context from their owner. - Not all layers are implemented and even less tested. ## API @@ -145,7 +144,7 @@ This is the top-level component that must be mounted for children ones to be ren ##### Popup -The Popup children will be rendered as its content using `React.renderToStaticMarkup()`, they must be valid React elements. +The Popup children will be rendered using `ReactDOM.render()`, they must be valid React elements. - `position: LatLng` (optional, dynamic) diff --git a/package.json b/package.json index 3e19f7a7..11ba1a1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-leaflet", - "version": "0.7.0", + "version": "0.8.0-rc.1", "description": "React components for Leaflet maps", "main": "lib/index.js", "scripts": { @@ -43,16 +43,16 @@ }, "devDependencies": { "babel": "^5.8.23", - "babel-eslint": "^4.1.1", + "babel-eslint": "^4.1.2", "babelify": "^6.3.0", "browserify": "^11.0.1", - "eslint": "^1.3.1", + "eslint": "^1.4.3", "eslint-plugin-react": "^3.3.1", "gulp": "^3.9.0", "gulp-load-plugins": "^0.10.0", "gulp-util": "^3.0.6", "gulp-webserver": "^0.9.1", - "jest-cli": "^0.5.2", + "jest-cli": "^0.5.5", "leaflet": "^0.7.5", "onchange": "^2.0.0", "react": "^0.14.0-rc1",