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

シンプルダイスロールで履歴を表示するように #297

Merged
merged 1 commit into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 23 additions & 12 deletions src/app/[locale]/(app)/dice/_components/SimpleDiceOutput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,35 @@ import D20 from '/public/assets/images/D20.svg';
import { twMerge } from 'tailwind-merge';

import styles from './SimpleDiceOutput.module.css';
import scrollbarStyles from '@/shared/styles/pretty-scrollbar.module.css';
import type { AvailableDice } from './hooks/useSimpleDiceInput';
import { useSimpleDiceOutput } from './hooks/useSimpleDiceOutput';

export const SimpleDiceOutput: FC = () => {
const { simpleDiceOutput } = useSimpleDiceOutput();
const { latestOutput, history } = useSimpleDiceOutput();

if (simpleDiceOutput === null) {
return <div className="grid min-h-[5rem] place-content-center text-slate-400">{t('dice:simple.output')}</div>;
if (latestOutput === null) {
return <div className="grid h-36 place-content-center text-slate-400">{t('dice:simple.output')}</div>;
}

const diceComponentCount = simpleDiceOutput.result.reduce((acc, { result }) => {
const diceComponentCount = latestOutput.result.reduce((acc, { result }) => {
return acc + result.length;
}, 0);
const animationDelayStep = diceComponentCount > 10 ? 0.3 / diceComponentCount : 0.03;

return (
<div className="min-h-[5rem]">
<div className="flex flex-wrap items-center">
{simpleDiceOutput.result.map(({ dice, result }, i) => {
<div>
<div className="flex flex-wrap items-center min-h-12">
{latestOutput.result.map(({ dice, result }, i) => {
const DiceComponent = diceComponents[dice];

const index = simpleDiceOutput.result.slice(0, i).reduce((acc, { result }) => {
const index = latestOutput.result.slice(0, i).reduce((acc, { result }) => {
return acc + result.length;
}, 0);

return result.map((count, i) => (
<DiceComponent
key={`${simpleDiceOutput.key}-${dice}-${i}`}
key={`${latestOutput.key}-${dice}-${i}`}
count={count}
className="animate-popup opacity-0"
style={{ animationDelay: `${(index + i) * animationDelayStep}s` }}
Expand All @@ -52,13 +53,23 @@ export const SimpleDiceOutput: FC = () => {
style={{
animationDelay: `${diceComponentCount * animationDelayStep + 0.2}s`,
}}
key={simpleDiceOutput.key}
key={latestOutput.key}
>
<IconChevronsRight />
<div className="text-xl font-bold">{simpleDiceOutput.sum}</div>
<div className="text-xl font-bold">{latestOutput.sum}</div>
</div>
</div>
<div className="text-slate-400">{simpleDiceOutput.resultStr}</div>
<div className="text-slate-500">{latestOutput.resultStr}</div>
<div className={clsx('h-16 overflow-auto mt-2', scrollbarStyles['pretty-scrollbar'])}>
{history
.toReversed()
.slice(1)
.map((output) => (
<div className="text-slate-300" key={output.key}>
{output.resultStr}
</div>
))}
</div>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ export type simpleDiceOutputAtom = {
resultStr: string;
};

const simpleDiceOutputAtom = atom<simpleDiceOutputAtom | null>(null);
const simpleDiceOutputHistoryAtom = atom<simpleDiceOutputAtom[]>([]);

export const useSimpleDiceOutput = () => {
const [simpleDiceOutput, setSimpleDiceOutput] = useAtom(simpleDiceOutputAtom);
return { simpleDiceOutput, setSimpleDiceOutput };
const [history, setHistory] = useAtom(simpleDiceOutputHistoryAtom);
const setOutput = (output: simpleDiceOutputAtom) => {
setHistory((prev) => [...prev, output]);
};
const latestOutput = history[history.length - 1] ?? null;
return { latestOutput, history, setOutput };
};
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const sum = (arr: number[]) => arr.reduce((acc, curr) => acc + curr, 0);

export const useSimpleDiceRoll = () => {
const { simpleDiceRoll: simpleDiceRollCore } = useSimpleDiceRollCore();
const { setSimpleDiceOutput } = useSimpleDiceOutput();
const { setOutput } = useSimpleDiceOutput();
const { sendEvent } = useGoogleAnalytics();

const simpleDiceRoll = useCallback(
Expand All @@ -49,12 +49,12 @@ export const useSimpleDiceRoll = () => {
.join('+'),
);

setSimpleDiceOutput({
setOutput({
key: Date.now().toString(36) + Math.random().toString(36).slice(2),
...result,
});
},
[sendEvent, setSimpleDiceOutput, simpleDiceRollCore],
[sendEvent, setOutput, simpleDiceRollCore],
);

return { simpleDiceRoll };
Expand Down
Loading