diff --git a/packages/client/components/modal/modals/LinkWarning.tsx b/packages/client/components/modal/modals/LinkWarning.tsx index 2be06e6a..1277284b 100644 --- a/packages/client/components/modal/modals/LinkWarning.tsx +++ b/packages/client/components/modal/modals/LinkWarning.tsx @@ -69,9 +69,7 @@ export function LinkWarningModal( } > - - You clicked on "{props.display}" - + You clicked on "{props.display}" diff --git a/packages/client/components/ui/components/design/TextEditor.tsx b/packages/client/components/ui/components/design/TextEditor.tsx index b40bfac8..f7a83659 100644 --- a/packages/client/components/ui/components/design/TextEditor.tsx +++ b/packages/client/components/ui/components/design/TextEditor.tsx @@ -870,6 +870,7 @@ function Suggestions(props: { }) { const element = () => props.state()!.element; const [floating, setFloating] = createSignal(); + const state = useState(); const position = useFloating(element, floating, { placement: "top-start", @@ -903,6 +904,9 @@ function Suggestions(props: { <> {" "} :{match.name}: diff --git a/packages/client/components/ui/components/floating/AutoComplete.tsx b/packages/client/components/ui/components/floating/AutoComplete.tsx index 4057cd6c..84967767 100644 --- a/packages/client/components/ui/components/floating/AutoComplete.tsx +++ b/packages/client/components/ui/components/floating/AutoComplete.tsx @@ -4,6 +4,7 @@ import { ServerMember } from "revolt.js"; import { styled } from "styled-system/jsx"; import { CustomEmoji, UnicodeEmoji } from "@revolt/markdown/emoji"; +import { useState } from "@revolt/state"; import { AutoCompleteState } from "../../directives"; import { Avatar } from "../design"; @@ -18,6 +19,9 @@ import { ColouredText } from "../utils"; export function AutoComplete( props: Exclude, ) { + const state = useState(); + const emoji_pack = state.settings.getValue("appearance:unicode_emoji"); + return ( @@ -39,6 +43,7 @@ export function AutoComplete( <> {" "} :{match.shortcode}: @@ -150,7 +155,7 @@ const Entry = styled("div", { selected: { true: { background: - "color-mix(in srgb, var(--md-sys-color-on-surface) 8%, transparent)", + "color-mix(in srgb, var(--md-sys-color-on-surface) 8%, transparent)", }, }, }, diff --git a/packages/client/components/ui/components/navigation/NavigationRail.tsx b/packages/client/components/ui/components/navigation/NavigationRail.tsx index ccf6c0e2..e7d5dce2 100644 --- a/packages/client/components/ui/components/navigation/NavigationRail.tsx +++ b/packages/client/components/ui/components/navigation/NavigationRail.tsx @@ -43,7 +43,7 @@ const rail = cva({ const Icon = cva({ base: { fill: "var(--md-sys-color-on-surface-variant)", - } + }, }); interface ItemProps { @@ -58,7 +58,10 @@ interface ItemProps { function NavigationRailItem(props: ItemProps) { return ( - {props.children}
{props.icon}
+ {props.children}{" "} +
+ {props.icon} +
); } diff --git a/packages/client/package.json b/packages/client/package.json index 0cb8d289..32220300 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -165,4 +165,4 @@ "zod": "3.23.8" }, "private": true -} \ No newline at end of file +} diff --git a/packages/client/src/interface/navigation/servers/UserMenu.tsx b/packages/client/src/interface/navigation/servers/UserMenu.tsx index e8a42d94..f1db5797 100644 --- a/packages/client/src/interface/navigation/servers/UserMenu.tsx +++ b/packages/client/src/interface/navigation/servers/UserMenu.tsx @@ -16,7 +16,6 @@ import { Trans } from "@lingui-solid/solid/macro"; import { t } from "@lingui/core/macro"; import { API } from "revolt.js"; import { styled } from "styled-system/jsx"; -import { useState } from "@revolt/state"; import { ContextMenu, @@ -26,13 +25,14 @@ import { } from "@revolt/app/menus/ContextMenu"; import { useClient, useUser } from "@revolt/client"; import { useModals } from "@revolt/modal"; +import { useState } from "@revolt/state"; import { Avatar, Column, Row, Text, UserStatus, iconSize } from "@revolt/ui"; +import MdContactPage from "@material-design-icons/svg/outlined/contact_page.svg?component-solid"; import MdDelete from "@material-design-icons/svg/outlined/delete.svg?component-solid"; import MdEditNote from "@material-design-icons/svg/outlined/edit_note.svg?component-solid"; import MdInfo from "@material-design-icons/svg/outlined/info.svg?component-solid"; import MdNotificationsOff from "@material-design-icons/svg/outlined/notifications_off.svg?component-solid"; -import MdContactPage from "@material-design-icons/svg/outlined/contact_page.svg?component-solid"; interface Props { anchor: Accessor; @@ -79,8 +79,9 @@ export function UserMenu(props: Props) { ), ); - const setPresence = (presence: (API.DataEditUser["status"] & {})["presence"]) => - user()?.edit({ status: { presence } }); + const setPresence = ( + presence: (API.DataEditUser["status"] & {})["presence"], + ) => user()?.edit({ status: { presence } }); function copyId() { navigator.clipboard.writeText(user()!.id); @@ -230,7 +231,7 @@ export function UserMenu(props: Props) { Clear status - + Copy user ID