Browse Source

fix: tldraw cljs demo

Peng Xiao 3 years ago
parent
commit
10d06f7c3f

+ 1 - 0
tldraw/cljs-demo/.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 public/js
+public/styles.css
 
 /target
 /checkouts

+ 3 - 2
tldraw/cljs-demo/package.json

@@ -3,15 +3,16 @@
   "name": "tldraw-logseq-demo",
   "license": "MIT",
   "scripts": {
+    "postinstall": "ln -f ../apps/tldraw-logseq/src/styles.css public/styles.css",
     "dev": "shadow-cljs watch frontend"
   },
   "devDependencies": {
     "node-libs-browser": "^2.2.1",
     "react": ">=16.8",
     "react-dom": "^16.8 || ^17.0",
-    "shadow-cljs": "^2.18.0"
+    "shadow-cljs": "^2.19.0"
   },
   "dependencies": {
-    "tldraw-logseq": "*"
+    "tldraw-logseq": "../apps/tldraw-logseq"
   }
 }

+ 3 - 2
tldraw/cljs-demo/public/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="light">
   <head>
     <meta charset="UTF-8" />
     <meta
@@ -21,9 +21,10 @@
         },
       };
     </script>
-  <body>
+  <body >
     <div id="app"></div>
     <script src="js/main.js"></script>
     <link rel="stylesheet" href="styles.css" />
+    <link rel="stylesheet" href="https://asset.logseq.com/static/css/style.css" />
   </body>
 </html>

+ 0 - 13
tldraw/cljs-demo/src/main/playground/index.cljs

@@ -2,19 +2,6 @@
   (:require [rum.core :as rum]
             [playground.tldraw :refer [Tldraw]]))
 
-(def persist-key "playground.index")
-
-;; Debounce it?
-(defn on-persist [e]
-  (let [document (.-document e)]
-    ;; persit to localstorage
-    (.setItem js/localStorage persist-key (js/JSON.stringify document))))
-
-(defn on-load []
-  (js/JSON.parse (.getItem js/localStorage persist-key)))
-
-(def doc (on-load))
-
 (rum/defc root []
   [:div.h-screen.w-screen (Tldraw)])
 

+ 38 - 20
tldraw/cljs-demo/src/main/playground/tldraw.cljs

@@ -6,26 +6,44 @@
 
 ;; from apps/logseq/src/documents/dev.ts
 (def dev-doc-model
-  {:currentPageId "page1",
-   :selectedIds ["yt1" "yt2"],
-   :pages
-   [{:name "Page",
-     :id "page1",
-     :shapes
-     [{:id "yt1",
-       :type "youtube",
-       :parentId "page1",
-       :point [100 100],
-       :size [160 90],
-       :embedId ""}
-      {:id "yt2",
-       :type "youtube",
-       :parentId "page1",
-       :point [300 300],
-       :size [160 90],
-       :embedId ""}],
-     :bindings []}],
-   :assets []})
+  {"currentPageId" "page1",
+   "selectedIds" ["0jy4JuM61pS9QQthBDme-"],
+   "pages"
+   [{"id" "page1",
+     "name" "Page",
+     "shapes"
+     [{"parentId" "page1",
+       "handles"
+       {"start" {"id" "start", "canBind" true, "point" [0 0]}, "end" {"id" "end", "canBind" true, "point" [392 272]}},
+       "scale" [1 1],
+       "label" "",
+       "id" "0jy4JuM61pS9QQthBDme-",
+       "stroke" "#fcb0b0",
+       "fill" "#ffffff",
+       "strokeWidth" 1,
+       "type" "line",
+       "decorations" {"end" "arrow"},
+       "nonce" 1655952872458,
+       "opacity" 1,
+       "point" [379.6805699752259 82.67652436640805 0.5]}
+      {"parentId" "page1",
+       "pageId" "car",
+       "collapsed" false,
+       "blockType" "P",
+       "collapsedHeight" 0,
+       "scale" [1 1],
+       "id" "hRp0fnc0i2BZIjEbZqO6_",
+       "stroke" "var(--ls-primary-text-color)",
+       "fill" "var(--ls-secondary-background-color)",
+       "strokeWidth" 2,
+       "type" "logseq-portal",
+       "nonce" 1655952865192,
+       "size" [600 320],
+       "opacity" 1,
+       "point" [876.7157262252258 195.59449311640805]}],
+     "bindings" [],
+     "nonce" 1}],
+   "assets" []})
 
 (set! *warn-on-infer* false)
 

+ 7 - 4
tldraw/cljs-demo/yarn.lock

@@ -559,10 +559,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b"
   integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg==
 
-shadow-cljs@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.18.0.tgz#f0dfeb7b52829b1e8058ded19b346cb6f9e454c3"
-  integrity sha512-yjANuBbKskNZMA8/+GznPC9xnfpAhFnx8ifuSYwzFfJeDwmQLhNOFoqw5I2lzL6I8FMJZFEnLC1oiVWdh88OuQ==
+shadow-cljs@^2.19.0:
+  version "2.19.4"
+  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.19.4.tgz#7973df717aa1edbec09539c0282d82de25bb575a"
+  integrity sha512-4SSy4RW5R7z8e3OIqXTFmF9AtxlG7nvsa7PZ81cAB5Wn2nn82nR8w9m4mtoZXdmqMgMOfadrhnMQdyurJdiXVQ==
   dependencies:
     node-libs-browser "^2.2.1"
     readline-sync "^1.4.7"
@@ -623,6 +623,9 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tldraw-logseq@../apps/tldraw-logseq:
+  version "0.0.0-dev"
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"