From 68146c7bea6c45eb3e2e954a7951b3c2855b8417 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Thu, 4 Jan 2024 00:52:55 +0800 Subject: [PATCH 1/5] fix: bugs --- .../CommonHeader/MobileMenu/constant.ts | 1 - .../CommonHeader/MobileMenu/index.tsx | 15 --- .../common/LinkButton/index.module.css | 2 +- src/components/home/Index/PC/index.module.css | 7 ++ .../NavbarItem/DropdownNavbarItem/index.js | 113 ++++++++++-------- 5 files changed, 68 insertions(+), 70 deletions(-) delete mode 100644 src/ILLATheme/CommonHeader/MobileMenu/constant.ts diff --git a/src/ILLATheme/CommonHeader/MobileMenu/constant.ts b/src/ILLATheme/CommonHeader/MobileMenu/constant.ts deleted file mode 100644 index 1ba0c5df37..0000000000 --- a/src/ILLATheme/CommonHeader/MobileMenu/constant.ts +++ /dev/null @@ -1 +0,0 @@ -export const CONTACT_US_URL = 'https://calendly.com/illa-demo/0295'; diff --git a/src/ILLATheme/CommonHeader/MobileMenu/index.tsx b/src/ILLATheme/CommonHeader/MobileMenu/index.tsx index ee3248a261..1d7c82df6a 100644 --- a/src/ILLATheme/CommonHeader/MobileMenu/index.tsx +++ b/src/ILLATheme/CommonHeader/MobileMenu/index.tsx @@ -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" @@ -71,19 +69,6 @@ const MobileMenu = ({ menuExpand, closeMenu }) => { ) })} - { - sendTagEvent({ - action: "click", - category: "homepage_menu_contact_click", - }) - closeMenu && closeMenu() - }} - className={style.menuItemStyle} - > - Book demo -
isItemActive(item, localPathname)); + return items.some((item) => isItemActive(item, localPathname)) } function DropdownNavbarItemDesktop({ items, @@ -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 (
+ className={clsx("navbar__item", "dropdown", { + "dropdown--right": position === "right", + "dropdown--show": showDropdown, + })} + onClick={() => { + setShowDropdown(!showDropdown) + }} + > e.preventDefault()} onKeyDown={(e) => { - if (e.key === 'Enter') { - e.preventDefault(); - setShowDropdown(!showDropdown); + if (e.key === "Enter") { + e.preventDefault() + setShowDropdown(!showDropdown) } - }}> + }} + > {props.children ?? props.label}
    @@ -83,7 +88,7 @@ function DropdownNavbarItemDesktop({ ))}
- ); + ) } function DropdownNavbarItemMobile({ items, @@ -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 (
  • + className={clsx("menu__list-item", { + "menu__list-item--collapsed": collapsed, + })} + > { - e.preventDefault(); - toggleCollapsed(); - }}> + e.preventDefault() + toggleCollapsed() + }} + > {props.children ?? props.label} @@ -135,9 +142,9 @@ function DropdownNavbarItemMobile({ ))}
    • - ); + ) } -export default function DropdownNavbarItem({mobile = false, ...props}) { - const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop; - return ; +export default function DropdownNavbarItem({ mobile = false, ...props }) { + const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop + return } From 8d23e57d9c0f1e542cafe88b8c89f7fab381464e Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Thu, 4 Jan 2024 01:11:42 +0800 Subject: [PATCH 2/5] fix: bugs --- .../home/Index/components/Solutions/index.tsx | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/components/home/Index/components/Solutions/index.tsx b/src/components/home/Index/components/Solutions/index.tsx index a7e63184d3..8c5dab7a19 100644 --- a/src/components/home/Index/components/Solutions/index.tsx +++ b/src/components/home/Index/components/Solutions/index.tsx @@ -106,23 +106,22 @@ const Solutions: FC = () => { > {item.content}
    - - -
    - { - sendTagEvent({ - action: "solution_try_for_free", - }) - }} - > - - Try now - - +
    + { + sendTagEvent({ + action: "solution_try_for_free", + }) + }} + > + + Try now + + +
    ))} From 8708999116e5d33bea4641c098f5653d4d70fa72 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Thu, 4 Jan 2024 01:14:35 +0800 Subject: [PATCH 3/5] fix: bugs --- src/components/home/Index/PC/index.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/home/Index/PC/index.module.css b/src/components/home/Index/PC/index.module.css index fdb48b3f1a..95d8dd9c26 100644 --- a/src/components/home/Index/PC/index.module.css +++ b/src/components/home/Index/PC/index.module.css @@ -7,7 +7,7 @@ } .bgStyle { - @apply absolute top-[0px] z-[0] w-full h-[382px] object-top object-none; + @apply hidden lg:block absolute top-[0px] z-[0] w-full h-[382px] object-top object-none; } .bgStyle::-webkit-media-controls-enclosure, From 055e9d351e907025dffc44cd92a503aaae33d6c6 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Thu, 4 Jan 2024 01:18:07 +0800 Subject: [PATCH 4/5] fix: remove modal title? --- src/components/banner/modal.tsx | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/src/components/banner/modal.tsx b/src/components/banner/modal.tsx index 960bf47464..4d0cfb659d 100644 --- a/src/components/banner/modal.tsx +++ b/src/components/banner/modal.tsx @@ -143,37 +143,6 @@ export const BannerModal: FC = ({ loading="lazy" /> -

    - {title} -

    - {/* -
    - {button.text} -
    - -     */}