diff --git a/.gitignore b/.gitignore index 0ed40f8848..3fb09f557e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ ios/App/App/capacitor.config.json startup.png +/src/main/frontend/tldraw-logseq.js /src/test/docs ~*~ diff --git a/deps.edn b/deps.edn index e41c8995f4..ac12fe3518 100755 --- a/deps.edn +++ b/deps.edn @@ -31,7 +31,7 @@ org.clojars.mmb90/cljs-cache {:mvn/version "0.1.4"} logseq/graph-parser {:local/root "deps/graph-parser"}} - :aliases {:cljs {:extra-paths ["src/dev-cljs/" "src/test/" "src/electron/" "src/js"] + :aliases {:cljs {:extra-paths ["src/dev-cljs/" "src/test/" "src/electron/"] :extra-deps {org.clojure/clojurescript {:mvn/version "1.11.54"} org.clojure/tools.namespace {:mvn/version "0.2.11"} cider/cider-nrepl {:mvn/version "0.28.4"} diff --git a/src/js/.gitignore b/src/js/.gitignore deleted file mode 100644 index 21012cbb5a..0000000000 --- a/src/js/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tldraw-logseq.js \ No newline at end of file diff --git a/src/js/.gitkeep b/src/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/frontend/extensions/tldraw.cljs b/src/main/frontend/extensions/tldraw.cljs index 08bf0f3986..d6402ab921 100644 --- a/src/main/frontend/extensions/tldraw.cljs +++ b/src/main/frontend/extensions/tldraw.cljs @@ -1,5 +1,5 @@ (ns frontend.extensions.tldraw - (:require ["/tldraw-logseq" :as TldrawLogseq] + (:require ["/frontend/tldraw-logseq" :as TldrawLogseq] [frontend.components.block :as block] [frontend.components.page :as page] [frontend.db.model :as model] @@ -90,7 +90,7 @@ (when (and (not-empty name) (not-empty (gobj/get data "currentPageId"))) [:div.draw.tldraw.whiteboard.relative.w-full.h-full {:style {:overscroll-behavior "none"} - :on-blur (fn [e] + :on-blur (fn [e] (when (#{"INPUT" "TEXTAREA"} (.-tagName (gobj/get e "target"))) (state/clear-edit!))) ;; wheel -> overscroll may cause browser navigation diff --git a/tldraw/apps/tldraw-logseq/build.mjs b/tldraw/apps/tldraw-logseq/build.mjs index 7d60c2793f..9d795274b7 100644 --- a/tldraw/apps/tldraw-logseq/build.mjs +++ b/tldraw/apps/tldraw-logseq/build.mjs @@ -17,7 +17,7 @@ Object.assign(glob, { fs.writeFileSync('dist/package.json', JSON.stringify(glob, null, 2)) -const dest = path.join(__dirname, '/../../../src/js/tldraw-logseq.js') +const dest = path.join(__dirname, '/../../../src/main/frontend/tldraw-logseq.js') if (fs.existsSync(dest)) fs.unlinkSync(dest) fs.linkSync(path.join(__dirname, '/dist/index.js'), dest)