Skip to content

Commit 3c636a8

Browse files
committed
refactor: 일부 데이터 타입들 변경
1 parent 17f9bd8 commit 3c636a8

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

src/components/ReceiptEdit/ReceiptEdit.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { useScanDataStore } from "@/store/useScanDataStore";
1313
const ReceiptEdit = () => {
1414
const { navigateToHome, navigateToSelectTag } = useRoute();
1515

16-
const { scanData } = useScanDataStore();
16+
const { scanData, resetScanData } = useScanDataStore();
1717

1818
const { setOcrText } = useCreateReviewStore();
1919

@@ -66,6 +66,11 @@ const ReceiptEdit = () => {
6666
navigateToSelectTag();
6767
};
6868

69+
const handleReScanClick = () => {
70+
resetScanData();
71+
navigateToHome();
72+
};
73+
6974
return (
7075
<div className={styles.ReceiptEdit}>
7176
<div className={styles.Top}>
@@ -114,7 +119,7 @@ const ReceiptEdit = () => {
114119
/>
115120
) : (
116121
<>
117-
<Button text="다시 스캔하기" variant="secondary" onClick={navigateToHome} />
122+
<Button text="다시 스캔하기" variant="secondary" onClick={handleReScanClick} />
118123
<Button
119124
text="정보가 맞아요"
120125
disabled={formData.some((item) => Object.values(item).some((value) => !value))}

src/components/ReviewResult/ReviewResult.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const ReviewResult = () => {
2424
const { generateReviewData } = useGenerateReviewStore();
2525

2626
const { isOpen, handleClose, handleOpen } = useOverlay();
27-
const { isToast } = useToast(1000);
27+
const { isToast, showToast } = useToast(1000);
2828

2929
const handleConfetti = () => {
3030
const setting: ConfettiOptions = {
@@ -62,9 +62,11 @@ const ReviewResult = () => {
6262
text="복사하기"
6363
iconName="paste"
6464
size="sm"
65-
onClick={() =>
66-
send({ type: AppBridgeMessageType.COPY, payload: { review: generateReviewData } })
67-
}
65+
onClick={() => {
66+
send({ type: AppBridgeMessageType.COPY, payload: { review: generateReviewData } });
67+
68+
showToast();
69+
}}
6870
/>
6971
</div>
7072
</div>

src/components/provider/AppBridgeProvider/convertToNativeMessage.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const iosHandlers = {
1111
[AppBridgeMessageType.CREATE_REVIEW]: (message: {
1212
payload: { ocrText: string; hashTag: string[]; reviewStyle: string };
1313
}) => window.webkit?.messageHandlers.createReview.postMessage(message.payload),
14-
[AppBridgeMessageType.COPY]: (message: { payload: { json: string } }) =>
15-
window.webkit?.messageHandlers.copy.postMessage(message.payload.json),
14+
[AppBridgeMessageType.COPY]: (message: { payload: { review: string } }) =>
15+
window.webkit?.messageHandlers.copy.postMessage(message.payload),
1616
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: string } }) =>
1717
window.response?.receiveScanResult(message.payload.result),
1818
[AppBridgeMessageType.RECEIVE_GENERATED_REVIEW]: (message: { payload: { result: string } }) =>
@@ -23,10 +23,11 @@ const androidHandlers = {
2323
[AppBridgeMessageType.OPEN_CAMERA]: () => window.AndroidBridge?.openCamera(),
2424
[AppBridgeMessageType.OPEN_GALLERY]: () => window.AndroidBridge?.openGallery(),
2525
[AppBridgeMessageType.SHARE]: () => window.AndroidBridge?.share(),
26-
[AppBridgeMessageType.CREATE_REVIEW]: (message: { payload: { json: string } }) =>
27-
window.AndroidBridge?.createReview(message.payload.json),
28-
[AppBridgeMessageType.COPY]: (message: { payload: { json: string } }) =>
29-
window.AndroidBridge?.copy(message.payload.json),
26+
[AppBridgeMessageType.CREATE_REVIEW]: (message: {
27+
payload: { ocrText: string; hashTag: string[]; reviewStyle: string };
28+
}) => window.AndroidBridge?.createReview(message.payload),
29+
[AppBridgeMessageType.COPY]: (message: { payload: { review: string } }) =>
30+
window.AndroidBridge?.copy(message.payload),
3031
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: string } }) =>
3132
window.response?.receiveScanResult(message.payload.result),
3233
[AppBridgeMessageType.RECEIVE_GENERATED_REVIEW]: (message: { payload: { result: string } }) =>

src/types/global.d.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ declare global {
1515
hashTag: string[];
1616
reviewStyle: string;
1717
}
18+
19+
interface CopyMessagePayload {
20+
review: string;
21+
}
1822
interface Window {
1923
response?: {
2024
receiveScanResult: (jsonData: string) => void;
@@ -26,15 +30,15 @@ declare global {
2630
openGallery: MessageHandler<string>;
2731
share: MessageHandler<string>;
2832
createReview: MessageHandler<CreateReviewPayload>;
29-
copy: MessageHandler<string>;
33+
copy: MessageHandler<CopyMessagePayload>;
3034
};
3135
};
3236
AndroidBridge?: {
3337
openCamera: () => void;
3438
openGallery: () => void;
3539
share: () => void;
36-
createReview: (json: string) => void;
37-
copy: (json: string) => void;
40+
createReview: (json: CreateReviewPayload) => void;
41+
copy: (json: CopyMessagePayload) => void;
3842
};
3943
}
4044
}

0 commit comments

Comments
 (0)