Skip to content

Bump react and @types/react in /extensions/ql-vscode #4131

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bump react and @types/react in /extensions/ql-vscode #4131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a19269f
Bump react and @types/react in /extensions/ql-vscode
dependabot[bot] Sep 22, 2025
b3d48e3
Fix react ref types
robertbrignull Sep 23, 2025
6fccabd
Merge branch 'main' into dependabot/npm_and_yarn/extensions/ql-vscode…
robertbrignull Sep 25, 2025
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
27 changes: 9 additions & 18 deletions extensions/ql-vscode/package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions extensions/ql-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2021,7 +2021,7 @@
"nanoid": "^5.0.7",
"p-queue": "^8.0.1",
"proper-lockfile": "^4.1.2",
"react": "^18.3.1",
"react": "^19.1.1",
"react-dom": "^18.3.1",
"semver": "^7.6.2",
"source-map": "^0.7.6",
Expand Down Expand Up @@ -2078,7 +2078,7 @@
"@types/js-yaml": "^4.0.6",
"@types/node": "22.17.*",
"@types/proper-lockfile": "^4.1.4",
"@types/react": "^18.3.12",
"@types/react": "^19.1.13",
"@types/react-dom": "^18.3.1",
"@types/sarif": "^2.1.2",
"@types/semver": "^7.5.8",
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/model-alerts/ModelAlertsResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const ModelAlertsResults = ({
[modelAlerts.model],
);

const ref = useRef<HTMLElement>();
const ref = useRef<HTMLElement>(undefined);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useRef now requires a default value, and the type it returns automatically becomes T | undefined (assuming default value is undefined).

I've tried to standardise on undefined instead of null, but no particular reason for that other than being consistent.

And all downstream components now have to handle the type being T | undefined which is slightly annoying.


useEffect(() => {
if (
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/model-editor/MethodRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export type MethodRowProps = {
export const MethodRow = (props: MethodRowProps) => {
const { method, methodCanBeModeled, revealedMethodSignature } = props;

const ref = useRef<HTMLElement>();
const ref = useRef<HTMLElement>(undefined);

useEffect(() => {
if (method.signature === revealedMethodSignature) {
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/results/AlertTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function AlertTable({
undefined,
);

const selectedItemRef = useRef<HTMLTableRowElement>(null);
const selectedItemRef = useRef<HTMLTableRowElement>(undefined);
useScrollIntoView(selectedItem, selectedItemRef);

/**
Expand Down
8 changes: 6 additions & 2 deletions extensions/ql-vscode/src/view/results/AlertTablePathNodeRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface Props {
pathIndex: number;
resultIndex: number;
selectedItem: undefined | ResultKey;
selectedItemRef: React.RefObject<HTMLTableRowElement>;
selectedItemRef: React.RefObject<HTMLTableRowElement | undefined>;
databaseUri: string;
sourceLocationPrefix: string;
run?: Run;
Expand Down Expand Up @@ -61,7 +61,11 @@ export function AlertTablePathNodeRow(props: Props) {
const zebraIndex = resultIndex + stepIndex;
return (
<tr
ref={isSelected ? selectedItemRef : undefined}
ref={
isSelected && selectedItemRef.current !== undefined
? (selectedItemRef as React.RefObject<HTMLTableRowElement>)
: undefined
}
className={isSelected ? "vscode-codeql__selected-path-node" : undefined}
>
<td className="vscode-codeql__icon-cell">
Expand Down
8 changes: 6 additions & 2 deletions extensions/ql-vscode/src/view/results/AlertTablePathRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface Props {
resultIndex: number;
currentPathExpanded: boolean;
selectedItem: undefined | ResultKey;
selectedItemRef: React.RefObject<HTMLTableRowElement>;
selectedItemRef: React.RefObject<HTMLTableRowElement | undefined>;
databaseUri: string;
sourceLocationPrefix: string;
run?: Run;
Expand Down Expand Up @@ -55,7 +55,11 @@ export function AlertTablePathRow(props: Props) {
return (
<>
<tr
ref={isPathSpecificallySelected ? selectedItemRef : undefined}
ref={
isPathSpecificallySelected && selectedItemRef.current !== undefined
? (selectedItemRef as React.RefObject<HTMLTableRowElement>)
: undefined
}
{...selectableZebraStripe(isPathSpecificallySelected, resultIndex)}
>
<td className="vscode-codeql__icon-cell">
Expand Down
8 changes: 6 additions & 2 deletions extensions/ql-vscode/src/view/results/AlertTableResultRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface Props {
resultIndex: number;
expanded: Set<string>;
selectedItem: undefined | ResultKey;
selectedItemRef: React.RefObject<HTMLTableRowElement>;
selectedItemRef: React.RefObject<HTMLTableRowElement | undefined>;
databaseUri: string;
sourceLocationPrefix: string;
run?: Run;
Expand Down Expand Up @@ -93,7 +93,11 @@ export function AlertTableResultRow(props: Props) {
return (
<>
<tr
ref={resultRowIsSelected ? selectedItemRef : undefined}
ref={
resultRowIsSelected && selectedItemRef.current !== undefined
? (selectedItemRef as React.RefObject<HTMLTableRowElement>)
: undefined
}
{...selectableZebraStripe(resultRowIsSelected, resultIndex)}
>
{result.codeFlows === undefined ? (
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/results/RawTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function RawTable({
}: RawTableProps) {
const [selectedItem, setSelectedItem] = useState<TableItem | undefined>();

const selectedItemRef = useRef<HTMLTableCellElement>(null);
const selectedItemRef = useRef<HTMLTableCellElement>(undefined);
useScrollIntoView(selectedItem, selectedItemRef);

const setSelection = useCallback((row: number, column: number): void => {
Expand Down
8 changes: 6 additions & 2 deletions extensions/ql-vscode/src/view/results/RawTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface Props {
databaseUri: string;
className?: string;
selectedColumn?: number;
selectedItemRef?: React.Ref<HTMLTableCellElement>;
selectedItemRef?: React.RefObject<HTMLTableCellElement | undefined>;
onSelected?: (row: number, column: number) => void;
}

Expand All @@ -24,7 +24,11 @@ export default function RawTableRow(props: Props) {
const isSelected = props.selectedColumn === columnIndex;
return (
<td
ref={isSelected ? props.selectedItemRef : undefined}
ref={
isSelected && props.selectedItemRef?.current !== undefined
? (props.selectedItemRef as React.RefObject<HTMLTableCellElement>)
: undefined
}
key={columnIndex}
{...(isSelected ? { className: selectedRowClassName } : {})}
>
Expand Down
4 changes: 3 additions & 1 deletion extensions/ql-vscode/src/view/results/__tests__/AlertTablePathRow.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { createMockResults } from "../../../../test/factories/results/mockresult

describe(AlertTablePathRow.name, () => {
const render = (props?: Props) => {
const mockRef = { current: null } as React.RefObject<HTMLTableRowElement>;
const mockRef = { current: undefined } as React.RefObject<
HTMLTableRowElement | undefined
>;
const results = createMockResults();
const threadFlow = results[0]?.codeFlows?.[0]?.threadFlows?.[0];

Expand Down
4 changes: 3 additions & 1 deletion extensions/ql-vscode/src/view/results/__tests__/AlertTableResultRow.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { createMockResults } from "../../../../test/factories/results/mockresult

describe(AlertTableResultRow.name, () => {
const render = (props?: Props) => {
const mockRef = { current: null } as React.RefObject<HTMLTableRowElement>;
const mockRef = { current: undefined } as React.RefObject<
HTMLTableRowElement | undefined
>;
const results = createMockResults();

reactRender(
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/results/useScrollIntoView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect } from "react";

export function useScrollIntoView<T>(
selectedElement: T | undefined,
selectedElementRef: RefObject<HTMLElement>,
selectedElementRef: RefObject<HTMLElement | undefined>,
) {
useEffect(() => {
const element = selectedElementRef.current;
Expand Down
Loading