Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: prepare react 19 types (#4553)

Bogdan Chadkina02e9d1afe87
diff --git a/@types/canvas-iframe.d.ts b/@types/canvas-iframe.d.ts
index 05a1a4ed11..6666e61852 100644
--- a/@types/canvas-iframe.d.ts
+++ b/@types/canvas-iframe.d.ts
@@ -1,10 +1,5 @@
-declare namespace JSX {
- interface IntrinsicElements {
- iframe: React.DetailedHTMLProps<
- React.IframeHTMLAttributes<HTMLIFrameElement> & {
- credentialless?: "true";
- },
- HTMLIFrameElement
- >;
+declare namespace React {
+ interface IframeHTMLAttributes {
+ credentialless?: "true";
}
}
diff --git a/apps/builder/app/auth/brand-button.tsx b/apps/builder/app/auth/brand-button.tsx
index d9049a76c9..c1fc7f833a 100644
--- a/apps/builder/app/auth/brand-button.tsx
+++ b/apps/builder/app/auth/brand-button.tsx
@@ -1,5 +1,5 @@
import { css, textVariants, theme } from "@webstudio-is/design-system";
-import type { ComponentProps } from "react";
+import type { ComponentProps, JSX } from "react";
export const buttonStyle = css({
boxSizing: "border-box",
diff --git a/apps/builder/app/auth/login.stories.tsx b/apps/builder/app/auth/login.stories.tsx
index 98152ce1d8..a7896b7ab9 100644
--- a/apps/builder/app/auth/login.stories.tsx
+++ b/apps/builder/app/auth/login.stories.tsx
@@ -1,3 +1,4 @@
+import type { JSX } from "react";
import type { StoryFn } from "@storybook/react";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { Login } from "./login";
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 8cbfa07fbe..974d7d6d3c 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState, type ReactNode } from "react";
+import { useEffect, useMemo, useState, type JSX, type ReactNode } from "react";
import { useStore } from "@nanostores/react";
import { TooltipProvider } from "@radix-ui/react-tooltip";
import { usePublish, $publisher } from "~/shared/pubsub";
diff --git a/apps/builder/app/builder/features/address-bar.tsx b/apps/builder/app/builder/features/address-bar.tsx
index 6fd7a60e91..604d639be7 100644
--- a/apps/builder/app/builder/features/address-bar.tsx
+++ b/apps/builder/app/builder/features/address-bar.tsx
@@ -143,7 +143,7 @@ const Suggestions = ({
options,
onSelect,
}: {
- containerRef: RefObject<HTMLFormElement>;
+ containerRef: RefObject<null | HTMLFormElement>;
options: string[];
onSelect: (option: string) => void;
}) => {
diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsx
index 1366b832f2..10812adac1 100644
--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx
+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx
@@ -71,7 +71,7 @@ export const AiCommandBar = () => {
const [isAudioTranscribing, setIsAudioTranscribing] = useState(false);
const [isAiRequesting, setIsAiRequesting] = useState(false);
- const abortController = useRef<AbortController>();
+ const abortController = useRef<undefined | AbortController>(undefined);
const recordButtonRef = useRef<HTMLButtonElement>(null);
const guardIdRef = useRef(0);
const { enableCanvasPointerEvents, disableCanvasPointerEvents } =
diff --git a/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts b/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
index 395485300c..a4d42788de 100644
--- a/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
+++ b/apps/builder/app/builder/features/ai/hooks/long-press-toggle.ts
@@ -15,7 +15,7 @@ type UseClickAndHoldProps = {
* - `onCancel`: Pointer up outside target during long press.
*/
export const useLongPressToggle = (props: UseClickAndHoldProps) => {
- const currentTarget = useRef<Element>();
+ const currentTarget = useRef<undefined | Element>(undefined);
const pointerDownTimeRef = useRef(0);
const stateRef = useRef<"idle" | "active">("idle");
const keyMapRef = useRef(new Set<string>());
diff --git a/apps/builder/app/builder/features/ai/hooks/media-recorder.ts b/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
index e213feaad7..e2cc23fc5f 100644
--- a/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
+++ b/apps/builder/app/builder/features/ai/hooks/media-recorder.ts
@@ -14,7 +14,7 @@ export const useMediaRecorder = (
},
options = DEFAULT_OPTIONS
) => {
- const disposeRef = useRef<() => void>();
+ const disposeRef = useRef<undefined | (() => void)>(undefined);
const cancelRef = useRef(false);
const isActiveRef = useRef<boolean>(false);
diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsx
index fb1f17e047..452f281fb8 100644
--- a/apps/builder/app/builder/features/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { type FocusEventHandler, useState, useCallback } from "react";
+import { type FocusEventHandler, useState, useCallback, type JSX } from "react";
import { useStore } from "@nanostores/react";
import { useDebouncedCallback } from "use-debounce";
import slugify from "slugify";
diff --git a/apps/builder/app/builder/features/pages/form.tsx b/apps/builder/app/builder/features/pages/form.tsx
index 540863b2f8..0a3637170d 100644
--- a/apps/builder/app/builder/features/pages/form.tsx
+++ b/apps/builder/app/builder/features/pages/form.tsx
@@ -1,3 +1,5 @@
+import type { JSX } from "react";
+
export const Form = ({
onSubmit,
children,
diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsx
index c780497f21..cd875fcd14 100644
--- a/apps/builder/app/builder/features/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/pages/page-settings.tsx
@@ -6,6 +6,7 @@ import {
useCallback,
useId,
useEffect,
+ type JSX,
} from "react";
import { useStore } from "@nanostores/react";
import { useDebouncedCallback } from "use-debounce";
diff --git a/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx b/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx
index 1964d92755..962dc3d2c5 100644
--- a/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx
+++ b/apps/builder/app/builder/features/project-settings/project-settings.stories.tsx
@@ -1,3 +1,4 @@
+import type { JSX } from "react";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { ProjectSettingsView } from "./project-settings";
import { $pages } from "~/shared/nano-states";
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
index a7264d8e92..4f6d8aec1d 100644
--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx
@@ -590,7 +590,7 @@ const VariablePanel = forwardRef<
VariablePanel.displayName = "VariablePanel";
const VariablePopoverContext = createContext<{
- containerRef?: RefObject<HTMLElement>;
+ containerRef?: RefObject<null | HTMLElement>;
}>({});
export const VariablePopoverProvider = VariablePopoverContext.Provider;
@@ -627,7 +627,7 @@ export const VariablePopoverTrigger = forwardRef<
const { containerRef } = useContext(VariablePopoverContext);
const [triggerRef, sideOffsset] = useSideOffset({ isOpen, containerRef });
const bindingPopoverContainerRef = useRef<HTMLDivElement>(null);
- const panelRef = useRef<undefined | PanelApi>();
+ const panelRef = useRef<undefined | PanelApi>(undefined);
const formRef = useRef<HTMLFormElement>(null);
const resources = useStore($resources);
const { allowDynamicData } = useStore($userPlanFeatures);
diff --git a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx
index c806aaba95..d8873fa86f 100644
--- a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx
@@ -1,5 +1,6 @@
-import { useState, type ReactNode } from "react";
+import { useState, type JSX, type ReactNode } from "react";
import { declarationDescriptions } from "@webstudio-is/css-data";
+import { AlertIcon } from "@webstudio-is/icons";
import {
Flex,
rawTheme,
@@ -19,7 +20,6 @@ import {
getPriorityStyleValueSource,
PropertyInfo,
} from "../../property-label";
-import { AlertIcon } from "@webstudio-is/icons";
export const ToggleGroupTooltip = ({
isOpen,
diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
index b7c7317efe..839f023f76 100644
--- a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx
@@ -1,4 +1,4 @@
-import { useState, type ReactNode } from "react";
+import { useState, type JSX, type ReactNode } from "react";
import {
theme,
Box,
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
index 59b4097896..10df7d45bd 100644
--- a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx
@@ -63,7 +63,7 @@ export const useScrub = <P extends StyleProperty>(props: {
const nonDependencies = useRef({ props, values, properties });
nonDependencies.current = { props, values, properties };
- const unitRef = useRef<UnitValue["unit"]>();
+ const unitRef = useRef<undefined | UnitValue["unit"]>(undefined);
useEffect(() => {
if (finalTarget === undefined) {
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
index 28f2820e77..969dfd3de6 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -87,8 +87,8 @@ const useScrub = ({
onChangeComplete: (value: StyleValue) => void;
shouldHandleEvent?: (node: Node) => boolean;
}): [
- React.MutableRefObject<HTMLDivElement | null>,
- React.MutableRefObject<HTMLInputElement | null>,
+ React.RefObject<HTMLDivElement | null>,
+ React.RefObject<HTMLInputElement | null>,
] => {
const scrubRef = useRef<HTMLDivElement | null>(null);
const inputRef = useRef<HTMLInputElement | null>(null);
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
index 998615162f..b15f50e4ef 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/unit-select.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo } from "react";
+import { useState, useMemo, type JSX } from "react";
import * as SelectPrimitive from "@radix-ui/react-select";
import type { Unit } from "@webstudio-is/css-engine";
import {
diff --git a/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx b/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx
index b6f5238d5e..ef6fff8f3c 100644
--- a/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx
@@ -15,7 +15,7 @@ import {
Select,
Grid,
} from "@webstudio-is/design-system";
-import { useEffect, useState } from "react";
+import { useEffect, useState, type JSX } from "react";
import {
CssValueInputContainer,
type IntermediateStyleValue,
diff --git a/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx b/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx
index e78bfe10f9..658d193c84 100644
--- a/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo, type JSX } from "react";
import type { RgbaColor } from "colord";
import {
toValue,
diff --git a/apps/builder/app/builder/features/style-panel/shared/show-more.tsx b/apps/builder/app/builder/features/style-panel/shared/show-more.tsx
index 7aed02faed..4423120c6a 100644
--- a/apps/builder/app/builder/features/style-panel/shared/show-more.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/show-more.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, type JSX } from "react";
import { Flex, Button, Collapsible } from "@webstudio-is/design-system";
import {
ChevronFilledDownIcon,
diff --git a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
index 1b140b6ef2..db87c56e37 100644
--- a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useMemo, useRef, type RefObject } from "react";
+import { forwardRef, useMemo, useRef, type JSX, type RefObject } from "react";
import {
css,
canvasPointerEventsPropertyName,
@@ -27,7 +27,7 @@ type CanvasIframeProps = JSX.IntrinsicElements["iframe"];
const CanvasRectUpdater = ({
iframeRef,
}: {
- iframeRef: RefObject<HTMLIFrameElement>;
+ iframeRef: RefObject<null | HTMLIFrameElement>;
}) => {
const [updateCallback, setUpdateCallback] = useState<
undefined | (() => void)
diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsx
index 59e2b00556..d54cb25f08 100644
--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx
+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx
@@ -1,4 +1,10 @@
-import { useEffect, useRef, useState, type ComponentProps } from "react";
+import {
+ useEffect,
+ useRef,
+ useState,
+ type ComponentProps,
+ type JSX,
+} from "react";
import type { AssetType } from "@webstudio-is/asset-uploader";
import {
Flex,
diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsx
index 048b7443cb..3bdd8443e8 100644
--- a/apps/builder/app/builder/shared/binding-popover.tsx
+++ b/apps/builder/app/builder/shared/binding-popover.tsx
@@ -82,7 +82,7 @@ const BindingPanel = ({
onChange: () => void;
onSave: (value: string, invalid: boolean) => void;
}) => {
- const editorApiRef = useRef<undefined | EditorApi>();
+ const editorApiRef = useRef<undefined | EditorApi>(undefined);
const [expression, setExpression] = useState(value);
const usedIdentifiers = useMemo(
() => getExpressionIdentifiers(value),
@@ -335,7 +335,7 @@ const BindingButton = forwardRef<
BindingButton.displayName = "BindingButton";
const BindingPopoverContext = createContext<{
- containerRef?: RefObject<HTMLElement>;
+ containerRef?: RefObject<null | HTMLElement>;
side?: "left" | "right";
}>({});
diff --git a/apps/builder/app/builder/shared/code-editor-base.tsx b/apps/builder/app/builder/shared/code-editor-base.tsx
index a291dc3643..ab120fa66d 100644
--- a/apps/builder/app/builder/shared/code-editor-base.tsx
+++ b/apps/builder/app/builder/shared/code-editor-base.tsx
@@ -197,8 +197,8 @@ export const EditorContent = ({
}: EditorContentProps) => {
globalStyles();
- const editorRef = useRef<null | HTMLDivElement>(null);
- const viewRef = useRef<undefined | EditorView>();
+ const editorRef = useRef<HTMLDivElement>(null);
+ const viewRef = useRef<undefined | EditorView>(undefined);
const onChangeRef = useRef(onChange);
onChangeRef.current = onChange;
diff --git a/apps/builder/app/builder/shared/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel.tsx
index 3fc491d6e1..80a637a328 100644
--- a/apps/builder/app/builder/shared/floating-panel.tsx
+++ b/apps/builder/app/builder/shared/floating-panel.tsx
@@ -1,11 +1,11 @@
import {
- type MutableRefObject,
type RefObject,
useContext,
useRef,
useState,
createContext,
useLayoutEffect,
+ type JSX,
} from "react";
import {
FloatingPanelPopover,
@@ -23,9 +23,9 @@ export const useSideOffset = ({
}: {
side?: "left" | "right";
isOpen: boolean;
- containerRef?: RefObject<HTMLElement>;
-}): [MutableRefObject<HTMLButtonElement | null>, number] => {
- const triggerRef = useRef<HTMLButtonElement | null>(null);
+ containerRef?: RefObject<null | HTMLElement>;
+}): [RefObject<HTMLButtonElement>, number] => {
+ const triggerRef = useRef<null | HTMLButtonElement>(null);
const [sideOffset, setSideOffset] = useState(0);
// use layout effect to avoid popover jumping
@@ -55,7 +55,7 @@ export const useSideOffset = ({
};
const FloatingPanelContext = createContext<{
- container: RefObject<HTMLElement>;
+ container: RefObject<null | HTMLElement>;
}>({
container: {
current: null,
@@ -67,7 +67,7 @@ export const FloatingPanelProvider = ({
container,
}: {
children: JSX.Element;
- container: RefObject<HTMLElement>;
+ container: RefObject<null | HTMLElement>;
}) => (
<FloatingPanelContext.Provider value={{ container }}>
{children}
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index 381d5a4204..06514a620e 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -140,7 +140,7 @@ const useElementsTree = (
const DesignMode = () => {
const debounceEffect = useDebounceEffect();
- const ref = useRef<Instances>();
+ const ref = useRef<undefined | Instances>(undefined);
useDragAndDrop();
@@ -182,7 +182,7 @@ const DesignMode = () => {
const ContentEditMode = () => {
const debounceEffect = useDebounceEffect();
- const ref = useRef<Instances>();
+ const ref = useRef<undefined | Instances>(undefined);
useEffect(() => {
const abortController = new AbortController();
diff --git a/apps/builder/app/canvas/elements.tsx b/apps/builder/app/canvas/elements.tsx
index fa011c435d..6a45386be3 100644
--- a/apps/builder/app/canvas/elements.tsx
+++ b/apps/builder/app/canvas/elements.tsx
@@ -1,6 +1,7 @@
import {
Fragment,
type ForwardRefExoticComponent,
+ type JSX,
type RefAttributes,
type RefObject,
} from "react";
diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsx
index 7ce5460455..1af2dbe37b 100644
--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx
+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx
@@ -4,6 +4,7 @@ import {
useLayoutEffect,
useCallback,
useRef,
+ type JSX,
} from "react";
import {
KEY_ENTER_COMMAND,
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 6228f885e4..ef6f67a926 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -7,6 +7,7 @@ import {
useMemo,
Fragment,
type ReactNode,
+ type JSX,
} from "react";
import { $getSelection, $isRangeSelection } from "lexical";
import { computed } from "nanostores";
diff --git a/apps/builder/app/canvas/shared/use-pointer-outline.ts b/apps/builder/app/canvas/shared/use-pointer-outline.ts
index 4036d764ee..3bee2c7418 100644
--- a/apps/builder/app/canvas/shared/use-pointer-outline.ts
+++ b/apps/builder/app/canvas/shared/use-pointer-outline.ts
@@ -4,7 +4,7 @@ import type { Point } from "@webstudio-is/design-system";
// Draw a point where we think the pointer is to visualize if calculations are based on the right position
// Only needed for debugging.
export const usePointerOutline = () => {
- const ref = useRef<HTMLDivElement>();
+ const ref = useRef<undefined | HTMLDivElement>(undefined);
useEffect(() => {
const div = document.createElement("div");
diff --git a/apps/builder/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsx
index 2e8bc2bddf..e0b366e106 100644
--- a/apps/builder/app/dashboard/dashboard.stories.tsx
+++ b/apps/builder/app/dashboard/dashboard.stories.tsx
@@ -1,4 +1,5 @@
import type { StoryFn } from "@storybook/react";
+import type { JSX } from "react";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { Dashboard } from "./dashboard";
import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";
diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsx
index 7d7773b704..5ab069fd31 100644
--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx
@@ -1,5 +1,5 @@
import { useRevalidator } from "@remix-run/react";
-import { useEffect, useState } from "react";
+import { useEffect, useState, type JSX } from "react";
import {
Box,
Button,
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
index a5dab6ec2f..f9cb25bf27 100644
--- a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
@@ -1,3 +1,4 @@
+import type { JSX } from "react";
import { test, expect, describe, beforeEach } from "vitest";
import { nanoid } from "nanoid";
import {
diff --git a/apps/builder/app/shared/matcher.test.tsx b/apps/builder/app/shared/matcher.test.tsx
index 5a4465bd67..f9c0fe18a3 100644
--- a/apps/builder/app/shared/matcher.test.tsx
+++ b/apps/builder/app/shared/matcher.test.tsx
@@ -1,4 +1,5 @@
import { describe, expect, test, vi } from "vitest";
+import type { JSX } from "react";
import { renderJsx, $, ExpressionValue } from "@webstudio-is/sdk/testing";
import { coreMetas } from "@webstudio-is/react-sdk";
import * as baseMetas from "@webstudio-is/sdk-components-react/metas";
diff --git a/apps/builder/app/shared/pubsub/create.ts b/apps/builder/app/shared/pubsub/create.ts
index 6ff6fb232e..acfcc974ed 100644
--- a/apps/builder/app/shared/pubsub/create.ts
+++ b/apps/builder/app/shared/pubsub/create.ts
@@ -125,7 +125,9 @@ export const createPubsub = <PublishMap>() => {
* To publish a postMessage event on the iframe and parent window from the parent window.
*/
usePublish() {
- const postMessageRef = useRef<typeof window.postMessage>();
+ const postMessageRef = useRef<undefined | typeof window.postMessage>(
+ undefined
+ );
const iframeRefCallback = useCallback(
(element: HTMLIFrameElement | null) => {
diff --git a/apps/builder/app/shared/style-object-model.test.tsx b/apps/builder/app/shared/style-object-model.test.tsx
index 756460cf75..2c3ccc7ec1 100644
--- a/apps/builder/app/shared/style-object-model.test.tsx
+++ b/apps/builder/app/shared/style-object-model.test.tsx
@@ -1,3 +1,4 @@
+import type { JSX } from "react";
import { describe, expect, test } from "vitest";
import type { HtmlTags } from "html-tags";
import {
diff --git a/packages/design-system/src/components/__DEPRECATED__/list.tsx b/packages/design-system/src/components/__DEPRECATED__/list.tsx
index a4317ee9a7..05b876b918 100644
--- a/packages/design-system/src/components/__DEPRECATED__/list.tsx
+++ b/packages/design-system/src/components/__DEPRECATED__/list.tsx
@@ -2,6 +2,7 @@ import {
type ComponentProps,
type FocusEvent,
forwardRef,
+ type JSX,
type KeyboardEvent,
} from "react";
import { Text } from "../text";
diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsx
index 806b484bed..b5f948cae0 100644
--- a/packages/design-system/src/components/combobox.tsx
+++ b/packages/design-system/src/components/combobox.tsx
@@ -273,7 +273,7 @@ export const useCombobox = <Item,>({
...rest
}: UseComboboxProps<Item>) => {
const [isOpen, setIsOpen] = useState(false);
- const selectedItemRef = useRef<Item>();
+ const selectedItemRef = useRef<undefined | Item>(undefined);
const itemsCache = useRef<Item[]>([]);
const [matchedItems, setMatchedItems] = useState<Item[]>([]);
diff --git a/packages/design-system/src/components/component-card.tsx b/packages/design-system/src/components/component-card.tsx
index 208fc2b905..06ef9d1dd9 100644
--- a/packages/design-system/src/components/component-card.tsx
+++ b/packages/design-system/src/components/component-card.tsx
@@ -3,7 +3,7 @@
* https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=2608-8921
*/
-import { forwardRef, type ComponentProps } from "react";
+import { forwardRef, type ComponentProps, type JSX } from "react";
import { css, theme } from "../stitches.config";
import { textVariants } from "./text";
import { Tooltip } from "./tooltip";
diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsx
index a5d5b2eb26..0aa21f537f 100644
--- a/packages/design-system/src/components/dialog.tsx
+++ b/packages/design-system/src/components/dialog.tsx
@@ -49,10 +49,13 @@ const useDraggable = ({
minHeight,
minWidth,
}: UseDraggableProps) => {
- const initialDataRef = useRef<{
- point: { x: number; y: number };
- rect: DOMRect;
- }>();
+ const initialDataRef = useRef<
+ | undefined
+ | {
+ point: { x: number; y: number };
+ rect: DOMRect;
+ }
+ >(undefined);
const { enableCanvasPointerEvents, disableCanvasPointerEvents } =
useDisableCanvasPointerEvents();
const draggableRef = useRef<HTMLDivElement | null>(null);
diff --git a/packages/design-system/src/components/primitives/arrow-focus.tsx b/packages/design-system/src/components/primitives/arrow-focus.tsx
index 75cece876f..ae0aeb8e42 100644
--- a/packages/design-system/src/components/primitives/arrow-focus.tsx
+++ b/packages/design-system/src/components/primitives/arrow-focus.tsx
@@ -3,7 +3,7 @@ import {
useFocusManager,
type FocusManagerOptions,
} from "@react-aria/focus";
-import type { KeyboardEvent } from "react";
+import type { KeyboardEvent, JSX } from "react";
type Render = (props: {
handleKeyDown: (
diff --git a/packages/design-system/src/components/primitives/create-content-controller.stories.tsx b/packages/design-system/src/components/primitives/create-content-controller.stories.tsx
index 19f07fe7b9..7146e2d49e 100644
--- a/packages/design-system/src/components/primitives/create-content-controller.stories.tsx
+++ b/packages/design-system/src/components/primitives/create-content-controller.stories.tsx
@@ -7,7 +7,7 @@ const useContentController = ({
write,
callback,
}: {
- ref: RefObject<HTMLInputElement>;
+ ref: RefObject<HTMLInputElement | null>;
read: (value: HTMLInputElement) => string;
write: (target: HTMLInputElement, value: string) => void;
callback: (value: { name: string; value: string }) => void;
diff --git a/packages/design-system/src/components/primitives/is-truncated.tsx b/packages/design-system/src/components/primitives/is-truncated.tsx
index 951c1865ff..b1b495566e 100644
--- a/packages/design-system/src/components/primitives/is-truncated.tsx
+++ b/packages/design-system/src/components/primitives/is-truncated.tsx
@@ -3,7 +3,10 @@ import { type RefObject, useState, useEffect } from "react";
/**
* Checks whether text was truncated in an element with `text-overflow: ellipsis`
*/
-export const useIsTruncated = (ref: RefObject<HTMLElement>, text: string) => {
+export const useIsTruncated = (
+ ref: RefObject<null | HTMLElement>,
+ text: string
+) => {
const [isTruncated, setIsTruncated] = useState(false);
useEffect(() => {
diff --git a/packages/design-system/src/components/primitives/numeric-gesture-control.stories.tsx b/packages/design-system/src/components/primitives/numeric-gesture-control.stories.tsx
index a02324ae0b..24ae770e45 100644
--- a/packages/design-system/src/components/primitives/numeric-gesture-control.stories.tsx
+++ b/packages/design-system/src/components/primitives/numeric-gesture-control.stories.tsx
@@ -11,7 +11,7 @@ const useNumericScrubControl = ({
direction,
acceleration,
}: {
- ref: RefObject<HTMLInputElement>;
+ ref: RefObject<null | HTMLInputElement>;
value: NumericScrubValue;
direction: NumericScrubDirection;
acceleration: number;
diff --git a/packages/design-system/src/components/search-field.tsx b/packages/design-system/src/components/search-field.tsx
index 19c1218c0d..7e48463891 100644
--- a/packages/design-system/src/components/search-field.tsx
+++ b/packages/design-system/src/components/search-field.tsx
@@ -7,6 +7,7 @@ import {
useEffect,
type ChangeEventHandler,
type KeyboardEventHandler,
+ type FormEventHandler,
} from "react";
import {
CrossCircledFilledIcon,
@@ -98,8 +99,8 @@ export const SearchField = forwardRef(SearchFieldBase);
type UseSearchFieldKeys = {
onMove: (event: { direction: "next" | "previous" | "current" }) => void;
- onChange?: ComponentProps<typeof SearchFieldBase>["onChange"];
- onCancel?: ComponentProps<typeof SearchFieldBase>["onCancel"];
+ onChange?: FormEventHandler<HTMLInputElement>;
+ onCancel?: () => void;
};
export const useSearchFieldKeys = ({
diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsx
index d3c88bf62b..917dac0002 100644
--- a/packages/design-system/src/components/select.tsx
+++ b/packages/design-system/src/components/select.tsx
@@ -3,6 +3,7 @@ import {
type ReactNode,
type Ref,
type ComponentProps,
+ type JSX,
useMemo,
forwardRef,
useState,
diff --git a/packages/design-system/src/components/tooltip.tsx b/packages/design-system/src/components/tooltip.tsx
index 8a1e539adb..9d8dce4b17 100644
--- a/packages/design-system/src/components/tooltip.tsx
+++ b/packages/design-system/src/components/tooltip.tsx
@@ -184,7 +184,7 @@ export const InputErrorsTooltip = ({
<Text key={index}>{error}</Text>
));
- const ref = useRef<HTMLDivElement>();
+ const ref = useRef<HTMLDivElement>(null);
// Use collision boundary to hide tooltips if original element out of visible area in the scroll viewport
const [collisionBoundary, setCollisionBoundary] = useState<
| {
diff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsx
index c89d0d6fdb..56243238cd 100644
--- a/packages/design-system/src/components/tree.tsx
+++ b/packages/design-system/src/components/tree.tsx
@@ -295,7 +295,7 @@ export const TreeSortableItem = <Data,>({
const handleDrop = useCallbackRef(onDrop);
const handleExpand = useCallbackRef(onExpand);
const handleCanDrag = useCallbackRef(canDrag);
- const expandTimeout = useRef<number>();
+ const expandTimeout = useRef<undefined | number>(undefined);
useEffect(() => {
if (elementRef.current === null) {
diff --git a/packages/design-system/src/utilities.ts b/packages/design-system/src/utilities.ts
index 0b9de81eb6..c59d243d1c 100644
--- a/packages/design-system/src/utilities.ts
+++ b/packages/design-system/src/utilities.ts
@@ -54,7 +54,9 @@ export const disableCanvasPointerEvents = () => {
};
export const useDisableCanvasPointerEvents = () => {
- const enableCanvasPointerEventsRef = useRef<() => void>();
+ const enableCanvasPointerEventsRef = useRef<undefined | (() => void)>(
+ undefined
+ );
const enableDisable = useMemo(
() => ({
diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsx
index b54dac9745..b28a9f2aac 100644
--- a/packages/image/src/image-dev.stories.tsx
+++ b/packages/image/src/image-dev.stories.tsx
@@ -29,13 +29,11 @@ const imageSrc = USE_CLOUDFLARE_IMAGE_TRANSFORM
? REMOTE_SELF_DOMAIN_IMAGE
: localLogoImage;
-const ImageBase: StoryFn<
- React.ForwardRefExoticComponent<
- Omit<ImageProps, "loader"> & {
- style?: React.HTMLAttributes<"img">["style"];
- }
- >
-> = (args) => {
+const ImageBase = (
+ args: Omit<ImageProps, "loader"> & {
+ style?: React.HTMLAttributes<"img">["style"];
+ }
+) => {
const style = {
maxWidth: "100%",
display: "block",
diff --git a/packages/sdk/src/jsx.ts b/packages/sdk/src/jsx.ts
index 27eaceba91..faf1b2b23b 100644
--- a/packages/sdk/src/jsx.ts
+++ b/packages/sdk/src/jsx.ts
@@ -1,4 +1,4 @@
-import type { ReactNode } from "react";
+import type { JSX, ReactNode } from "react";
import type { Instances } from "./schema/instances";
import type { Props } from "./schema/props";