Skip to content

Commit

Permalink
fix: bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Wangtaofeng committed Jan 3, 2024
1 parent e5d991d commit 68146c7
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 70 deletions.
1 change: 0 additions & 1 deletion src/ILLATheme/CommonHeader/MobileMenu/constant.ts

This file was deleted.

15 changes: 0 additions & 15 deletions src/ILLATheme/CommonHeader/MobileMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { sendTagEvent } from "@site/src/utils/gtag"
import { MENU_ITEMS, SOLUTIONS } from "../constants"
import LocaleDropdownNavbarItem from "@theme/NavbarItem/LocaleDropdownNavbarItem"
import CloseWhiteIcon from "@site/static/img/public/close.svg"
import { CONTACT_US_URL } from "./constant"
import Translate from "@docusaurus/Translate"
import { Disclosure } from "@headlessui/react"
import { MenuItem } from "./menuItem"
import style from "./index.module.css"
Expand Down Expand Up @@ -71,19 +69,6 @@ const MobileMenu = ({ menuExpand, closeMenu }) => {
)
})}
</div>
<Link
href={CONTACT_US_URL}
onClick={() => {
sendTagEvent({
action: "click",
category: "homepage_menu_contact_click",
})
closeMenu && closeMenu()
}}
className={style.menuItemStyle}
>
<Translate id="nav.contact">Book demo</Translate>
</Link>

<div className="max-h-[180px] overflow-y-auto list-none ">
<LocaleDropdownNavbarItem
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/LinkButton/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

.normalSizeStyle {
@apply min-w-[320px] h-[56px] rounded-[24px] text-[16px];
@apply min-w-[320px] h-[56px] rounded-[28px] text-[16px];
}

.largeSizeStyle {
Expand Down
7 changes: 7 additions & 0 deletions src/components/home/Index/PC/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
@apply absolute top-[0px] z-[0] w-full h-[382px] object-top object-none;
}

.bgStyle::-webkit-media-controls-enclosure,
.bgStyle::-webkit-media-controls-panel,
.bgStyle::-webkit-media-controls-play-button,
.bgStyle::-webkit-media-controls-start-playback-button {
display: none;
}

