lookbook 2.0.0.rc.1 → 2.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 174a4ec48c4ecd1c29e75dfe398b67432344d13e37129b24c344e54519b29734
-  data.tar.gz: d1d3165449445809fa7ec6aad3b8005fb8607c7bd01a7a5752ff7802f0095778
+  metadata.gz: 8e65ff18c2a7f112552e6b9a7ef3936628b84690a03123736bfbd2d69734319a
+  data.tar.gz: 841ccc4584b2b66bf165f822a3be984370d9bc0df0095ded20ef9800e5f76877
 SHA512:
-  metadata.gz: 65a1324e145f01c7287d016395bf98d3278bc6b552c4fba3dbfa9c525c98d8622d463d48787dc1aaccd2eac0f1fc32126547ef3f80f13128e83089b9088166a9
-  data.tar.gz: 85ae77aa8223fb11f60e6d4ea075827f49f809f96dd3e017be0176e89ffe58b373a55e52079391132b5253ab241b33df4200c8ebeee4cfe97956ba4a51bc83e7
+  metadata.gz: 6e67bf7cf970cfb18166050d582b8daf29a9d13ceec465ce7e9ad49c3fdd12f04b9d5a72bba7786cb62be56a8be29464e34602f9758d68660b1f38bf0f2cddec
+  data.tar.gz: 50b18c05c31bd207acc07f40a07a564926aae7865f0770fe1612bab661a8342418fe3662f50a2fbfa13f105c48b66786e8ed67c261eb96962182b7abf63357ea

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

@@ -3,12 +3,23 @@ module Lookbook
     extend ActiveSupport::Concern
 
     def preview_controller
-      return @_preview_controller if @_preview_controller
+      @_preview_controller ||= begin
+        # In order to get URL helpers working correctly in the preview,
+        # the request needs to look like it's coming from the host app,
+        # not the Lookbook engine. So we try to get the controller and action
+        # for the root path and use that as the 'fake' request context instead.
+        request_path = main_app.respond_to?(:root_path) ? main_app.root_path : "/"
+        path_parameters = Rails.application.routes.recognize_path(request_path)
 
-      controller = Engine.preview_controller.new
-      controller.request = request
-      controller.response = response
-      @_preview_controller ||= controller
+        preview_request = request.clone
+        preview_request.path_parameters = path_parameters if path_parameters.present?
+
+        controller = Engine.preview_controller.new
+        controller.request = preview_request
+        controller.response = response
+
+        controller
+      end
     end
   end
 end

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

@@ -1,5 +1,9 @@
 <% if @render_args[:component] %>
-  <%= render(@render_args[:component], @render_args[:args], &@render_args[:block]) %>
+  <% if defined?(Phlex::SGML) && @render_args[:component].is_a?(Phlex::SGML) %>
+    <%= 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[:template], **@render_args[:locals], &@render_args[:block]) %>
 <% end %>

data/config/app.yml

@@ -42,7 +42,7 @@ shared:
     theme: github
     dark: false
 
-  component_paths: [app/views]
+  component_paths: [app/views, app/components]
 
   reload_on_change: ~
   live_updates: false

data/lib/lookbook/helpers/preview_helper.rb

@@ -10,9 +10,5 @@ module Lookbook
     def lookbook_data(key, fallback = nil)
       Lookbook.data.fetch(key.to_sym, fallback)
     end
-
-    def url_for(*args)
-      main_app.url_for(*args)
-    end
   end
 end

data/lib/lookbook/preview_controller_actions.rb

@@ -4,57 +4,58 @@ module Lookbook
 
     included do
       helper PreviewHelper
+      helper Rails.application.routes.url_helpers
       prepend_view_path Engine.root.join("app/views")
+    end
 
