chore: mv remaining pdf properties to be in logseq.property.pdf

deps/db/src/logseq/db/frontend/class.cljs

@@ -57,10 +57,10 @@
    :logseq.class/Pdf-annotation
    {:title "PDF Annotation"
     :properties {:logseq.property.class/hide-from-node true}
-    :schema {:properties [:logseq.property/ls-type :logseq.property/hl-color :logseq.property/asset
+    :schema {:properties [:logseq.property/ls-type :logseq.property.pdf/hl-color :logseq.property/asset
                           :logseq.property.pdf/hl-page :logseq.property.pdf/hl-value
-                          :logseq.property/hl-type :logseq.property.pdf/hl-image]
-             :required-properties [:logseq.property/ls-type :logseq.property/hl-color :logseq.property/asset
+                          :logseq.property.pdf/hl-type :logseq.property.pdf/hl-image]
+             :required-properties [:logseq.property/ls-type :logseq.property.pdf/hl-color :logseq.property/asset
                                    :logseq.property.pdf/hl-page :logseq.property.pdf/hl-value]}}
 
 ;; TODO: Add more classes such as :book, :paper, :movie, :music, :project)

deps/db/src/logseq/db/frontend/property.cljs

@@ -85,10 +85,12 @@
    :logseq.property/asset   {:title "Asset"
                              :schema {:type :entity
                                       :hide? true}}
+   ;; used by pdf and whiteboard
    :logseq.property/ls-type {:schema {:type :keyword
                                       :hide? true}}
-   :logseq.property/hl-type {:schema {:type :keyword :hide? true}}
-   :logseq.property/hl-color {:schema {:type :default :hide? true}}
+
+   :logseq.property.pdf/hl-type {:schema {:type :keyword :hide? true}}
+   :logseq.property.pdf/hl-color {:schema {:type :default :hide? true}}
    :logseq.property.pdf/hl-page {:schema {:type :number :hide? true}}
    :logseq.property.pdf/hl-image {:schema {:type :entity :hide? true}}
    :logseq.property.pdf/hl-value {:schema {:type :map :hide? true}}

deps/db/src/logseq/db/frontend/schema.cljs

@@ -2,7 +2,7 @@
   "Main datascript schemas for the Logseq app"
   (:require [clojure.set :as set]))
 
-(def version 41)
+(def version 42)
 
 ;; A page is a special block, a page can corresponds to multiple files with the same ":block/name".
 (def ^:large-vars/data-var schema

deps/publishing/src/logseq/publishing/db.cljs

@@ -106,7 +106,7 @@
   [db]
   (if (entity-util/db-based-graph? db)
     (fn [datom]
-      (and (= :logseq.property/hl-type (:a datom))
+      (and (= :logseq.property.pdf/hl-type (:a datom))
            (= (keyword (:v datom)) :area)))
     (fn [datom]
       (and

src/main/frontend/components/block.cljs

@@ -1148,7 +1148,7 @@
               block (when db-id (db/sub-block db-id))
               properties (:block/properties block)
               block-type (keyword (pu/lookup properties :logseq.property/ls-type))
-              hl-type (pu/lookup properties :logseq.property/hl-type)
+              hl-type (pu/lookup properties :logseq.property.pdf/hl-type)
               repo (state/get-current-repo)
               stop-inner-events? (= block-type :whiteboard-shape)]
           (if (and block (:block/title block))
@@ -2145,7 +2145,7 @@
     (->elem
      elem
      (merge
-      {:data-hl-type (pu/lookup properties :logseq.property/hl-type)}
+      {:data-hl-type (pu/lookup properties :logseq.property.pdf/hl-type)}
       (when (and marker
                  (not (string/blank? marker))
                  (not= "nil" marker))
@@ -2159,7 +2159,7 @@
            :class "px-1 with-bg-color"})))
 
      ;; children
-     (let [area?  (= :area (keyword (pu/lookup properties :logseq.property/hl-type)))
+     (let [area?  (= :area (keyword (pu/lookup properties :logseq.property.pdf/hl-type)))
            hl-ref #(when (not (#{:default :whiteboard-shape} block-type))
                      [:div.prefix-link
                       {:on-pointer-down
@@ -2652,9 +2652,9 @@
                         :pointer-events (when stop-events? "none")}}
 
                 (not (string/blank?
-                      (pu/lookup properties :logseq.property/hl-color)))
+                      (pu/lookup properties :logseq.property.pdf/hl-color)))
                 (assoc :data-hl-color
-                       (pu/lookup properties :logseq.property/hl-color))
+                       (pu/lookup properties :logseq.property.pdf/hl-color))
 
                 (not block-ref?)
                 (assoc mouse-down-key (fn [e]

src/main/frontend/extensions/pdf/assets.cljs

@@ -130,7 +130,7 @@
                 props (cond->
                        {(pu/get-pid :logseq.property/ls-type)  :annotation
                         (pu/get-pid :logseq.property.pdf/hl-page)  page
-                        (pu/get-pid :logseq.property/hl-color) (:color properties)}
+                        (pu/get-pid :logseq.property.pdf/hl-color) (:color properties)}
 
                         db-base?
                         (assoc (pu/get-pid :logseq.property.pdf/hl-value) hl)
@@ -158,12 +158,12 @@
               properties (cond->
                           {:block/tags :logseq.class/Pdf-annotation
                            :logseq.property/ls-type  :annotation
-                           :logseq.property/hl-color (:color properties)
+                           :logseq.property.pdf/hl-color (:color properties)
                            :logseq.property/asset (:db/id pdf-block)
                            :logseq.property.pdf/hl-page  page
                            :logseq.property.pdf/hl-value hl}
                            (:image content)
-                           (assoc :logseq.property/hl-type :area
+                           (assoc :logseq.property.pdf/hl-type :area
                                   :logseq.property.pdf/hl-image (:image content)))]
           (when (string? text)
             (editor-handler/api-insert-new-block!
@@ -282,7 +282,7 @@
   [highlight]
   (when-let [block (db-model/get-block-by-uuid (:id highlight))]
     (when-let [color (get-in highlight [:properties :color])]
-      (let [k (pu/get-pid :logseq.property/hl-color)]
+      (let [k (pu/get-pid :logseq.property.pdf/hl-color)]
         (property-handler/set-block-property! (state/get-current-repo) (:block/uuid block) k color)))))
 
 (defn unlink-hl-area-image$

src/main/frontend/worker/db/migrate.cljs

@@ -363,7 +363,9 @@
                      :logseq.property.pdf/hl-page :logseq.property.pdf/hl-value
                      :logseq.property/hl-type :logseq.property.pdf/hl-image]
         :fix add-pdf-annotation-class}]
-   [41 {:fix (rename-classes {:logseq.class/pdf-annotation :logseq.class/Pdf-annotation})}]])
+   [41 {:fix (rename-classes {:logseq.class/pdf-annotation :logseq.class/Pdf-annotation})}]
+   [42 {:fix (rename-properties {:logseq.property/hl-color :logseq.property.pdf/hl-color
+                                 :logseq.property/hl-type :logseq.property.pdf/hl-type})}]])
 
 (let [max-schema-version (apply max (map first schema-version->updates))]
   (assert (<= db-schema/version max-schema-version))