Device manager - selectable device tile wrapper (PSG-637) (#9153)

* add selectabledevicetile wrapper

* set pointer cursor

* line up own device icon with new checkboxes

src/components/views/elements/StyledCheckbox.tsx

@@ -70,9 +70,11 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
                 <div className="mx_Checkbox_background">
                     <div className="mx_Checkbox_checkmark" />
                 </div>
-                <div>
-                    { this.props.children }
-                </div>
+                { !!this.props.children &&
+                    <div>
+                        { this.props.children }
+                    </div>
+                }
             </label>
         </span>;
     }

src/components/views/settings/DevicesPanelEntry.tsx

@@ -20,7 +20,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import StyledCheckbox, { CheckboxStyle } from '../elements/StyledCheckbox';
 import AccessibleButton from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 import Modal from "../../../Modal";
@@ -28,6 +27,7 @@ import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
 import LogoutDialog from '../dialogs/LogoutDialog';
 import DeviceTile from './devices/DeviceTile';
+import SelectableDeviceTile from './devices/SelectableDeviceTile';
 
 interface IProps {
     device: IMyDevice;
@@ -133,14 +133,6 @@ export default class DevicesPanelEntry extends React.Component<IProps, IState> {
             </AccessibleButton>;
         }
 
-        const left = this.props.isOwnDevice ?
-            <div className="mx_DevicesPanel_deviceTrust">
-                <span className={"mx_DevicesPanel_icon mx_E2EIcon " + iconClass} />
-            </div> :
-            <div className="mx_DevicesPanel_checkbox">
-                <StyledCheckbox kind={CheckboxStyle.Outline} onChange={this.onDeviceToggled} checked={this.props.selected} />
-            </div>;
-
         const buttons = this.state.renaming ?
             <form className="mx_DevicesPanel_renameForm" onSubmit={this.onRenameSubmit}>
                 <Field
@@ -162,12 +154,22 @@ export default class DevicesPanelEntry extends React.Component<IProps, IState> {
                 </AccessibleButton>
             </React.Fragment>;
 
-        return (
-            <div className={"mx_DevicesPanel_device" + myDeviceClass}>
-                { left }
+        if (this.props.isOwnDevice) {
+            return <div className={"mx_DevicesPanel_device" + myDeviceClass}>
+                <div className="mx_DevicesPanel_deviceTrust">
+                    <span className={"mx_DevicesPanel_icon mx_E2EIcon " + iconClass} />
+                </div>
                 <DeviceTile device={this.props.device}>
                     { buttons }
                 </DeviceTile>
+            </div>;
+        }
+
+        return (
+            <div className={"mx_DevicesPanel_device" + myDeviceClass}>
+                <SelectableDeviceTile device={this.props.device} onClick={this.onDeviceToggled} isSelected={this.props.selected}>
+                    { buttons }
+                </SelectableDeviceTile>
             </div>
         );
     }

src/components/views/settings/devices/DeviceTile.tsx

@@ -23,15 +23,16 @@ import TooltipTarget from "../../elements/TooltipTarget";
 import { Alignment } from "../../elements/Tooltip";
 import Heading from "../../typography/Heading";
 
-interface Props {
+export interface DeviceTileProps {
     device: IMyDevice;
     children?: React.ReactNode;
+    onClick?: () => void;
 }
 
 const DeviceTileName: React.FC<{ device: IMyDevice }> = ({ device }) => {
     if (device.display_name) {
         return <TooltipTarget
-            alignment={Alignment.Left}
+            alignment={Alignment.Top}
             label={`${device.display_name} (${device.device_id})`}
         >
             <Heading size='h4'>
@@ -59,7 +60,7 @@ const DeviceMetadata: React.FC<{ value: string, id: string }> = ({ value, id })
     value ? <span data-testid={`device-metadata-${id}`}>{ value }</span> : null
 );
 
-const DeviceTile: React.FC<Props> = ({ device, children }) => {
+const DeviceTile: React.FC<DeviceTileProps> = ({ device, children, onClick }) => {
     const lastActivity = device.last_seen_ts && `${_t('Last activity')} ${formatLastActivity(device.last_seen_ts)}`;
     const metadata = [
         { id: 'lastActivity', value: lastActivity },
@@ -67,7 +68,7 @@ const DeviceTile: React.FC<Props> = ({ device, children }) => {
     ];
 
     return <div className="mx_DeviceTile">
-        <div className="mx_DeviceTile_info">
+        <div className="mx_DeviceTile_info" onClick={onClick}>
             <DeviceTileName device={device} />
             <div className="mx_DeviceTile_metadata">
                 { metadata.map(({ id, value }, index) =>

src/components/views/settings/devices/SelectableDeviceTile.tsx

@@ -0,0 +1,42 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import StyledCheckbox, { CheckboxStyle } from '../../elements/StyledCheckbox';
+import DeviceTile, { DeviceTileProps } from './DeviceTile';
+
+interface Props extends DeviceTileProps {
+    isSelected: boolean;
+    onClick: () => void;
+}
+
+const SelectableDeviceTile: React.FC<Props> = ({ children, device, isSelected, onClick }) => {
+    return <div className='mx_SelectableDeviceTile'>
+        <StyledCheckbox
+            kind={CheckboxStyle.Solid}
+            checked={isSelected}
+            onChange={onClick}
+            className='mx_SelectableDeviceTile_checkbox'
+            id={`device-tile-checkbox-${device.device_id}`}
+        />
+        <DeviceTile device={device} onClick={onClick}>
+            { children }
+        </DeviceTile>
+    </div>;
+};
+
+export default SelectableDeviceTile;