enhance: store property text as blocks

src/main/frontend/components/container.css

@@ -816,6 +816,6 @@ html[data-theme='dark'] {
   }
 }
 
-.blocks-selection-mode .page-title, .blocks-selection-mode .block-content-inner, .blocks-selection-mode .ls-properties-area {
+.blocks-selection-mode .page-title, .blocks-selection-mode .block-content-inner, .blocks-selection-mode .block-body, .blocks-selection-mode .ls-properties-area {
     user-select: none;
 }

src/main/frontend/components/property.cljs

@@ -168,11 +168,12 @@
                (components-pu/update-property! property property-name schema)
                (when block
                  (let [id (str "ls-property-" (:db/id block) "-" (:db/id property) "-editor")]
-                   (state/set-state! :editor/editing-property-value-id
-                                     {id true}))
-                 (property-handler/set-block-property! repo (:block/uuid block)
-                                                       (:db/ident (db/entity [:block/original-name property-name]))
-                                                       (if (= type :default) "" :logseq.property/empty-placeholder)))))))}
+                   (state/set-state! :editor/editing-property-value-id {id true}))
+                 (if (= type :default)
+                   (pv/<create-new-block! block property "")
+                   (property-handler/set-block-property! repo (:block/uuid block)
+                                                         (:db/ident (db/entity [:block/original-name property-name]))
+                                                         :logseq.property/empty-placeholder)))))))}
 
         ;; only set when in property configure modal
         (and *property-name (:type property-schema))
@@ -740,9 +741,7 @@
         ;; This section produces own-properties and full-hidden-properties
         hide-with-property-id (fn [property-id]
                                 (cond
-                                  (= property-id :logseq.property/built-in?)
-                                  true
-                                  (or root-block? page? page-configure?)
+                                  (or root-block? page-configure?)
                                   false
                                   :else
                                   (boolean (:hide? (:block/schema (db/entity property-id))))))

src/main/frontend/components/property.css

@@ -19,11 +19,15 @@
     max-height: var(--radix-dropdown-menu-content-available-height);
 }
 
-.ls-block .ls-properties-area, .property-block-container {
+.ls-block .ls-properties-area {
     border-left: 1px solid;
     border-left-color: or(--lx-gray-04-alpha, --ls-guideline-color, #ddd) !important;
 }
 
+.property-block-container {
+    margin-left: -24px;
+}
+
 .ls-page-properties > .ls-properties-area > .property-block {
     margin-left: -22px;
 }

src/main/frontend/components/property/value.cljs

@@ -347,18 +347,6 @@
                                    (when on-chosen (on-chosen)))))]
     (select-page property opts')))
 
-(defn- save-text!
-  [repo block property value _editor-id e]
-  (let [new-value (util/evalue e)]
-    (when (not (state/get-editor-action))
-      (util/stop e)
-      (p/do!
-       (when (not= new-value value)
-         (property-handler/set-block-property! repo (:block/uuid block)
-                                               (:db/ident property)
-                                               (string/trim new-value)))
-       (exit-edit-property)))))
-
 (defn <create-new-block!
   [block property value]
   (let [container-id (state/get-current-container-id)
@@ -381,37 +369,6 @@
             _ (<add-property! block (:db/ident property) (:block/uuid (last blocks)))]
       (last blocks))))
 
