Skip to content

Commit ad1d76e

Browse files
committed
Don't reverse icons that don't have directional functionality
1 parent bc070bd commit ad1d76e

File tree

7 files changed

+11
-66
lines changed

7 files changed

+11
-66
lines changed

src/components/AppBar/SpeakerMenu.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { useSelector } from "react-redux";
2222
import { type Speaker } from "api/models";
2323
import { getAllSpeakers } from "backend";
2424
import { buttonMinHeight } from "components/AppBar/AppBarTypes";
25-
import BidiIcon from "components/BidiIcon";
2625
import { setCurrentSpeaker } from "components/Project/ProjectActions";
2726
import { useAppDispatch } from "rootRedux/hooks";
2827
import { type StoreState } from "rootRedux/types";
@@ -63,7 +62,7 @@ export default function SpeakerMenu(): ReactElement {
6362
minWidth: 0,
6463
}}
6564
>
66-
<BidiIcon icon={RecordVoiceOver} />
65+
<RecordVoiceOver />
6766
</Button>
6867
<Menu
6968
anchorEl={anchorElement}

src/components/AppBar/UserMenu.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
shortenName,
3232
tabColor,
3333
} from "components/AppBar/AppBarTypes";
34-
import BidiIcon from "components/BidiIcon";
3534
import { clearCurrentProject } from "components/Project/ProjectActions";
3635
import { useAppDispatch } from "rootRedux/hooks";
3736
import { Path } from "types/path";
@@ -172,7 +171,7 @@ export function UserMenuList(props: UserMenuListProps): ReactElement {
172171
props.onSelect();
173172
}}
174173
>
175-
<BidiIcon icon={ExitToApp} iconProps={{ style: iconStyle }} />
174+
<ExitToApp style={iconStyle} />
176175
{t("userMenu.logout")}
177176
</MenuItem>
178177

src/components/BidiIcon/index.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/components/DataEntry/DataEntryHeader.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
55
import { Key } from "ts-key-enum";
66

77
import { SemanticDomainFull } from "api/models";
8-
import BidiIcon from "components/BidiIcon";
98
import theme from "types/theme";
109

