2597098234

Build Type

github

Committed by GitHub

Commit Message

Merge 605f76e8c into fa6896a92

Pull Request Pull Request #383: Improve chat

Run Details

266 of 626 branches covered (42.49%)

Branch coverage included in aggregate %.

69 of 82 new or added lines in 9 files covered. (84.15%)

2 existing lines in 2 files now uncovered.

772 of 1394 relevant lines covered (55.38%)

15.46 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

61.9

/src/components/Chat/Toggler/Toggler.js

/**
 * Copyright (c) [2022] SUSE Linux
 *
 * This software may be modified and distributed under the terms
 * of the MIT license.  See the LICENSE.txt file for details.
 */

import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { actionCreators as roomActions } from '../../../state/ducks/room';
import { MessageSquare } from 'react-feather';
import { classNames } from '../../../utils/common';
import { useDebounce } from 'use-debounce';

function toggle(dispatch, settings) {
  return () => {
    const newSettings = {...settings, chatOpen: !settings.chatOpen };
    dispatch(roomActions.saveSettings(newSettings));
  };
}

function Toggler() {
  const dispatch = useDispatch();
  const { settings } = useSelector((state) => state.room);

  let title;
  let classes;

  if (settings.chatOpen) {
    title = 'Hide chat';
    classes = 'bg-white text-primary';
  } else {
    title = 'Show chat';
    classes = 'bg-primary-dark hover:bg-primary text-white';
  }

  const { displayed, list: messages } = useSelector((state) => state.messages);

  // Use debounce to give the new messages the opportunity to be displayed
  // (that may imply waiting for an smooth scroll to finish)
  const [unread] = useDebounce(
    messages.filter((m) => m.type === "chatMsg" && m.index > displayed).length,
    300
  );

  const displayedClasses =
    'absolute -top-1 -right-1 h-5 w-5 text-secondary rounded-full flex justify-center items-center items';

  return (
    <button title={ title } onClick={toggle(dispatch, settings)}>
      <strong className="relative inline-flex items-center top-0.5">
        <span className={classNames(unread > 0 || 'hidden', displayedClasses)}>
          <span>{unread}</span>
        </span>
        <MessageSquare className={classNames('p-0.5 rounded', classes)} />
      </strong>
    </button>
  );
}

export default Toggler;

1	/**
2	* Copyright (c) [2022] SUSE Linux
3	*
4	* This software may be modified and distributed under the terms
5	* of the MIT license. See the LICENSE.txt file for details.
6	*/
7
8	import React from 'react';
9	import { useDispatch, useSelector } from 'react-redux';
10	import { actionCreators as roomActions } from '../../../state/ducks/room';
11	import { MessageSquare } from 'react-feather';
12	import { classNames } from '../../../utils/common';
13	import { useDebounce } from 'use-debounce';
14
15	function toggle(dispatch, settings) {
16	return () => {	4✔
NEW 17	const newSettings = {...settings, chatOpen: !settings.chatOpen };	×
NEW 18	dispatch(roomActions.saveSettings(newSettings));	×
19	};
20	}
21
22	function Toggler() {
23	const dispatch = useDispatch();	4✔
24	const { settings } = useSelector((state) => state.room);	4✔
25
26	let title;
27	let classes;
28
29	if (settings.chatOpen) {	4!
30	title = 'Hide chat';	4✔
31	classes = 'bg-white text-primary';	4✔
32	} else {
NEW 33	title = 'Show chat';	×
NEW 34	classes = 'bg-primary-dark hover:bg-primary text-white';	×
35	}
36
37	const { displayed, list: messages } = useSelector((state) => state.messages);	4✔
38
39	// Use debounce to give the new messages the opportunity to be displayed
40	// (that may imply waiting for an smooth scroll to finish)
41	const [unread] = useDebounce(	4✔
NEW 42	messages.filter((m) => m.type === "chatMsg" && m.index > displayed).length,	×
43	300
44	);
45
46	const displayedClasses =
47	'absolute -top-1 -right-1 h-5 w-5 text-secondary rounded-full flex justify-center items-center items';	4✔
48
49	return (	4✔
50	<button title={ title } onClick={toggle(dispatch, settings)}>
51	<strong className="relative inline-flex items-center top-0.5">
52	<span className={classNames(unread > 0 \|\| 'hidden', displayedClasses)}>	8✔
53	<span>{unread}</span>
54	</span>
55	<MessageSquare className={classNames('p-0.5 rounded', classes)} />
56	</strong>
57	</button>
58	);
59	}
60
61	export default Toggler;

jangouts / jangouts / 2597098234

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous