From ff7dbd65625fce19cfeafe8c99f1ad1dcb89bad8 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Mon, 23 Dec 2019 11:58:03 +1100
Subject: [PATCH] Globalised consts

---
 stylesheets/_session.scss                      |  5 +++++
 ts/components/ConversationListItem.tsx         |  1 -
 ts/components/UserDetailsDialog.tsx            |  6 ------
 ts/components/session/SessionDropdownItem.tsx  |  5 ++---
 ts/components/session/SessionToggle.tsx        | 10 ++++++++--
 ts/components/session/tools/ComponentTools.tsx |  8 --------
 ts/global.d.ts                                 |  1 +
 7 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 ts/components/session/tools/ComponentTools.tsx

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 76bdcc0f2..5628d0c6f 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -631,6 +631,11 @@ label {
   &--selected {
     background-color: $session-shade-7 !important;
   }
+  &:active,
+  &:visited,
+  &:focus {
+    outline: none;
+  }
 }
 
 .session-dropdown {
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index 8d33a6f1a..d26d1fe08 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import { isEmpty } from 'lodash';
 import { ContextMenu, ContextMenuTrigger, MenuItem } from 'react-contextmenu';
diff --git a/ts/components/UserDetailsDialog.tsx b/ts/components/UserDetailsDialog.tsx
index 0f06304b0..99ca613bb 100644
--- a/ts/components/UserDetailsDialog.tsx
+++ b/ts/components/UserDetailsDialog.tsx
@@ -8,12 +8,6 @@ import {
   SessionButtonType,
 } from './session/SessionButton';
 
-declare global {
-  interface Window {
-    displayNameRegex: any;
-  }
-}
-
 interface Props {
   i18n: any;
   profileName: string;
diff --git a/ts/components/session/SessionDropdownItem.tsx b/ts/components/session/SessionDropdownItem.tsx
index 2647339b2..2ea9cde59 100644
--- a/ts/components/session/SessionDropdownItem.tsx
+++ b/ts/components/session/SessionDropdownItem.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import classNames from 'classnames';
 
 import { SessionIcon, SessionIconSize, SessionIconType } from './icon/';
-import { generateID } from './tools/ComponentTools';
 
 export enum SessionDropDownItemType {
   Default = 'default',
@@ -20,7 +19,6 @@ interface Props {
 
 export class SessionDropdownItem extends React.PureComponent<Props> {
   public static defaultProps = {
-    id: generateID(),
     type: SessionDropDownItemType.Default,
     icon: null,
     active: false,
@@ -33,7 +31,8 @@ export class SessionDropdownItem extends React.PureComponent<Props> {
   }
 
   public render() {
-    const { id, content, type, icon, active } = this.props;
+    const { content, type, icon, active } = this.props;
+    const id = this.props.id || window.generateID();
 
     return (
       <li
diff --git a/ts/components/session/SessionToggle.tsx b/ts/components/session/SessionToggle.tsx
index 7c169c1ed..9dec4c510 100644
--- a/ts/components/session/SessionToggle.tsx
+++ b/ts/components/session/SessionToggle.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 
 interface Props {
   active: boolean;
+  onClick: any;
 }
 
 interface State {
@@ -10,7 +11,7 @@ interface State {
 }
 
 export class SessionToggle extends React.PureComponent<Props, State> {
-  public static readonly extendedDefaults = {
+  public static defaultProps = {
     onClick: () => null,
   };
 
@@ -40,9 +41,14 @@ export class SessionToggle extends React.PureComponent<Props, State> {
     );
   }
 
-  private clickHandler() {
+  private clickHandler(e: any) {
     this.setState({
       active: !this.state.active,
     });
+
+    if (this.props.onClick) {
+      e.stopPropagation();
+      this.props.onClick();
+    }
   }
 }
diff --git a/ts/components/session/tools/ComponentTools.tsx b/ts/components/session/tools/ComponentTools.tsx
deleted file mode 100644
index e91b8a295..000000000
--- a/ts/components/session/tools/ComponentTools.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is a collection of tools which can be ued to simplify the esign and rendering process of your components.
-
-export function generateID() {
-  // Generates a unique ID for your component
-  const buffer = new Uint32Array(10);
-
-  return window.crypto.getRandomValues(buffer)[0].toString();
-}
diff --git a/ts/global.d.ts b/ts/global.d.ts
index 5817c1f87..3a85cc274 100644
--- a/ts/global.d.ts
+++ b/ts/global.d.ts
@@ -12,6 +12,7 @@ interface Window {
   textsecure: any;
   Session: any;
   i18n: any;
+  generateID: any;
 }
 
 interface Promise<T> {