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.

fix: Development mode refersh fix. (#3534)

Ivan Starkovadc2c21ce964
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index d98b69de40..dbba8a496e 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -60,13 +60,12 @@ import { useToastErrors } from "~/shared/error/toast-error";
import { canvasApi } from "~/shared/canvas-api";
import { loadBuilderData, setBuilderData } from "~/shared/builder-data";
import { WebstudioIcon } from "@webstudio-is/icons";
-import { atom, computed } from "nanostores";
+import { computed } from "nanostores";
import { useInterval } from "~/shared/hook-utils/use-interval";
+import { $dataLoadingState } from "~/shared/nano-states/builder";
registerContainers();
-const $dataLoadingState = atom<"idle" | "loading" | "loaded">("idle");
-
const useSetWindowTitle = () => {
const project = useStore($project);
useEffect(() => {
@@ -322,7 +321,7 @@ const ProgressIndicator = ({ value }: { value: number }) => {
size={60}
style={{
filter: `
- drop-shadow(3px 3px 6px rgba(0, 0, 0, 0.7))
+ drop-shadow(3px 3px 6px rgba(0, 0, 0, 0.7))
brightness(${fakeValue}%)
`,
}}
@@ -364,6 +363,7 @@ export const Builder = ({
$authTokenPermissions.set(authTokenPermissions);
const controller = new AbortController();
+
$dataLoadingState.set("loading");
loadBuilderData({ projectId: project.id, signal: controller.signal })
.then((data) => {
@@ -427,6 +427,7 @@ export const Builder = ({
const navigatorLayout = useNavigatorLayout();
const dataLoadingState = useStore($dataLoadingState);
+
const loadingState = useStore($loadingState);
const canvasUrl = getBuildUrl({
diff --git a/apps/builder/app/builder/shared/assets/asset-upload.tsx b/apps/builder/app/builder/shared/assets/asset-upload.tsx
index 1dfad973d6..2f79285257 100644
--- a/apps/builder/app/builder/shared/assets/asset-upload.tsx
+++ b/apps/builder/app/builder/shared/assets/asset-upload.tsx
@@ -8,7 +8,7 @@ import {
toBytes,
} from "@webstudio-is/asset-uploader";
import { FONT_MIME_TYPES } from "@webstudio-is/fonts";
-import { useUploadAsset } from "./use-assets";
+import { uploadAssets } from "./use-assets";
import { $authPermit } from "~/shared/nano-states";
import { imageMimeTypes } from "./image-formats";
@@ -29,7 +29,6 @@ const getFilesFromInput = (_type: AssetType, input: HTMLInputElement) => {
};
const useUpload = (type: AssetType) => {
- const uploadAsset = useUploadAsset();
const inputRef = useRef<HTMLInputElement | null>(null);
const onChange = (event: ChangeEvent<HTMLFormElement>) => {
@@ -39,7 +38,7 @@ const useUpload = (type: AssetType) => {
return;
}
const files = getFilesFromInput(type, input);
- uploadAsset(type, files);
+ uploadAssets(type, files);
form.reset();
};
diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsx
index 4074b67c3b..b097fa2af0 100644
--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx
+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx
@@ -18,7 +18,7 @@ import {
import { dropTargetForExternal } from "@atlaskit/pragmatic-drag-and-drop/external/adapter";
import invariant from "tiny-invariant";
import type { ContainsSource } from "@atlaskit/pragmatic-drag-and-drop/dist/types/public-utils/external/native-types";
-import { useUploadAsset } from "./use-assets";
+import { uploadAssets } from "./use-assets";
import { UploadIcon } from "@webstudio-is/icons";
import {
IDLE,
@@ -58,8 +58,6 @@ export const AssetsShell = ({
const [dropTargetState, setDropTargetState] = useState<DropTargetState>(IDLE);
- const uploadAssets = useUploadAsset();
-
useExternalDragStateEffect((state) => {
const element = ref.current;
@@ -145,7 +143,7 @@ export const AssetsShell = ({
},
})
);
- }, [accept, containsByType, type, uploadAssets]);
+ }, [accept, containsByType, type]);
const dragState = Math.max(monitorState, dropTargetState);
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index 1378560375..48112977c3 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -15,7 +15,6 @@ import type { ActionData } from "~/builder/shared/assets";
import { $assets, $authToken, $project } from "~/shared/nano-states";
import { atom, computed } from "nanostores";
import { serverSyncStore } from "~/shared/sync";
-import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import type { Simplify } from "type-fest";
import { extractImageNameAndMimeTypeFromUrl } from "./image-formats";
@@ -214,63 +213,59 @@ const uploadAsset = async ({
}
};
-export const useUploadAsset = () => {
- const handleAfterSubmit = (assetId: string, data: UploadData) => {
- warnOnce(
- data.uploadedAssets?.length !== 1,
- "Expected exactly 1 uploaded asset"
- );
-
- const uploadedAsset = data.uploadedAssets?.[0];
-
- if (uploadedAsset === undefined) {
- warnOnce(true, "An uploaded asset is undefined");
- toast.error("Could not upload an asset");
- deleteAssets([assetId]);
- return;
- }
-
- // update store with new asset and set current id
- setAsset({ ...uploadedAsset, id: assetId });
- };
-
- const uploadAssets = async (
- type: AssetType,
- files: File[],
- urls: URL[] = []
- ) => {
- const projectId = $project.get()?.id;
- const authToken = $authToken.get();
- if (projectId === undefined) {
- return;
- }
+const handleAfterSubmit = (assetId: string, data: UploadData) => {
+ warnOnce(
+ data.uploadedAssets?.length !== 1,
+ "Expected exactly 1 uploaded asset"
+ );
- const filesData = getFilesData(type, files, urls);
+ const uploadedAsset = data.uploadedAssets?.[0];
- addUploadingFilesData(filesData);
+ if (uploadedAsset === undefined) {
+ warnOnce(true, "An uploaded asset is undefined");
+ toast.error("Could not upload an asset");
+ deleteAssets([assetId]);
+ return;
+ }
- for (const fileData of filesData) {
- const assetId = fileData.assetId;
+ // update store with new asset and set current id
+ setAsset({ ...uploadedAsset, id: assetId });
+};
- await uploadAsset({
- authToken,
- projectId,
- fileOrUrl: fileData.source === "file" ? fileData.file : fileData.url,
- onCompleted: (data) => {
- URL.revokeObjectURL(fileData.objectURL);
- deleteUploadingFileData(assetId);
- handleAfterSubmit(assetId, data);
- },
- onError: (error) => {
- deleteAssets([assetId]);
- deleteUploadingFileData(assetId);
- toast.error(error);
- },
- });
- }
- };
+export const uploadAssets = async (
+ type: AssetType,
+ files: File[],
+ urls: URL[] = []
+) => {
+ const projectId = $project.get()?.id;
+ const authToken = $authToken.get();
+ if (projectId === undefined) {
+ return;
+ }
- return useEffectEvent(uploadAssets);
+ const filesData = getFilesData(type, files, urls);
+
+ addUploadingFilesData(filesData);
+
+ for (const fileData of filesData) {
+ const assetId = fileData.assetId;
+
+ await uploadAsset({
+ authToken,
+ projectId,
+ fileOrUrl: fileData.source === "file" ? fileData.file : fileData.url,
+ onCompleted: (data) => {
+ URL.revokeObjectURL(fileData.objectURL);
+ deleteUploadingFileData(assetId);
+ handleAfterSubmit(assetId, data);
+ },
+ onError: (error) => {
+ deleteAssets([assetId]);
+ deleteUploadingFileData(assetId);
+ toast.error(error);
+ },
+ });
+ }
};
const filterByType = (assetContainers: AssetContainer[], type: AssetType) => {
diff --git a/apps/builder/app/shared/nano-states/builder.ts b/apps/builder/app/shared/nano-states/builder.ts
new file mode 100644
index 0000000000..7dccd98663
--- /dev/null
+++ b/apps/builder/app/shared/nano-states/builder.ts
@@ -0,0 +1,3 @@
+import { atom } from "nanostores";
+
+export const $dataLoadingState = atom<"idle" | "loading" | "loaded">("idle");