lookbook 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6dfc00bd48155e8ce1a32cd2ad27668bb1b86a179ecbcce6236ea29f7cd4ef3
-  data.tar.gz: 30abb627e57ba885312e2b9c4a70f7cfc2a8a27dc6d5fbb6fa721dca38ae913f
+  metadata.gz: 7f540f127ea326803394a4fb256d8ec3f27a9f7564f003d075b5e3b70ccd0ff2
+  data.tar.gz: 7987f3e5caaeb9cc8ebd3e0a38fc3b2735ba3c894207320b612e15075441ac5e
 SHA512:
-  metadata.gz: b6634bc5a89fe0b43c389bfeeaf521563d8de55fa2cf8a5778f7471a62bd69949ed79bbbc07a539b87882a0a4802515718a08e5fe7a6637f389c93b8e3bb961f
-  data.tar.gz: 89e1af478c55cc5f62c532715432f958d8be1651531917828669104ac3b1aa74177fd14162353e583adc9632cb58529c3fa690ac8220b08006b0c568c3e8381d
+  metadata.gz: 4984fbeb06a7ba811cb45a0253fb9391f238c1fbe48e8cb4d2f8b32166e5551c08a9df6116b737423af6ecdd90d13bd91317189d962fc174b32e16b848f21f26
+  data.tar.gz: aadc14cb2bc965a03fbed65fb6824b898449567fc09574974dd4edde3c317fe52ef5ba989b9039f291a34c6ad0673471f22c9b2ce5869567a3e684d78fbdfbbe

data/app/controllers/concerns/lookbook/targetable_concern.rb

@@ -44,14 +44,15 @@ module Lookbook
           display_params = SearchParamParser.call(params[:_display])
           display_params.each do |name, value|
             if @dynamic_display_options.key?(name)
-              cookies["lookbook-display-#{name}"] = value
+              cookies["lookbook-display-#{name}"] = value.is_a?(Array) ? value[1] : value
             end
           end
         end
 
         @dynamic_display_options.each do |name, opts|
           choices = opts.is_a?(Hash) ? opts[:choices].to_a : opts
-          @static_display_options[name] ||= cookies.fetch("lookbook-display-#{name}", choices.first)
+          value = choices.first.is_a?(Array) ? choices.first[1] : choices.first
+          @static_display_options[name] ||= cookies.fetch("lookbook-display-#{name}", value)
         end
 
         unless params[:_display]

data/app/views/layouts/lookbook/application.html.erb

@@ -13,7 +13,7 @@
         }",
         "@click.outside": "closeMobileSidebar",
         cloak: true do %>
-        <% cache do %>
+        <% cache Lookbook::Engine.last_changed do %>
           <%= lookbook_render :split_layout,
             alpine_data: "$store.layout.#{@pages.any? && @previews.any? ? "sidebar" : "singleSectionSidebar"}",
             style: "height: calc(100vh - 2.5rem);" do |layout| %>

data/lib/lookbook/engine.rb

@@ -43,6 +43,7 @@ module Lookbook
     initializer "lookbook.file_watcher.pages" do
       file_watcher.watch(opts.page_paths, opts.page_extensions) do |changes|
         Engine.pages.load(Engine.page_paths)
+        Engine.mark_changed
         Engine.websocket.broadcast(:reload)
         run_hooks(:after_change, changes)
       end
@@ -51,6 +52,7 @@ module Lookbook
     initializer "lookbook.parser.previews_load_callback" do
       parser.after_parse do |code_objects|
         Engine.previews.load(code_objects.all(:class))
+        Engine.mark_changed
         Engine.websocket.broadcast(:reload)
       end
     end
@@ -168,6 +170,14 @@ module Lookbook
         @_previews ||= PreviewCollection.new
       end
 
+      def mark_changed
+        @_last_changed = nil
+      end
+
+      def last_changed
+        @_last_changed ||= (Time.now.to_f * 1000).to_i
+      end
+
       attr_reader :preview_controller
     end
 

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end