-(defn- new-text-editor-opts
-  [repo block property value editor-id]
-  {:style {:padding 0
-           :background "none"}
-   :on-blur
-   (fn [e]
-     (save-text! repo block property value editor-id e))
-   :on-key-down
-   (fn [e]
-     (let [enter? (= (util/ekey e) "Enter")
-           esc? (= (util/ekey e) "Escape")
-           backspace? (= (util/ekey e) "Backspace")
-           new-value (util/evalue e)
-           new-property? (or @(:editor/properties-container @state/state)
-                             @(:editor/new-property-input-id @state/state))]
-       (when (and (or enter? esc? backspace?)
-                  (not (state/get-editor-action)))
-         (when-not backspace? (util/stop e))
-         (cond
-           (or esc?
-               (and enter? (util/tag? new-value))
-               (and enter? new-property?)
-               (string/blank? value))
-           (save-text! repo block property value editor-id e)
-
-           enter?
-           (<create-new-block! block property new-value)
-
-           :else
-           nil))))})
-
 (rum/defcs select < rum/reactive
   {:init (fn [state]
            (let [*values (atom :loading)]
@@ -500,7 +457,7 @@
                   (:block/_parent (db/entity (:db/id parent)))
                   parent)]
     (if (seq children)
-      [:div.property-block-container.w-full
+      [:div.property-block-container.content.w-full
        (block-cp children {:id (str (:block/uuid parent))
                            :editor-box editor-box})]
       (property-empty-value))))
@@ -517,7 +474,7 @@
       (when-let [entity (db/sub-block (:db/id (db/entity [:block/uuid value])))]
         (let [properties-cp (:properties-cp opts)]
           (when (and entity properties-cp)
-            [:div.property-block-container.w-full.property-template
+            [:div.property-block-container.content.w-full.property-template
              (properties-cp config entity (:editor-id config) (merge opts {:in-block-container? true}))]))))))
 
 (defn- create-template-block!
@@ -656,22 +613,16 @@
          (property-value-select-page block property select-opts' opts))]))))
 
 (defn- property-editing
-  [block property value schema editor-box editor-args editor-id]
-  (let [repo (state/get-current-repo)
-        multiple-values? (= :many (:cardinality schema))]
-    [:div.flex.flex-1
-    (case type
-      :template
-      (let [id (first (:classes schema))
-            template (when id (db/entity [:block/uuid id]))]
-        (when template
-          (<create-new-block-from-template! block property template)))
-
-      (let [config {:editor-opts (new-text-editor-opts repo block property value editor-id)}]
-        [:div
-         (editor-box editor-args editor-id (cond-> config
-                                             multiple-values?
-                                             (assoc :property-value value)))]))]))
+  [block property schema]
+  [:div.flex.flex-1
+   (case type
+     :template
+     (let [id (first (:classes schema))
+           template (when id (db/entity [:block/uuid id]))]
+       (when template
+         (<create-new-block-from-template! block property template)))
+
+     nil)])
 
 (defn- property-value-inner
   [block property value {:keys [inline-text block-cp page-cp
@@ -731,7 +682,7 @@
          (inline-text {} :markdown (macro-util/expand-value-if-macro (str value) (state/get-macros)))))]))
 
 (rum/defcs property-scalar-value < rum/reactive db-mixins/query
-  [state block property value {:keys [container-id editor-id editor-box editor-args editing?
+  [state block property value {:keys [container-id editor-id editing?
                                       on-chosen]
                                :as opts}]
   (let [property (model/sub-block (:db/id property))
@@ -773,7 +724,7 @@
         ;; :others
          [:div.flex.flex-1
           (if editing?
-            (property-editing block property value schema editor-box editor-args editor-id)
+            (property-editing block property schema)
             (property-value-inner block property value opts))])))))
 
 (rum/defc multiple-values

src/main/frontend/handler/db_based/property.cljs

@@ -499,15 +499,14 @@
 
 (defn property-create-new-block
   [block property value parse-block]
-  (let [current-page-id (:db/id (or (:block/page block) block))
-        page-name (str "$$$" current-page-id)
+  (let [page-name (str "$$$" (:db/id property))
         page-entity (db/get-page page-name)
         page (or page-entity
                  (-> (block/page-name->map page-name true)
                      (assoc :block/type #{"hidden"}
                             :block/format :markdown
                             :block/properties
-                            (sqlite-util/build-property-pair :logseq.property/source-page current-page-id))))
+                            (sqlite-util/build-property-pair :logseq.property/source-page (:db/id property)))))
         page-tx (when-not page-entity page)
         page-id [:block/uuid (:block/uuid page)]
         parent-id (db/new-block-id)
@@ -553,15 +552,14 @@
 
 (defn property-create-new-block-from-template
   [block property template]
-  (let [current-page-id (:db/id (or (:block/page block) block))
-        page-name (str "$$$" current-page-id)
+  (let [page-name (str "$$$" (:db/id property))
         page-entity (db/get-page page-name)
         page (or page-entity
                  (-> (block/page-name->map page-name true)
                      (assoc :block/type #{"hidden"}
                             :block/format :markdown
                             :block/properties
-                            (sqlite-util/build-property-pair :logseq.property/source-page current-page-id))))
+                            (sqlite-util/build-property-pair :logseq.property/source-page (:db/id property)))))
         page-tx (when-not page-entity page)
         page-id [:block/uuid (:block/uuid page)]
         block-id (db/new-block-id)