Fix (Whiteboards): An attempt to fix most of the remaining issues (#8893

) * Revert "enhance: clear selection ranges" This reverts commit cb2c1f1. * fix: untitled name crash on click * fix: breadcrumb without label * fix: maintain original page name * fix: revert shape to block change * fix: allow toolbar scrolling * fix: remove overflow from context bar
logseq · Mar 25, 2023 · b5494f3 · b5494f3
1 parent 011860e
commit b5494f3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
@@ -2505,7 +2505,7 @@
 
 (rum/defc breadcrumb-fragment
   [config block label opts]
-  [:a {:on-mouse-down
+  [:a {:on-mouse-up
        (fn [e]
          (cond
            (gobj/get e "shiftKey")
@@ -2570,13 +2570,14 @@
                                                                    content)
                                        config (assoc config :block/uuid uuid)]
                                    [block
-                                    (if (seq title)
-                                      (->elem :span (map-inline config title))
-                                      (->elem :div (markup-elements-cp config body)))]))))
+                                    (when title
+                                      (if (seq title)
+                                        (->elem :span (map-inline config title))
+                                        (->elem :div (markup-elements-cp config body))))]))))
               breadcrumb (->> (into [] parents-props)
                               (concat [page-name-props] (when more? [:more]))
                               (filterv identity)
-                              (map (fn [x] (if (vector? x)
+                              (map (fn [x] (if (and (vector? x) (second x))
                                              (let [[block label] x]
                                                (rum/with-key (breadcrumb-fragment config block label opts) (:block/uuid block)))
                                              [:span.opacity-70 "⋯"])))

diff --git a/src/main/frontend/handler/whiteboard.cljs b/src/main/frontend/handler/whiteboard.cljs
@@ -285,7 +285,8 @@
             :block/uuid uuid
             :block/content (or content "")
             :block/format :markdown ;; fixme to support org?
-            :block/page {:block/name (util/page-name-sanity-lc page-name)}
+            :block/page {:block/name (util/page-name-sanity-lc page-name)
+                         :block/original-name page-name}
             :block/parent {:block/name page-name}}]
     (db-utils/transact! [tx])
     uuid))

diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
@@ -973,7 +973,6 @@ Similar to re-frame subscriptions"
 
 (defn clear-selection!
   []
-  (util/clear-selection!)
   (swap! state assoc
          :selection/mode false
          :selection/blocks nil

diff --git a/tldraw/apps/tldraw-logseq/src/lib/preview-manager.tsx b/tldraw/apps/tldraw-logseq/src/lib/preview-manager.tsx
@@ -24,7 +24,7 @@ export class PreviewManager {
   }
 
   load(snapshot: TLDocumentModel) {
-    const page = snapshot.pages[0]
+    const page = snapshot?.pages?.[0]
     this.pageId = page?.id
     this.assets = snapshot.assets
     this.shapes = page?.shapes

diff --git a/tldraw/apps/tldraw-logseq/src/styles.css b/tldraw/apps/tldraw-logseq/src/styles.css
@@ -171,7 +171,6 @@ html[data-theme='light'] {
   border-radius: 8px;
   white-space: nowrap;
   gap: 8px;
-
   align-items: stretch;
   box-shadow: var(--shadow-medium);
   z-index: 1000;
@@ -289,10 +288,13 @@ html[data-theme='light'] {
 
   .tl-button {
     font-size: 16px;
+    flex: 0 0 auto;
   }
 }
 
 .tl-tools-floating-panel {
+  max-height: 90vh;
+  overflow-y: auto;
   flex-flow: column;
 }