.bannerContentContainer {
@apply flex justify-center pt-[24px] flex-col items-center gap-[186px];
@apply lg:max-w-[1040px];
Expand Down
113 changes: 60 additions & 53 deletions src/theme/NavbarItem/DropdownNavbarItem/index.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import React, {useState, useRef, useEffect} from 'react';
import clsx from 'clsx';
import React, { useState, useRef, useEffect } from "react"
import clsx from "clsx"
import {
isRegexpStringMatch,
useCollapsible,
Collapsible,
} from '@docusaurus/theme-common';
import {isSamePath, useLocalPathname} from '@docusaurus/theme-common/internal';
import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
import NavbarItem from '@theme/NavbarItem';
import styles from './styles.module.css';
} from "@docusaurus/theme-common"
import { isSamePath, useLocalPathname } from "@docusaurus/theme-common/internal"
import NavbarNavLink from "@theme/NavbarItem/NavbarNavLink"
import NavbarItem from "@theme/NavbarItem"
import styles from "./styles.module.css"
function isItemActive(item, localPathname) {
if (isSamePath(item.to, localPathname)) {
return true;
return true
}
if (isRegexpStringMatch(item.activeBaseRegex, localPathname)) {
return true;
return true
}
if (item.activeBasePath && localPathname.startsWith(item.activeBasePath)) {
return true;
return true
}
return false;
return false
}
function containsActiveItems(items, localPathname) {
return items.some((item) => isItemActive(item, localPathname));
return items.some((item) => isItemActive(item, localPathname))
}
function DropdownNavbarItemDesktop({
items,
Expand All @@ -31,45 +31,50 @@ function DropdownNavbarItemDesktop({
onClick,
...props
}) {
const dropdownRef = useRef(null);
const [showDropdown, setShowDropdown] = useState(false);
const dropdownRef = useRef(null)
const [showDropdown, setShowDropdown] = useState(false)
useEffect(() => {
const handleClickOutside = (event) => {
if (!dropdownRef.current || dropdownRef.current.contains(event.target)) {
return;
return
}
setShowDropdown(false);
};
document.addEventListener('mousedown', handleClickOutside);
document.addEventListener('touchstart', handleClickOutside);
document.addEventListener('focusin', handleClickOutside);
setShowDropdown(false)
}
document.addEventListener("mousedown", handleClickOutside)
document.addEventListener("touchstart", handleClickOutside)
document.addEventListener("focusin", handleClickOutside)
return () => {
document.removeEventListener('mousedown', handleClickOutside);
document.removeEventListener('touchstart', handleClickOutside);
document.removeEventListener('focusin', handleClickOutside);
};
}, [dropdownRef]);
document.removeEventListener("mousedown", handleClickOutside)
document.removeEventListener("touchstart", handleClickOutside)
document.removeEventListener("focusin", handleClickOutside)
}
}, [dropdownRef])
return (
<div
ref={dropdownRef}
className={clsx('navbar__item', 'dropdown', 'dropdown--hoverable', {
'dropdown--right': position === 'right',
'dropdown--show': showDropdown,
})}>
className={clsx("navbar__item", "dropdown", {
"dropdown--right": position === "right",
"dropdown--show": showDropdown,
})}
onClick={() => {
setShowDropdown(!showDropdown)
}}
>
<NavbarNavLink
aria-haspopup="true"
aria-expanded={showDropdown}
role="button"
href={props.to ? undefined : '#'}
className={clsx('navbar__link', className)}
href={props.to ? undefined : "#"}
className={clsx("navbar__link", className)}
{...props}
onClick={props.to ? undefined : (e) => e.preventDefault()}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.preventDefault();
setShowDropdown(!showDropdown);
if (e.key === "Enter") {
e.preventDefault()
setShowDropdown(!showDropdown)
}
}}>
}}
>
{props.children ?? props.label}
</NavbarNavLink>
<ul className="dropdown__menu">
Expand All @@ -83,7 +88,7 @@ function DropdownNavbarItemDesktop({
))}
</ul>
</div>
);
)
}
function DropdownNavbarItemMobile({
items,
Expand All @@ -92,34 +97,36 @@ function DropdownNavbarItemMobile({
onClick,
...props
}) {
const localPathname = useLocalPathname();
const containsActive = containsActiveItems(items, localPathname);
const {collapsed, toggleCollapsed, setCollapsed} = useCollapsible({
const localPathname = useLocalPathname()
const containsActive = containsActiveItems(items, localPathname)
const { collapsed, toggleCollapsed, setCollapsed } = useCollapsible({
initialState: () => !containsActive,
});
})
// Expand/collapse if any item active after a navigation
useEffect(() => {
if (containsActive) {
setCollapsed(!containsActive);
setCollapsed(!containsActive)
}
}, [localPathname, containsActive, setCollapsed]);
}, [localPathname, containsActive, setCollapsed])
return (
<li
className={clsx('menu__list-item', {
'menu__list-item--collapsed': collapsed,
})}>
className={clsx("menu__list-item", {
"menu__list-item--collapsed": collapsed,
})}
>
<NavbarNavLink
role="button"
className={clsx(
styles.dropdownNavbarItemMobile,
'menu__link menu__link--sublist menu__link--sublist-caret',
"menu__link menu__link--sublist menu__link--sublist-caret",
className,
)}
{...props}
onClick={(e) => {
e.preventDefault();
toggleCollapsed();
}}>
e.preventDefault()
toggleCollapsed()
}}
>
{props.children ?? props.label}
</NavbarNavLink>
<Collapsible lazy as="ul" className="menu__list" collapsed={collapsed}>
Expand All @@ -135,9 +142,9 @@ function DropdownNavbarItemMobile({
))}
</Collapsible>
</li>
);
)
}
export default function DropdownNavbarItem({mobile = false, ...props}) {
const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop;
return <Comp {...props} />;
export default function DropdownNavbarItem({ mobile = false, ...props }) {
const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop
return <Comp {...props} />
}

0 comments on commit 68146c7

Please sign in to comment.