Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify optimization tab #1514

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust tooltip location for graph
  • Loading branch information
nguyentvan7 committed Feb 19, 2024
commit 4c6c9ae8aca145134d0f07f1323fd7ad466d57ec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReadOnlyTextArea } from '@genshin-optimizer/common/react-util'
import { CardThemed } from '@genshin-optimizer/common/ui'
import { BootstrapTooltip, CardThemed } from '@genshin-optimizer/common/ui'
import {
objKeyMap,
objPathValue,
Expand Down Expand Up @@ -37,9 +37,6 @@ import {
XAxis,
YAxis,
} from 'recharts'
import BootstrapTooltip from '../../../../../../Components/BootstrapTooltip'
import CardDark from '../../../../../../Components/Card/CardDark'
import InfoTooltip from '../../../../../../Components/InfoTooltip'
import { CharacterContext } from '../../../../../../Context/CharacterContext'
import { DataContext } from '../../../../../../Context/DataContext'
import { GraphContext } from '../../../../../../Context/GraphContext'
Expand Down Expand Up @@ -225,7 +222,7 @@ export default function ChartCard({
</span>
</BootstrapTooltip>
</Grid>
<Grid item>
<Grid item flexGrow={1}>
<BootstrapTooltip
title={!plotBase ? '' : t('ui:reset')}
placement="top"
Expand All @@ -241,12 +238,6 @@ export default function ChartCard({
</span>
</BootstrapTooltip>
</Grid>
<Grid item flexGrow={1}>
<InfoTooltip
placement="top"
title={t('page_character_optimize:tcGraph.desc')}
/>
</Grid>
{!!downloadData && (
<Grid item>
<Button
Expand All @@ -273,7 +264,7 @@ export default function ChartCard({
{chartData && displayData && !!displayData.length && (
<CardContent>
<Collapse in={!!downloadData && showDownload}>
<CardDark sx={{ mb: 2 }}>
<CardThemed bgt="dark" sx={{ mb: 2 }}>
<CardContent>
<Typography>Min Data</Typography>
<ReadOnlyTextArea
Expand All @@ -284,7 +275,7 @@ export default function ChartCard({
value={JSON.stringify(downloadData?.allData)}
/>
</CardContent>
</CardDark>
</CardThemed>
</Collapse>
<Chart
displayData={displayData}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useForceUpdate } from '@genshin-optimizer/common/react-util'
import { InfoTooltip } from '@genshin-optimizer/common/ui'
import { objPathValue, range } from '@genshin-optimizer/common/util'
import type { CharacterKey } from '@genshin-optimizer/gi/consts'
import { charKeyToLocCharKey } from '@genshin-optimizer/gi/consts'
Expand Down Expand Up @@ -598,6 +599,10 @@ export default function TabBuild() {
>
<AccordionSummary expandIcon={<ExpandMore />}>
{t('tcGraph.summary')}
<InfoTooltip
placement="top"
title={t('page_character_optimize:tcGraph.desc')}
/>
</AccordionSummary>
<AccordionDetails>
<ChartCard
Expand Down
Loading