fix(pdf): conflicts

This commit is contained in:
charlie
2021-07-30 10:36:15 +08:00
41 changed files with 1882 additions and 249 deletions

View File

@@ -83,6 +83,7 @@
:editor/show-date-picker? false
;; With label or other data
:editor/show-input nil
:editor/show-zotero false
:editor/last-saved-cursor nil
:editor/editing? nil
:editor/last-edit-block-input-id nil
@@ -544,6 +545,16 @@
[]
(get @state :editor/show-input))
(defn set-editor-show-zotero!
[value]
(set-state! :editor/show-zotero value))
(defn get-editor-show-zotero
[]
(get @state :editor/show-zotero))
(defn set-edit-input-id!
[input-id]
(swap! state update :editor/editing?
@@ -1260,8 +1271,8 @@
[q]
(when-not (string/blank? q)
(update-state! :search/graph-filters
(fn [value]
(vec (distinct (conj value q)))))))
(fn [value]
(vec (distinct (conj value q)))))))
(defn remove-search-filter!
[q]