calendar fixed

This commit is contained in:
VividTruthKeeper 2023-03-15 16:32:48 +05:00
parent 26b42b341f
commit 13a8f509bb
2 changed files with 26 additions and 21 deletions

View File

@ -13,29 +13,25 @@ const Calendar = () => {
const valueMemo = useMemo(() => ({ value, onChange }), [value, onChange]); const valueMemo = useMemo(() => ({ value, onChange }), [value, onChange]);
const constructDateParam = useCallback(() => { const constructDateParam = (date: Date) => {
return `${value.getFullYear()}-${ return `${date.getFullYear()}-${
value.getDate().toString().length < 2 (date.getMonth() + 1).toString().length < 2
? "0" + value.getDate() ? "0" + (date.getMonth() + 1)
: value.getDate() : date.getMonth() + 1
}-${ }-${
(value.getMonth() + 1).toString().length < 2 date.getDate().toString().length < 2
? "0" + (value.getMonth() + 1) ? "0" + date.getDate()
: value.getMonth() + 1 : date.getDate()
}`; }`;
}, [valueMemo.value]); };
const api = new Api(url + `/posts`, [
{ name: "date", value: constructDateParam() },
]);
return ( return (
<div className="calendar"> <div className="calendar">
<ReactCalendar <ReactCalendar
value={valueMemo.value} value={valueMemo.value}
onChange={valueMemo.onChange} onChange={valueMemo.onChange}
onClickDay={() => onClickDay={(date) =>
navigate(`/all?type=date&date=${constructDateParam()}`) navigate(`/all?type=date&date=${constructDateParam(date)}`)
} }
/> />
</div> </div>

View File

@ -79,7 +79,6 @@ const AllPosts = () => {
api.get(data, setData); api.get(data, setData);
}, [params]); }, [params]);
console.log(pageMemo.activePage);
useEffect(() => { useEffect(() => {
if (language !== lastLanguage) { if (language !== lastLanguage) {
api.get(data, setData); api.get(data, setData);
@ -106,11 +105,21 @@ const AllPosts = () => {
/> />
) : null} ) : null}
{data ? ( {data ? (
<CustomNewsScroll data.data.length > 0 ? (
data={data} <CustomNewsScroll
pagination={true} data={data}
pageMemo={pageMemo} pagination={true}
/> pageMemo={pageMemo}
/>
) : (
<span className="empty">
{language === "EN"
? "No news for the selected date"
: language === "RU"
? "Нет новостей для выбранной даты"
: "Saýlanan sene üçin habar ýok"}
</span>
)
) : ( ) : (
<Loader /> <Loader />
)} )}