From 016ef8af79e6178de0bb7ef81f612c7ffd0c4eaa Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Thu, 3 Jun 2021 18:12:23 -0400
Subject: [PATCH] Use the new Select component everywhere

---
 ts/components/Select.tsx                      |  4 +-
 .../GroupLinkManagement.tsx                   | 63 ++++++++++---------
 .../GroupV2Permissions.tsx                    | 47 +++++---------
 ts/util/getAccessControlOptions.ts            |  6 +-
 4 files changed, 53 insertions(+), 67 deletions(-)

diff --git a/ts/components/Select.tsx b/ts/components/Select.tsx
index b47578adf3d..7ca39008b4b 100644
--- a/ts/components/Select.tsx
+++ b/ts/components/Select.tsx
@@ -1,7 +1,7 @@
 // Copyright 2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import React from 'react';
+import React, { ChangeEvent } from 'react';
 import classNames from 'classnames';
 
 export type Option = Readonly<{
@@ -19,7 +19,7 @@ export type PropsType = Readonly<{
 export function Select(props: PropsType): JSX.Element {
   const { moduleClassName, value, options, onChange } = props;
 
-  const onSelectChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+  const onSelectChange = (event: ChangeEvent<HTMLSelectElement>) => {
     onChange(event.target.value);
   };
 
diff --git a/ts/components/conversation/conversation-details/GroupLinkManagement.tsx b/ts/components/conversation/conversation-details/GroupLinkManagement.tsx
index de1e65188b2..bb2d07f2383 100644
--- a/ts/components/conversation/conversation-details/GroupLinkManagement.tsx
+++ b/ts/components/conversation/conversation-details/GroupLinkManagement.tsx
@@ -9,6 +9,7 @@ import { LocalizerType } from '../../../types/Util';
 import { PanelRow } from './PanelRow';
 import { PanelSection } from './PanelSection';
 import { AccessControlClass } from '../../../textsecure.d';
+import { Select } from '../../Select';
 
 export type PropsType = {
   accessEnum: typeof AccessControlClass.AccessRequired;
@@ -36,8 +37,8 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
   }
 
   const createEventHandler = (handleEvent: (x: boolean) => void) => {
-    return (event: React.ChangeEvent<HTMLSelectElement>) => {
-      handleEvent(event.target.value === 'true');
+    return (value: string) => {
+      handleEvent(value === 'true');
     };
   };
 
@@ -57,19 +58,20 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
           label={i18n('ConversationDetails--group-link')}
           right={
             isAdmin ? (
-              <div className="module-conversation-details-select">
-                <select
-                  onChange={createEventHandler(changeHasGroupLink)}
-                  value={String(Boolean(hasGroupLink))}
-                >
-                  <option value="true" aria-label={i18n('on')}>
-                    {i18n('on')}
-                  </option>
-                  <option value="false" aria-label={i18n('off')}>
-                    {i18n('off')}
-                  </option>
-                </select>
-              </div>
+              <Select
+                onChange={createEventHandler(changeHasGroupLink)}
+                options={[
+                  {
+                    text: i18n('on'),
+                    value: i18n('on'),
+                  },
+                  {
+                    text: i18n('off'),
+                    value: i18n('off'),
+                  },
+                ]}
+                value={String(Boolean(hasGroupLink))}
+              />
             ) : null
           }
         />
@@ -112,21 +114,22 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
                 info={i18n('GroupLinkManagement--approve-info')}
                 label={i18n('GroupLinkManagement--approve-label')}
                 right={
-                  <div className="module-conversation-details-select">
-                    <select
-                      onChange={createEventHandler(
-                        setAccessControlAddFromInviteLinkSetting
-                      )}
-                      value={String(membersNeedAdminApproval)}
-                    >
-                      <option value="true" aria-label={i18n('on')}>
-                        {i18n('on')}
-                      </option>
-                      <option value="false" aria-label={i18n('off')}>
-                        {i18n('off')}
-                      </option>
-                    </select>
-                  </div>
+                  <Select
+                    onChange={createEventHandler(
+                      setAccessControlAddFromInviteLinkSetting
+                    )}
+                    options={[
+                      {
+                        text: i18n('on'),
+                        value: i18n('on'),
+                      },
+                      {
+                        text: i18n('off'),
+                        value: i18n('off'),
+                      },
+                    ]}
+                    value={String(membersNeedAdminApproval)}
+                  />
                 }
               />
             </PanelSection>
diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
index f0c69d34123..3d7a38ec885 100644
--- a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
+++ b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
@@ -10,6 +10,7 @@ import { AccessControlClass } from '../../../textsecure.d';
 
 import { PanelRow } from './PanelRow';
 import { PanelSection } from './PanelSection';
+import { Select } from '../../Select';
 
 export type PropsType = {
   accessEnum: typeof AccessControlClass.AccessRequired;
@@ -30,15 +31,11 @@ export const GroupV2Permissions: React.ComponentType<PropsType> = ({
     throw new Error('GroupV2Permissions rendered without a conversation');
   }
 
-  const updateAccessControlAttributes = (
-    event: React.ChangeEvent<HTMLSelectElement>
-  ) => {
-    setAccessControlAttributesSetting(Number(event.target.value));
+  const updateAccessControlAttributes = (value: string) => {
+    setAccessControlAttributesSetting(Number(value));
   };
-  const updateAccessControlMembers = (
-    event: React.ChangeEvent<HTMLSelectElement>
-  ) => {
-    setAccessControlMembersSetting(Number(event.target.value));
+  const updateAccessControlMembers = (value: string) => {
+    setAccessControlMembersSetting(Number(value));
   };
   const accessControlOptions = getAccessControlOptions(accessEnum, i18n);
 
@@ -48,36 +45,22 @@ export const GroupV2Permissions: React.ComponentType<PropsType> = ({
         label={i18n('ConversationDetails--add-members-label')}
         info={i18n('ConversationDetails--add-members-info')}
         right={
-          <div className="module-conversation-details-select">
-            <select
-              onChange={updateAccessControlMembers}
-              value={conversation.accessControlMembers}
-            >
-              {accessControlOptions.map(({ name, value }) => (
-                <option aria-label={name} key={name} value={value}>
-                  {name}
-                </option>
-              ))}
-            </select>
-          </div>
+          <Select
+            onChange={updateAccessControlMembers}
+            options={accessControlOptions}
+            value={String(conversation.accessControlMembers)}
+          />
         }
       />
       <PanelRow
         label={i18n('ConversationDetails--group-info-label')}
         info={i18n('ConversationDetails--group-info-info')}
         right={
-          <div className="module-conversation-details-select">
-            <select
-              onChange={updateAccessControlAttributes}
-              value={conversation.accessControlAttributes}
-            >
-              {accessControlOptions.map(({ name, value }) => (
-                <option aria-label={name} key={name} value={value}>
-                  {name}
-                </option>
-              ))}
-            </select>
-          </div>
+          <Select
+            onChange={updateAccessControlAttributes}
+            options={accessControlOptions}
+            value={String(conversation.accessControlAttributes)}
+          />
         }
       />
     </PanelSection>
diff --git a/ts/util/getAccessControlOptions.ts b/ts/util/getAccessControlOptions.ts
index ac7c3d0686f..6320cfdb250 100644
--- a/ts/util/getAccessControlOptions.ts
+++ b/ts/util/getAccessControlOptions.ts
@@ -5,7 +5,7 @@ import { LocalizerType } from '../types/Util';
 import { AccessControlClass } from '../textsecure.d';
 
 type AccessControlOption = {
-  name: string;
+  text: string;
   value: number;
 };
 
@@ -15,11 +15,11 @@ export function getAccessControlOptions(
 ): Array<AccessControlOption> {
   return [
     {
-      name: i18n('GroupV2--all-members'),
+      text: i18n('GroupV2--all-members'),
       value: accessEnum.MEMBER,
     },
     {
-      name: i18n('GroupV2--only-admins'),
+      text: i18n('GroupV2--only-admins'),
       value: accessEnum.ADMINISTRATOR,
     },
   ];