Skip to content

Commit 4dea854

Browse files
committed
v1.15.0
1 parent 8521eaf commit 4dea854

File tree

4 files changed

+166
-109
lines changed

4 files changed

+166
-109
lines changed

components/Html/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export default class FieldHtml extends FieldCoreBase<IProps, IState> {
106106

107107
render() {
108108
const { editorState, focused } = this.state;
109-
const { classes, label, helperText, placeholder, disabled, onChange, onBlur, ...editorProps } = this.props;
109+
const { classes, label, helperText, disabled, onChange, onBlur, ...editorProps } = this.props;
110110

111111
return (
112112
<div className={`${styles.component}`}>
@@ -124,8 +124,7 @@ export default class FieldHtml extends FieldCoreBase<IProps, IState> {
124124
</div>
125125
<Editor
126126
{...editorProps}
127-
readonly={disabled}
128-
placeholder={placeholder}
127+
readOnly={editorProps.readOnly || disabled}
129128
editorState={editorState}
130129
handlePastedText={this.handlePastedText}
131130
onFocus={this.onFocus}

config/builder.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default class ConfigBuilder extends CoreConfigBuilder {
1919
editorLocale: locale,
2020
editorToolbar: toolbar || this.config.editorToolbar
2121
};
22+
2223
return this;
2324
}
2425

@@ -27,6 +28,7 @@ export default class ConfigBuilder extends CoreConfigBuilder {
2728
...this.config,
2829
validationOn: event
2930
};
31+
3032
return this;
3133
}
3234
}

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"validation",
1111
"material"
1212
],
13-
"version": "1.14.14",
13+
"version": "1.15.0",
1414
"main": "./dist/index.js",
1515
"types": "./dist/index.d.ts",
1616
"license": "MIT",
@@ -37,40 +37,40 @@
3737
}
3838
},
3939
"dependencies": {
40-
"@date-io/date-fns": "^1.0.1",
41-
"@react-form-fields/core": "^1.4.8",
40+
"@date-io/date-fns": "^1.1.0",
41+
"@react-form-fields/core": "^1.5.0",
4242
"autosuggest-highlight": ">=3.1.1",
4343
"date-fns": "2.0.0-alpha.21",
4444
"draft-js": "^0.10.5",
45-
"draft-js-import-html": "^1.2.1",
45+
"draft-js-import-html": "^1.3.3",
4646
"draftjs-to-html": "^0.8.4",
4747
"html-to-draftjs": "^1.4.0",
48-
"material-ui-pickers": "2.1.1",
48+
"material-ui-pickers": "^2.2.4",
4949
"react-autosuggest": ">=9.4.3",
5050
"react-color": ">=2.17.0",
51-
"react-draft-wysiwyg": "^1.12.20",
51+
"react-draft-wysiwyg": "^1.13.2",
5252
"tslib": ">=1.9.3",
5353
"validatorjs": ">=3.15.1"
5454
},
5555
"peerDependencies": {
56-
"@material-ui/core": ">=3.9.0",
56+
"@material-ui/core": ">=3.9.2",
5757
"@material-ui/icons": ">=3.0.2",
5858
"react": ">=16.0.0"
5959
},
6060
"devDependencies": {
61-
"@material-ui/core": ">=3.9.0",
61+
"@material-ui/core": ">=3.9.2",
6262
"@material-ui/icons": ">=3.0.2",
63-
"@types/draft-js": "^0.10.27",
64-
"@types/react-autosuggest": "9.3.6",
65-
"@types/react-color": "2.14.0",
66-
"@types/react-draft-wysiwyg": "^1.12.0",
67-
"@types/validatorjs": "3.7.1",
63+
"@types/draft-js": "0.10.29",
64+
"@types/react-autosuggest": "9.3.7",
65+
"@types/react-color": "2.14.1",
66+
"@types/react-draft-wysiwyg": "1.12.2",
67+
"@types/validatorjs": "3.15.0",
6868
"concurrently": "4.1.0",
6969
"husky": "1.3.1",
70-
"react": ">=16.7.0",
71-
"tslint": "5.12.1",
70+
"react": ">=16.8.4",
71+
"tslint": "5.13.1",
7272
"tslint-eslint-rules": "5.4.0",
73-
"tslint-react": "^3.6.0",
74-
"typescript": "3.2.2"
73+
"tslint-react": "3.6.0",
74+
"typescript": "3.3.3333"
7575
}
7676
}

0 commit comments

Comments
 (0)