diff --git a/public/index.html b/public/index.html index 22f5a598..14401fe4 100644 --- a/public/index.html +++ b/public/index.html @@ -127,6 +127,16 @@ width: 100%; height: 100%; } + /* iOS safari */ + @supports (-webkit-touch-callout: none) { + body { + height: -webkit-fill-available; + } + .h-screen { + height: -webkit-fill-available !important ; + overflow: auto; + } + } /* iframe 样式覆盖 */ body.iframe { position: fixed; diff --git a/src/common/component/InviteModal/index.tsx b/src/common/component/InviteModal/index.tsx index 77f27033..cb5abb7f 100644 --- a/src/common/component/InviteModal/index.tsx +++ b/src/common/component/InviteModal/index.tsx @@ -25,7 +25,7 @@ const InviteModal: FC = ({ type = "server", cid, title = "", closeModal } const finalTitle = type == "server" ? server.name : `#${title || channel?.name}`; return ( -
+

{t("invite_title", { name: finalTitle })} diff --git a/src/common/component/StyledSettingContainer.tsx b/src/common/component/StyledSettingContainer.tsx index de28d79e..e20ce492 100644 --- a/src/common/component/StyledSettingContainer.tsx +++ b/src/common/component/StyledSettingContainer.tsx @@ -32,7 +32,7 @@ const StyledSettingContainer: FC> = ({ return ( <>
-
+

{title}

diff --git a/src/routes/chat/GuestChannelChat/index.tsx b/src/routes/chat/GuestChannelChat/index.tsx index 160fc068..6efc1992 100644 --- a/src/routes/chat/GuestChannelChat/index.tsx +++ b/src/routes/chat/GuestChannelChat/index.tsx @@ -35,48 +35,46 @@ export default function GuestChannelChat({ cid = 0 }: Props) { const { name, description, is_public } = data; const feeds = [...msgIds, ...appends]; return ( - <> - - -
- - {name} - {description} -
- - } - > - <> - {hasMore ? ( - - ) : ( -
-

{t("welcome_channel", { name })}

-

{t("welcome_desc", { name })}

-
- )} - {/*
*/} - {feeds.map((mid, idx) => { - const curr = messageData[mid]; - if (!curr) return null; - const isFirst = idx == 0; - const prev = isFirst ? null : messageData[feeds[idx - 1]]; - return renderMessageFragment({ - readonly: true, - selectMode: false, - prev, - curr, - contextId: cid, - context: "channel" - }); - })} - - - + + +
+ + {name} + {description} +
+ + } + > + <> + {hasMore ? ( + + ) : ( +
+

{t("welcome_channel", { name })}

+

{t("welcome_desc", { name })}

+
+ )} + {/*
*/} + {feeds.map((mid, idx) => { + const curr = messageData[mid]; + if (!curr) return null; + const isFirst = idx == 0; + const prev = isFirst ? null : messageData[feeds[idx - 1]]; + return renderMessageFragment({ + readonly: true, + selectMode: false, + prev, + curr, + contextId: cid, + context: "channel" + }); + })} + + ); } diff --git a/src/routes/chat/Layout/index.tsx b/src/routes/chat/Layout/index.tsx index 91173c83..119d1d77 100644 --- a/src/routes/chat/Layout/index.tsx +++ b/src/routes/chat/Layout/index.tsx @@ -2,16 +2,15 @@ import { useState, useRef, useEffect, FC, ReactElement } from "react"; import { useDrop } from "react-dnd"; import { NativeTypes } from "react-dnd-html5-backend"; import clsx from "clsx"; + import ImagePreviewModal from "../../../common/component/ImagePreviewModal"; import Send from "../../../common/component/Send"; import Operations from "./Operations"; import useUploadFile from "../../../common/hook/useUploadFile"; - import { useAppSelector } from "../../../app/store"; import LoginTip from "./LoginTip"; import useLicense from "../../../common/hook/useLicense"; import LicenseUpgradeTip from "./LicenseOutdatedTip"; -// import { useTranslation } from "react-i18next"; import DnDTip from "./DnDTip"; interface Props { diff --git a/src/routes/chat/SessionList/index.tsx b/src/routes/chat/SessionList/index.tsx index c57a20f4..9cd0cb0b 100644 --- a/src/routes/chat/SessionList/index.tsx +++ b/src/routes/chat/SessionList/index.tsx @@ -66,7 +66,7 @@ const SessionList: FC = ({ tempSession }) => { ]); return ( <> -
    +
      {sessions.map((s) => { const { key, type, id, mid = 0 } = s; return ( diff --git a/src/routes/chat/index.tsx b/src/routes/chat/index.tsx index f97efc53..3661b26d 100644 --- a/src/routes/chat/index.tsx +++ b/src/routes/chat/index.tsx @@ -54,7 +54,7 @@ function ChatPage() { )} {usersModalVisible && } -
      +
      {sessionListVisible &&
      }
      +