move functionality from preload to main

Author: sprocketc

src/electron/main.cljs

@@ -1,12 +1,14 @@
 (ns electron.main
   (:require
    #_["@sentry/electron/main" :as sentry-electron-main]
+   ["@webref/css" :as css]
    ["electron-extension-installer" :refer [REACT_DEVELOPER_TOOLS installExtension]]
    ["electron-log/main" :as log]
    ["electron-reloader"]
    #_["electron-updater" :as updater]
    ["electron-window-state" :as window-state-keeper]
    ["electron" :refer [app shell ipcMain BrowserWindow clipboard nativeTheme]]
+   ["font-scanner" :as fontManager]
    ["os" :as os]
    ["path" :as path]
    [config]
@@ -79,6 +81,17 @@
      ["restore" "windowRestored"]]]
     (.on ^js @main-window window-event #(send-to-renderer! action))))
 
+(defn load-system-fonts!
+  "https://github.com/axosoft/font-scanner#getavailablefonts"
+  []
+  (let [fonts (.getAvailableFontsSync fontManager)]
+    (send-to-renderer! "fontsLoaded" fonts)))
+
+(defn load-webref!
+  []
+  (p/let [files (.listAll css)]
+    (send-to-renderer! "webrefLoaded" files)))
+
 (defn register-web-contents-events!
   []
   (doseq
@@ -115,6 +128,8 @@
            (fn []
              (.show ^js @main-window)
              (.manage win-state ^js @main-window)
+             (load-system-fonts!)
+             (load-webref!)
              (send-to-renderer! (if (.isMaximized ^js @main-window)
                                   "windowMaximized"
                                   "windowUnmaximized"))

src/electron/preload.cljs

@@ -1,10 +1,8 @@
 (ns electron.preload
   (:require
    #_["@sentry/electron" :as Sentry]
-   ["@webref/css" :as css]
    ["electron" :refer [contextBridge ipcRenderer]]
    ["font-scanner" :as fontManager]
-   ["mdn-data" :as mdn] ;; deprecating in favor of w3c/webref
    ["opentype.js" :as opentype]
    ["os" :as os]
    [config]))
@@ -21,19 +19,15 @@
    :receive (fn [channel f]
               ;; Strip event (_) as it includes `sender`
               (.on ipcRenderer channel (fn [_ args] (f args))))
-   :mdn mdn
-   :webrefCss css
    :platform (.platform os)
-   ;; https://github.com/axosoft/font-scanner#getavailablefonts
-   :systemFonts (.getAvailableFontsSync fontManager)
    :findFonts (fn [descriptor] (.findFontsSync fontManager descriptor))
    :textToPath (fn [text options]
                  (text->path text (js->clj options :keywordize-keys true)))})
 
 (defn ^:export init []
   ;; https://docs.sentry.io/platforms/javascript/guides/electron/#configuring-the-client
   #_(.init Sentry (clj->js config/sentry-options))
-  ;; Expose protected methods that allow the renderer process to use the 
+  ;; Expose protected methods that allow the renderer process to use the
   ;; ipcRenderer without exposing the entire object
   ;; https://www.electronjs.org/docs/api/context-bridge
   (.exposeInMainWorld contextBridge "api" (clj->js api)))

src/renderer/core.cljs

@@ -3,12 +3,12 @@
    #_["@sentry/electron/renderer" :as sentry-electron-renderer]
    #_["@sentry/react" :as sentry-react]
    ["electron-log/renderer"]
+   ["mdn-data" :as mdn] ;; deprecating in favor of w3c/webref
    ["paper" :refer [paper]]
    [cljs.reader :as edn]
    [config]
    [devtools.core :as devtools]
    [platform]
-   [promesa.core :as p]
    [re-frame.core :as rf]
    [re-pressed.core :as rp]
    [reagent.dom :as ra.dom]
@@ -82,7 +82,8 @@
    "fromMain"
    (fn [data]
      (case (.-action data)
-       "fontsLoaded" (js/console.log "fontsLoaded")
+       "fontsLoaded" (rf/dispatch [:set-system-fonts (js->clj (.-data data) :keywordize-keys true)])
+       "webrefLoaded" (rf/dispatch [:set-webref-css (js->clj (.-data data) :keywordize-keys true)])
        "windowMaximized" (rf/dispatch [::window.e/set-maximized? true])
        "windowUnmaximized" (rf/dispatch [::window.e/set-maximized? false])
        "windowEnteredFullscreen" (rf/dispatch [::window.e/set-fullscreen? true])
@@ -92,15 +93,6 @@
        "fileLoaded" (rf/dispatch [::document.e/load (edn/read-string (.-data data))])
        "fileSaved" (rf/dispatch [::document.e/saved (edn/read-string (.-data data))])))))
 
-(defn load-system-fonts!
-  []
-  (let [fonts (js->clj js/window.api.systemFonts :keywordize-keys true)]
-    (rf/dispatch-sync [:set-system-fonts fonts])))
-
-(defn load-webref!
-  []
-  (p/let [files (js/window.api.webrefCss.listAll)]
-    (rf/dispatch-sync [:set-webref-css (js->clj files :keywordize-keys true)])))
 
 (defn ^:export init []
   #_(if platform/electron?
@@ -121,6 +113,7 @@
   (rf/dispatch-sync [:theme/init-mode])
   (rf/dispatch-sync [::document.e/new])
   (rf/dispatch-sync [:set-tool :select])
+  (rf/dispatch-sync [:set-mdn (js->clj mdn :keywordize-keys true)])
 
   (rf/dispatch-sync [::rp/add-keyboard-event-listener "keydown"])
   (rf/dispatch-sync [::rp/set-keydown-rules keyb/keydown-rules])
@@ -131,10 +124,7 @@
   (.setup paper) ; REVIEW
 
   (if platform/electron?
-    (do (load-system-fonts!)
-        (load-webref!)
-        (rf/dispatch-sync [:set-mdn (js->clj js/window.api.mdn :keywordize-keys true)])
-        (init-api!))
+    (init-api!)
     (.addEventListener js/document
                        "fullscreenchange"
                        #(rf/dispatch [:window.e/set-fullscreen? (boolean (.-fullscreenElement js/document))])))

src/renderer/history/handlers.cljs

@@ -104,7 +104,7 @@
   [db [x y]]
   (assoc-in db (conj (history-path db) :translate) [x y]))
 
-(defn create-state
+(defn- create-state
   [db id explanation]
   {:explanation explanation
    :elements (element.h/elements db)
@@ -114,7 +114,7 @@
    :parent (:position (history db))
    :children []})
 
-(defn update-ancestors
+(defn- update-ancestors
   "Makes all ancestors of the active branch the rightmost element.
    This ensures that when users remain in the latest branch when they undo/redo."
   [db]