From 6b367aeb8c488ec37beec240f8a937b6bc0144b2 Mon Sep 17 00:00:00 2001 From: Amin Ghasempoor Date: Sun, 15 Oct 2023 16:45:36 +0330 Subject: [PATCH] CFE-26 styling tabs and active --- .../CallTabs/callTabsList/CallTabDetails.jsx | 10 +++++----- .../CallTabs/callTabsList/CallTabLabel.jsx | 17 ++++++++++------ .../__test__/CallTabDetails.test.js | 2 +- .../CallTabs/callTabsList/index.jsx | 11 +++++++--- src/lib/callWidget/contexts/answers.jsx | 20 +++++++++++++++++-- 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx index 6856eec..574d4ca 100644 --- a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx @@ -11,19 +11,19 @@ const CallTabDetails = ({tab}) => { } return ( - - - {tab.phone_number} + + + {tab.phone_number} { error ? ( - errror + errror ): ( isLoading ? ( ) :( - 5 روز پیش + 5 روز پیش //dateChange(data.date) ) ) } diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx index dc1811a..877dfb2 100644 --- a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx @@ -4,18 +4,23 @@ import useAnswers from "@/lib/callWidget/hooks/useAnswers"; import CallTabDetails from "@/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails"; -const CallTabLabel = ({tab}) => { - const {closeAnswerTab} = useAnswers() +const CallTabLabel = ({tab, index}) => { + const {closeAnswerTab, activeTab} = useAnswers() const handleCloseClick = (id) => { closeAnswerTab(id) }; return ( - - + + - handleCloseClick(tab.id)}> - + handleCloseClick(tab.id)}> + diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js index 9714201..f81920a 100644 --- a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js @@ -15,7 +15,7 @@ describe("Call Tab Details from Call Tan List", ()=>{ ) - const phoneNumberElement = screen.getByRole("heading", {level : 6}) + const phoneNumberElement = screen.getByText("09134849737") await waitFor(()=>{ expect(phoneNumberElement).toHaveTextContent("09134849737") }) diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx index 6a9c5ef..898e729 100644 --- a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx @@ -14,10 +14,15 @@ const CallTabsList = () => { - {answersList.map((answer) => ( - } key={answer.id}/> + {answersList.map((answer, index) => ( + } key={answer.id}/> ))} diff --git a/src/lib/callWidget/contexts/answers.jsx b/src/lib/callWidget/contexts/answers.jsx index 3e49bce..86033b2 100644 --- a/src/lib/callWidget/contexts/answers.jsx +++ b/src/lib/callWidget/contexts/answers.jsx @@ -20,14 +20,30 @@ export const AnswersProvider = ({children}) => { const [state, dispatch] = useReducer(reducer, [{ id:45, phone_number:'09120630676', - active:true + active:false }, { id:50, phone_number:'09120630675', - active:true + active:false }, { id:55, phone_number:'09120630672', + active:false + }, { + id:60, + phone_number:'09120630672', + active:false + }, { + id:65, + phone_number:'09120630672', + active:false + }, { + id:70, + phone_number:'09120630672', + active:false + }, { + id:75, + phone_number:'09120630672', active:true }]);