-      def render_scenario_to_string(preview, scenario)
-        prepend_application_view_paths
-        prepend_preview_examples_view_path
-
-        @preview = preview
-        @scenario_name = scenario.name
-        @render_args = @preview.render_args(@scenario_name, params: params.permit!)
-        template = @render_args[:template]
-        locals = @render_args[:locals]
-        opts = {}
-        opts[:layout] = nil
-        opts[:locals] = locals if locals.present?
-
-        rendered = render_to_string(template, **opts)
-
-        if scenario.after_render_method.present?
-          render_context = Store.new({
-            preview: preview,
-            scenario: scenario,
-            params: user_request_parameters
-          })
-          rendered = @preview.after_render(method: scenario.after_render_method, html: rendered, context: render_context)
-        end
+    def render_scenario_to_string(preview, scenario)
+      prepend_application_view_paths
+      prepend_preview_examples_view_path
+
+      @preview = preview
+      @scenario_name = scenario.name
+      @render_args = @preview.render_args(@scenario_name, params: params.permit!)
+      template = @render_args[:template]
+      locals = @render_args[:locals]
+      opts = {}
+      opts[:layout] = nil
+      opts[:locals] = locals if locals.present?
+
+      rendered = render_to_string(template, **opts)
+
+      if scenario.after_render_method.present?
+        render_context = Store.new({
+          preview: preview,
+          scenario: scenario,
+          params: user_request_parameters
+        })
+        rendered = @preview.after_render(method: scenario.after_render_method, html: rendered, context: render_context)
+      end
 
-        with_optional_action_view_annotations do
-          render html: rendered
-        end
+      with_optional_action_view_annotations do
+        render html: rendered
       end
+    end
 
-      def render_in_layout_to_string(template, locals, opts = {})
-        with_optional_action_view_annotations do
-          html = render_to_string(template, locals: locals, **determine_layout(opts[:layout]))
-          if opts[:append_html].present?
-            html += opts[:append_html]
-          end
-          render html: html
+    def render_in_layout_to_string(template, locals, opts = {})
+      with_optional_action_view_annotations do
+        html = render_to_string(template, locals: locals, **determine_layout(opts[:layout]))
+        if opts[:append_html].present?
+          html += opts[:append_html]
         end
+        render html: html
       end
+    end
 
-      protected
+    protected
 
-      def with_optional_action_view_annotations(&block)
-        disable = Lookbook.config.preview_disable_action_view_annotations
-        ActionViewAnnotationsHandler.call(disable_annotations: disable, &block)
-      end
+    def with_optional_action_view_annotations(&block)
+      disable = Lookbook.config.preview_disable_action_view_annotations
+      ActionViewAnnotationsHandler.call(disable_annotations: disable, &block)
+    end
 
-      def user_request_parameters
-        request.query_parameters.to_h.filter { |k, v| !k.start_with?("_") }
-      end
+    def user_request_parameters
+      request.query_parameters.to_h.filter { |k, v| !k.start_with?("_") }
     end
   end
 end

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "2.0.0.rc.1"
+  VERSION = "2.0.0.rc.2"
 end

data/public/lookbook-assets/js/index.js

@@ -7815,7 +7815,49 @@ function $12b7aa006b8a97e1$var$toCamel(s) {
 }
 
 
-var $52abf2efa3492135$exports = {};
+var $57df4ec1d6bb80f5$exports = {};
+var $47a1c62621be0c54$exports = {};
+
+$parcel$defineInteropFlag($47a1c62621be0c54$exports);
+
+$parcel$export($47a1c62621be0c54$exports, "default", () => $47a1c62621be0c54$export$2e2bcd8739ae039);
+var $4e31c85e11272811$exports = {};
+
+$parcel$defineInteropFlag($4e31c85e11272811$exports);
+
+$parcel$export($4e31c85e11272811$exports, "initClipboard", () => $4e31c85e11272811$export$c6684e6159b21de3);
+$parcel$export($4e31c85e11272811$exports, "default", () => $4e31c85e11272811$export$2e2bcd8739ae039);
+
+function $4e31c85e11272811$export$c6684e6159b21de3(context = {}) {
+    let copyTimeout = null;
+    return Object.assign(context, {
+        copied: false,
+        async copyToClipboard (target = null) {
+            let targetEl;
+            if (this.$refs.copyTarget) targetEl = this.$refs.copyTarget;
+            else if (typeof target === "string") targetEl = document.querySelector(target);
+            if (!targetEl) {
+                this.warn("Could not find copy target");
+                return false;
+            }
+            const content = (0, $fb8f79f7dd40b68f$export$6cb344a21ca18aec)(targetEl.innerHTML.trim());
+            await window.navigator.clipboard.writeText(content);
+            this.copied = true;
+            if (copyTimeout) clearTimeout(copyTimeout);
+            copyTimeout = setTimeout(()=>{
+                this.copied = false;
+                this.onCopyComplete();
+            }, 1000);
+            return content;
+        },
+        onCopyComplete () {}
+    });
+}
+function $4e31c85e11272811$export$2e2bcd8739ae039() {
+    return $4e31c85e11272811$export$c6684e6159b21de3({});
+}
+
+
 var $cbd28b10fa9798c7$exports = {};
 
 $parcel$defineInteropFlag($cbd28b10fa9798c7$exports);
