Skip to content

[Refactor/#84] 일부 디자인 수정, 타입 변경 #89

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.

Sign up for GitHub

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

Merged
sikkzz merged 1 commit into from
Feb 15, 2025
+19 −26
Merged

[Refactor/#84] 일부 디자인 수정, 타입 변경 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/Home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Home = () => {
onClick={() => {
send({ type: AppBridgeMessageType.OPEN_GALLERY, payload: "" });

send({ type: AppBridgeMessageType.RECEIVE_SCAN_RESULT, payload: scanData });
send({ type: AppBridgeMessageType.RECEIVE_SCAN_RESULT, payload: { result: "" } });
}}
/>
<IconButton
Expand All @@ -55,7 +55,7 @@ const Home = () => {
onClick={() => {
send({ type: AppBridgeMessageType.OPEN_CAMERA, payload: "" });

send({ type: AppBridgeMessageType.RECEIVE_SCAN_RESULT, payload: scanData });
send({ type: AppBridgeMessageType.RECEIVE_SCAN_RESULT, payload: { result: "" } });
}}
/>
</div>
Expand Down
5 changes: 1 addition & 4 deletions src/components/ReceiptEdit/ReceiptEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ const ReceiptEdit = () => {

const { setOcrText } = useCreateReviewStore();

const [formData, setFormData] = useState<{ [key: string]: string }[]>([
{ test: "abc" },
{ test2: "aadsasf" },
]);
const [formData, setFormData] = useState<{ key: string; value: string }[]>([]);
const [focusState, setFocusState] = useState<{ [key: string]: boolean }>({});

useEffect(() => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/provider/AppBridgeProvider/AppBridgeMessage.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export interface CopyMessage {

export interface ReceiveScanResultMessage {
type: AppBridgeMessageType.RECEIVE_SCAN_RESULT;
// payload: Array<{ [key: string]: string }>;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
payload: any;
payload: {
result: string;
};
}

export interface ReceiveGeneratedReviewMessage {
Expand Down
4 changes: 1 addition & 3 deletions src/components/provider/AppBridgeProvider/AppBridgeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ export function AppBridgeProvider({ children }: AppBridgeProviderProps) {
useEffect(() => {
if (typeof window !== "undefined") {
window.response = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
receiveScanResult: (jsonData: any) => {
receiveScanResult: (jsonData: string) => {
try {
// alert("Scan Result: " + jsonData);
setScanData(JSON.parse(jsonData));
} catch (error) {
console.error("Invalid JSON data for scan result:", error);
Expand Down
6 changes: 2 additions & 4 deletions src/components/provider/AppBridgeProvider/convertToNativeMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ const iosHandlers = {
}) => window.webkit?.messageHandlers.createReview.postMessage(message.payload),
[AppBridgeMessageType.COPY]: (message: { payload: { review: string } }) =>
window.webkit?.messageHandlers.copy.postMessage(message.payload),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: any } }) =>
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: string } }) =>
window.response?.receiveScanResult(message.payload.result),
[AppBridgeMessageType.RECEIVE_GENERATED_REVIEW]: (message: { payload: { result: string } }) =>
window.response?.receiveGeneratedReview(message.payload.result),
Expand All @@ -29,8 +28,7 @@ const androidHandlers = {
}) => window.AndroidBridge?.createReview(JSON.stringify(message.payload)),
[AppBridgeMessageType.COPY]: (message: { payload: { review: string } }) =>
window.AndroidBridge?.copy(JSON.stringify(message.payload)),
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: any } }) =>
[AppBridgeMessageType.RECEIVE_SCAN_RESULT]: (message: { payload: { result: string } }) =>
window.response?.receiveScanResult(message.payload.result),
[AppBridgeMessageType.RECEIVE_GENERATED_REVIEW]: (message: { payload: { result: string } }) =>
window.response?.receiveGeneratedReview(message.payload.result),
Expand Down
13 changes: 5 additions & 8 deletions src/store/useScanDataStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { create } from "zustand";

interface ScanDataStoreProps {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
scanData: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setScanData: (scanData: any[]) => void;
scanData: ScanResultPayload;
setScanData: (scanData: ScanResultPayload) => void;
resetScanData: () => void;
}

export const useScanDataStore = create<ScanDataStoreProps>((set) => ({
scanData: [],
// eslint-disable-next-line @typescript-eslint/no-explicit-any
setScanData: (scanData: any[]) => set({ scanData }),
resetScanData: () => set({ scanData: [] }),
scanData: { parsed: [] },
setScanData: (scanData: ScanResultPayload) => set({ scanData }),
resetScanData: () => set({ scanData: { parsed: [] } }),
}));
7 changes: 5 additions & 2 deletions src/types/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ declare global {
interface CopyMessagePayload {
review: string;
}

interface ScanResultPayload {
parsed: Array<{ key: string; value: string }>;
}
interface Window {
response?: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
receiveScanResult: (jsonData: any) => void;
receiveScanResult: (jsonData: string) => void;
receiveGeneratedReview: (jsonData: string) => void;
};
webkit?: {
Expand Down