minor fixes in chip-input
This commit is contained in:
@@ -70,7 +70,7 @@ class MessagesView extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.propsChange(this.props);
|
this.propsChange(this.props, this.state);
|
||||||
if (this.messagesScroller) {
|
if (this.messagesScroller) {
|
||||||
this.messagesScroller.addEventListener('scroll', this.handleScrollEvent);
|
this.messagesScroller.addEventListener('scroll', this.handleScrollEvent);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ export default class ChipInput extends React.Component {
|
|||||||
placeholder: nextProps.chips ? '' : nextProps.prompt,
|
placeholder: nextProps.chips ? '' : nextProps.prompt,
|
||||||
sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required),
|
sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required),
|
||||||
chipIndex: ChipInput.indexChips(nextProps.chips),
|
chipIndex: ChipInput.indexChips(nextProps.chips),
|
||||||
input: '',
|
|
||||||
focused: prevState && prevState.focused
|
focused: prevState && prevState.focused
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -38,8 +37,8 @@ export default class ChipInput extends React.Component {
|
|||||||
|
|
||||||
// Map chip index to user name
|
// Map chip index to user name
|
||||||
static indexChips(chips) {
|
static indexChips(chips) {
|
||||||
var index = {};
|
const index = {};
|
||||||
var count = 0;
|
let count = 0;
|
||||||
chips.map(function(item) {
|
chips.map(function(item) {
|
||||||
index[item.user] = count;
|
index[item.user] = count;
|
||||||
count ++;
|
count ++;
|
||||||
@@ -49,8 +48,8 @@ export default class ChipInput extends React.Component {
|
|||||||
|
|
||||||
// Have non-removable chips appear before all other chips.
|
// Have non-removable chips appear before all other chips.
|
||||||
static sortChips(chips, keep) {
|
static sortChips(chips, keep) {
|
||||||
var required = [];
|
const required = [];
|
||||||
var normal = [];
|
const normal = [];
|
||||||
chips.map(function(item) {
|
chips.map(function(item) {
|
||||||
if (item.user === keep) {
|
if (item.user === keep) {
|
||||||
required.push(item);
|
required.push(item);
|
||||||
@@ -69,7 +68,7 @@ export default class ChipInput extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
removeChipAt(idx) {
|
removeChipAt(idx) {
|
||||||
var removed = this.state.sortedChips[idx];
|
const removed = this.state.sortedChips[idx];
|
||||||
this.props.onChipRemoved(removed.user, this.state.chipIndex[removed.user]);
|
this.props.onChipRemoved(removed.user, this.state.chipIndex[removed.user]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,8 +107,8 @@ export default class ChipInput extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
var chips = [];
|
const chips = [];
|
||||||
var count = 0;
|
let count = 0;
|
||||||
this.state.sortedChips.map((item) => {
|
this.state.sortedChips.map((item) => {
|
||||||
chips.push(
|
chips.push(
|
||||||
<Chip
|
<Chip
|
||||||
@@ -124,7 +123,7 @@ export default class ChipInput extends React.Component {
|
|||||||
);
|
);
|
||||||
count++;
|
count++;
|
||||||
});
|
});
|
||||||
var className = "chip-input" + (this.state.focused ? ' focused' : '');
|
const className = "chip-input" + (this.state.focused ? ' focused' : '');
|
||||||
return (
|
return (
|
||||||
<div className={className}>
|
<div className={className}>
|
||||||
{chips}
|
{chips}
|
||||||
|
|||||||
+1
-2
@@ -2638,7 +2638,7 @@ var MessagesView = function (_React$Component) {
|
|||||||
_createClass(MessagesView, [{
|
_createClass(MessagesView, [{
|
||||||
key: "componentDidMount",
|
key: "componentDidMount",
|
||||||
value: function componentDidMount() {
|
value: function componentDidMount() {
|
||||||
this.propsChange(this.props);
|
this.propsChange(this.props, this.state);
|
||||||
|
|
||||||
if (this.messagesScroller) {
|
if (this.messagesScroller) {
|
||||||
this.messagesScroller.addEventListener('scroll', this.handleScrollEvent);
|
this.messagesScroller.addEventListener('scroll', this.handleScrollEvent);
|
||||||
@@ -6326,7 +6326,6 @@ var ChipInput = function (_React$Component) {
|
|||||||
placeholder: nextProps.chips ? '' : nextProps.prompt,
|
placeholder: nextProps.chips ? '' : nextProps.prompt,
|
||||||
sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required),
|
sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required),
|
||||||
chipIndex: ChipInput.indexChips(nextProps.chips),
|
chipIndex: ChipInput.indexChips(nextProps.chips),
|
||||||
input: '',
|
|
||||||
focused: prevState && prevState.focused
|
focused: prevState && prevState.focused
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user