enhance(ux): batch set text/url/checkbox properties

src/main/frontend/components/property.cljs

@@ -215,13 +215,16 @@
   [block *property *property-key *show-new-property-config? {:keys [class-schema?]}]
   (fn [{:keys [value label]}]
     (reset! *property-key (if (uuid? value) label value))
-    (let [property (when (uuid? value) (db/entity [:block/uuid value]))]
+    (let [property (when (uuid? value) (db/entity [:block/uuid value]))
+          batch? (pv/batch-operation?)]
       (when (and *show-new-property-config? (not (ldb/property? property)))
         (reset! *show-new-property-config? true))
       (reset! *property property)
       (when property
         (let [add-class-property? (and (ldb/class? block) class-schema?)
-              type (:logseq.property/type property)]
+              type (:logseq.property/type property)
+              default-or-url? (and (contains? #{:default :url} type)
+                                   (not (seq (:property/closed-values property))))]
           (cond
             add-class-property?
             (p/do!
@@ -229,6 +232,9 @@
              (shui/popup-hide!)
              (shui/dialog-close!))
 
+            (and batch? (or (= :checkbox type) (and batch? default-or-url?)))
+            nil
+
             (= :checkbox type)
             (p/do!
              (ui/hide-popups-until-preview-popup!)
@@ -239,8 +245,7 @@
                            false)]
                (pv/<add-property! block (:db/ident property) value {:exit-edit? true})))
 
-            (and (contains? #{:default :url} type)
-                 (not (seq (:property/closed-values property))))
+            default-or-url?
             (pv/<create-new-block! block property "" {:batch-op? true})
 
             ;; using class as property
@@ -375,8 +380,13 @@
                                    (and (ldb/built-in? block) (contains? #{:logseq.property/parent} (:db/ident m))))))
         property (rum/react *property)
         property-key (rum/react *property-key)
+        batch? (pv/batch-operation?)
         hide-property-key? (or (contains? #{:date :datetime} (:logseq.property/type property))
-                               (pv/select-type? block property))]
+                               (pv/select-type? block property)
+                               (and
+                                batch?
+                                (contains? #{:default :url} (:logseq.property/type property))
+                                (not (seq (:property/closed-values property)))))]
     [:div.ls-property-input.flex.flex-1.flex-row.items-center.flex-wrap.gap-1
      {:ref #(reset! *ref %)}
      (if property-key

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

@@ -64,18 +64,29 @@
        (ui/icon "line-dashed"))
      "Empty")])
 
-(defn- get-operating-blocks
+(defn- get-selected-blocks
+  []
+  (some->> (state/get-selection-block-ids)
+           (map (fn [id] (db/entity [:block/uuid id])))
+           (seq)
+           block-handler/get-top-level-blocks
+           (remove ldb/property?)))
+
+(defn get-operating-blocks
   [block]
-  (let [selected-blocks (some->> (state/get-selection-block-ids)
-                                 (map (fn [id] (db/entity [:block/uuid id])))
-                                 (seq)
-                                 block-handler/get-top-level-blocks
-                                 (remove ldb/property?))
+  (let [selected-blocks (get-selected-blocks)
         view-selected-blocks (:view/selected-blocks @state/state)]
     (or (seq selected-blocks)
         (seq view-selected-blocks)
         [block])))
 
+(defn batch-operation?
+  []
+  (let [selected-blocks (get-selected-blocks)
+        view-selected-blocks (:view/selected-blocks @state/state)]
+    (or (> (count selected-blocks) 1)
+        (seq view-selected-blocks))))
+
 (rum/defc icon-row
   [block editing?]
   (let [icon-value (:logseq.property/icon block)
@@ -142,22 +153,17 @@
   (let [<create-block (fn [block]
                         (if (and (contains? #{:default :url} (:logseq.property/type property))
                                  (not (db-property/many? property)))
-                          (p/let [existing-value (get block (:db/ident property))
-                                  default-value (:logseq.property/default-value property)
-                                  existing-value? (and (some? existing-value)
-                                                       (not= (:db/ident existing-value) :logseq.property/empty-placeholder)
-                                                       (not= (:db/id existing-value) (:db/id default-value)))
-                                  new-block-id (when-not existing-value? (db/new-block-id))
-                                  _ (when-not existing-value?
-                                      (let [value' (if (and default-value (string? value) (string/blank? value))
-                                                     (db-property/property-value-content default-value)
-                                                     value)]
-                                        (db-property-handler/create-property-text-block!
-                                         (:db/id block)
-                                         (:db/id property)
-                                         value'
-                                         {:new-block-id new-block-id})))]
-                            (if existing-value? existing-value (db/entity [:block/uuid new-block-id])))
+                          (p/let [default-value (:logseq.property/default-value property)
+                                  new-block-id (db/new-block-id)
+                                  _ (let [value' (if (and default-value (string? value) (string/blank? value))
+                                                   (db-property/property-value-content default-value)
+                                                   value)]
+                                      (db-property-handler/create-property-text-block!
+                                       (:db/id block)
+                                       (:db/id property)
+                                       value'
+                                       {:new-block-id new-block-id}))]
+                            (db/entity [:block/uuid new-block-id]))
                           (p/let [new-block-id (db/new-block-id)
                                   _ (db-property-handler/create-property-text-block!
                                      (:db/id block)
@@ -190,7 +196,7 @@
 (defn <add-property!
   "If a class and in a class schema context, add the property to its schema.
   Otherwise, add a block's property and its value"
-  ([block property-key property-value] (<add-property! block property-key property-value {}))
+  ([block property-id property-value] (<add-property! block property-id property-value {}))
   ([block property-id property-value {:keys [selected? exit-edit? class-schema?]
                                       :or {exit-edit? true}}]
    (let [repo (state/get-current-repo)
@@ -210,8 +216,7 @@
           (if (and (db-property-type/all-ref-property-types (:logseq.property/type property))
                    (string? property-value))
             (p/let [new-block (<create-new-block! block (db/entity property-id) property-value {:edit-block? false})]
-              (when (seq (remove #{(:db/id block)} (map :db/id block)))
-                (property-handler/batch-set-block-property! repo block-ids property-id (:db/id new-block)))
+              (property-handler/batch-set-block-property! repo block-ids property-id (:db/id new-block))
               new-block)
             (property-handler/batch-set-block-property! repo block-ids property-id property-value))))
       (cond
@@ -736,7 +741,7 @@
                                               (str "Set " (:block/title property)))
                  :show-new-when-not-exact-match? (if (or (and parent-property? (contains? (set children-pages) (:db/id block)))
                                                          ;; Don't allow creating private tags
-                                                         (seq (set/intersection (set (map :db/ident classes))
+                                                         (seq (set/intersection (set (map :db/ident classes'))
                                                                                 ldb/private-tags)))
                                                    false
                                                    true)
@@ -1046,7 +1051,7 @@
        (inline-text-cp (str value)))]))
 
 (rum/defc single-value-select
-  [block property value value-f select-opts opts]
+  [block property value select-opts {:keys [value-render] :as opts}]
   (let [*el (rum/use-ref nil)
         editing? (:editing? opts)
         type (:logseq.property/type property)
@@ -1085,7 +1090,7 @@
           :on-click show!}
          (if (string/blank? value)
            (property-empty-text-value property opts)
-           (value-f)))))))
+           (value-render)))))))
 
 (defn- property-value-inner
   [block property value {:keys [inline-text page-cp
@@ -1124,8 +1129,10 @@
         editing? (or editing?
                      (and (state/sub-editing? [container-id (:block/uuid block)])
                           (= (:db/id property) (:db/id (:property (state/get-editor-action-data))))))
-        select-type?' (select-type? block property)
+        batch? (batch-operation?)
         closed-values? (seq (:property/closed-values property))
+        select-type?' (or (select-type? block property)
+                          (and editing? batch? (contains? #{:default :url} type) (not closed-values?)))
         select-opts {:on-chosen on-chosen}
         value (if (and (de/entity? value*) (= (:db/ident value*) :logseq.property/empty-placeholder))
                 nil
@@ -1153,9 +1160,10 @@
                                                      (when choice
                                                        (db-property-handler/set-block-property! (:db/id block) (:db/ident property) (:db/id choice)))))}))
             (single-value-select block property value
-                                 (fn [] (select-item property type value opts))
                                  select-opts
-                                 (assoc opts :editing? editing?))))
+                                 (assoc opts
+                                        :editing? editing?
+                                        :value-render (fn [] (select-item property type value opts))))))
         (case type
           (:date :datetime)
           (property-value-date-picker block property value (merge opts {:editing? editing?}))

src/main/frontend/state.cljs

@@ -1200,6 +1200,7 @@ Similar to re-frame subscriptions"
 
 (defn- set-selection-blocks-aux!
   [blocks]
+  (set-state! :view/selected-blocks nil)
   (let [selected-ids (set (get-selected-block-ids @(:selection/blocks @state)))
         _ (set-state! :selection/blocks blocks)
         new-ids (set (get-selection-block-ids))
@@ -1380,7 +1381,8 @@ Similar to re-frame subscriptions"
   (set-state! :editor/content {})
   (set-state! :ui/select-query-cache {})
   (set-state! :editor/block-refs #{})
-  (set-state! :editor/action-data nil))
+  (set-state! :editor/action-data nil)
+  (set-state! :view/selected-blocks nil))
 
 (defn into-code-editor-mode!
   []