Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store component state for editors #1746

Merged
merged 1 commit into from Feb 14, 2018
Merged

Store component state for editors #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/components/views/rooms/RoomNameEditor.js
View file
Open in desktop
Expand Up @@ -29,13 +29,21 @@ module.exports = React.createClass({
room: PropTypes.object.isRequired,
},

getInitialState: function() {
return {
name: null,
};
},

componentWillMount: function() {
const room = this.props.room;
const name = room.currentState.getStateEvents('m.room.name', '');
const myId = MatrixClientPeg.get().credentials.userId;
const defaultName = room.getDefaultRoomName(myId);

this._initialName = name ? name.getContent().name : '';
this.setState({
name: name ? name.getContent().name : '',
});

this._placeholderName = _t("Unnamed Room");
if (defaultName && defaultName !== 'Empty room') { // default name from JS SDK, needs no translation as we don't ever show it.
Expand All @@ -44,7 +52,13 @@ module.exports = React.createClass({
},

getRoomName: function() {
return this.refs.editor.getValue();
return this.state.name;
},

_onValueChanged: function(value, shouldSubmit) {
this.setState({
name: value,
});
},

render: function() {
Expand All @@ -57,7 +71,8 @@ module.exports = React.createClass({
placeholderClassName="mx_RoomHeader_placeholder"
placeholder={this._placeholderName}
blurToCancel={false}
initialValue={this._initialName}
initialValue={this.state.name}
onValueChanged={this._onValueChanged}
dir="auto" />
</div>
);
Expand Down
23 changes: 19 additions & 4 deletions src/components/views/rooms/RoomTopicEditor.js
View file
Open in desktop
Expand Up @@ -28,26 +28,41 @@ module.exports = React.createClass({
room: PropTypes.object.isRequired,
},

getInitialState: function() {
return {
topic: null,
};
},

componentWillMount: function() {
const room = this.props.room;
const topic = room.currentState.getStateEvents('m.room.topic', '');
this._initialTopic = topic ? topic.getContent().topic : '';
this.setState({
topic: topic ? topic.getContent().topic : '',
});
},

getTopic: function() {
return this.refs.editor.getValue();
return this.state.topic;
},

_onValueChanged: function(value) {
this.setState({
topic: value,
});
},

render: function() {
const EditableText = sdk.getComponent("elements.EditableText");

return (
<EditableText ref="editor"
<EditableText
className="mx_RoomHeader_topic mx_RoomHeader_editable"
placeholderClassName="mx_RoomHeader_placeholder"
placeholder={_t("Add a topic")}
blurToCancel={false}
initialValue={this._initialTopic}
initialValue={this.state.topic}
onValueChanged={this._onValueChanged}
dir="auto" />
);
},
Expand Down