image size

Author: bitgamma

src/status_im/ui/screens/chat/message/message.cljs

@@ -19,6 +19,7 @@
             [status-im.ui.screens.chat.message.reactions :as reactions]
             [status-im.ui.screens.chat.image.preview.views :as preview]
             [quo.core :as quo]
+                        [taoensso.timbre :as log]
             [status-im.utils.config :as config]
             [reagent.core :as reagent]
             [status-im.ui.screens.chat.components.reply :as components.reply]
@@ -341,20 +342,21 @@
 (def image-max-height 192)
 
 (defn image-set-size [dimensions]
-  (fn [width height]
-    (when (< width height)
-      ;; if width less than the height we reduce width proportionally to height
-      (let [k (/ height image-max-height)]
-        (when (not= (/ width k) (first @dimensions))
-          (reset! dimensions [(/ width k) image-max-height]))))))
+  (fn [evt]
+    (let [width (.-width (.-nativeEvent evt))
+          height (.-height (.-nativeEvent evt))]
+      (when (< width height)
+        ;; if width less than the height we reduce width proportionally to height
+        (let [k (/ height image-max-height)]
+          (when (not= (/ width k) (first @dimensions))
+            (reset! dimensions [(/ width k) image-max-height])))))))
 
 (defn message-content-image
   [{:keys [content outgoing in-popover?] :as message}
    {:keys [on-long-press]}]
   (let [dimensions (reagent/atom [image-max-width image-max-height])
         visible (reagent/atom false)
         uri (:image content)]
-    (react/image-get-size uri (image-set-size dimensions))
     (fn []
       (let [style-opts {:outgoing outgoing
                         :width    (first @dimensions)
@@ -372,6 +374,7 @@
           [react/view {:style               (style/image-message style-opts)
                        :accessibility-label :image-message}
            [react/fast-image {:style       (dissoc style-opts :outgoing)
+                              :on-load     (image-set-size dimensions)
                               :source      {:uri uri}}
             [react/view {:style (style/image-message-border style-opts)}]]]]]))))
 

status-go-version.json

@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "experiment/run-http-image-server-2",
-    "commit-sha1": "5ae5f5d4d8f43f7cec6075dd8343718bff878ae4",
-    "src-sha256": "1m3wsn57j5l5fi2rql4a4bsgm9b0spb3h1fns5krdsnmjpiv5sxl"
+    "commit-sha1": "e035a62b7ef8c82b99b317e4bfe638c794c38a44",
+    "src-sha256": "1zzq68fy2s179f5h125lmaxrkx98fjgwyrn4qfgnayksky8b2kgm"
 }