diff --git a/README.md b/README.md index 73c10ff..c759374 100644 --- a/README.md +++ b/README.md @@ -4,26 +4,23 @@ This plugin allows you to embed js-draw whiteboards anywhere in your SiYuan documents. ## Usage instructions -1. Install the plugin - - Grab a release from the [Releases page](https://git.massive.box/massivebox/siyuan-jsdraw-plugin/releases) - - Unzip it in the folder `./data/plugins`, relatively to your SiYuan workspace. - > The plugin is not yet available in the official marketplace. I will try to publish it there soon! -2. Insert a drawing in your documents by typing `/Insert Drawing` in your document, and selecting the correct menu entry -3. The whiteboard editor will open in a new tab. Draw as you like, then click the Save button. It will also add a - drawing block to your document. -4. Click the Gear icon > Refresh to refresh the drawing block, if it's still displaying the old drawing. -5. Click the drawing block to open the editor again. +- Install the plugin from the marketplace. You can find it by searching for `js-draw`. +- To edit an SVG image that is already embedded in your document: + 1. Right-click on the image, select "Plugin" > "Edit with js-draw" in the menu + 2. The editor tab will open, edit your file as you like, then click the Save button and close the tab. + 3. The image is updated, but SiYuan will still show the cached (old) image. This will be fixed in future releases, + please be patient. Until them, you can refresh the editor or change the image path. +- To add a new drawing to your document: + 1. Type `/Insert Drawing` in your document, and select the correct menu entry + 2. The whiteboard editor will open in a new tab. Draw as you like, then click the Save button and close the tab. + 3. Click the Gear icon > Refresh to refresh the drawing block. + 4. Click the drawing block to open the editor again. ## Planned features -- [ ] Auto-reload drawing blocks on drawing change -- [ ] Rename whiteboards -- [ ] Improve internationalization framework -- [ ] Default background color and grid options -- [ ] Respecting user theme for the editor -- And more! +Check out the [Projects](https://git.massive.box/massivebox/siyuan-jsdraw-plugin/projects) tab! ## Contributing -Contributions are always welcome! Right now, I'm working on the core functionality and fixing bugs. +Contributions are always welcome! Right now, I'm working on the core functionality and fixing bugs. After that is done, I will need help with the internationalization, as, unfortunately, I don't speak Chinese. Please [contact me](mailto:box@massive.box) if you'd like to help! diff --git a/public/webapp/button.js b/public/webapp/button.js index 610799d..7e6a160 100644 --- a/public/webapp/button.js +++ b/public/webapp/button.js @@ -1,6 +1,9 @@ function copyEditLink(fileID) { navigator.clipboard.writeText(getEditLink(fileID)); } +function copyImageLink(fileID) { + navigator.clipboard.writeText(`![Drawing](assets/${fileID}.svg)`); +} function refreshPage() { window.location.reload(); @@ -20,7 +23,7 @@ function addButton(document, fileID) { popupMenu.innerHTML = ` - + `; document.body.appendChild(popupMenu); @@ -31,6 +34,7 @@ function addButton(document, fileID) { document.body.addEventListener('mouseleave', () => { floatingButton.style.display = 'none'; + popupMenu.style.display = 'none'; }); // Toggle popup menu on button click diff --git a/src/helper.ts b/src/helper.ts index 18386c7..0492b07 100644 --- a/src/helper.ts +++ b/src/helper.ts @@ -54,4 +54,37 @@ export function getPreviewHTML(id: string): string { return ` ` -} \ No newline at end of file +} + +// given a tag (such as a div) containing an image as a child at any level, return the src of the image +export function findImgSrc(element: HTMLElement): string | null { + // Base case: if current element is an image + if (element.tagName === 'IMG') { + const fullSrc = (element as HTMLImageElement).src; + // Extract the path after host:port using URL API + const url = new URL(fullSrc); + return url.pathname.startsWith('/assets/') + ? url.pathname.substring(1) // Remove leading slash + : null; + } + + // Recursively check children + if (element.children) { + for (const child of Array.from(element.children)) { + const src = findImgSrc(child as HTMLElement); + if (src) return src; + } + } + + return null; +} + +export function extractFileID(imgSrc: string | null): string | null { + if (!imgSrc) return null; + + const [pathPart] = imgSrc.split('?'); + // Match pattern: assets/{fileID}.svg + const match = pathPart.match(/^assets\/([^\/]+)\.svg$/i); + + return match?.[1] || null; +} diff --git a/src/index.ts b/src/index.ts index e19ecb2..1ea3b47 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,12 +1,11 @@ import {Plugin, Protyle} from 'siyuan'; -import {getPreviewHTML, loadIcons, getMenuHTML, generateSiyuanId} from "@/helper"; +import {getPreviewHTML, loadIcons, getMenuHTML, generateSiyuanId, findImgSrc, extractFileID} from "@/helper"; import {createEditor, openEditorTab} from "@/editorTab"; export default class DrawJSPlugin extends Plugin { onload() { loadIcons(this); - //const id = Math.random().toString(36).substring(7); this.addTab({ 'type': "whiteboard", init() { @@ -25,20 +24,21 @@ export default class DrawJSPlugin extends Plugin { } }]; + this.eventBus.on("open-menu-image", (e: any) => { + const fileID = extractFileID(findImgSrc(e.detail.element)); + if(fileID === null) { + return; + } + console.log("got ID" + fileID); + e.detail.menu.addItem({ + icon: "iconDraw", + label: "Edit with js-draw", + click: () => { + openEditorTab(this, fileID); + } + }) + }) + } - onLayoutReady() { - // This function is automatically called when the layout is loaded. - } - - onunload() { - // This function is automatically called when the plugin is disabled. - } - - uninstall() { - // This function is automatically called when the plugin is uninstalled. - } - - - } \ No newline at end of file diff --git a/vite.config.ts.timestamp-1743541342564-d66840ad6dd8b.mjs b/vite.config.ts.timestamp-1743541342564-d66840ad6dd8b.mjs new file mode 100644 index 0000000..f2c6618 --- /dev/null +++ b/vite.config.ts.timestamp-1743541342564-d66840ad6dd8b.mjs @@ -0,0 +1,185 @@ +// vite.config.ts +import { resolve as resolve2 } from "path"; +import { defineConfig } from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/vite/dist/node/index.js"; +import { viteStaticCopy } from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/vite-plugin-static-copy/dist/index.js"; +import livereload from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/rollup-plugin-livereload/dist/index.cjs.js"; +import { svelte } from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/@sveltejs/vite-plugin-svelte/src/index.js"; +import zipPack from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/vite-plugin-zip-pack/dist/esm/index.mjs"; +import fg from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/fast-glob/out/index.js"; + +// yaml-plugin.js +import fs from "fs"; +import yaml from "file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/js-yaml/dist/js-yaml.mjs"; +import { resolve } from "path"; +function vitePluginYamlI18n(options = {}) { + const DefaultOptions = { + inDir: "src/i18n", + outDir: "dist/i18n" + }; + const finalOptions = { ...DefaultOptions, ...options }; + return { + name: "vite-plugin-yaml-i18n", + buildStart() { + console.log("\u{1F308} Parse I18n: YAML to JSON.."); + const inDir = finalOptions.inDir; + const outDir = finalOptions.outDir; + if (!fs.existsSync(outDir)) { + fs.mkdirSync(outDir, { recursive: true }); + } + const files = fs.readdirSync(inDir); + for (const file of files) { + if (file.endsWith(".yaml") || file.endsWith(".yml")) { + console.log(`-- Parsing ${file}`); + const jsonFile = file.replace(/\.(yaml|yml)$/, ".json"); + if (files.includes(jsonFile)) { + console.log(`---- File ${jsonFile} already exists, skipping...`); + continue; + } + try { + const filePath = resolve(inDir, file); + const fileContents = fs.readFileSync(filePath, "utf8"); + const parsed = yaml.load(fileContents); + const jsonContent = JSON.stringify(parsed, null, 2); + const outputFilePath = resolve(outDir, file.replace(/\.(yaml|yml)$/, ".json")); + console.log(`---- Writing to ${outputFilePath}`); + fs.writeFileSync(outputFilePath, jsonContent); + } catch (error) { + this.error(`---- Error parsing YAML file ${file}: ${error.message}`); + } + } + } + } + }; +} + +// vite.config.ts +var __vite_injected_original_dirname = "/home/massive/Dev/siyuan-jsdraw-plugin"; +var env = process.env; +var isSrcmap = env.VITE_SOURCEMAP === "inline"; +var isDev = env.NODE_ENV === "development"; +var outputDir = isDev ? "dev" : "dist"; +console.log("isDev=>", isDev); +console.log("isSrcmap=>", isSrcmap); +console.log("outputDir=>", outputDir); +var vite_config_default = defineConfig({ + resolve: { + alias: { + "@": resolve2(__vite_injected_original_dirname, "src") + } + }, + plugins: [ + svelte(), + vitePluginYamlI18n({ + inDir: "public/i18n", + outDir: `${outputDir}/i18n` + }), + viteStaticCopy({ + targets: [ + { src: "./README*.md", dest: "./" }, + { src: "./plugin.json", dest: "./" }, + { src: "./preview.png", dest: "./" }, + { src: "./icon.png", dest: "./" } + ] + }) + ], + define: { + "process.env.DEV_MODE": JSON.stringify(isDev), + "process.env.NODE_ENV": JSON.stringify(env.NODE_ENV) + }, + build: { + outDir: outputDir, + emptyOutDir: false, + minify: true, + sourcemap: isSrcmap ? "inline" : false, + lib: { + entry: resolve2(__vite_injected_original_dirname, "src/index.ts"), + fileName: "index", + formats: ["cjs"] + }, + rollupOptions: { + plugins: [ + ...isDev ? [ + livereload(outputDir), + { + name: "watch-external", + async buildStart() { + const files = await fg([ + "public/i18n/**", + "./README*.md", + "./plugin.json" + ]); + for (let file of files) { + this.addWatchFile(file); + } + } + } + ] : [ + // Clean up unnecessary files under dist dir + cleanupDistFiles({ + patterns: ["i18n/*.yaml", "i18n/*.md"], + distDir: outputDir + }), + zipPack({ + inDir: "./dist", + outDir: "./", + outFileName: "package.zip" + }) + ] + ], + external: ["siyuan", "process"], + output: { + entryFileNames: "[name].js", + assetFileNames: (assetInfo) => { + if (assetInfo.name === "style.css") { + return "index.css"; + } + return assetInfo.name; + } + } + } + } +}); +function cleanupDistFiles(options) { + const { + patterns, + distDir + } = options; + return { + name: "rollup-plugin-cleanup", + enforce: "post", + writeBundle: { + sequential: true, + order: "post", + async handler() { + const fg2 = await import("file:///home/massive/Dev/siyuan-jsdraw-plugin/node_modules/fast-glob/out/index.js"); + const fs2 = await import("fs"); + const distPatterns = patterns.map((pat) => `${distDir}/${pat}`); + console.debug("Cleanup searching patterns:", distPatterns); + const files = await fg2.default(distPatterns, { + dot: true, + absolute: true, + onlyFiles: false + }); + for (const file of files) { + try { + if (fs2.default.existsSync(file)) { + const stat = fs2.default.statSync(file); + if (stat.isDirectory()) { + fs2.default.rmSync(file, { recursive: true }); + } else { + fs2.default.unlinkSync(file); + } + console.log(`Cleaned up: ${file}`); + } + } catch (error) { + console.error(`Failed to clean up ${file}:`, error); + } + } + } + } + }; +} +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "yaml-plugin.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/home/massive/Dev/siyuan-jsdraw-plugin\";const __vite_injected_original_filename = \"/home/massive/Dev/siyuan-jsdraw-plugin/vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///home/massive/Dev/siyuan-jsdraw-plugin/vite.config.ts\";import { resolve } from \"path\"\nimport { defineConfig, loadEnv } from \"vite\"\nimport { viteStaticCopy } from \"vite-plugin-static-copy\"\nimport livereload from \"rollup-plugin-livereload\"\nimport { svelte } from \"@sveltejs/vite-plugin-svelte\"\nimport zipPack from \"vite-plugin-zip-pack\";\nimport fg from 'fast-glob';\n\nimport vitePluginYamlI18n from './yaml-plugin';\n\nconst env = process.env;\nconst isSrcmap = env.VITE_SOURCEMAP === 'inline';\nconst isDev = env.NODE_ENV === 'development';\n\nconst outputDir = isDev ? \"dev\" : \"dist\";\n\nconsole.log(\"isDev=>\", isDev);\nconsole.log(\"isSrcmap=>\", isSrcmap);\nconsole.log(\"outputDir=>\", outputDir);\n\nexport default defineConfig({\n    resolve: {\n        alias: {\n            \"@\": resolve(__dirname, \"src\"),\n        }\n    },\n\n    plugins: [\n        svelte(),\n\n        vitePluginYamlI18n({\n            inDir: 'public/i18n',\n            outDir: `${outputDir}/i18n`\n        }),\n\n        viteStaticCopy({\n            targets: [\n                { src: \"./README*.md\", dest: \"./\" },\n                { src: \"./plugin.json\", dest: \"./\" },\n                { src: \"./preview.png\", dest: \"./\" },\n                { src: \"./icon.png\", dest: \"./\" }\n            ],\n        }),\n\n    ],\n\n    define: {\n        \"process.env.DEV_MODE\": JSON.stringify(isDev),\n        \"process.env.NODE_ENV\": JSON.stringify(env.NODE_ENV)\n    },\n\n    build: {\n        outDir: outputDir,\n        emptyOutDir: false,\n        minify: true,\n        sourcemap: isSrcmap ? 'inline' : false,\n\n        lib: {\n            entry: resolve(__dirname, \"src/index.ts\"),\n            fileName: \"index\",\n            formats: [\"cjs\"],\n        },\n        rollupOptions: {\n            plugins: [\n                ...(isDev ? [\n                    livereload(outputDir),\n                    {\n                        name: 'watch-external',\n                        async buildStart() {\n                            const files = await fg([\n                                'public/i18n/**',\n                                './README*.md',\n                                './plugin.json'\n                            ]);\n                            for (let file of files) {\n                                this.addWatchFile(file);\n                            }\n                        }\n                    }\n                ] : [\n                    // Clean up unnecessary files under dist dir\n                    cleanupDistFiles({\n                        patterns: ['i18n/*.yaml', 'i18n/*.md'],\n                        distDir: outputDir\n                    }),\n                    zipPack({\n                        inDir: './dist',\n                        outDir: './',\n                        outFileName: 'package.zip'\n                    })\n                ])\n            ],\n\n            external: [\"siyuan\", \"process\"],\n\n            output: {\n                entryFileNames: \"[name].js\",\n                assetFileNames: (assetInfo) => {\n                    if (assetInfo.name === \"style.css\") {\n                        return \"index.css\"\n                    }\n                    return assetInfo.name\n                },\n            },\n        },\n    }\n});\n\n\n/**\n * Clean up some dist files after compiled\n * @author frostime\n * @param options:\n * @returns \n */\nfunction cleanupDistFiles(options: { patterns: string[], distDir: string }) {\n    const {\n        patterns,\n        distDir\n    } = options;\n\n    return {\n        name: 'rollup-plugin-cleanup',\n        enforce: 'post',\n        writeBundle: {\n            sequential: true,\n            order: 'post' as 'post',\n            async handler() {\n                const fg = await import('fast-glob');\n                const fs = await import('fs');\n                // const path = await import('path');\n\n                // \u4F7F\u7528 glob \u8BED\u6CD5\uFF0C\u786E\u4FDD\u80FD\u5339\u914D\u5230\u6587\u4EF6\n                const distPatterns = patterns.map(pat => `${distDir}/${pat}`);\n                console.debug('Cleanup searching patterns:', distPatterns);\n\n                const files = await fg.default(distPatterns, {\n                    dot: true,\n                    absolute: true,\n                    onlyFiles: false\n                });\n\n                // console.info('Files to be cleaned up:', files);\n\n                for (const file of files) {\n                    try {\n                        if (fs.default.existsSync(file)) {\n                            const stat = fs.default.statSync(file);\n                            if (stat.isDirectory()) {\n                                fs.default.rmSync(file, { recursive: true });\n                            } else {\n                                fs.default.unlinkSync(file);\n                            }\n                            console.log(`Cleaned up: ${file}`);\n                        }\n                    } catch (error) {\n                        console.error(`Failed to clean up ${file}:`, error);\n                    }\n                }\n            }\n        }\n    };\n}\n", "const __vite_injected_original_dirname = \"/home/massive/Dev/siyuan-jsdraw-plugin\";const __vite_injected_original_filename = \"/home/massive/Dev/siyuan-jsdraw-plugin/yaml-plugin.js\";const __vite_injected_original_import_meta_url = \"file:///home/massive/Dev/siyuan-jsdraw-plugin/yaml-plugin.js\";/*\n * Copyright (c) 2024 by frostime. All Rights Reserved.\n * @Author       : frostime\n * @Date         : 2024-04-05 21:27:55\n * @FilePath     : /yaml-plugin.js\n * @LastEditTime : 2024-04-05 22:53:34\n * @Description  : \u53BB\u59AE\u739B\u7684 json \u683C\u5F0F\uFF0C\u6211\u5C31\u662F\u8981\u7528 yaml \u5199 i18n\n */\n// plugins/vite-plugin-parse-yaml.js\nimport fs from 'fs';\nimport yaml from 'js-yaml';\nimport { resolve } from 'path';\n\nexport default function vitePluginYamlI18n(options = {}) {\n    // Default options with a fallback\n    const DefaultOptions = {\n        inDir: 'src/i18n',\n        outDir: 'dist/i18n',\n    };\n\n    const finalOptions = { ...DefaultOptions, ...options };\n\n    return {\n        name: 'vite-plugin-yaml-i18n',\n        buildStart() {\n            console.log('\uD83C\uDF08 Parse I18n: YAML to JSON..');\n            const inDir = finalOptions.inDir;\n            const outDir = finalOptions.outDir\n\n            if (!fs.existsSync(outDir)) {\n                fs.mkdirSync(outDir, { recursive: true });\n            }\n\n            //Parse yaml file, output to json\n            const files = fs.readdirSync(inDir);\n            for (const file of files) {\n                if (file.endsWith('.yaml') || file.endsWith('.yml')) {\n                    console.log(`-- Parsing ${file}`)\n                    //\u68C0\u67E5\u662F\u5426\u6709\u540C\u540D\u7684json\u6587\u4EF6\n                    const jsonFile = file.replace(/\\.(yaml|yml)$/, '.json');\n                    if (files.includes(jsonFile)) {\n                        console.log(`---- File ${jsonFile} already exists, skipping...`);\n                        continue;\n                    }\n                    try {\n                        const filePath = resolve(inDir, file);\n                        const fileContents = fs.readFileSync(filePath, 'utf8');\n                        const parsed = yaml.load(fileContents);\n                        const jsonContent = JSON.stringify(parsed, null, 2);\n                        const outputFilePath = resolve(outDir, file.replace(/\\.(yaml|yml)$/, '.json'));\n                        console.log(`---- Writing to ${outputFilePath}`);\n                        fs.writeFileSync(outputFilePath, jsonContent);\n                    } catch (error) {\n                        this.error(`---- Error parsing YAML file ${file}: ${error.message}`);\n                    }\n                }\n            }\n        },\n    };\n}\n"],
  "mappings": "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",
  "names": ["resolve", "resolve", "fg", "fs"]
}