1110
interface DataEntryHeaderProps {
@@ -23,10 +22,6 @@ export default function DataEntryHeader(
2322
const domain = props.domain;
2423
const { t } = useTranslation();
2524

26-
const switchIcon = (
27-
<BidiIcon icon={Help} iconProps={{ style: { fontSize: 21 } }} />
28-
);
29-
3025
return (
3126
<Typography
3227
variant="h4"
@@ -40,8 +35,8 @@ export default function DataEntryHeader(
4035
<Switch
4136
id="questionVisibilitySwitch"
4237
onChange={() => props.setQuestionVisibility(!props.questionsVisible)}
43-
icon={switchIcon}
44-
checkedIcon={switchIcon}
38+
icon={<Help style={{ fontSize: 21 }} />}
39+
checkedIcon={<Help style={{ fontSize: 21 }} />}
4540
checked={props.questionsVisible}
4641
color="primary"
4742
style={{ paddingTop: "8px" }}

src/components/DataEntry/DataEntryTable/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
} from "api/models";
2828
import * as backend from "backend";
2929
import { getCurrentUser, getUserId } from "backend/localStorage";
30-
import BidiIcon from "components/BidiIcon";
3130
import NewEntry from "components/DataEntry/DataEntryTable/NewEntry";
3231
import RecentEntry from "components/DataEntry/DataEntryTable/RecentEntry";
3332
import { filterWordsWithSenses } from "components/DataEntry/utilities";
@@ -1128,7 +1127,7 @@ export default function DataEntryTable(
11281127
variant="contained"
11291128
color={highlightExitButton ? "primary" : "secondary"}
11301129
style={{ marginTop: theme.spacing(2) }}
1131-
endIcon={<BidiIcon icon={ExitToApp} />}
1130+
endIcon={<ExitToApp />}
11321131
tabIndex={-1}
11331132
onClick={handleExit}
11341133
>

src/components/PasswordReset/ResetPage.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ExitToApp } from "@mui/icons-material";
1+
import ExitToAppIcon from "@mui/icons-material/ExitToApp";
22
import { Button, Card, Grid, TextField, Typography } from "@mui/material";
33
import {
44
type FormEvent,
@@ -11,7 +11,6 @@ import { useTranslation } from "react-i18next";
1111
import { useNavigate, useParams } from "react-router-dom";
1212

1313
import { resetPassword, validateResetToken } from "backend";
14-
import BidiIcon from "components/BidiIcon";
1514
import InvalidLink from "components/InvalidLink";
1615
import { Path } from "types/path";
1716
import { meetsPasswordRequirements } from "utilities/utilities";
@@ -169,7 +168,7 @@ export default function PasswordReset(): ReactElement {
169168
>
170169
{t("passwordReset.backToLogin")}
171170
&nbsp;
172-
<BidiIcon icon={ExitToApp} />
171+
<ExitToAppIcon />
173172
</Button>
174173
</>
175174
) : (

src/components/ProjectSettings/index.tsx

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import { toast } from "react-toastify";
3939

4040
import { Permission, type Project } from "api/models";
4141
import { canUploadLift, getCurrentPermissions } from "backend";
42-
import BidiIcon from "components/BidiIcon";
4342
import {
4443
asyncRefreshProjectUsers,
4544
asyncSetNewCurrentProject,
@@ -158,12 +157,7 @@ export default function ProjectSettingsComponent(): ReactElement {
158157
{/* Project name */}
159158
{permissions.includes(Permission.DeleteEditSettingsAndUsers) && (
160159
<BaseSettings
161-
icon={
162-
<BidiIcon
163-
icon={Edit}
164-
iconProps={{ "data-testid": Setting.Name }}
165-
/>
166-
}
160+
icon={<Edit data-testid={Setting.Name} />}
167161
title={t("projectSettings.name")}
168162
body={
169163
<ProjectName project={project} setProject={updateProject} />
@@ -174,12 +168,7 @@ export default function ProjectSettingsComponent(): ReactElement {
174168
{/* Autocomplete toggle */}
175169
{permissions.includes(Permission.DeleteEditSettingsAndUsers) && (
176170
<BaseSettings
177-
icon={
178-
<BidiIcon
179-
icon={Sms}
180-
iconProps={{ "data-testid": Setting.Autocomplete }}
181-
/>
182-
}
171+
icon={<Sms data-testid={Setting.Autocomplete} />}
183172
title={t("projectSettings.autocomplete.label")}
184173
body={
185174
<ProjectAutocomplete
@@ -255,12 +244,7 @@ export default function ProjectSettingsComponent(): ReactElement {
255244
{/* Add users to project */}
256245
{permissions.includes(Permission.DeleteEditSettingsAndUsers) && (
257246
<BaseSettings
258-
icon={
259-
<BidiIcon
260-
icon={PersonAdd}
261-
iconProps={{ "data-testid": Setting.UserAdd }}
262-
/>
263-
}
247+
icon={<PersonAdd data-testid={Setting.UserAdd} />}
264248
title={t("projectSettings.user.addUser")}
265249
body={<AddProjectUsers projectId={project.id} />}
266250
/>
@@ -269,12 +253,7 @@ export default function ProjectSettingsComponent(): ReactElement {
269253
{/* Manage project speakers */}
270254
{permissions.includes(Permission.DeleteEditSettingsAndUsers) && (
271255
<BaseSettings
272-
icon={
273-
<BidiIcon
274-
icon={RecordVoiceOver}
275-
iconProps={{ "data-testid": Setting.Speakers }}
276-
/>
277-
}
256+
icon={<RecordVoiceOver data-testid={Setting.Speakers} />}
278257
title={t("projectSettings.speaker.label")}
279258
body={<ProjectSpeakersList projectId={project.id} />}
280259
/>

0 commit comments

Comments
 (0)