Skip to content

Commit

Permalink
Merge pull request Weaverse#193 from Weaverse/dev
Browse files Browse the repository at this point in the history
v2.8.2
  • Loading branch information
hta218 authored Aug 15, 2024
2 parents 1bf1cf0 + 6d470d5 commit b38b3c3
Show file tree
Hide file tree
Showing 7 changed files with 238 additions and 411 deletions.
2 changes: 1 addition & 1 deletion app/components/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import type {
TooltipTriggerProps,
} from "@radix-ui/react-tooltip";
import {
Arrow,
Content,
Portal,
Provider,
Arrow,
Root,
Trigger,
} from "@radix-ui/react-tooltip";
Expand Down
6 changes: 1 addition & 5 deletions app/modules/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ export function Drawer({

return (
<Transition appear show={open} as={Fragment}>
<Dialog
as="div"
className="relative z-50"
onClose={onClose}
>
<Dialog as="div" className="relative z-50" onClose={onClose}>
<Transition.Child
as={Fragment}
enter="ease-out duration-300"
Expand Down
4 changes: 1 addition & 3 deletions app/modules/header/MobileHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ export function MobileHeader({
}) {
// useHeaderStyleFix(containerStyle, setContainerStyle, isHome);
let isHome = useIsHomePath();
let {
enableTransparentHeader,
} = useThemeSettings();
let { enableTransparentHeader } = useThemeSettings();
let { y } = useWindowScroll();
let enableTransparent = enableTransparentHeader && isHome;
let isTransparent = enableTransparent && y < 50;
Expand Down
17 changes: 2 additions & 15 deletions app/sections/collection-filters/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@ interface CollectionFiltersProps extends HydrogenComponentProps {

let CollectionFilters = forwardRef<HTMLElement, CollectionFiltersProps>(
(props, sectionRef) => {
let {
showCollectionDescription,
loadPrevText,
loadMoreText,
loaderData,
...rest
} = props;
let { showCollectionDescription, loadPrevText, loadMoreText, ...rest } =
props;

console.log(4444, loaderData?.randomNumber);
let { ref, inView } = useInView();
let [numberInRow, setNumberInRow] = useState(4);
let onLayoutChange = (number: number) => {
Expand Down Expand Up @@ -112,13 +106,6 @@ let CollectionFilters = forwardRef<HTMLElement, CollectionFiltersProps>(
},
);

export let loader = async ({ weaverse }: ComponentLoaderArgs) => {
let { storefront } = weaverse;
let randomNumber = Math.floor(Math.random() * 1000);
console.log(3333, randomNumber);
return { randomNumber };
};

export default CollectionFilters;

export let schema: HydrogenComponentSchema = {
Expand Down
Loading

0 comments on commit b38b3c3

Please sign in to comment.