lookbook 2.3.4 → 2.3.13

data/app/views/lookbook/inspector/show.html.erb

@@ -2,7 +2,7 @@
   <%= lookbook_render :split_layout,
     id: "inspector",
     alpine_data: "$store.layout.inspector",
-    ":class": "($store.inspector.drawer.hidden || #{@drawer_panels.none?}) && '!grid-rows-[1fr] !grid-cols-[1fr]'",
+    "x-bind:class": "($store.inspector.drawer.hidden || #{@drawer_panels.none?}) && '!grid-rows-[1fr] !grid-cols-[1fr]'",
     data: {
       "preview-target": @target.id
     } do |layout| %>
@@ -11,7 +11,7 @@
       "x-effect": "forceOrientation = (layoutWidth < $store.inspector.minVerticalSplitWidth) ? 'horizontal' : null" do %>
     
       <%= lookbook_render :toolbar, id: "main-toolbar" do |toolbar| %>
-        <% toolbar.with_section ":class": "layoutResizing && 'overflow-hidden'" do %>
+        <% toolbar.with_section "x-bind:class": "layoutResizing && 'overflow-hidden'" do %>
           <%= lookbook_render :tabs, alpine_data: "$store.inspector.main", id: "inspector-tabs-main" do |tabs| %>
             <%= @main_panels.each do |panel| %>
               <% tabs.with_tab name: panel.name,
@@ -99,7 +99,7 @@
       "x-show": "!$store.inspector.drawer.hidden && #{@drawer_panels.any?}" do %>
 
       <%= lookbook_render :toolbar, id: "drawer-toolbar" do |toolbar| %>
-        <% toolbar.with_section ":class": "layoutResizing && 'overflow-hidden'" do %>
+        <% toolbar.with_section "x-bind:class": "layoutResizing && 'overflow-hidden'" do %>
           <%= lookbook_render :tabs, alpine_data: "$store.inspector.drawer", id: "inspector-tabs-drawer" do |tabs| %>
             <%= @drawer_panels.each do |panel| %>
               <% tabs.with_tab name: panel.name,
@@ -133,7 +133,7 @@
               tooltip: "Pin drawer on right",
               "x-on:click": "switchOrientation",
               "x-show": "horizontal",
-              ":class": "{'pointer-events-none opacity-50 !cursor-not-allowed': horizontal && layoutWidth <= $store.inspector.minVerticalSplitWidth}",
+              "x-bind:class": "{'pointer-events-none opacity-50 !cursor-not-allowed': horizontal && layoutWidth <= $store.inspector.minVerticalSplitWidth}",
               cloak: true %>
 
             <% group.with_button id: "drawer-to-bottom-button",

data/app/views/lookbook/pages/show.html.erb

@@ -95,4 +95,4 @@
       </div>
     </div>
   </div>
-</main>
+</main>

data/app/views/lookbook/partials/_iframe_content_scripts.html.erb

@@ -1 +1 @@
-<script src="<%= lookbook_asset_path("/js/iframe.js") %>" defer></script>
+<script src="<%= lookbook_asset_path("/js/iframe.js") %>" defer></script>

data/app/views/lookbook/partials/_user_styles.html.erb

@@ -2,4 +2,4 @@
   <style media="all" id="user-styles">
     <%= content_for :user_styles -%>
   </style>
-<% end %>
+<% end %>

data/app/views/lookbook/previews/group.html.erb

@@ -12,4 +12,4 @@
 <% else %>
   <%# Render a single scenario %>
   <%= scenarios.first.output %>
-<% end %>
+<% end %>

data/app/views/lookbook/previews/preview.html.erb

@@ -1,6 +1,10 @@
 <% if @render_args[:component] %>
   <% if defined?(Phlex::SGML) && @render_args[:component].is_a?(Phlex::SGML) %>
-    <%= raw(@render_args[:component].call(view_context: self, &@render_args[:block])) %>
+    <% if defined?(Phlex::VERSION) && Gem::Version.new(Phlex::VERSION) < Gem::Version.new("2.0.0") %>
+      <%= raw(@render_args[:component].call(view_context: self, &@render_args[:block])) %>
+    <% else %>
+      <%= render(@render_args[:component], @render_args[:args], &@render_args[:block]) %>
+    <% end %>
   <% else %>
     <%= render(@render_args[:component], @render_args[:args], &@render_args[:block]) %>
   <% end %>

data/app/views/lookbook/previews/show.html.erb

@@ -1 +1 @@
- <%= @preview_html %>
+ <%= @preview_html %>

