Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use react v19 types #1872

Merged
merged 1 commit into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"@capacitor/status-bar": "^7.0.0",
"@github/markdown-toolbar-element": "^2.2.3",
"@ionic/core": "npm:[email protected]",
"@ionic/react": "8.4.3",
"@ionic/react-router": "8.4.3",
"@ionic/react": "8.4.4-dev.11740669619.1b5165be",
"@ionic/react-router": "8.4.4-dev.11740669619.1b5165be",
"@mantine/hooks": "^7.17.0",
"@reduxjs/toolkit": "^2.6.0",
"capacitor-android-nav-mode": "^2.0.0",
Expand Down Expand Up @@ -131,8 +131,8 @@
"@types/history": "^4.7.11",
"@types/mdast": "^4.0.4",
"@types/node": "^22.13.5",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.4",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3",
"@types/ua-parser-js": "^0.7.39",
Expand Down
96 changes: 45 additions & 51 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/GlobalStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default function GlobalStyles({ children }: React.PropsWithChildren) {
Keyboard.setStyle({ style: keyboardStyle });
}, [isDark, usingSystemDarkMode]);

return <DarkContext.Provider value={isDark}>{children}</DarkContext.Provider>;
return <DarkContext value={isDark}>{children}</DarkContext>;
}

function useComputeIsDark(): boolean {
Expand Down
4 changes: 1 addition & 3 deletions src/core/TabContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,5 @@ function TabContextProviderInternals({
tabRef.current = tab;
}, [tab]);

return (
<TabContext.Provider value={{ tabRef }}>{children}</TabContext.Provider>
);
return <TabContext value={{ tabRef }}>{children}</TabContext>;
}
2 changes: 1 addition & 1 deletion src/core/listeners/AppUrlListener.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function AppUrlListener() {
);
const deepLinkReady = useAppSelector((state) => state.deepLinkReady.ready);

const appUrlFromEventRef = useRef<string>();
const appUrlFromEventRef = useRef<string>(undefined);

const notReady =
!knownInstances ||
Expand Down
8 changes: 4 additions & 4 deletions src/features/auth/AppContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React, {
} from "react";
import { VListHandle } from "virtua";

export type Page = RefObject<VListHandle | HTMLElement>;
export type Page = RefObject<VListHandle | HTMLElement | null>;

interface IAppContext {
// used for determining whether page needs to be scrolled up first
Expand All @@ -23,17 +23,17 @@ export const AppContext = createContext<IAppContext>({
});

export function AppContextProvider({ children }: React.PropsWithChildren) {
const activePageRef = useRef<Page>();
const activePageRef = useRef<Page>(undefined);

return (
<AppContext.Provider
<AppContext
value={{
activePageRef,
setActivePage: (page: Page) => (activePageRef.current = page),
}}
>
{children}
</AppContext.Provider>
</AppContext>
);
}

Expand Down
8 changes: 4 additions & 4 deletions src/features/auth/PageContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export interface BanUserPayload {

interface IPageContext {
// used for ion presentingElement
pageRef: RefObject<HTMLElement | undefined> | undefined;
pageRef: RefObject<HTMLElement | null> | undefined;

/**
* @returns true if login dialog was presented
Expand Down Expand Up @@ -124,7 +124,7 @@ interface PageContextProvider extends React.PropsWithChildren {
export function PageContextProvider({ value, children }: PageContextProvider) {
const dispatch = useAppDispatch();
const jwt = useAppSelector(jwtSelector);
const reportRef = useRef<ReportHandle>(null);
const reportRef = useRef<ReportHandle>(undefined);
const shareAsImageDataRef = useRef<ShareAsImageData | null>(null);

const [presentShareAsImageModal, onDismissShareAsImageModal] = useIonModal(
Expand Down Expand Up @@ -304,7 +304,7 @@ export function PageContextProvider({ value, children }: PageContextProvider) {
};

return (
<PageContext.Provider
<PageContext
value={{
...value,
presentLoginIfNeeded,
Expand Down Expand Up @@ -352,6 +352,6 @@ export function PageContextProvider({ value, children }: PageContextProvider) {
isOpen={isUserTagOpen}
setIsOpen={setIsUserTagOpen}
/>
</PageContext.Provider>
</PageContext>
);
}
2 changes: 1 addition & 1 deletion src/features/auth/login/join/Captcha.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface CaptchaHandle {

interface CaptchaProps {
url: string;
ref: React.RefObject<CaptchaHandle>;
ref: React.RefObject<CaptchaHandle | undefined>;
}

export default function Captcha({ url, ref }: CaptchaProps) {
Expand Down
2 changes: 1 addition & 1 deletion src/features/auth/login/join/Join.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function Join({ answer }: JoinProps) {
const [email, setEmail] = useState("");
const [honeypot, setHoneypot] = useState("");

const captchaRef = useRef<CaptchaHandle>(null);
const captchaRef = useRef<CaptchaHandle>(undefined);

useEffect(() => {
setTimeout(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/features/comment/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function Comment({

const canModerate = useCanModerate(commentView.community);

const commentEllipsisHandleRef = useRef<CommentEllipsisHandle>(null);
const commentEllipsisHandleRef = useRef<CommentEllipsisHandle>(undefined);

const stub = isStubComment(comment, canModerate);

Expand Down
Loading
Loading