Skip to content

Commit a8924dd

Browse files
committed
Fixed bug with macOs text field’s placeholder
1 parent 020c63f commit a8924dd

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 0.2.15 (January 9th, 2017)
4+
5+
- Fixed bug with macOs text field’s placeholder
6+
37
## 0.2.14 (September 19th, 2016)
48

59
- Fixed duplicate onChange events on the windows textInput

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2016 Gabriel Bull
3+
Copyright © 2017 Gabriel Bull
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-desktop",
33
"author": "Gabriel Bull",
4-
"version": "0.2.14",
4+
"version": "0.2.15",
55
"description": "React UI Components for macOS Sierra and Windows 10",
66
"main": "./index.js",
77
"keywords": [
@@ -42,26 +42,26 @@
4242
"react-dom": "^15.0.0"
4343
},
4444
"devDependencies": {
45-
"babel-cli": "^6.14.0",
46-
"babel-core": "^6.14.0",
47-
"babel-eslint": "^6.1.2",
48-
"babel-loader": "^6.2.5",
45+
"babel-cli": "^6.18.0",
46+
"babel-core": "^6.21.0",
47+
"babel-eslint": "^7.1.1",
48+
"babel-loader": "^6.2.10",
4949
"babel-plugin-transform-decorators-legacy": "^1.3.4",
50-
"babel-preset-es2015": "^6.14.0",
51-
"babel-preset-react": "^6.11.1",
52-
"babel-preset-stage-0": "^6.5.0",
50+
"babel-preset-es2015": "^6.18.0",
51+
"babel-preset-react": "^6.16.0",
52+
"babel-preset-stage-0": "^6.16.0",
5353
"chai": "^3.5.0",
54-
"eslint": "^3.5.0",
55-
"eslint-plugin-react": "^6.2.2",
56-
"html-webpack-plugin": "^2.22.0",
57-
"jsdom": "^9.5.0",
58-
"mocha": "^3.0.2",
59-
"react": "^15.3.1",
60-
"react-addons-test-utils": "^15.3.1",
61-
"react-color": "^2.3.0",
62-
"react-dom": "^15.3.1",
63-
"react-hot-loader": "^1.3.0",
64-
"webpack": "^1.13.2",
65-
"webpack-dev-server": "^1.16.1"
54+
"eslint": "^3.13.0",
55+
"eslint-plugin-react": "^6.9.0",
56+
"html-webpack-plugin": "^2.26.0",
57+
"jsdom": "^9.9.1",
58+
"mocha": "^3.2.0",
59+
"react": "^15.4.2",
60+
"react-addons-test-utils": "^15.4.2",
61+
"react-color": "^2.11.1",
62+
"react-dom": "^15.4.2",
63+
"react-hot-loader": "^1.3.1",
64+
"webpack": "^1.14.0",
65+
"webpack-dev-server": "^1.16.2"
6666
}
6767
}

src/textInput/macOs/textInput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class TextFieldOSX extends Component {
216216
} else if (placeholder) {
217217
input = (
218218
<PlaceholderStyle placeholderStyle={styles.textField[':placeholder']}>
219-
{cloneElement(input, { ...input.props, style: { ...input.props.style, ...inputStyle } })}
219+
{cloneElement(input, { ...input.props, style: { ...input.props.style, ...inputStyle }, placeholder })}
220220
</PlaceholderStyle>
221221
);
222222
}

0 commit comments

Comments
 (0)