diff --git a/apps/web/src/layout/toolbar/index.tsx b/apps/web/src/layout/toolbar/index.tsx index 88d70b76..fd2c997c 100644 --- a/apps/web/src/layout/toolbar/index.tsx +++ b/apps/web/src/layout/toolbar/index.tsx @@ -435,7 +435,7 @@ const Toolbar: Component<{ class?: string }> = (props) => { return (
diff --git a/apps/web/src/lib/editor/extensions/code-block/menu.tsx b/apps/web/src/lib/editor/extensions/code-block/menu.tsx index 0f6bd622..b1a5ddd1 100644 --- a/apps/web/src/lib/editor/extensions/code-block/menu.tsx +++ b/apps/web/src/lib/editor/extensions/code-block/menu.tsx @@ -37,7 +37,7 @@ const CodeBlockMenu: Component = (props) => { ); return ( -
+
= (props) => { }; return ( -
+
= (props) => { "pointer-events-auto flex bg-gray-50 dark:bg-gray-900 border-gray-200 dark:border-gray-700 border-y-2 backdrop-blur-sm relative", options().cover && "w-full border-t-0", !options().cover && - "md:gap-2 w-screen md:w-auto md:border-0 md:rounded-2xl !md:bg-transparent left-[5px] !md:left-unset" + "md:gap-2 w-screen md:w-auto md:border-0 md:rounded-2xl !md:bg-transparent left-0 !md:left-unset" )} > diff --git a/apps/web/src/views/editor/editor.tsx b/apps/web/src/views/editor/editor.tsx index 52deed4b..46323d9e 100644 --- a/apps/web/src/views/editor/editor.tsx +++ b/apps/web/src/views/editor/editor.tsx @@ -215,7 +215,10 @@ const Editor: Component = (props) => { const { selection } = state; const { $anchor, empty } = selection; const isRootDepth = - $anchor.depth === 1 || ($anchor.depth === 2 && $anchor.node(1).type.name === "element"); + $anchor.depth === 1 || + ["element", "blockquote", "listItem", "taskItem"].includes( + $anchor.node($anchor.depth - 1)?.type?.name + ); const isEmptyTextBlock = $anchor.parent.isTextblock && !$anchor.parent.type.spec.code && diff --git a/apps/web/src/views/editor/menus/bubble/index.tsx b/apps/web/src/views/editor/menus/bubble/index.tsx index a367b1ba..6118707d 100644 --- a/apps/web/src/views/editor/menus/bubble/index.tsx +++ b/apps/web/src/views/editor/menus/bubble/index.tsx @@ -60,6 +60,8 @@ const BubbleMenu: Component = (props) => { mode={mode()} opened={props.opened} setMode={setMode} + setBlockMenuOpened={props.setBlockMenuOpened} + blur={props.blur} class={props.class} /> diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 79317a13..a6f2b278 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -6,6 +6,7 @@ import unocss from "unocss/vite"; export default defineConfig(async ({ mode }) => { const plugins: PluginOption[] = [tsconfigPaths(), unocss(), solidPlugin()]; const env = loadEnv(mode, process.cwd(), "PUBLIC_"); + const proxyTarget = env.PUBLIC_APP_URL; if (mode === "development") { // Only transform index.html in dev mode - in production Handlebars will do this @@ -25,13 +26,13 @@ export default defineConfig(async ({ mode }) => { server: { proxy: { "/api": { - target: "http://localhost:3333", + target: proxyTarget, ws: true }, - "/session": { target: "http://localhost:3333", ws: true }, - "/login": { target: "http://localhost:3333", ws: true }, - "/github": { target: "http://localhost:3333", ws: true }, - "/upload": { target: "http://localhost:3333", ws: true } + "/session": { target: proxyTarget, ws: true }, + "/login": { target: proxyTarget, ws: true }, + "/github": { target: proxyTarget, ws: true }, + "/upload": { target: proxyTarget, ws: true } } }, build: { diff --git a/packages/editor/src/code-block.ts b/packages/editor/src/code-block.ts index e0a4ab39..b3669d2f 100644 --- a/packages/editor/src/code-block.ts +++ b/packages/editor/src/code-block.ts @@ -23,19 +23,12 @@ declare module "@tiptap/core" { const CodeBlock = Node.create({ name: "codeBlock", - content: "text*", - marks: "", - group: "block", - code: true, - atom: true, - isolating: true, - addOptions() { return { inline: false, diff --git a/packages/extensions/src/mdx/functions/configure.ts b/packages/extensions/src/mdx/functions/configure.ts index b1f5b3bd..771a3270 100644 --- a/packages/extensions/src/mdx/functions/configure.ts +++ b/packages/extensions/src/mdx/functions/configure.ts @@ -5,15 +5,15 @@ const configure = async (context: ExtensionBaseContext): Promise => { const mdxTransformer = transformers.find((transformer) => { return ( transformer.label === "MDX" && - transformer.input === "http://localhost:7777/mdx/input" && - transformer.output === "http://localhost:7777/mdx/output" + transformer.input === "https://extensions.vrite.io/mdx/input" && + transformer.output === "https://extensions.vrite.io/mdx/output" ); }); if (!mdxTransformer) { await context.client.transformers.create({ - input: "http://localhost:7777/mdx/input", - output: "http://localhost:7777/mdx/output", + input: "https://extensions.vrite.io/mdx/input", + output: "https://extensions.vrite.io/mdx/output", maxBatchSize: 100, label: "MDX" }); diff --git a/packages/extensions/src/mdx/functions/uninstall.ts b/packages/extensions/src/mdx/functions/uninstall.ts index 9180dfd0..6d832126 100644 --- a/packages/extensions/src/mdx/functions/uninstall.ts +++ b/packages/extensions/src/mdx/functions/uninstall.ts @@ -7,8 +7,8 @@ const uninstall = async (context: ExtensionGeneralContext): Promise => { const mdxTransformer = transformers.find((transformer) => { return ( transformer.label === "MDX" && - transformer.input === "http://localhost:7777/mdx/input" && - transformer.output === "http://localhost:7777/mdx/output" + transformer.input === "https://extensions.vrite.io/mdx/input" && + transformer.output === "https://extensions.vrite.io/mdx/output" ); });