@@ -11346,59 +11388,6 @@ function $cbd28b10fa9798c7$export$2e2bcd8739ae039() {
 }
 
 
-var $99486586f6691564$exports = {};
-
-$parcel$defineInteropFlag($99486586f6691564$exports);
-
-$parcel$export($99486586f6691564$exports, "default", () => $99486586f6691564$export$2e2bcd8739ae039);
-function $99486586f6691564$export$2e2bcd8739ae039() {
-    return {};
-}
-
-
-var $47a1c62621be0c54$exports = {};
-
-$parcel$defineInteropFlag($47a1c62621be0c54$exports);
-
-$parcel$export($47a1c62621be0c54$exports, "default", () => $47a1c62621be0c54$export$2e2bcd8739ae039);
-var $4e31c85e11272811$exports = {};
-
-$parcel$defineInteropFlag($4e31c85e11272811$exports);
-
-$parcel$export($4e31c85e11272811$exports, "initClipboard", () => $4e31c85e11272811$export$c6684e6159b21de3);
-$parcel$export($4e31c85e11272811$exports, "default", () => $4e31c85e11272811$export$2e2bcd8739ae039);
-
-function $4e31c85e11272811$export$c6684e6159b21de3(context = {}) {
-    let copyTimeout = null;
-    return Object.assign(context, {
-        copied: false,
-        async copyToClipboard (target = null) {
-            let targetEl;
-            if (this.$refs.copyTarget) targetEl = this.$refs.copyTarget;
-            else if (typeof target === "string") targetEl = document.querySelector(target);
-            if (!targetEl) {
-                this.warn("Could not find copy target");
-                return false;
-            }
-            const content = (0, $fb8f79f7dd40b68f$export$6cb344a21ca18aec)(targetEl.innerHTML.trim());
-            await window.navigator.clipboard.writeText(content);
-            this.copied = true;
-            if (copyTimeout) clearTimeout(copyTimeout);
-            copyTimeout = setTimeout(()=>{
-                this.copied = false;
-                this.onCopyComplete();
-            }, 1000);
-            return content;
-        },
-        onCopyComplete () {}
-    });
-}
-function $4e31c85e11272811$export$2e2bcd8739ae039() {
-    return $4e31c85e11272811$export$c6684e6159b21de3({});
-}
-
-
-
 function $47a1c62621be0c54$export$2e2bcd8739ae039() {
     const button = (0, $cbd28b10fa9798c7$export$2e2bcd8739ae039)();
     return {
@@ -11412,6 +11401,17 @@ function $47a1c62621be0c54$export$2e2bcd8739ae039() {
 }
 
 
+
+var $99486586f6691564$exports = {};
+
+$parcel$defineInteropFlag($99486586f6691564$exports);
+
+$parcel$export($99486586f6691564$exports, "default", () => $99486586f6691564$export$2e2bcd8739ae039);
+function $99486586f6691564$export$2e2bcd8739ae039() {
+    return {};
+}
+
+
 var $e398acaded942bbe$exports = {};
 
 $parcel$defineInteropFlag($e398acaded942bbe$exports);
@@ -12336,10 +12336,10 @@ function $6d64716f0b34fdf4$export$2e2bcd8739ae039(store) {
 }
 
 
-$52abf2efa3492135$exports = {
+$57df4ec1d6bb80f5$exports = {
+    "copy_button": $47a1c62621be0c54$exports,
     "button": $cbd28b10fa9798c7$exports,
     "code": $99486586f6691564$exports,
-    "copy_button": $47a1c62621be0c54$exports,
     "dimensions_display": $e398acaded942bbe$exports,
     "embed_code_dropdown": $216ef7001f59f21d$exports,
     "filter": $e9904a14dabf652d$exports,
@@ -13521,7 +13521,7 @@ const $22969b543678f572$var$prefix = window.APP_NAME;
 // Components
 (0, $caa9439642c6336c$export$2e2bcd8739ae039).data("app", (0, $5792afa4170ed552$export$2e2bcd8739ae039));
 [
-    $52abf2efa3492135$exports,
+    $57df4ec1d6bb80f5$exports,
     $3b154185c6273749$exports,
     $338da9a25bc5c332$exports
 ].forEach((scripts)=>{