diff --git a/CHANGELOG.md b/CHANGELOG.md index f7f8e3bb..c981f425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.2.15 (January 9th, 2017) + +- Fixed bug with macOs text field’s placeholder + ## 0.2.14 (September 19th, 2016) - Fixed duplicate onChange events on the windows textInput diff --git a/LICENSE b/LICENSE index 27cd8c4c..e198fcb5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright © 2016 Gabriel Bull +Copyright © 2017 Gabriel Bull Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index 34f5b547..97fbde76 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-desktop", "author": "Gabriel Bull", - "version": "0.2.14", + "version": "0.2.15", "description": "React UI Components for macOS Sierra and Windows 10", "main": "./index.js", "keywords": [ @@ -42,26 +42,26 @@ "react-dom": "^15.0.0" }, "devDependencies": { - "babel-cli": "^6.14.0", - "babel-core": "^6.14.0", - "babel-eslint": "^6.1.2", - "babel-loader": "^6.2.5", + "babel-cli": "^6.18.0", + "babel-core": "^6.21.0", + "babel-eslint": "^7.1.1", + "babel-loader": "^6.2.10", "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-preset-es2015": "^6.14.0", - "babel-preset-react": "^6.11.1", - "babel-preset-stage-0": "^6.5.0", + "babel-preset-es2015": "^6.18.0", + "babel-preset-react": "^6.16.0", + "babel-preset-stage-0": "^6.16.0", "chai": "^3.5.0", - "eslint": "^3.5.0", - "eslint-plugin-react": "^6.2.2", - "html-webpack-plugin": "^2.22.0", - "jsdom": "^9.5.0", - "mocha": "^3.0.2", - "react": "^15.3.1", - "react-addons-test-utils": "^15.3.1", - "react-color": "^2.3.0", - "react-dom": "^15.3.1", - "react-hot-loader": "^1.3.0", - "webpack": "^1.13.2", - "webpack-dev-server": "^1.16.1" + "eslint": "^3.13.0", + "eslint-plugin-react": "^6.9.0", + "html-webpack-plugin": "^2.26.0", + "jsdom": "^9.9.1", + "mocha": "^3.2.0", + "react": "^15.4.2", + "react-addons-test-utils": "^15.4.2", + "react-color": "^2.11.1", + "react-dom": "^15.4.2", + "react-hot-loader": "^1.3.1", + "webpack": "^1.14.0", + "webpack-dev-server": "^1.16.2" } } diff --git a/src/textInput/macOs/textInput.js b/src/textInput/macOs/textInput.js index 4a6baff3..3f675d06 100644 --- a/src/textInput/macOs/textInput.js +++ b/src/textInput/macOs/textInput.js @@ -216,7 +216,7 @@ class TextFieldOSX extends Component { } else if (placeholder) { input = ( - {cloneElement(input, { ...input.props, style: { ...input.props.style, ...inputStyle } })} + {cloneElement(input, { ...input.props, style: { ...input.props.style, ...inputStyle }, placeholder })} ); }