From 30996118b0e73582ee10882185517b58a1621339 Mon Sep 17 00:00:00 2001
From: leizhe <leizhe@leizhedeMacBook-Air.local>
Date: Thu, 20 Jan 2022 23:27:14 +0800
Subject: [PATCH] enhance(mobile): tweat diff window

---
 src/main/frontend/components/diff.cljs | 44 ++++++++++++--------------
 src/main/frontend/components/diff.css  | 14 ++++++--
 src/main/frontend/handler/events.cljs  |  3 +-
 src/main/frontend/ui.css               | 10 ++++++
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/main/frontend/components/diff.cljs b/src/main/frontend/components/diff.cljs
index 3a4a23bfa..eb1724a1d 100644
--- a/src/main/frontend/components/diff.cljs
+++ b/src/main/frontend/components/diff.cljs
@@ -241,9 +241,9 @@
   (when (nil? @disk-value)
     (reset! disk-value disk-content)
     (reset! db-value db-content))
-  [:div.cp__diff-file {:style {:width 980}}
+  [:div.cp__diff-file
    [:div.cp__diff-file-header
-    [:span.cp__diff-file-header-content.pl-1.font-medium {:style {:word-break "break-word"}}
+    [:span.cp__diff-file-header-content.pl-1.font-medium
      (str "File " path " has been modified on the disk.")]]
    [:div.p-4
     (when (not= (string/trim disk-content) (string/trim db-content))
@@ -264,39 +264,37 @@
         :title-trigger? true}))
 
     [:hr]
-
-    [:div.flex.flex-row.mt-4
+    
+    [:div.flex.flex-col.mt-4.sm:flex-row
      [:div.flex-1
       [:div.mb-2 "On disk:"]
       [:textarea.overflow-auto
        {:value (rum/react disk-value)
         :on-change (fn [e]
-                     (reset! disk-value (util/evalue e)))
-        :style {:min-height "50vh"}}
+                     (reset! disk-value (util/evalue e)))}
        disk-content]
       (ui/button "Select this"
-        :on-click
-        (fn []
-          (when-let [value @disk-value]
-            (file/alter-file repo path value
-                            {:re-render-root? true
-                             :skip-compare? true}))
-          (state/close-modal!)))]
+                 :on-click
+                 (fn []
+                   (when-let [value @disk-value]
+                     (file/alter-file repo path value
+                                      {:re-render-root? true
+                                       :skip-compare? true}))
+                   (state/close-modal!)))]
 
-     [:div.ml-4.flex-1
+     [:div.flex-1.mt-8.sm:ml-4.sm:mt-0
       [:div.mb-2 "In Logseq:"]
       [:textarea.overflow-auto
        {:value (rum/react db-value)
         :on-change (fn [e]
                      (prn "new-value: " (util/evalue e))
-                     (reset! db-value (util/evalue e)))
-        :style {:min-height "50vh"}}
+                     (reset! db-value (util/evalue e)))}
        db-content]
       (ui/button "Select this"
-        :on-click
-        (fn []
-          (when-let [value @db-value]
-            (file/alter-file repo path value
-                            {:re-render-root? true
-                             :skip-compare? true}))
-          (state/close-modal!)))]]]])
+                 :on-click
+                 (fn []
+                   (when-let [value @db-value]
+                     (file/alter-file repo path value
+                                      {:re-render-root? true
+                                       :skip-compare? true}))
+                   (state/close-modal!)))]]]])
diff --git a/src/main/frontend/components/diff.css b/src/main/frontend/components/diff.css
index a3216abec..8b4619b2a 100644
--- a/src/main/frontend/components/diff.css
+++ b/src/main/frontend/components/diff.css
@@ -5,7 +5,15 @@
 }
 
 .cp__diff-file {
-  @apply mb-3;
+    @apply mb-3;
+
+    textarea {
+        min-height: 20vh;
+
+        @screen sm {
+            min-height: 50vh;
+        }
+    }
  }
 
 .cp__diff-file-header {
@@ -16,8 +24,8 @@
 }
 
 .cp__diff-file-header-content {
-  @apply truncate
-
+    @apply truncate;
+    overflow-wrap: break-word;
 }
 
 .cp__diff-file-header-type {
diff --git a/src/main/frontend/handler/events.cljs b/src/main/frontend/handler/events.cljs
index 6601daaac..3599fb17a 100644
--- a/src/main/frontend/handler/events.cljs
+++ b/src/main/frontend/handler/events.cljs
@@ -176,7 +176,8 @@
   (when-let [repo (state/get-current-repo)]
     (when (and disk-content db-content
                (not= (util/trim-safe disk-content) (util/trim-safe db-content)))
-      (state/set-modal! #(diff/local-file repo path disk-content db-content)))))
+      (state/set-modal! #(diff/local-file repo path disk-content db-content)
+                        {:label "diff__cp"}))))
 
 (defmethod handle :modal/display-file-version [[_ path content hash]]
   (p/let [content (when content (encrypt/decrypt content))]
diff --git a/src/main/frontend/ui.css b/src/main/frontend/ui.css
index fbec8b226..693c588ed 100644
--- a/src/main/frontend/ui.css
+++ b/src/main/frontend/ui.css
@@ -136,6 +136,16 @@
       transform: translateY(-60%);
     }
   }
+
+  &[label="diff__cp"] {
+      .panel-content {
+          padding: 2rem 1rem;
+
+          @screen sm {
+              padding: 2rem;
+          }
+      }
+  }
 }
 
 html.is-native-andorid,