data/config/app.yml

@@ -25,6 +25,7 @@ shared:
   preview_type_default: view_component
   preview_sort_scenarios: false
   preview_disable_error_handling: false
+  preview_single_pass_rendering: false
 
   page_collection_label: "Pages"
   page_nav_filter: false
@@ -40,7 +41,6 @@ shared:
     disable_indented_code_blocks: true
     strikethrough: true
     highlight: true
-    with_toc_data: true
     lax_spacing: true
 
   highlighter_options:

data/lib/lookbook/engine.rb

@@ -14,11 +14,11 @@ module Lookbook
       )
     end
 
-    initializer "lookbook.set_autoload_paths" do
+    initializer "lookbook.set_autoload_paths", before: :set_autoload_paths do |app|
       if opts.autoload_previews && opts.preview_paths.any?
-        paths_to_add = opts.preview_paths - ActiveSupport::Dependencies.autoload_paths
+        paths_to_add = opts.preview_paths - app.config.autoload_paths
         filtered_paths = paths_to_add.filter { |p| !Engine.component_paths.include?(p) }
-        ActiveSupport::Dependencies.autoload_paths.concat(filtered_paths) if filtered_paths.any?
+        app.config.autoload_paths.concat(filtered_paths) if filtered_paths.any?
       end
     end
 
@@ -37,26 +37,50 @@ module Lookbook
       if opts.using_view_component
         vc_config = Engine.host_config.view_component
 
-        opts.preview_paths += vc_config.preview_paths
+        if vc_config.key?(:previews)
+          # New config style (ViewComponent >= 4.0)
+          opts.preview_paths += vc_config.previews.paths
 
-        # sync preview controller and layout setting between Lookbook and ViewComponent
-        if opts.preview_controller == "Lookbook::PreviewController" ||
-            vc_config.preview_controller != ViewComponent::Config.defaults.preview_controller
-          opts.preview_controller = vc_config.preview_controller
-        else
-          vc_config.preview_controller = opts.preview_controller
-        end
+          if opts.preview_controller == "Lookbook::PreviewController" ||
+              vc_config.previews.controller != "ViewComponentsController"
+            opts.preview_controller = vc_config.previews.controller
+          else
+            vc_config.previews.controller = opts.preview_controller
+          end
 
-        if opts.preview_layout.nil? || vc_config.default_preview_layout.present?
-          opts.preview_layout = vc_config.default_preview_layout
+          if opts.preview_layout.nil? || vc_config.previews.default_layout.present?
+            opts.preview_layout = vc_config.previews.default_layout
+          else
+            vc_config.previews.default_layout = opts.preview_layout
+          end
+
+          vc_config.previews.enabled = true
+
+          if vc_config.generate.path.present?
+            opts.component_paths << vc_config.generate.path
+          end
         else
-          vc_config.default_preview_layout = opts.preview_layout
-        end
+          # Legacy config style (ViewComponent < 4.0)
+          opts.preview_paths += vc_config.preview_paths
+
+          if opts.preview_controller == "Lookbook::PreviewController" ||
+              vc_config.preview_controller != ViewComponent::Config.defaults.preview_controller
+            opts.preview_controller = vc_config.preview_controller
+          else
+            vc_config.preview_controller = opts.preview_controller
+          end
 
-        vc_config.show_previews = true
+          if opts.preview_layout.nil? || vc_config.default_preview_layout.present?
+            opts.preview_layout = vc_config.default_preview_layout
+          else
+            vc_config.default_preview_layout = opts.preview_layout
+          end
 
-        if vc_config.view_component_path.present?
-          opts.component_paths << vc_config.view_component_path
+          vc_config.show_previews = true
+
+          if vc_config.view_component_path.present?
+            opts.component_paths << vc_config.view_component_path
+          end
         end
 
         ViewComponent::Preview.extend(Lookbook::PreviewAfterRender)

data/lib/lookbook/preview_controller_actions.rb

@@ -16,8 +16,13 @@ module Lookbook
         @render_args = @preview.render_args(@scenario_name, params: params.permit!)
         template = @render_args[:template]
         locals = @render_args[:locals]
-        opts = {}
-        opts[:layout] = nil
+
+        opts = if Lookbook.config.preview_single_pass_rendering && !scenario.group.present?
+          determine_layout(preview.layout)
+        else
+          {layout: nil}
+        end
+
         opts[:assigns] = @render_args[:assigns] || {}
         opts[:locals] = locals if locals.present?
 

data/lib/lookbook/preview_parser.rb

