Skip to content

refactor: replace framer-motion with motion/react and update imports #709

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
anyulled merged 2 commits into from
May 14, 2025
Merged

refactor: replace framer-motion with motion/react and update imports #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe25ca9
refactor: replace framer-motion with motion/react and update imports
anyulled May 14, 2025
bb9add7
refactor: return empty array instead of object in useFetchSpeakers an…
anyulled May 14, 2025
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
27 changes: 27 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"gsap": "^3.13.0",
"lenis": "^1.3.1",
"moment": "^2.30.1",
"motion": "^12.11.0",
"primeicons": "^7.0.0",
"primereact": "^10.9.1",
"react": "^18.3.1",
Expand Down
6 changes: 3 additions & 3 deletions src/2023/Home/components/Faqs/Faqs.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { Color } from "../../../../styles/colors";
import { motion } from "framer-motion";
import { BIG_BREAKPOINT } from "../../../../constants/BreakPoints";
import { Color } from "@styles/colors";
import { motion } from "motion/react";
import { BIG_BREAKPOINT } from "@constants/BreakPoints";

export type FaqCardType = {
faq: {
Expand Down
6 changes: 3 additions & 3 deletions src/2023/Home/components/Home/Style.Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { Color } from "../../../../styles/colors";
import { motion } from "framer-motion";
import { BIG_BREAKPOINT } from "../../../../constants/BreakPoints";
import { Color } from "@styles/colors";
import { motion } from "motion/react";
Comment on lines +2 to +3
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider using a direct import from the motion package instead of motion/react if the component is intended to be used outside of React components. This might provide more flexibility and avoid unnecessary dependencies if the core animation logic is needed elsewhere.

Suggested change
import { Color } from "@styles/colors";
import { motion } from "motion/react";
import { Color } from "@styles/colors";
import { motion } from "motion";

import { BIG_BREAKPOINT } from "@constants/BreakPoints";

export const StyledHomaImage = styled.div`
padding: 70px 0 40px;
Expand Down
8 changes: 4 additions & 4 deletions src/2023/Home/components/SpeakersCarousel/SpeakerSwiper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { FC } from "react";
import { Autoplay, Parallax } from "swiper";
import { Swiper, SwiperSlide } from "swiper/react";
import { styled } from "styled-components";
import { Color } from "../../../../styles/colors";
import { Color } from "@styles/colors";
import "swiper/swiper-bundle.min.css";
import { Link } from "react-router";
import { ROUTE_SPEAKER_DETAIL } from "../../../../constants/routes";
import { useFetchSpeakers } from "../../../../hooks/useFetchSpeakers";
import { useSentryErrorReport } from "../../../../hooks/useSentryErrorReport";
import { ROUTE_SPEAKER_DETAIL } from "@constants/routes";
import { useFetchSpeakers } from "@hooks/useFetchSpeakers";
import { useSentryErrorReport } from "@hooks/useSentryErrorReport";

const StyledSlideImage = styled.img`
display: block;
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Home/components/Sponsors/Sponsors.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { styled } from "styled-components";
import { BIG_BREAKPOINT } from "@constants/BreakPoints";
import { motion } from "framer-motion";
import { motion } from "motion/react";

export const StyledSponsorsContainer = styled.div`
position: relative;
Expand Down
6 changes: 3 additions & 3 deletions src/2023/SpeakerDetail/Speaker.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { styled } from "styled-components";
import { Color } from "../../styles/colors";
import { Color } from "@styles/colors";
import {
BIG_BREAKPOINT,
LARGE_BREAKPOINT,
TABLET_BREAKPOINT,
} from "../../constants/BreakPoints";
import { motion } from "framer-motion";
} from "@constants/BreakPoints";
import { motion } from "motion/react";

export const StyledContainer = styled.div`
background-color: ${Color.BLUE};
Expand Down
6 changes: 3 additions & 3 deletions src/2023/SpeakerDetail/SpeakerDetail.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import { BIG_BREAKPOINT } from "../../constants/BreakPoints";
import { Color } from "../../styles/colors";
import { motion } from "motion/react";
import { BIG_BREAKPOINT } from "@constants/BreakPoints";
import { Color } from "@styles/colors";
import { Link } from "react-router";
/* eslint-disable @typescript-eslint/no-unused-expressions*/
export const StyledTalkDescription = styled(Link)`
Expand Down
6 changes: 3 additions & 3 deletions src/2023/Speakers/Speakers.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "../../constants/BreakPoints";
import { Color } from "../../styles/colors";
import { motion } from "motion/react";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "@constants/BreakPoints";
import { Color } from "@styles/colors";

export const StyledSpeakersSection = styled.section`
display: flex;
Expand Down
112 changes: 3 additions & 109 deletions src/2023/TalkDetail/Style.MeetingDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { BIG_BREAKPOINT, LARGE_BREAKPOINT } from "../../constants/BreakPoints";
import { motion } from "framer-motion";
import { Color } from "../../styles/colors";
import { BIG_BREAKPOINT } from "@constants/BreakPoints";
import { motion } from "motion/react";
import { Color } from "@styles/colors";

export const StyledContainer = styled.div`
padding-top: 2rem;
Expand Down Expand Up @@ -51,10 +51,8 @@ export const StyledDescription = styled.p`
`;

export const StyledExtraInfo = styled.p`
{
margin-top: 10px;
color: ${Color.LIGHT_BLUE};
}

& strong {
color: ${Color.DARK_BLUE};
Expand Down Expand Up @@ -134,18 +132,6 @@ export const StyledDetailsContainer = styled.div`
padding: 3rem 0 4rem 3rem;
}
`;

export const StyledImageContainer = styled.div`
flex-direction: column;
width: 25%;
padding: 0 1rem;
display: none;

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
display: flex;
}
`;

export const StyledRightContainer = styled.div`
display: flex;
flex-direction: row;
Expand All @@ -154,10 +140,8 @@ export const StyledRightContainer = styled.div`
`;

export const StyledNameContainer = styled.div`
{
width: 50%;
text-align: center;
}

& a {
text-decoration: none;
Expand All @@ -179,93 +163,3 @@ export const StyledName = styled.h3`
margin-bottom: 0;
}
`;

export const StyledSpeakerImgBorder = styled.div`
width: 100%;
height: 300px;
margin-bottom: 0.75rem;
padding: 0.3rem;
border: 1px solid ${Color.YELLOW};

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
padding: 0.2rem;
height: 200px;
}

@media only screen and (min-width: ${LARGE_BREAKPOINT}px) {
padding: 0.2rem;
height: 275px;
}
`;

export const StyledSpeakerImg = styled.div<{ photo: string }>`
width: 100%;
height: 100%;
background-image: url(${({ photo }) => photo});
background-repeat: no-repeat;
background-position: center;
background-size: cover;
`;

export const StyledSlashes = styled.img`
width: 80%;
margin-bottom: 0.75rem;

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
margin-bottom: 0;
width: 75%;
}
`;

export const StyledSpeakerTitle = styled.h4`
font-size: 1.15rem;
margin-bottom: 1rem;

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
text-align: left;
}
`;

export const StyledSocialMediaContainer = styled.div`
display: flex;
width: 100%;
justify-content: center;
margin-bottom: 0.75rem;
`;

export const StyledSpeakerDescription = styled.p`
text-align: justify;

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
padding-right: 4rem;
}
`;

export const StyledLink = styled.a`
text-decoration: none;
color: ${Color.WHITE};
cursor: pointer;
display: flex;
align-items: center;
`;

export const StyledSocialMediaIcon = styled.img<{ noMargin?: boolean }>`
height: 1.5rem;
margin-right: ${({ noMargin }) => (noMargin ? "0" : "0.75rem")};

@media only screen and (min-width: ${BIG_BREAKPOINT}px) {
margin-right: ${({ noMargin }) => (noMargin ? "0" : "0.5rem")};
}
`;

export const StyledAbsoluteSlashes = styled.div`
position: absolute;
display: flex;
align-items: center;
color: ${Color.DARK_BLUE};
font-size: 2rem;
height: 2rem;
font-weight: 900;
bottom: -0.65rem;
left: 0;
`;
6 changes: 3 additions & 3 deletions src/2024/Home/Style.Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import { Color } from "../../styles/colors";
import { BIG_BREAKPOINT, BIGGER_BREAKPOINT } from "../../constants/BreakPoints";
import { motion } from "motion/react";
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider using a direct import from the motion package instead of motion/react if the component is intended to be used outside of React components. This might provide more flexibility and avoid unnecessary dependencies if the core animation logic is needed elsewhere.

Suggested change
import { motion } from "motion/react";
import { motion } from "motion";

import { Color } from "@styles/colors";
import { BIG_BREAKPOINT, BIGGER_BREAKPOINT } from "@constants/BreakPoints";

export const StyledHomeImage = styled.div`
padding: 70px 0 40px;
Expand Down
6 changes: 3 additions & 3 deletions src/2024/Speakers/Speakers.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "../../constants/BreakPoints";
import { Color } from "../../styles/colors";
import { motion } from "motion/react";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "@constants/BreakPoints";
import { Color } from "@styles/colors";

export const StyledSpeakersSection = styled.section`
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/2024/Sponsors/Sponsors.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { styled } from "styled-components";
import { BIG_BREAKPOINT } from "@constants/BreakPoints";
import { motion } from "framer-motion";
import { motion } from "motion/react";

export const StyledSponsorsContainer = styled.div`
position: relative;
Expand Down
8 changes: 4 additions & 4 deletions src/components/JobOffers/JobsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { FC } from "react";
import { styled } from "styled-components";
import { Color } from "../../styles/colors";
import { motion } from "framer-motion";
import { Color } from "@styles/colors";
import { motion } from "motion/react";
import LocationIcon from "../../assets/images/LocationIcon.svg";
import {
StyledFaqCard,
StyledFaqText,
StyledFaqTitle,
} from "../../views/Home/components/Faqs/Faqs.style";
import { Offer } from "../../types/jobOffers";
} from "@views/Home/components/Faqs/Faqs.style";
import { Offer } from "@types/jobOffers";

export type IJobsCardProps = {
offer: Offer;
Expand Down
4 changes: 2 additions & 2 deletions src/components/LeftHashWithText/LeftHashWithText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FC } from "react";
import { motion } from "framer-motion";
import { motion } from "motion/react";
import { styled } from "styled-components";
import { TLateralHashWithText } from "../RightHashWithText/RightHashWithText";
import { MOBILE_BREAKPOINT } from "../../constants/BreakPoints";
import { MOBILE_BREAKPOINT } from "@constants/BreakPoints";

const StyledLeftSlashWrapper = styled(motion.div)`
display: flex;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Navigation/Style.Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import { Color } from "../../styles/colors";
import { motion } from "motion/react";
import { Color } from "@styles/colors";
import { NavLink } from "react-router";
import { MAX_WIDTH, MOBILE_BREAKPOINT } from "../../constants/BreakPoints";
import { MAX_WIDTH, MOBILE_BREAKPOINT } from "@constants/BreakPoints";

export const StyledBlueHamburger = styled(motion.img)`
height: 2.5rem;
Expand Down
4 changes: 2 additions & 2 deletions src/components/RightHashWithText/RightHashWithText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC } from "react";
import { motion } from "framer-motion";
import { motion } from "motion/react";
import { styled } from "styled-components";
import { MOBILE_BREAKPOINT } from "../../constants/BreakPoints";
import { MOBILE_BREAKPOINT } from "@constants/BreakPoints";

export type TLateralHashWithText = {
color: string;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Swiper/SpeakersCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC } from "react";
import { Link } from "react-router";
import LessThanBlueWhiteIcon from "../../assets/images/LessThanBlueIcon.svg";
import { motion } from "framer-motion";
import LessThanBlueWhiteIcon from "@assets/images/LessThanBlueIcon.svg";
import { motion } from "motion/react";
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider using a direct import from the motion package instead of motion/react if the component is intended to be used outside of React components. This might provide more flexibility and avoid unnecessary dependencies if the core animation logic is needed elsewhere.

import { motion } from "motion";

import { styled } from "styled-components";
import SpeakerSwiper from "./SpeakerSwiper";
import { Color } from "@styles/colors";
Expand Down
9 changes: 3 additions & 6 deletions src/components/YearSpecific/Speakers/Speakers.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { styled } from "styled-components";
import { motion } from "framer-motion";
import {
BIG_BREAKPOINT,
TABLET_BREAKPOINT,
} from "../../../constants/BreakPoints";
import { Color } from "../../../styles/colors";
import { motion } from "motion/react";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "@constants/BreakPoints";
import { Color } from "@styles/colors";

export const StyledSpeakersSection = styled.section`
display: flex;
Expand Down
Loading
Loading