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: listen hotkeys before first user interaction (#2436)

Bogdan Chadkina3b200fcdad6
diff --git a/apps/builder/app/shared/commands-emitter.ts b/apps/builder/app/shared/commands-emitter.ts
index 7a475f003a..50a302209f 100644
--- a/apps/builder/app/shared/commands-emitter.ts
+++ b/apps/builder/app/shared/commands-emitter.ts
@@ -1,5 +1,5 @@
import { isHotkeyPressed } from "react-hotkeys-hook";
-import { atom, onMount } from "nanostores";
+import { atom } from "nanostores";
import { $publisher, subscribe } from "~/shared/pubsub";
import { clientSyncStore } from "~/shared/sync";
@@ -40,6 +40,7 @@ export type Command<CommandName extends string> = CommandMeta<CommandName> & {
* expose command metas to synchronize between builder, canvas and plugins
*/
export const $commandMetas = atom(new Map<string, CommandMeta<string>>());
+clientSyncStore.register("commandMetas", $commandMetas);
export const createCommandsEmitter = <CommandName extends string>({
source,
@@ -56,17 +57,10 @@ export const createCommandsEmitter = <CommandName extends string>({
}
if (commands.length > 0) {
- onMount($commandMetas, () => {
- // listener from sync-stores is called after onMount callback
- // schedule store.set to the next tick
- // so store.listen is executed after store.set below
- Promise.resolve().then(() => {
- clientSyncStore.createTransaction([$commandMetas], (commandMetas) => {
- for (const { handler, ...meta } of commands) {
- commandMetas.set(meta.name, meta);
- }
- });
- });
+ clientSyncStore.createTransaction([$commandMetas], (commandMetas) => {
+ for (const { handler, ...meta } of commands) {
+ commandMetas.set(meta.name, meta);
+ }
});
}
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index e2d317d847..1aa4053cd6 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -30,7 +30,6 @@ import {
synchronizedComponentsMetaStores,
dataSourceVariablesStore,
} from "~/shared/nano-states";
-import { $commandMetas } from "~/shared/commands-emitter";
enableMapSet();
@@ -75,7 +74,6 @@ export const registerContainers = () => {
serverSyncStore.register("props", propsStore);
serverSyncStore.register("dataSources", dataSourcesStore);
serverSyncStore.register("assets", assetsStore);
- clientSyncStore.register("commandMetas", $commandMetas);
// synchronize whole states
clientStores.set("project", projectStore);
clientStores.set("dataSourceVariables", dataSourceVariablesStore);
diff --git a/apps/builder/package.json b/apps/builder/package.json
index d3c2d8521d..477d2a6be7 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -79,7 +79,7 @@
"hono": "^3.7.3",
"hyphenate-style-name": "^1.0.4",
"immer": "^10.0.3",
- "immerhin": "^0.8.1",
+ "immerhin": "^0.9.0",
"jose": "^4.11.2",
"lexical": "^0.12.2",
"match-sorter": "^6.3.1",
@@ -88,7 +88,7 @@
"memoize-one": "^6.0.0",
"micromark-extension-gfm": "^3.0.0",
"nanoevents": "^8.0.0",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"nanostores": "^0.9.3",
"node-fetch": "^3.3.1",
"pretty-bytes": "^6.1.1",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 7b86fd5e21..aae140ab0e 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -23,7 +23,7 @@
"fontkit": "^2.0.2",
"image-size": "^1.0.2",
"immer": "^10.0.3",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"warn-once": "^0.1.1"
},
"devDependencies": {
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index bed39456e4..0e6f1713ff 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -38,7 +38,7 @@
"dependencies": {
"dotenv": "^16.3.1",
"execa": "^7.2.0",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"prompts": "^2.4.2",
"umzug": "^3.2.1"
},
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 0f0b553a4c..ffce2c3dd4 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -36,7 +36,7 @@
"@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"zod": "^3.21.4"
},
"devDependencies": {
diff --git a/packages/project/package.json b/packages/project/package.json
index 95744e9db9..0b775b8be8 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -18,7 +18,7 @@
"@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"slugify": "^1.6.6",
"uuid": "^9.0.0",
"zod": "^3.21.4"
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index c1df6a2209..c70b3335b9 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -42,7 +42,7 @@
"change-case": "^5.0.2",
"html-tags": "^3.3.1",
"jsep": "^1.3.8",
- "nanoid": "^4.0.2",
+ "nanoid": "^5.0.1",
"title-case": "^4.1.0"
},
"exports": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b14220cbd8..b6c44adbf8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -239,8 +239,8 @@ importers:
specifier: ^10.0.3
version: 10.0.3
immerhin:
- specifier: ^0.8.1
- version: 0.8.1
+ specifier: ^0.9.0
+ version: 0.9.0
jose:
specifier: ^4.11.2
version: 4.11.2
@@ -266,8 +266,8 @@ importers:
specifier: ^8.0.0
version: 8.0.0
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
nanostores:
specifier: ^0.9.3
version: 0.9.3
@@ -755,8 +755,8 @@ importers:
specifier: ^10.0.3
version: 10.0.3
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
warn-once:
specifier: ^0.1.1
version: 0.1.1
@@ -1456,8 +1456,8 @@ importers:
specifier: ^7.2.0
version: 7.2.0
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
prompts:
specifier: ^2.4.2
version: 2.4.2
@@ -1511,8 +1511,8 @@ importers:
specifier: workspace:*
version: link:../trpc-interface
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
slugify:
specifier: ^1.6.6
version: 1.6.6
@@ -1545,8 +1545,8 @@ importers:
specifier: workspace:*
version: link:../trpc-interface
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
zod:
specifier: ^3.21.4
version: 3.21.4
@@ -1594,8 +1594,8 @@ importers:
specifier: ^1.3.8
version: 1.3.8
nanoid:
- specifier: ^4.0.2
- version: 4.0.2
+ specifier: ^5.0.1
+ version: 5.0.1
title-case:
specifier: ^4.1.0
version: 4.1.0
@@ -11621,11 +11621,11 @@ packages:
resolution: {integrity: sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==}
dev: false
- resolution: {integrity: sha512-pQrkWwkPj7/UHL7qVU7hTjTxN8uGy6ewhyfEiooY0lkT00h7i+HbV0cvKud6mZzcz5o2iAMiKiq55twxON4+QQ==}
+ resolution: {integrity: sha512-J+SCbceSlOLTWaEmVt0ei6ZCDHmuFtt7It1/mt1Juw8Ll0lQg0N/mnswaqUlB67DeN4JICyU0JKnNQgBC2+61Q==}
dependencies:
immer: 10.0.3
- nanoid: 4.0.2
+ nanoid: 5.0.1
dev: false
@@ -14016,9 +14016,9 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
- resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
- engines: {node: ^14 || ^16 || >=18}
+ resolution: {integrity: sha512-vWeVtV5Cw68aML/QaZvqN/3QQXc6fBfIieAlu05m7FZW2Dgb+3f0xc0TTxuJW+7u30t7iSDTV/j3kVI0oJqIfQ==}
+ engines: {node: ^18 || >=20}
hasBin: true
dev: false