[251031] fix: resolve merge conflicts in voice input overlay and search components

This commit is contained in:
2025-10-31 10:19:40 +09:00
parent 7912d0f1b3
commit 0b1d435e62
6 changed files with 311 additions and 20 deletions

View File

@@ -17,6 +17,13 @@ const initialState = {
hotPicksForYou: [],
},
shopperHouseError: null, // ShopperHouse API 오류 정보 저장
// 🎯 [Phase 1] SearchPanel 모드 제어 명령
panelCommand: {
type: null, // 명령 타입: 'SWITCH_TO_SEARCH_INPUT', 'SWITCH_TO_VOICE_INPUT' 등
source: null, // 명령 발생 출처: 'VoiceInputOverlay', 'SearchInputOverlay' 등
timestamp: null, // 명령 발생 시간
},
};
export const searchReducer = (state = initialState, action) => {
@@ -236,6 +243,31 @@ export const searchReducer = (state = initialState, action) => {
},
};
// 🎯 [Phase 1] SearchPanel 모드 제어 명령
case types.SWITCH_TO_SEARCH_INPUT_OVERLAY:
console.log('[searchReducer] 🔄 SWITCH_TO_SEARCH_INPUT_OVERLAY 명령 저장', {
source: action.payload?.source,
timestamp: new Date().toISOString(),
});
return {
...state,
panelCommand: {
type: 'SWITCH_TO_SEARCH_INPUT',
source: action.payload?.source || 'unknown',
timestamp: Date.now(),
},
};
case types.CLEAR_PANEL_COMMAND:
return {
...state,
panelCommand: {
type: null,
source: null,
timestamp: null,
},
};
default:
return state;
}