fix: use context to share style_map instead of use global hashmap (#98)

Author: mistricky

Cargo.lock

@@ -22,12 +22,10 @@ rgb = "0.8.50"
 derive_builder = "0.20.2"
 chrono = "0.4.38"
 base64 = "0.22.1"
-once_cell = "1.20.2"
 serde_json = "1.0.132"
 ansi_term = "0.12.1"
 strip-ansi-escapes = "0.2.1"
 cansi = "2.2.1"
-lazy_static = "1.5.0"
 include_dir = "0.7.4"
 schemars = "0.8.22"
 reqwest = "0.12.15"

core/Cargo.toml

@@ -1,9 +1,11 @@
+use std::{collections::HashMap, sync::Mutex};
+
 use crate::{config::HighlightLine, edges::padding::Padding, utils::color::RgbaColor};
 
 use super::{
     editor::code::CODE_LINE_HEIGHT,
     interface::{
-        component::{query_style, Component, ComponentContext, RenderParams},
+        component::{Component, ComponentContext, RenderParams},
         style::ComponentStyle,
     },
 };
@@ -46,6 +48,7 @@ impl Component for HighlightCodeBlock {
                 }
             };
             let (rect, paint) = self.draw_highlight_line(
+                &context.style_map,
                 render_params,
                 parent_style,
                 *start_line_number,
@@ -81,6 +84,7 @@ impl HighlightCodeBlock {
 
     fn draw_highlight_line(
         &self,
+        style_map: &Mutex<HashMap<&'static str, ComponentStyle>>,
         render_params: &RenderParams,
         parent_style: &ComponentStyle,
         start_line_number: u32,
@@ -90,6 +94,7 @@ impl HighlightCodeBlock {
         // If the start_line_number is greater than end_line_number, swap them
         if start_line_number > end_line_number {
             return self.draw_highlight_line(
+                style_map,
                 render_params,
                 parent_style,
                 end_line_number,
@@ -98,7 +103,8 @@ impl HighlightCodeBlock {
             );
         }
 
-        let editor_style = query_style("RectInnerLayer").unwrap();
+        let style_map = style_map.lock().unwrap();
+        let editor_style = style_map.get("RectInnerLayer").unwrap();
         let end_line_number = end_line_number.min(self.code_line_count as u32);
         let mut paint = Paint::default();
         // If the start line number is start at n, the y offset should be (n - 1) * line_height

core/src/components/highlight_code_block.rs

@@ -7,31 +7,18 @@ use crate::{
     edges::edge::Edge,
     utils::{text::FontRenderer, theme_provider::ThemeProvider},
 };
-use lazy_static::lazy_static;
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
 use tiny_skia::Pixmap;
 
-lazy_static! {
-    // The style parse process is recursive, there may some components style to be reculculated
-    // many times, so we cache the style to avoid reculculate
-    // The key is the component name, which defined in the Component trait
-    static ref STYLE_MAP: Mutex<HashMap<&'static str, Style<f32>>> = Mutex::new(HashMap::new());
-}
-
-pub(crate) fn query_style(name: &'static str) -> Option<Style<f32>> {
-    let style_map = STYLE_MAP.lock().unwrap();
-
-    style_map.get(name).cloned()
-}
-
 pub struct ComponentContext {
     pub scale_factor: f32,
     pub take_snapshot_params: Arc<SnapshotConfig>,
     pub theme_provider: ThemeProvider,
     pub font_renderer: Mutex<FontRenderer>,
+    pub style_map: Mutex<HashMap<&'static str, Style<f32>>>,
 }
 
 #[derive(Default, Clone)]
@@ -127,7 +114,7 @@ pub trait Component {
     ) -> Style<f32> {
         let name = self.name();
 
-        if let Some(style) = STYLE_MAP.lock().unwrap().get(name) {
+        if let Some(style) = context.style_map.lock().unwrap().get(name) {
             if name != "STUB_COMPONENT" {
                 return style.clone();
             }
@@ -166,7 +153,12 @@ pub trait Component {
             margin: style.margin,
         };
 
-        STYLE_MAP.lock().unwrap().insert(self.name(), style.clone());
+        context
+            .style_map
+            .lock()
+            .unwrap()
+            .insert(self.name(), style.clone());
+
         style
     }
 

core/src/components/interface/component.rs

@@ -26,7 +26,6 @@ pub mod assets;
 mod components;
 pub mod config;
 pub mod edges;
-pub mod preset_background;
 pub mod snapshot;
 pub mod themes;
 pub mod utils;

core/src/lib.rs

@@ -1,11 +1,14 @@
-use std::sync::{Arc, Mutex};
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
 
 use crate::{
     components::{
         command_line::{
             command_line_header::CommandLineHeader, command_line_output::CommandLineOutput,
         },
-        interface::component::Component,
+        interface::{component::Component, style::Style},
         layout::{column::Column, row::Row},
     },
     config::{self, CommandLineContent, SnapshotConfig, DEFAULT_WINDOW_MARGIN},
@@ -91,6 +94,10 @@ impl ImageSnapshot {
         window_padding: Padding,
     ) -> Box<dyn Fn(Vec<Box<dyn Component>>) -> anyhow::Result<Pixmap>> {
         Box::new(move |render_content| {
+            // The style parse process is recursive, there may some components style to be reculculated
+            // many times, so we cache the style to avoid reculculate
+            // The key is the component name, which defined in the Component trait
+            let style_map: Mutex<HashMap<&'static str, Style<f32>>> = Mutex::new(HashMap::new());
             let editor_background_color = theme_provider.theme_background();
             let font_renderer = Mutex::new(FontRenderer::new(
                 config.scale_factor as f32,
@@ -101,6 +108,7 @@ impl ImageSnapshot {
                 take_snapshot_params: Arc::new(config.clone()),
                 theme_provider: theme_provider.clone(),
                 font_renderer,
+                style_map,
             };
             let background_padding = Padding::from(config.window.margin.clone());
             let border_rgba_color: RgbaColor = config.window.border.color.as_str().into();

core/src/preset_background.rs

@@ -1,9 +1,8 @@
 use std::sync::Arc;
 
 use cosmic_text::{
-    fontdb::{Database, Source},
-    Align, Attrs, AttrsList, Buffer, BufferLine, Color, Family, FontSystem, LayoutRunIter,
-    LineEnding, Metrics, Shaping, SwashCache,
+    fontdb::Source, Align, Attrs, AttrsList, Buffer, BufferLine, Color, Family, FontSystem,
+    LayoutRunIter, LineEnding, Metrics, Shaping, SwashCache,
 };
 use tiny_skia::{Paint, Pixmap, Rect, Transform};