[Fix] incorrect code highlight component width (#91)

Author: mistricky

cli/src/code_config.rs

@@ -16,6 +16,7 @@ pub fn create_code_config(cli: &CLI, code_config: CodeConfig) -> anyhow::Result<
 
 fn map_breadcrumbs(cli: &CLI, breadcrumbs_config: Breadcrumbs) -> Breadcrumbs {
     Breadcrumbs {
+        enable: cli.has_breadcrumbs.unwrap_or(breadcrumbs_config.enable),
         separator: cli
             .breadcrumbs_separator
             .clone()

cli/src/main.rs

@@ -93,9 +93,9 @@ struct CLI {
     /// Breadcrumbs is a useful and unique feature in CodeSnap, it shows the path of the file
     /// so that users can know where the code snippet comes from.
     #[arg(long)]
-    has_breadcrumbs: bool,
+    has_breadcrumbs: Option<bool>,
 
-    #[arg(long)]
+    #[arg(long, default_value = "false")]
     has_line_number: bool,
 
     /// Breadcrumbs separator is the character to separate the path in breadcrumbs

core/assets/theme_configs/bamboo.json

@@ -22,6 +22,7 @@
   "code_config": {
     "font_family": "CaskaydiaCove Nerd Font",
     "breadcrumbs": {
+      "enable": false,
       "separator": "/",
       "color": "#80848b",
       "font_family": "CaskaydiaCove Nerd Font"

core/src/components/breadcrumbs.rs

@@ -17,7 +17,6 @@ const LINE_HEIGHT: f32 = 15.;
 
 pub struct Breadcrumbs {
     children: Vec<Box<dyn Component>>,
-    has_breadcrumbs: bool,
     path: Option<String>,
 }
 
@@ -30,14 +29,14 @@ impl Component for Breadcrumbs {
         &self.children
     }
 
-    fn render_condition(&self, _context: &ComponentContext) -> bool {
-        self.has_breadcrumbs
+    fn render_condition(&self, context: &ComponentContext) -> bool {
+        context.take_snapshot_params.code_config.breadcrumbs.enable
     }
 
-    fn style(&self, _context: &ComponentContext) -> RawComponentStyle {
+    fn style(&self, context: &ComponentContext) -> RawComponentStyle {
         let style = RawComponentStyle::default();
 
-        if !self.has_breadcrumbs {
+        if !context.take_snapshot_params.code_config.breadcrumbs.enable {
             return style;
         }
 
@@ -95,11 +94,10 @@ impl Component for Breadcrumbs {
 }
 
 impl Breadcrumbs {
-    pub fn from(has_breadcrumbs: bool, file_path: Option<String>) -> Breadcrumbs {
+    pub fn from(file_path: Option<String>) -> Breadcrumbs {
         Breadcrumbs {
             children: vec![],
             path: file_path,
-            has_breadcrumbs,
         }
     }
 }

core/src/components/highlight_code_block.rs

@@ -1,13 +1,14 @@
 use crate::{
     config::HighlightLine,
     edges::{edge::Edge, padding::Padding},
-    utils::color::RgbaColor,
+    snapshot::image_snapshot::DEFAULT_WINDOW_MIN_WIDTH,
+    utils::{code::min_width, color::RgbaColor},
 };
 
 use super::{
     editor::code::CODE_LINE_HEIGHT,
     interface::{
-        component::{Component, ComponentContext, RenderParams},
+        component::{query_style, Component, ComponentContext, RenderParams},
         style::ComponentStyle,
     },
 };
@@ -102,14 +103,15 @@ impl HighlightCodeBlock {
             );
         }
 
+        let editor_style = query_style("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
         let start_y_offset = (start_line_number - 1) as f32 * CODE_LINE_HEIGHT;
         let rect = Rect::from_xywh(
             render_params.x - self.editor_padding.left,
             render_params.y + start_y_offset,
-            parent_style.width + self.editor_padding.horizontal(),
+            editor_style.width,
             // If end_line_number is equal to start_line_number, the height should be line_height
             (end_line_number - start_line_number + 1) as f32 * CODE_LINE_HEIGHT,
         )

core/src/components/interface/component.rs

@@ -21,6 +21,12 @@ lazy_static! {
     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>,
@@ -144,12 +150,13 @@ pub trait Component {
         let width = self.parse_size(style.width, width, parent_style.map(|s| s.width))
             + style.padding.horizontal()
             + style.margin.horizontal();
+
         let style = Style {
             min_width: style.min_width,
-            width: if width > style.min_width {
-                width
-            } else {
+            width: if width < style.min_width {
                 style.min_width
+            } else {
+                width
             },
             height: self.parse_size(style.height, height, parent_style.map(|s| s.height))
                 + style.padding.vertical()

core/src/config.rs

@@ -127,6 +127,9 @@ pub struct Margin {
 
 #[derive(Clone, Builder, Serialize, Deserialize, Debug, JsonSchema, Default)]
 pub struct Breadcrumbs {
+    #[builder(default = false)]
+    pub enable: bool,
+
     #[builder(setter(into, strip_option), default = String::from("/"))]
     pub separator: String,
 
@@ -206,9 +209,6 @@ pub struct Code {
     #[builder(setter(into))]
     pub content: String,
 
-    #[builder(default = false)]
-    pub has_breadcrumbs: bool,
-
     #[builder(setter(into, strip_option), default = None)]
     pub start_line_number: Option<u32>,
 

core/src/snapshot/ascii_snapshot.rs

@@ -11,6 +11,7 @@ const SPACE_BOTH_SIDE: usize = 2;
 
 pub struct ASCIISnapshot {
     code: Code,
+    has_breadcrumbs: bool,
 }
 
 fn optional(component: String, is_view: bool) -> String {
@@ -32,6 +33,7 @@ impl ASCIISnapshot {
         match config.content {
             Content::Code(ref raw_code) => Ok(ASCIISnapshot {
                 code: raw_code.clone(),
+                has_breadcrumbs: config.code_config.breadcrumbs.enable,
             }),
             _ => Err(anyhow::anyhow!("The code content is not raw")),
         }
@@ -84,7 +86,7 @@ impl ASCIISnapshot {
                 "{}{line}",
                 text_line(&self.code.file_path.clone().unwrap_or(String::from("")))
             ),
-            self.code.has_breadcrumbs,
+            self.has_breadcrumbs,
         );
 
         format!("{top_frame}{breadcrumbs}{code}{bottom_frame}")

core/src/snapshot/image_snapshot.rs

@@ -159,10 +159,7 @@ impl ImageSnapshot {
     ) -> anyhow::Result<Vec<Box<dyn Component>>> {
         let code_lines = code_content.content.lines().collect::<Vec<&str>>();
         let view: Vec<Box<dyn Component>> = vec![
-            Box::new(Breadcrumbs::from(
-                code_content.has_breadcrumbs,
-                code_content.file_path.clone(),
-            )),
+            Box::new(Breadcrumbs::from(code_content.file_path.clone())),
             Box::new(CodeBlock::from_children(vec![
                 Box::new(HighlightCodeBlock::from(
                     code_content.highlight_lines.clone(),