diff --git a/apps/insights/src/app/price-feeds/layout.ts b/apps/insights/src/app/price-feeds/layout.ts index 356243f82e..ccac787736 100644 --- a/apps/insights/src/app/price-feeds/layout.ts +++ b/apps/insights/src/app/price-feeds/layout.ts @@ -1,6 +1,9 @@ import type { Metadata } from "next"; +import type { ReactNode } from "react"; -export { ZoomLayoutTransition as default } from "../../components/ZoomLayoutTransition"; +const Layout = ({ children }: { children: ReactNode }) => children; +export default Layout; +// export { ZoomLayoutTransition as default } from "../../components/ZoomLayoutTransition"; export const metadata: Metadata = { title: { diff --git a/apps/insights/src/app/publishers/[cluster]/[key]/price-feeds/loading.tsx b/apps/insights/src/app/publishers/[cluster]/[key]/price-feeds/loading.tsx new file mode 100644 index 0000000000..945a19fef5 --- /dev/null +++ b/apps/insights/src/app/publishers/[cluster]/[key]/price-feeds/loading.tsx @@ -0,0 +1 @@ +export { PriceFeedsLoading as default } from "../../../../../components/Publisher/price-feeds-loading"; diff --git a/apps/insights/src/app/publishers/layout.ts b/apps/insights/src/app/publishers/layout.ts index c4d4ea35eb..e912382cd8 100644 --- a/apps/insights/src/app/publishers/layout.ts +++ b/apps/insights/src/app/publishers/layout.ts @@ -1,6 +1,9 @@ import type { Metadata } from "next"; +import type { ReactNode } from "react"; -export { ZoomLayoutTransition as default } from "../../components/ZoomLayoutTransition"; +const Layout = ({ children }: { children: ReactNode }) => children; +export default Layout; +// export { ZoomLayoutTransition as default } from "../../components/ZoomLayoutTransition"; export const metadata: Metadata = { title: { diff --git a/apps/insights/src/components/PriceComponentsCard/index.tsx b/apps/insights/src/components/PriceComponentsCard/index.tsx index 7b9e5d7745..34850c6438 100644 --- a/apps/insights/src/components/PriceComponentsCard/index.tsx +++ b/apps/insights/src/components/PriceComponentsCard/index.tsx @@ -347,11 +347,9 @@ export const PriceComponentsCardContents = < title={ <> {label} - {!props.isLoading && ( - - {props.numResults} - - )} + + {!props.isLoading && props.numResults} + } toolbar={ diff --git a/apps/insights/src/components/Publisher/price-feeds-loading.tsx b/apps/insights/src/components/Publisher/price-feeds-loading.tsx new file mode 100644 index 0000000000..c058054b14 --- /dev/null +++ b/apps/insights/src/components/Publisher/price-feeds-loading.tsx @@ -0,0 +1,22 @@ +"use client"; + +import { PriceComponentsCardContents } from "../PriceComponentsCard"; +import { PriceFeedTag } from "../PriceFeedTag"; + +export const PriceFeedsLoading = () => ( + } + isLoading + extraColumns={[ + { + id: "assetClass", + name: "ASSET CLASS", + alignment: "left", + allowsSorting: true, + }, + ]} + nameWidth={90} + /> +); diff --git a/apps/insights/src/components/Root/tabs.tsx b/apps/insights/src/components/Root/tabs.tsx index 21778c2ad0..bd05eca600 100644 --- a/apps/insights/src/components/Root/tabs.tsx +++ b/apps/insights/src/components/Root/tabs.tsx @@ -27,46 +27,47 @@ export const MainNavTabs = ( return ; }; -export const TabPanel = ({ - children, - ...props -}: Omit, "id">) => { +export const TabPanel = ( + props: Omit, "id">, +) => { const tabId = useSelectedLayoutSegment() ?? ""; - return ( - - {(args) => ( - ({ - opacity: 0, - x: isMovingLeft(custom) ? "-2%" : "2%", - }), - exit: (custom) => ({ - opacity: 0, - x: isMovingLeft(custom) ? "2%" : "-2%", - transition: { - x: { type: "spring", bounce: 0 }, - }, - }), - }} - initial="initial" - animate={{ - opacity: 1, - x: 0, - transition: { - x: { type: "spring", bounce: 0 }, - }, - }} - exit="exit" - > - {typeof children === "function" ? children(args) : children} - - )} - - ); + return ; + + // return ( + // + // {(args) => ( + // ({ + // opacity: 0, + // x: isMovingLeft(custom) ? "-2%" : "2%", + // }), + // exit: (custom) => ({ + // opacity: 0, + // x: isMovingLeft(custom) ? "2%" : "-2%", + // transition: { + // x: { type: "spring", bounce: 0 }, + // }, + // }), + // }} + // initial="initial" + // animate={{ + // opacity: 1, + // x: 0, + // transition: { + // x: { type: "spring", bounce: 0 }, + // }, + // }} + // exit="exit" + // > + // {typeof children === "function" ? children(args) : children} + // + // )} + // + // ); }; -const isMovingLeft = ({ segment, prevSegment }: VariantArg): boolean => - segment === null || - (segment === "publishers" && prevSegment === "price-feeds"); +// const isMovingLeft = ({ segment, prevSegment }: VariantArg): boolean => +// segment === null || +// (segment === "publishers" && prevSegment === "price-feeds"); diff --git a/apps/insights/src/components/Tabs/index.tsx b/apps/insights/src/components/Tabs/index.tsx index 6ab5994f9f..f70a40354c 100644 --- a/apps/insights/src/components/Tabs/index.tsx +++ b/apps/insights/src/components/Tabs/index.tsx @@ -9,7 +9,7 @@ import { useSelectedLayoutSegment, usePathname } from "next/navigation"; import type { ComponentProps } from "react"; import { useMemo } from "react"; -import { LayoutTransition } from "../LayoutTransition"; +// import { LayoutTransition } from "../LayoutTransition"; export const TabRoot = ( props: Omit, "selectedKey">, @@ -44,42 +44,43 @@ export const Tabs = ({ prefix, items, ...props }: TabsProps) => { return ; }; -export const TabPanel = ({ - children, - ...props -}: Omit, "id">) => { +export const TabPanel = ( + props: Omit, "id">, +) => { const tabId = useSelectedLayoutSegment() ?? ""; - return ( - - {(args) => ( - ({ - opacity: 0, - x: segment === null ? "-2%" : "2%", - }), - exit: ({ segment }) => ({ - opacity: 0, - x: segment === null ? "2%" : "-2%", - transition: { - x: { type: "spring", bounce: 0 }, - }, - }), - }} - initial="initial" - animate={{ - opacity: 1, - x: 0, - transition: { - x: { type: "spring", bounce: 0 }, - }, - }} - exit="exit" - > - {typeof children === "function" ? children(args) : children} - - )} - - ); + return ; + + // return ( + // + // {(args) => ( + // ({ + // opacity: 0, + // x: segment === null ? "-2%" : "2%", + // }), + // exit: ({ segment }) => ({ + // opacity: 0, + // x: segment === null ? "2%" : "-2%", + // transition: { + // x: { type: "spring", bounce: 0 }, + // }, + // }), + // }} + // initial="initial" + // animate={{ + // opacity: 1, + // x: 0, + // transition: { + // x: { type: "spring", bounce: 0 }, + // }, + // }} + // exit="exit" + // > + // {typeof children === "function" ? children(args) : children} + // + // )} + // + // ); };