浏览代码

fix: limit scope to page-ref only for CJK spaces detection

Tienson Qin 2 年之前
父节点
当前提交
65fb452865
共有 2 个文件被更改,包括 9 次插入10 次删除
  1. 3 2
      src/main/frontend/commands.cljs
  2. 6 8
      src/main/frontend/handler/page.cljs

+ 3 - 2
src/main/frontend/commands.cljs

@@ -322,7 +322,7 @@
 
 (defn insert!
   [id value
-   {:keys [last-pattern postfix-fn backward-pos forward-pos end-pattern backward-truncate-number command]
+   {:keys [last-pattern postfix-fn backward-pos end-pattern backward-truncate-number command]
     :as _option}]
   (when-let [input (gdom/getElement id)]
     (let [last-pattern (when-not backward-truncate-number
@@ -342,7 +342,8 @@
                                           (gp-util/safe-subs orig-prefix 0 last-index))]
                                   (not
                                    (or
-                                    (and (not= command :block-ref)
+                                    (and (= :page-ref command)
+                                         (util/cjk-string? value)
                                          (or (util/cjk-string? (str (last orig-prefix)))
                                              (util/cjk-string? (str (first postfix)))))
                                     (and s

+ 6 - 8
src/main/frontend/handler/page.cljs

@@ -771,19 +771,18 @@
                        (page-ref/->page-ref chosen)
                        chosen)
               q (if @editor-handler/*selected-text "" q)
-              [last-pattern forward-pos] (if wrapped?
-                                           [q 3]
-                                           (if (= \# (first q))
-                                             [(subs q 1) 1]
-                                             [q 2]))
+              last-pattern (if wrapped?
+                             q
+                             (if (= \# (first q))
+                               (subs q 1)
+                               q))
               last-pattern (str "#" (when wrapped? page-ref/left-brackets) last-pattern)]
           (editor-handler/insert-command! id
                                           (str "#" (when wrapped? page-ref/left-brackets) chosen)
                                           format
                                           {:last-pattern last-pattern
                                            :end-pattern (when wrapped? page-ref/right-brackets)
-                                           :forward-pos forward-pos
-                                           :command :tag-page-ref})))
+                                           :command :page-ref})))
       (fn [chosen _click?]
         (state/clear-editor-action!)
         (let [prefix (str (t :new-page) ": ")
@@ -797,7 +796,6 @@
                                           {:last-pattern (str page-ref/left-brackets (if @editor-handler/*selected-text "" q))
                                            :end-pattern page-ref/right-brackets
                                            :postfix-fn   (fn [s] (util/replace-first page-ref/right-brackets s ""))
-                                           :forward-pos 3
                                            :command :page-ref}))))))
 
 (defn create-today-journal!