fix excel compatibility for images

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          delivery-calculator
-version:       0.1.0.1
+version:       0.1.0.2
 synopsis:      Delivery Calculator
 category:      Web
 build-type:    Simple

ghcjs/delivery-calculator/src/App/Xlsx.hs

@@ -18,9 +18,7 @@ newXlsx st imgs = xlsx
     xlsx =
       fromXlsx 0
         $ def
-        & #xlStyles
-        .~ renderStyleSheet style
-        & atSheet "Delivery_Calculator"
+        & atSheet "Delivery Calculator"
         ?~ sheet
     sheet =
       def
@@ -70,18 +68,6 @@ newColProps rows = nubOrd $ do
             cpBestFit = False
           }
 
-style :: StyleSheet
-style =
-  def
-    & #styleSheetCellXfs
-    .~ [ def
-          & #cellXfAlignment
-          ?~ ( def
-                & #_alignmentVertical
-                ?~ CellVerticalAlignmentCenter
-             )
-       ]
-
 addHeader :: St Unique -> Worksheet -> Worksheet
 addHeader st sheet =
   case sortOn length headers of
@@ -173,7 +159,7 @@ addCol imgs sheet rowIdx colIdx field =
           . _Just
           %~ \case
             Drawing xs ->
-              Drawing $ newImg rowIdx colIdx (length xs) img : xs
+              Drawing $ newImg rowIdx colIdx (length xs + 1) img : xs
   where
     txt = field ^. #fieldInput . #uniqueValue
 
@@ -190,12 +176,19 @@ newImg (RowIndex rowIdx) (ColumnIndex colIdx) imgIdx rfc2397 =
       anchClientData = def
     }
   where
+    mime = decodeUtf8 $ rfc2397Mime rfc2397
+    ext =
+      from @Text @String
+        . maybe mempty ("." <>)
+        . safeHead
+        . reverse
+        $ splitWhen (== '/') mime
     obj =
       picture
         (DrawingElementId imgIdx)
         FileInfo
-          { fiFilename = "img",
-            fiContentType = decodeUtf8 $ rfc2397Mime rfc2397,
+          { fiFilename = "image" <> inspect imgIdx <> ext,
+            fiContentType = mime,
             fiContents = rfc2397Bytes rfc2397
           }
 

ghcjs/delivery-calculator/trapeze.yaml

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Delivery Calculator
-    versionCode: 1
-    versionName: 0.1.0.1
+    versionCode: 2
+    versionName: 0.1.0.2
     packageName: com.functora.delivery_calculator
     manifest:
       - file: AndroidManifest.xml

nix/configuration.nix

@@ -563,6 +563,7 @@ in {
         xorg.xev
         yewtube
         niv
+        zip
         unzip
         pciutils
         docker-compose

pub/xlsx/src/Codec/Xlsx/Types/Drawing.hs

@@ -139,7 +139,7 @@ picture dId fi =
     shProps =
       ShapeProperties
         { spXfrm = Nothing,
-          spGeometry = Nothing,
+          spGeometry = Just PresetGeometry,
           spFill = Just NoFill,
           spOutline = Just $ def {_lnFill = Just NoFill}
         }