imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Iterate toast count indicator more logically

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-05-22 14:28:01 +01:00
parent a822ab49d5
commit c464abaa49
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/ToastContainer.tsx
View file

@ -15,12 +15,12 @@ limitations under the License.
*/
import * as React from "react";
import { _t } from '../../languageHandler';
import ToastStore, {IToast} from "../../stores/ToastStore";
import classNames from "classnames";
interface IState {
toasts: IToast<any>[];
countSeen: number;
}
export default class ToastContainer extends React.Component<{}, IState> {
@ -28,6 +28,7 @@ export default class ToastContainer extends React.Component<{}, IState> {
super(props, context);
this.state = {
toasts: ToastStore.sharedInstance().getToasts(),
countSeen: 0,
};
// Start listening here rather than in componentDidMount because
@ -42,7 +43,10 @@ export default class ToastContainer extends React.Component<{}, IState> {
}
_onToastStoreUpdate = () => {
this.setState({toasts: ToastStore.sharedInstance().getToasts()});
this.setState({
toasts: ToastStore.sharedInstance().getToasts(),
countSeen: ToastStore.sharedInstance().getCountSeen(),
});
};
render() {
@ -56,7 +60,11 @@ export default class ToastContainer extends React.Component<{}, IState> {
"mx_Toast_hasIcon": icon,
[`mx_Toast_icon_${icon}`]: icon,
});
const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
let countIndicator;
if (isStacked || this.state.countSeen > 0) {
countIndicator = ` (${this.state.countSeen + 1}/${this.state.countSeen + totalCount})`;
}
const toastProps = Object.assign({}, props, {
key,