-
- {name}
- ({`tests: ${testCount}, runs: ${resultCount}`})
-
- {body}
+ const className = classNames(
+ 'tests-group',
+ {'tests-group_collapsed': !isActive}
+ );
+
+ const onToggleCheckbox = (e) => {
+ e.stopPropagation();
+
+ actions.toggleGroupCheckbox({
+ browserIds: group.browserIds,
+ checkStatus: getToggledCheckboxState(checkStatus)
+ });
+ };
+
+ return (
+
+
+
+ {name}
+ ({`tests: ${testCount}, runs: ${resultCount}`})
- );
- }
-}
+ {body}
+
+ );
+};
+
+GroupTestsItem.propTypes = {
+ group: PropTypes.object.isRequired,
+ isActive: PropTypes.bool.isRequired,
+ onClick: PropTypes.func.isRequired,
+ checkStatus: PropTypes.number
+};
+
+export default connect(
+ ({tree}, {group}) => {
+ const childCount = group.browserIds.length;
+ const checkedCount = group.browserIds.reduce((sum, browserId) => {
+ return sum + tree.browsers.stateById[browserId].checkStatus;
+ }, 0);
+ const checkStatus = Number((checkedCount === childCount) || (checkedCount && INDETERMINATE));
+
+ return {checkStatus};
+ },
+ (dispatch) => ({actions: bindActionCreators(actions, dispatch)})
+)(GroupTestsItem);
diff --git a/lib/static/components/popup/index.js b/lib/static/components/popup/index.js
index 1ba08cb16..62d10e086 100644
--- a/lib/static/components/popup/index.js
+++ b/lib/static/components/popup/index.js
@@ -9,7 +9,7 @@ import './index.styl';
const OVERFLOW_BORDER = 20;
const Popup = (props) => {
- const {action, target, children, ...rest} = props;
+ const {action, target, hideOnClick, children, ...rest} = props;
const isClickHandled = useRef(false);
const [show, setShow] = useState(false);
@@ -41,6 +41,8 @@ const Popup = (props) => {
const mouseClickOuterHandler = action === 'click' ? () => handleClick(true) : null;
const mouseClickAwayHandler = action === 'click' ? () => handleClick(false, {isLast: true}) : null;
+ const childrenClickHandler = hideOnClick ? () => setShow(false) : null;
+
useEffect(() => {
if (mouseClickAwayHandler) {
window.addEventListener('click', mouseClickAwayHandler);
@@ -69,6 +71,7 @@ const Popup = (props) => {
ref={popupRef}
className='popup__content'
style={{transform: `translate(${-overflow}px)`}}
+ onClick={childrenClickHandler}
>
{children}