From 053c7d94029aa351f605c59947ac46878ca54d4a Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Mon, 20 Feb 2023 12:54:45 +0800 Subject: [PATCH] chore: remove hover effects in mobile --- src/common/component/AddEntriesMenu.tsx | 2 +- src/common/component/ChannelModal/index.tsx | 2 +- src/common/component/ForwardModal/index.tsx | 4 ++-- .../component/InviteModal/AddMembers.tsx | 2 +- src/common/component/ManageMembers/index.tsx | 2 +- src/common/component/Message/Commands.tsx | 21 ++++++------------- .../component/Message/FavoredMessage.tsx | 2 +- src/common/component/Message/Reaction.tsx | 4 ++-- .../component/Message/ReactionPicker.tsx | 2 +- src/common/component/Message/index.tsx | 2 +- .../component/StyledSettingContainer.tsx | 2 +- src/common/component/UsersModal.tsx | 2 +- src/common/component/Version.tsx | 3 ++- src/common/component/styled/Button.tsx | 4 ++-- src/routes/chat/GuestBlankPlaceholder.tsx | 4 ++-- src/routes/chat/GuestSessionList/Session.tsx | 2 +- src/routes/chat/Layout/Operations.tsx | 8 +++---- src/routes/chat/SessionList/Session.tsx | 4 ++-- src/routes/favs/index.tsx | 2 +- src/routes/home/index.tsx | 10 ++++----- src/routes/onboarding/index.tsx | 2 +- src/routes/onboarding/steps/invite-link.tsx | 2 +- .../setting/BotConfig/TestAPIKeyModal.tsx | 4 ++-- src/routes/setting/BotConfig/index.tsx | 2 +- .../setting/License/LicensePriceListModal.tsx | 2 +- src/routes/setting/Widget.tsx | 2 +- src/routes/users/index.tsx | 2 +- 27 files changed, 46 insertions(+), 54 deletions(-) diff --git a/src/common/component/AddEntriesMenu.tsx b/src/common/component/AddEntriesMenu.tsx index d85c1ff4..63b106dc 100644 --- a/src/common/component/AddEntriesMenu.tsx +++ b/src/common/component/AddEntriesMenu.tsx @@ -42,7 +42,7 @@ export default function AddEntriesMenu() { setChannelModalVisible(false); }; - const itemClass = "rounded flex items-center gap-2 text-sm font-semibold cursor-pointer px-2 py-2.5 hover:bg-gray-800/20 dark:hover:bg-gray-200/20"; + const itemClass = "rounded flex items-center gap-2 text-sm font-semibold cursor-pointer px-2 py-2.5 md:hover:bg-gray-800/20 md:dark:hover:bg-gray-200/20"; const iconClass = "w-5 h-5 dark:fill-gray-300"; return ( <> diff --git a/src/common/component/ChannelModal/index.tsx b/src/common/component/ChannelModal/index.tsx index 5f77b2af..5833cbe5 100644 --- a/src/common/component/ChannelModal/index.tsx +++ b/src/common/component/ChannelModal/index.tsx @@ -114,7 +114,7 @@ const ChannelModal: FC = ({ personal = false, closeModal }) => {
  • = ({ mids, closeModal }) => { key={gid} data-type="channel" data-id={gid} - className="cursor-pointer flex items-center px-4 rounded hover:bg-gray-600/10" + className="cursor-pointer flex items-center px-4 rounded md:hover:bg-gray-600/10" onClick={toggleCheck} > @@ -112,7 +112,7 @@ const ForwardModal: FC = ({ mids, closeModal }) => { key={uid} data-id={uid} data-type="user" - className="cursor-pointer flex items-center px-4 rounded hover:bg-gray-600/10" + className="cursor-pointer flex items-center px-4 rounded md:hover:bg-gray-600/10" onClick={toggleCheck} > diff --git a/src/common/component/InviteModal/AddMembers.tsx b/src/common/component/InviteModal/AddMembers.tsx index da0c54b2..358637c8 100644 --- a/src/common/component/InviteModal/AddMembers.tsx +++ b/src/common/component/InviteModal/AddMembers.tsx @@ -82,7 +82,7 @@ const AddMembers: FC = ({ cid = 0, closeModal }) => {
  • = ({ cid }) => { const canRemoveFromChannel = channel && channel.owner == loginUser?.uid && loginUser?.uid != uid; return ( -
  • +
  • diff --git a/src/common/component/Message/Commands.tsx b/src/common/component/Message/Commands.tsx index 79b73015..aeaa5f45 100644 --- a/src/common/component/Message/Commands.tsx +++ b/src/common/component/Message/Commands.tsx @@ -82,16 +82,7 @@ const Commands: FC = ({ context = "user", contextId = 0, mid = 0, toggleE toast.error("Added Favorites Failed!"); } }; - - - // const StyledCmds = styled.ul` - // > .picker { - // position: absolute; - // left: -10px; - // top: 0; - // transform: translateX(-100%); - // } - // `; + const cmdClass = `flex cursor-pointer p-1 md:hover:bg-gray-100 md:dark:hover:bg-gray-800`; return ( <>
      = ({ context = "user", contextId = 0, mid = 0, toggleE trigger="click" content={} > -
    • +
    • icon emoji
    • {canEdit && ( -
    • +
    • icon edit
    • )} {canReply && ( -
    • +
    • icon reply
    • )} -
    • +
    • @@ -166,7 +157,7 @@ const Commands: FC = ({ context = "user", contextId = 0, mid = 0, toggleE /> } > -
    • +
    • icon more diff --git a/src/common/component/Message/FavoredMessage.tsx b/src/common/component/Message/FavoredMessage.tsx index 418393a9..7faf1dba 100644 --- a/src/common/component/Message/FavoredMessage.tsx +++ b/src/common/component/Message/FavoredMessage.tsx @@ -22,7 +22,7 @@ const FavoredMessage: FC = ({ id = "" }) => { {messages.map((msg, idx) => { const { user = {}, download, content, content_type, properties, thumbnail } = msg; return ( -
      +
      {user && (
      diff --git a/src/common/component/Message/Reaction.tsx b/src/common/component/Message/Reaction.tsx index 40558599..7ba1f907 100644 --- a/src/common/component/Message/Reaction.tsx +++ b/src/common/component/Message/Reaction.tsx @@ -65,7 +65,7 @@ const Reaction: FC = ({ mid, reactions = null, readOnly = false }) => { return uids.length > 0 ? ( = ({ mid, reactions = null, readOnly = false }) => { trigger="click" content={} > - diff --git a/src/common/component/Message/ReactionPicker.tsx b/src/common/component/Message/ReactionPicker.tsx index 5f2c1754..ac9beaed 100644 --- a/src/common/component/Message/ReactionPicker.tsx +++ b/src/common/component/Message/ReactionPicker.tsx @@ -28,7 +28,7 @@ const ReactionPicker: FC = ({ mid, hidePicker }) => { reactionData[emoji] && reactionData[emoji].findIndex((id) => id == currUid) > -1; return (
    • diff --git a/src/common/component/Message/index.tsx b/src/common/component/Message/index.tsx index 8e878229..e8ca5ba1 100644 --- a/src/common/component/Message/index.tsx +++ b/src/common/component/Message/index.tsx @@ -96,7 +96,7 @@ const Message: FC = ({ onContextMenu={readOnly ? undefined : handleContextMenuEvent} data-msg-mid={mid} ref={inviewRef} - className={clsx(`group w-full relative flex items-start gap-2 md:gap-4 px-1 md:px-2 py-1 my-2 rounded-lg dark:hover:bg-gray-800 hover:bg-gray-100`, + className={clsx(`group w-full relative flex items-start gap-2 md:gap-4 px-1 md:px-2 py-1 my-2 rounded-lg md:dark:hover:bg-gray-800 md:hover:bg-gray-100`, readOnly && "hover:bg-transparent", showExpire && "bg-red-200", pinInfo && "bg-cyan-50 dark:bg-cyan-800 pt-7" diff --git a/src/common/component/StyledSettingContainer.tsx b/src/common/component/StyledSettingContainer.tsx index ca1ec881..de28d79e 100644 --- a/src/common/component/StyledSettingContainer.tsx +++ b/src/common/component/StyledSettingContainer.tsx @@ -41,7 +41,7 @@ const StyledSettingContainer: FC> = ({
        {items.map(({ name, title }) => { return ( -
      • +
      • {title}
      • ); diff --git a/src/common/component/UsersModal.tsx b/src/common/component/UsersModal.tsx index d5a0dd50..d39a76b4 100644 --- a/src/common/component/UsersModal.tsx +++ b/src/common/component/UsersModal.tsx @@ -33,7 +33,7 @@ const UsersModal: FC = ({ closeModal }) => { {users.map((u) => { const { uid = 0 } = u || {}; return ( -
      • +
      • diff --git a/src/common/component/Version.tsx b/src/common/component/Version.tsx index 68bf606b..f6f2f873 100644 --- a/src/common/component/Version.tsx +++ b/src/common/component/Version.tsx @@ -1,6 +1,7 @@ import dayjs from "dayjs"; import { FC, useState } from "react"; import { useTranslation } from "react-i18next"; +import { Ring } from "@uiball/loaders"; import { useGetServerVersionQuery } from "../../app/services/server"; import Button from "./styled/Button"; import { unregister } from '../../serviceWorkerRegistration'; @@ -28,7 +29,7 @@ const Version: FC = () => {
      • - +
      ); diff --git a/src/common/component/styled/Button.tsx b/src/common/component/styled/Button.tsx index b16a9091..fa586a17 100644 --- a/src/common/component/styled/Button.tsx +++ b/src/common/component/styled/Button.tsx @@ -10,14 +10,14 @@ const StyledButton = ({ children, className = '', ...rest }: Props) => { const isSmall = className.includes('small'); const isMini = className.includes('mini'); const isFull = className.includes('flex'); - return - - diff --git a/src/routes/chat/SessionList/Session.tsx b/src/routes/chat/SessionList/Session.tsx index 1436c212..aaca79ea 100644 --- a/src/routes/chat/SessionList/Session.tsx +++ b/src/routes/chat/SessionList/Session.tsx @@ -109,7 +109,7 @@ const Session: FC = ({ > clsx(`nav flex gap-2 rounded-lg p-2 w-full hover:bg-gray-500/20`, isActive && "shadow-[inset_0_0_0_2px_#52edff]", linkActive && "bg-gray-500/20")} + className={({ isActive: linkActive }) => clsx(`nav flex gap-2 rounded-lg p-2 w-full md:hover:bg-gray-500/20`, isActive && "shadow-[inset_0_0_0_2px_#52edff]", linkActive && "bg-gray-500/20")} to={type == "user" ? `/chat/dm/${id}` : `/chat/channel/${id}`} onContextMenu={handleContextMenuEvent} > @@ -142,7 +142,7 @@ const Session: FC = ({
      0 ? `w-36` : ``)}>{renderPreviewMessage(previewMsg)} {unreads > 0 && ( - 99 && 'w-1.5 h-1.5 p-0 min-w-[unset]', muted && "bg-gray-500")}> + 99 && 'w-1.5 !h-1.5 p-0 min-w-[unset]', muted && "bg-gray-500")}> {unreads > 99 ? null : unreads} )} diff --git a/src/routes/favs/index.tsx b/src/routes/favs/index.tsx index e7b95d5c..0352f6ef 100644 --- a/src/routes/favs/index.tsx +++ b/src/routes/favs/index.tsx @@ -125,7 +125,7 @@ function FavsPage() { return (
    • {icon} diff --git a/src/routes/home/index.tsx b/src/routes/home/index.tsx index dc4b2424..695759c7 100644 --- a/src/routes/home/index.tsx +++ b/src/routes/home/index.tsx @@ -48,7 +48,7 @@ function HomePage() { // 有点绕 const chatNav = isChatHomePath ? "/chat" : chatPath || "/chat"; const userNav = userPath || "/users"; - const linkClass = `flex items-center gap-2.5 px-3 py-2 font-semibold text-sm text-gray-600 rounded-lg hover:bg-gray-800/10`; + const linkClass = `flex items-center gap-2.5 px-3 py-2 font-semibold text-sm text-gray-600 rounded-lg md:hover:bg-gray-800/10`; return ( <> @@ -59,7 +59,7 @@ function HomePage() { {loginUid && }