diff --git a/package.json b/package.json index c8c31f51c..dc6e2a2d8 100644 --- a/package.json +++ b/package.json @@ -21,10 +21,10 @@ "@radix-ui/react-avatar": "^1.1.0", "@radix-ui/react-checkbox": "^1.1.1", "@radix-ui/react-dialog": "^1.1.1", + "@radix-ui/react-dropdown-menu": "2.1.6", "@radix-ui/react-icons": "^1.3.0", "@radix-ui/react-popover": "^1.1.1", "@radix-ui/react-scroll-area": "^1.2.0", - "@radix-ui/react-dropdown-menu": "2.1.6", "@radix-ui/react-select": "^2.1.1", "@radix-ui/react-slider": "^1.2.0", "@radix-ui/react-tooltip": "^1.1.4", @@ -43,11 +43,11 @@ "colorjs.io": "^0.5.2", "colorthief": "^2.4.0", "commander": "^12.1.0", - "framer-motion": "^11.11.17", "isbot": "^4.1.0", "lucide-react": "^0.439.0", "match-sorter": "^6.3.4", "moment": "^2.30.1", + "motion": "^12.4.12", "numerable": "^0.3.15", "qs": "^6.13.0", "react": "^18.3.1", diff --git a/src/components/primitives/Accordion.tsx b/src/components/primitives/Accordion.tsx index 441f3ded5..e9bf83c74 100644 --- a/src/components/primitives/Accordion.tsx +++ b/src/components/primitives/Accordion.tsx @@ -1,6 +1,6 @@ import * as RadixAccordion from "@radix-ui/react-accordion"; -import { motion } from "framer-motion"; +import { motion } from "motion/react"; import { tv } from "tailwind-variants"; import { mergeClass } from "../../utils/css"; import type { Component, Styled } from "../../utils/types"; @@ -48,10 +48,10 @@ export default function Accordion({ look, size, items, className }: AccordionPro className="border-b-2 py-lg*2 border-accent-11" initial={{ y: "100%" }} whileInView={{ y: 0 }} - transition={{ delay: 0.1 * index }} + transition={{ delay: 0.075 * index }} viewport={{ once: true }}> - + {item.trigger} diff --git a/src/components/primitives/Tabs.tsx b/src/components/primitives/Tabs.tsx index bf0579add..e14e6b3c4 100644 --- a/src/components/primitives/Tabs.tsx +++ b/src/components/primitives/Tabs.tsx @@ -41,6 +41,7 @@ import type { Component, Styled, Themable } from "../../utils/types"; import Group from "../extenders/Group"; import Container from "../layout/Container"; import EventBlocker from "./EventBlocker"; +import React from "react"; export const tabsStyles = tv( { @@ -150,7 +151,7 @@ export default function Tabs({ look, size, to, theme, className, tabs = [], ...p const relativeUrl = tab.link.split("?")[0]; return ( - <> + {tab.link ? ( )} - + ); })} diff --git a/src/context/Theme.context.tsx b/src/context/Theme.context.tsx index 0d628f422..176325ffe 100644 --- a/src/context/Theme.context.tsx +++ b/src/context/Theme.context.tsx @@ -75,7 +75,7 @@ export default function ThemeProvider({ themes, sizing, modes, children }: Theme data-theme={value?.theme} data-mode={value?.mode} style={value?.vars} - className="bg-background overflow-auto"> + className="bg-background overflow-auto ease"> {children}