Bläddra i källkod

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

charlie 6 månader sedan
förälder
incheckning
b7b8a4daa6

+ 1 - 1
src/main/capacitor/components/app.cljs

@@ -223,7 +223,7 @@
      (shui-toaster/install-toaster)
      (shui-dialog/install-modals)
      (shui-popup/install-popups)
-     (modal/modal presenting-element)
+     (modal/block-modal presenting-element)
      (popup/popup))))
 
 (rum/defc main < rum/reactive

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

@@ -10,18 +10,17 @@
             [frontend.state :as fstate]
             [rum.core :as rum]))
 
-(rum/defc modal < rum/reactive
+(rum/defc block-modal < rum/reactive
   [presenting-element]
-  (let [{:keys [open? block mode]} (rum/react state/*modal-data)
+  (let [{:keys [open? block]} (rum/react state/*modal-data)
         show-action-bar? (fstate/sub :mobile/show-action-bar?)]
     (ion/modal
-      (cond-> {:isOpen (boolean open?)
-               :presenting-element presenting-element
-               :onDidDismiss (fn [] (state/set-modal! nil))
-               :expand "block"}
+      {:isOpen (boolean open?)
+       :presenting-element presenting-element
+       :onDidDismiss (fn [] (state/set-modal! nil))
+       :mode "ios" ;; force card modal for android
+       :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)])))

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

@@ -37,7 +37,6 @@
          (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

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

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