فهرست منبع

enhance(mobile): enable block fold-down button as default option

charlie 2 سال پیش
والد
کامیت
00b903a4a6

+ 1 - 10
src/main/frontend/components/settings.cljs

@@ -393,13 +393,6 @@
           #(let [value (not enable-timetracking?)]
              (config-handler/set-config! :feature/enable-timetracking? value))))
 
-(defn fold-button-on-right-row [t enable-fold-button-on-right?]
-  (toggle "enable_fold_button_right"
-          (t :settings-page/enable-fold-button-on-right)
-          enable-fold-button-on-right?
-          #(let [value (not enable-fold-button-on-right?)]
-             (config-handler/set-config! :feature/enable-fold-button-on-right? value))))
-
 (defn update-home-page
   [event]
   (let [value (util/evalue event)]
@@ -586,7 +579,6 @@
         preferred-date-format (state/get-date-formatter)
         preferred-workflow (state/get-preferred-workflow)
         enable-timetracking? (state/enable-timetracking?)
-        enable-fold-button-on-right? (state/enable-fold-button-right?)
         enable-all-pages-public? (state/all-pages-public?)
         logical-outdenting? (state/logical-outdenting?)
         preferred-pasting-file? (state/preferred-pasting-file?)
@@ -601,8 +593,7 @@
      (workflow-row t preferred-workflow)
      ;; (enable-block-timestamps-row t enable-block-timestamps?)
      (show-brackets-row t show-brackets?)
-     (when (mobile-util/native-platform?)
-       (fold-button-on-right-row t enable-fold-button-on-right?))
+
      (when (util/electron?) (switch-spell-check-row t))
      (outdenting-row t logical-outdenting?)
      (preferred-pasting-file t preferred-pasting-file?)

+ 5 - 5
src/main/frontend/components/sidebar.cljs

@@ -755,11 +755,11 @@
                        (util/fix-open-external-with-shift! e))}
 
      [:main.theme-inner
-      {:class (util/classnames [{:ls-left-sidebar-open left-sidebar-open?
-                                 :ls-right-sidebar-open sidebar-open?
-                                 :ls-wide-mode wide-mode?
-                                 :ls-fold-button-on-right (and (util/sm-breakpoint?) fold-button-on-right?)
-                                 :ls-hl-colored ls-block-hl-colored?}])}
+      {:class (util/classnames [{:ls-left-sidebar-open    left-sidebar-open?
+                                 :ls-right-sidebar-open   sidebar-open?
+                                 :ls-wide-mode            wide-mode?
+                                 :ls-fold-button-on-right fold-button-on-right?
+                                 :ls-hl-colored           ls-block-hl-colored?}])}
 
       [:button#skip-to-main
        {:on-click #(ui/focus-element (ui/main-node))

+ 0 - 2
src/main/frontend/dicts.cljc

@@ -225,7 +225,6 @@
         :settings-page/preferred-pasting-file "Preferred pasting file"
         :settings-page/enable-shortcut-tooltip "Enable shortcut tooltip"
         :settings-page/enable-timetracking "Timetracking"
-        :settings-page/enable-fold-button-on-right "Place block fold button to the right side"
         :settings-page/enable-tooltip "Tooltips"
         :settings-page/enable-journals "Journals"
         :settings-page/enable-all-pages-public "All pages public when publishing"
@@ -1654,7 +1653,6 @@
            :settings-page/preferred-workflow "首选工作流"
            :settings-page/preferred-pasting-file "保存链接为文件"
            :settings-page/enable-timetracking "开启 timetracking"
-           :settings-page/enable-fold-button-on-right "将块折叠按钮放置在右边"
            :settings-page/enable-tooltip "开启提示框"
            :settings-page/enable-journals "开启日记"
            :settings-page/enable-all-pages-public "发布所有页面"

+ 2 - 2
src/main/frontend/state.cljs

@@ -584,8 +584,8 @@ Similar to re-frame subscriptions"
 
 (defn enable-fold-button-right?
   []
-  (and (mobile-util/native-platform?)
-       (true? (:feature/enable-fold-button-on-right? (sub-config)))))
+  (let [_ (sub :ui/viewport)]
+    (util/md-breakpoint?)))
 
 (defn enable-journals?
   ([]

+ 10 - 3
src/main/frontend/util.cljc

@@ -1327,9 +1327,16 @@
            nil)))))
 
 #?(:cljs
-   (defn sm-breakpoint?
-     []
-     (< (.-offsetWidth js/document.documentElement) 640)))
+   (do
+     (defn breakpoint?
+       [size]
+       (< (.-offsetWidth js/document.documentElement) size))
+
+     (defn sm-breakpoint?
+       [] (breakpoint? 640))
+
+     (defn md-breakpoint?
+       [] (breakpoint? 768))))
 
 #?(:cljs
    (defn event-is-composing?