Контроль и ограничения (часть 1)

src/components/app.tsx

@@ -6,27 +6,22 @@ import { Route, Routes } from 'react-router-dom';
 import { AppRoute, authorizationStatus } from '../const';
 import NotFoundPage from '../pages/not-found-page';
 import ProtectedRoute from './protected-route';
-import { Offer } from '../types/offer';
 
-type TAppProps = {
-  offers: Offer[];
-}
-
-export default function App({ offers }: TAppProps) {
+export default function App() {
   return (
     <Routes>
       <Route path='/'>
         <Route
           index
-          element={<MainPage offers={offers} />}
+          element={<MainPage />}
         />
         <Route
           path={`/${AppRoute.Offer}/:offerId`}
-          element={<OfferPage offers={offers} />}
+          element={<OfferPage />}
         />
         <Route
           path={AppRoute.Favorites}
-          element={<ProtectedRoute hasAccess={authorizationStatus.AUTH}> <FavoritePage offers={offers} /></ProtectedRoute>}
+          element={<ProtectedRoute hasAccess={authorizationStatus.AUTH}> <FavoritePage /></ProtectedRoute>}
         />
         <Route
           path={AppRoute.Login}

src/components/card.tsx

@@ -9,40 +9,50 @@
     width: string;
     height: string;
   };
+  handelPointCardMouseOver?: (currentOffer: OfferPreviews | null) => void;
 }
 
-export default function Card({ offer, optionCard }: TCardProps) {
+export default function Card({ offer, optionCard, handelPointCardMouseOver }: TCardProps) {
   const { width, height, classCard } = optionCard;
+
+  const onPointCardMouseOver = () => {
+    handelPointCardMouseOver(offer);
+  };
+
+  const onPointCardMouseLeave = () => {
+    handelPointCardMouseOver(null);
+  };
+
   return (
-    <article className={`${classCard} place-card`} data-id={offer.id}>
+    <article className={`${classCard} place-card`} onMouseOver={onPointCardMouseOver} onMouseLeave={onPointCardMouseLeave}>
       {offer.isPremium &&
         <div className="place-card__mark">
           <span>Premium</span>
         </div>}
 
       <div className="cities__image-wrapper place-card__image-wrapper">
         <Link to={`/${AppRoute.Offer}/${offer.id}`}>
-          <img className="place-card__image" src={`${offer.previewImage}`} width={width} height={height} alt="Place image" data-id={offer.id} />
+          <img className="place-card__image" src={`${offer.previewImage}`} width={width} height={height} alt="Place image" />
         </Link>
       </div>
-      <div className="place-card__info" data-id={offer.id}>
-        <div className="place-card__price-wrapper" data-id={offer.id}>
-          <div className="place-card__price" data-id={offer.id}>
-            <b className="place-card__price-value" data-id={offer.id}>&euro;{offer.price}</b>
-            <span className="place-card__price-text" data-id={offer.id}>&#47;&nbsp;night</span>
+      <div className="place-card__info" >
+        <div className="place-card__price-wrapper" >
+          <div className="place-card__price" >
+            <b className="place-card__price-value" >&euro;{offer.price}</b>
+            <span className="place-card__price-text" >&#47;&nbsp;night</span>
           </div>
-          <button className="place-card__bookmark-button button" type="button" data-id={offer.id}>
-            <svg className="place-card__bookmark-icon" width="18" height="19" data-id={offer.id}>
+          <button className="place-card__bookmark-button button" type="button" >
+            <svg className="place-card__bookmark-icon" width="18" height="19" >
               <use xlinkHref="#icon-bookmark"></use>
             </svg>
             <span className="visually-hidden">To bookmarks</span>
           </button>
         </div>
-        <Rating ratingClass="place-card" rating={offer.rating} data-id={offer.id} />
-        <h2 className="place-card__name" data-id={offer.id}>
-          <Link to={`/${AppRoute.Offer}/${offer.id}`} state={offer} data-id={offer.id}>{offer.title}</Link>
+        <Rating ratingClass="place-card" rating={offer.rating} />
+        <h2 className="place-card__name" >
+          <Link to={`/${AppRoute.Offer}/${offer.id}`} state={offer} >{offer.title}</Link>
         </h2>
-        <p className="place-card__type" data-id={offer.id}>{offer.type}</p>
+        <p className="place-card__type" >{offer.type}</p>
       </div>
     </article>
   );

src/components/list-cards.tsx

@@ -1,30 +1,23 @@
-import { MouseEvent, useState } from 'react';
-import { optionCard } from '../const';
+import { OptionCard } from '../const';
 import { Offer } from '../types/offer';
 import Card from './card';
+import { OfferPreviews } from '../types/offer-preview';
 
 type ListOfferNearbyProps = {
   offers: Offer[];
-  onListItemHover: (currentCard: Offer) => void;
+  onListItemHover: (currentCard: OfferPreviews | null) => void;
   extraClass: string;
 }
 
 export default function ListCards({ offers, onListItemHover, extraClass }: ListOfferNearbyProps) {
-  const [cardId, setCardId] = useState('');
 
-  const onPointingCardMouseOver = ({ target }: MouseEvent<HTMLDivElement>) => {
-    setCardId(target.dataset.id);
+  const handelPointingCardMouseOver = (offer: OfferPreviews | null) => {
+    onListItemHover(offer);
   };
 
-  const currentCard = offers.find((offer) => offer.id === cardId);
-
-  if (currentCard !== undefined) {
-    onListItemHover(currentCard);
-  }
-
   return (
-    <div className={extraClass} onMouseOver={onPointingCardMouseOver}>
-      {offers.map((offer) => <Card key={offer.id} optionCard={optionCard.CITIES_CARD} offer={offer} />)}
+    <div className={extraClass}>
+      {offers.map((offer) => <Card key={offer.id} optionCard={OptionCard.CITIES_CARD} offer={offer} handelPointCardMouseOver={handelPointingCardMouseOver} />)}
     </div>
   );
 }

src/components/list-location.tsx

@@ -0,0 +1,15 @@
+import Location from './location';
+import { MouseEvent } from 'react';
+
+type ListLocation = {
+  listLocations: string[];
+  handleCurrentCityClick: (evt: MouseEvent<HTMLSpanElement>) => void;
+}
+
+export default function ListLocation({ listLocations, handleCurrentCityClick }: ListLocation) {
+  return (
+    <ul className="locations__list tabs__list" onClick={handleCurrentCityClick}>
+      {listLocations.map((location) => <Location key={location} city={location} />)}
+    </ul>
+  );
+}

src/components/location.tsx

@@ -0,0 +1,14 @@
+type LocationProps = {
+  city: string;
+}
+
+export default function Location({ city }: LocationProps) {
+  return (
+    <li className="locations__item">
+      <a className="locations__item-link tabs__item" href="#">
+        <span>{city}</span>
+      </a>
+    </li>
+  );
+}
+

src/components/map.tsx

@@ -5,11 +5,13 @@
 import { URL_MARKER_DEFAULT, URL_MARKER_CURRENT } from '../const';
 import { City } from '../types/city';
 import useMap from '../hooks/useMap';
+import { OfferPreviews } from '../types/offer-preview';
+import { MapSize } from '../const';
 
 type MapProps = {
   city: City;
   offers: Offer[];
-  selectedOffer: Offer | undefined;
+  selectedOffer: OfferPreviews | null;
 };
 
 const defaultCustomIcon = leaflet.icon({
@@ -26,30 +28,35 @@
 
 export default function Map(props: MapProps): JSX.Element {
   const { city, offers, selectedOffer } = props;
-
+  console.log(city);
   const mapRef = useRef(null);
   const map = useMap(mapRef, city);
 
   useEffect(() => {
     if (map) {
+      const markerLayer = leaflet.layerGroup().addTo(map);
       offers.forEach((offer) => {
         leaflet.marker({
           lat: offer.location.latitude,
           lng: offer.location.longitude
         }, {
-          icon: (selectedOffer !== undefined && offer.title === selectedOffer.title)
+          icon: (selectedOffer !== null && offer.title === selectedOffer.title)
             ? currentCustomIcon
             : defaultCustomIcon,
         })
-          .addTo(map);
+          .addTo(markerLayer);
       });
+      return () => {
+        map.removeLayer(markerLayer);
+        mapRef.current = null;
+      };
     }
-  }, [map, offers, selectedOffer]);
+  }, [map, offers, selectedOffer, city]);
 
   return (
     <div
       ref={mapRef}
-      style={{ width: '100%', height: '100%' }}
+      style={{ width: MapSize.WIDTH, height: MapSize.HEIGHT }}
     >
 
     </div>

src/const.ts

@@ -10,7 +10,7 @@ const AuthorizationStatus = {
   NO_AUTH: false,
 };
 
-const optionCard = {
+const OptionCard = {
   CITIES_CARD: {
     classCard: 'cities__card',
     width: '260',
@@ -23,6 +23,12 @@ const optionCard = {
   }
 };
 
+const MapSize = {
+  WIDTH: '100%',
+  HEIGHT: '100%',
+};
+
+
 const OptionListCard = {
   FAVORITES_CARD: 'near-places__list places__list',
   CITIES_CARD: 'cities__places-list places__list tabs__content',
@@ -35,4 +41,4 @@ const URL_MARKER_CURRENT = '../markup/img/pin-active.svg';
 
 const CountStar: number = 5;
 
-export { CountStar, AppRoute, AuthorizationStatus as authorizationStatus, optionCard, URL_MARKER_DEFAULT, URL_MARKER_CURRENT, OptionListCard };
+export { CountStar, AppRoute, AuthorizationStatus as authorizationStatus, OptionCard, URL_MARKER_DEFAULT, URL_MARKER_CURRENT, OptionListCard, MapSize };

src/hooks/index.ts

@@ -0,0 +1,9 @@
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import type { State, AppDispatch } from '../types/state';
+
+const useAppDispatch = () => useDispatch<AppDispatch>();
+
+const useAppSelector: TypedUseSelectorHook<State> = useSelector;
+
+export { useAppDispatch, useAppSelector };
+

src/hooks/useMap.tsx

@@ -8,9 +8,10 @@
 ): Map | null {
   const [map, setMap] = useState<Map | null>(null);
   const isRenderedRef = useRef<boolean>(false);
-
+  console.log('1 условие:', isRenderedRef.current, '2 условие: ', mapRef.current);
   useEffect(() => {
     if (mapRef.current !== null && !isRenderedRef.current) {
+      console.log('rfhnf', city);
       const instance = new Map(mapRef.current, {
         center: {
           lat: city.location.latitude,
@@ -28,10 +29,12 @@
       );
 
       instance.addLayer(layer);
-
       setMap(instance);
     }
-    isRenderedRef.current = true;
+
+    return () => {
+      isRenderedRef.current = true;
+    };
   }, [mapRef, city]);
 
   return map;

src/index.tsx

@@ -4,17 +4,21 @@
 import { BrowserRouter } from 'react-router-dom';
 import { HelmetProvider } from 'react-helmet-async';
 import { offers } from './mocks/offers';
+import { Provider } from 'react-redux';
+import { store } from './store';
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement
 );
 
 root.render(
   <React.StrictMode>
-    <HelmetProvider>
-      <BrowserRouter>
-        <App offers={offers} />
-      </BrowserRouter>
-    </HelmetProvider>
+    <Provider store={store}>
+      <HelmetProvider>
+        <BrowserRouter>
+          <App offers={offers} />
+        </BrowserRouter>
+      </HelmetProvider>
+    </Provider>
   </React.StrictMode>
 );

src/mocks/locations.ts

@@ -0,0 +1 @@
+export const locations = ['Paris', 'Cologne', 'Brussels', 'Amsterdam', 'Hamburg', 'Dusseldorf',];

src/pages/favorite-page.tsx

@@ -2,16 +2,15 @@ import Container from '../components/container';
 import Card from '../components/card';
 import FavoriteItems from '../components/favorite-items';
 import { Helmet } from 'react-helmet-async';
-import { Offer } from '../types/offer';
-import { optionCard } from '../const';
+import { OptionCard } from '../const';
 import FavoritesEmpty from '../components/favorites-empty';
 import { getFavoritesByLocation } from '../utils/utils';
+import { useAppSelector } from '../hooks';
 
-type TOfferPageProps = {
-  offers: Offer[];
-}
 
-export default function FavoritePage({ offers }: TOfferPageProps) {
+export default function FavoritePage() {
+  const offers = useAppSelector((state) => state.offers);
+
   const favorites = getFavoritesByLocation(offers);
   return (
     <Container mainClass='favorites'>
@@ -26,7 +25,7 @@ export default function FavoritePage({ offers }: TOfferPageProps) {
               <ul className="favorites__list">
                 {Object.entries(favorites).map(([location, gropedFavorites]) => (
                   <FavoriteItems key={location} city={location}>
-                    {gropedFavorites.map((favorite) => <Card key={favorite.id} optionCard={optionCard.FAVORITES_CARD} offer={favorite} />)}
+                    {gropedFavorites.map((favorite) => <Card key={favorite.id} optionCard={OptionCard.FAVORITES_CARD} offer={favorite} />)}
                   </FavoriteItems>
                 )
                 )}