Преглед на файлове

enhance(mobile): force ios mode card modal for the block page

charlie преди 6 месеца
родител
ревизия
87411f42c7
променени са 3 файла, в които са добавени 13 реда и са изтрити 8 реда
  1. 11 8
      src/main/capacitor/components/modal.cljs
  2. 1 0
      src/main/capacitor/core.cljs
  3. 1 0
      src/main/capacitor/state.cljs

+ 11 - 8
src/main/capacitor/components/modal.cljs

@@ -12,16 +12,19 @@
 
 (rum/defc modal < rum/reactive
   [presenting-element]
-  (let [{:keys [open? block]} (rum/react state/*modal-data)
+  (let [{:keys [open? block mode]} (rum/react state/*modal-data)
         show-action-bar? (fstate/sub :mobile/show-action-bar?)]
     (ion/modal
-     {:isOpen (boolean open?)
-      :presenting-element presenting-element
-      :onDidDismiss (fn [] (state/set-modal! nil))
-      :expand "block"}
-     (ion/content {:class "ion-padding scrolling"}
-                  (ui/classic-app-container-wrap
-                   (page/page-cp (db/entity [:block/uuid (:block/uuid block)])))
+      (cond-> {:isOpen (boolean open?)
+               :presenting-element presenting-element
+               :onDidDismiss (fn [] (state/set-modal! nil))
+               :expand "block"}
+
+        (string? mode)
+        (assoc :mode mode))
+      (ion/content {:class "ion-padding scrolling"}
+        (ui/classic-app-container-wrap
+          (page/page-cp (db/entity [:block/uuid (:block/uuid block)])))
                   (mobile-bar/mobile-bar)
                   (when show-action-bar?
                     (action-bar/action-bar))))))

+ 1 - 0
src/main/capacitor/core.cljs

@@ -37,6 +37,7 @@
          (when (util/uuid-string? id-str)
            (let [page-uuid (uuid id-str)]
              (state/set-modal! {:open? true
+                                :mode "ios"
                                 :block {:block/uuid page-uuid}}))))
        :user-login
        nil

+ 1 - 0
src/main/capacitor/state.cljs

@@ -14,6 +14,7 @@
 (defn open-block-modal!
   [block]
   (set-modal! {:open? true
+               :mode "ios"
                :block block}))
 
 (defonce *popup-data (atom nil))