@@ -6,15 +6,14 @@ module Lookbook
       @paths = paths
       @after_parse_callbacks = []
       @after_parse_once_callbacks = []
-      @parsing = false
+      @parsing = Monitor.new
 
       define_tags(tags)
       YARD::Parser::SourceParser.after_parse_list { run_callbacks }
     end
 
     def parse(files = nil, &block)
-      unless @parsing
-        @parsing = true
+      @parsing.synchronize do
         @after_parse_once_callbacks << block if block
         files_list = files ? files.select { |file| file.to_s.end_with?(".rb") } : paths
 
@@ -43,7 +42,6 @@ module Lookbook
     def run_callbacks
       callbacks.each { |cb| cb.call(YARD::Registry) }
       @after_parse_once_callbacks = []
-      @parsing = false
     end
 
     def define_tags(tags = nil)

data/lib/lookbook/services/markdown_renderer.rb

@@ -2,16 +2,18 @@ require "redcarpet"
 
 module Lookbook
   class MarkdownRenderer < Service
-    attr_reader :text, :opts
+    attr_reader :text, :extensions, :options
 
-    def initialize(text, opts = {})
+    # In Lookbook config, `markdown_options` are actually Redcarpet `extensions` so we store them as `@extensions`
+    def initialize(text, extensions = {}, options = {})
       @text = text
-      @opts = Lookbook.config.markdown_options.merge(opts.to_h)
+      @extensions = Lookbook.config.markdown_options.merge(extensions.to_h)
+      @options = default_options.merge(options.to_h)
     end
 
     def call
       clean_text = ActionViewAnnotationsStripper.call(text)
-      md = Redcarpet::Markdown.new(LookbookMarkdownRenderer, opts)
+      md = Redcarpet::Markdown.new(LookbookMarkdownRenderer.new(default_options), extensions)
       md.render(clean_text).html_safe
     end
 
@@ -29,5 +31,11 @@ module Lookbook
         full_document
       end
     end
+
+    def default_options
+      {
+        with_toc_data: true
+      }
+    end
   end
 end

data/lib/lookbook/stores/config_store.rb

@@ -63,6 +63,10 @@ module Lookbook
       store[:preview_disable_error_handling] = value
     end
 
+    def preview_single_pass_rendering=(value)
+      store[:preview_single_pass_rendering] = value
+    end
+
     def ui_theme=(name)
       name = name.to_s
       if Theme.valid_theme?(name)

data/lib/lookbook/support/errors/config_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class ConfigError < Error
     def initialize(msg = nil, scope: "config", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/parser_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class ParserError < Error
     def initialize(msg = nil, scope: "parser", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/preview_template_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class PreviewTemplateError < Error
     def initialize(msg = nil, scope: "preview", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/template_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class TemplateError < Error
     def initialize(msg = nil, scope: "template", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/store.rb

@@ -27,7 +27,7 @@ module Lookbook
       if name.to_s.end_with?("=")
         args[0] = normalize_value(args[0])
       end
-      super(name, *args)
+      super
     end
 
     def respond_to_missing?(name, include_private)

data/lib/lookbook/support/utils/utils.rb

@@ -12,7 +12,7 @@ module Lookbook
       end
 
       def name(str)
-        str.to_s.parameterize.tr("-", "_")
+        str.to_s.dup.force_encoding("UTF-8").parameterize.tr("-", "_")
       end
 
       def symbolize_name(str)

data/lib/lookbook/tags/param_tag.rb

@@ -28,7 +28,10 @@ module Lookbook
     def value_default
       default_value_parts = object.parameters.find { |parts| parts[0].chomp(":") == name }
       if default_value_parts
-        host_class_instance.instance_eval(default_value_parts[1])
+        # fix issue with YARD argument parser not splitting args correctly (leaving a trailing comma or bracket)
+        # when one or more of the argument values is a negative number.
+        cleaned_value = default_value_parts[1].start_with?("-") ? default_value_parts[1].sub(/[,\)]$/, "") : default_value_parts[1]
+        host_class_instance.instance_eval(cleaned_value)
       else
         raise ParserError.new "Unknown method parameter '#{name}'"
       end

data/lib/lookbook/tags/yard_tag.rb

@@ -5,7 +5,7 @@ module Lookbook
         tag_name = self.class.name.demodulize.underscore.chomp("_tag")
         super(tag_name, args.first, nil, @name)
       else
-        super(*args)
+        super
       end
     end
 

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "2.3.4"
+  VERSION = "2.3.13"
 end