lookbook 0.4.7 → 0.5.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce922c11cf8df5a1161c555189786265e51e29881c5a5e0948153fa65e855a50
-  data.tar.gz: 38fe97d9e04c6505ebc8e1b8bc877fe761db215b525117b42a044cadf7b2eb50
+  metadata.gz: 7838a877b435b1952e1eed9163cad4f21fa44b2578d9114430bfc1d262b15c23
+  data.tar.gz: 4f8512d21d07f2b93164706569f0a28483f6b43e60446f19857411b4e66ac6ee
 SHA512:
-  metadata.gz: d319e159fc2b87e710532dbd6c426360f2a6173e174d3e0eac05c677bdfd945cf0c5a391c426a8f987cb7539797aa10241e45cdddd55048f25af84689d0af9b2
-  data.tar.gz: 80a217bf6303a778676872bd9d6c1412a3811323903031d491e945c0788ebba20cc2ccbb059d011e823b80d74b5342994c9b42f7590fd4fbfd305166b187d345
+  metadata.gz: bf6f6045ce9ea8d5bca9932bfb3538e0e5c307b856cdbc0a209520be5112bed281f623cc879af59e51216f1d284aa2de08ed6ef1b483f794ea74c434a150bb13
+  data.tar.gz: 4b2d545082ea784bc1122a51c947b0d5391cc829e895adfe224107591acdb68fabb23e8d21fe8be1f1d6acf405e774130dad1e1ba9676470a5bea9240f82cd34

data/README.md

@@ -79,7 +79,7 @@ Lookbook parses [Yard-style comment tags](https://rubydoc.info/gems/yard/file/do
 
 ```ruby
 # @label Basic Button
-# @display bg_color #fff
+# @display bg_color "#fff"
 class ButtonComponentPreview < ViewComponent::Preview
 
   # Primary button
@@ -110,7 +110,7 @@ class ButtonComponentPreview < ViewComponent::Preview
   # ---------------
   # For light-on-dark screens
   #
-  # @display bg_color #000
+  # @display bg_color "#000"
   def secondary
     render ButtonComponent.new(style: :inverted) do
       "Click me"
@@ -188,7 +188,7 @@ end
 The `@display` tag lets you pass custom parameters to your preview layout so that the component preview can be customised on a per-example basis.
 
 ```ruby
-# @display bg_color #eee
+# @display bg_color "#eee"
 class FooComponentPreview < ViewComponent::Preview
 
   # @display max_width 500px
@@ -207,6 +207,8 @@ The `@display` tag can be applied at the preview (class) or at the example (meth
 - `<key>` must be a valid Ruby hash key name, without quotes or spaces
 - `<value>` will be parsed using the [Ruby YAML parser](https://yaml.org/YAML_for_ruby.html) to resolve the value
 
+> Note: Ruby YAML does not (generally) require quoting of string values. However in some cases it _is_ required due to the presence of [indicator characters](https://yaml.org/YAML_for_ruby.html#indicators_in_strings) (such as `#`, `:` etc) - hence why the hex color code in the example above is surrounded by quotes. It's perfectly ok to quote all string values if you prefer.
+
 These display parameters can then be accessed via the `params` hash in your preview layout using `params[:lookbook][:display][<key>]`:
 
 ```html

data/app/assets/lookbook/css/app.css

@@ -2,6 +2,7 @@
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
 @import "tippy.js/dist/tippy";
+@import "tippy.js/dist/border";
 @import "code_theme";
 @import "tooltip_theme";
 
@@ -57,8 +58,8 @@
 }
 
 @layer components {
-  #nav > ul > li {
-    @apply py-1;
+  #nav > ul > li > div {
+    @apply py-1 border-b border-gray-300;
   }
 
   .nav-toggle {
@@ -77,8 +78,12 @@
     @apply block;
   }
 
+  .code.wrapped pre {
+    @apply whitespace-pre-wrap;
+  }
+
   .code .line {
-    @apply flex items-center leading-relaxed;
+    @apply leading-relaxed;
   }
 
   .code.numbered {
@@ -87,35 +92,41 @@
 
   .code.numbered:before {
     content: "";
-    left: calc(2.7em + 8px);
+    left: 2.7em;
     @apply absolute top-0 bottom-0 border-r border-gray-200;
   }
 
+  .code.numbered .line {
+    padding-left: calc(2.7em + 8px);
+    @apply relative;
+  }
+
   .code .line-number {
+    display: inline-block;
     width: calc(2.7em + 8px);
     padding-top: 3px;
     padding-bottom: 3px;
     padding-right: 8px;
     margin-right: 16px;
-    @apply font-mono text-right text-gray-400 flex-none text-xs;
+    @apply font-mono text-right text-gray-400 flex-none text-xs absolute left-0;
   }
 
   .code .line-content {
     @apply flex-none pr-4;
   }
 
-  /* .code .line:before {
-    content: counter(line);
-    width: calc(3em + 8px);
-    padding-top: 2px;
-    padding-bottom: 2px;
-    padding-right: 8px;
-    @apply font-mono inline-block text-right mr-4 text-gray-400 border-r border-gray-200;
-  } */
+  .resize-handle {
+    @apply flex items-center justify-center h-full w-full border-gray-300 bg-white hover:bg-indigo-100 hover:bg-opacity-20 text-gray-400 hover:text-gray-700 transition select-none touch-none;
+  }
 }
 
 @layer utilities {
   .form-input {
     @apply border-gray-300 text-gray-700 focus:ring-indigo-300 focus:border-indigo-300 rounded-sm text-sm w-full;
   }
+
+  .checked-bg {
+    background-color: #ffffff;
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3E%3Cg fill='%23f3f3f3' fill-opacity='1'%3E%3Cpath fill-rule='evenodd' d='M0 0h4v4H0V0zm4 4h4v4H4V4z'/%3E%3C/g%3E%3C/svg%3E");
+  }
 }

data/app/assets/lookbook/css/tooltip_theme.css

@@ -4,13 +4,41 @@
   &[data-placement^="top"] > .tippy-arrow::before {
     border-top-color: theme("colors.indigo.500");
   }
+
   &[data-placement^="bottom"] > .tippy-arrow::before {
     border-bottom-color: theme("colors.indigo.500");
   }
+
   &[data-placement^="left"] > .tippy-arrow::before {
     border-left-color: theme("colors.indigo.500");
   }
+
   &[data-placement^="right"] > .tippy-arrow::before {
     border-right-color: theme("colors.indigo.500");
   }
 }
+
+.tippy-box[data-theme~="menu"] {
+  border: 1px solid theme("colors.gray.300");
+  @apply bg-white text-gray-600 shadow-md rounded;
+
+  & > .tippy-content {
+    padding: 0;
+  }
+
+  &[data-placement^="top"] > .tippy-arrow::before {
+    border-top-color: white;
+  }
+
+  &[data-placement^="bottom"] > .tippy-arrow::before {
+    border-bottom-color: white;
+  }
+
+  &[data-placement^="left"] > .tippy-arrow::before {
+    border-left-color: white;
+  }
+
+  &[data-placement^="right"] > .tippy-arrow::before {
+    border-right-color: white;
+  }
+}

data/app/assets/lookbook/js/app.js

@@ -13,7 +13,9 @@ import nav from "./components/nav";
 import navItem from "./components/nav-item";
 import navGroup from "./components/nav-group";
 import splitter from "./components/splitter";
+import tabs from "./components/tabs";
 import copy from "./components/copy";
+import code from "./components/code";
 import sizes from "./components/sizes";
 
 import initFilterStore from "./stores/filter";
@@ -42,11 +44,13 @@ Alpine.data("page", page);
 Alpine.data("splitter", splitter);
 Alpine.data("previewWindow", previewWindow);
 Alpine.data("copy", copy);
+Alpine.data("code", code);
 Alpine.data("inspector", inspector);
 Alpine.data("filter", filter);
 Alpine.data("param", param);
 Alpine.data("sizes", sizes);
 Alpine.data("nav", nav);
+Alpine.data("tabs", tabs);
 Alpine.data("navItem", navItem);
 Alpine.data("navGroup", navGroup);
 

data/app/assets/lookbook/js/components/code.js

@@ -0,0 +1,5 @@
+export default function code() {
+  return {
+    wrap: false,
+  };
+}

data/app/assets/lookbook/js/components/filter.js

@@ -12,7 +12,7 @@ export default function filter() {
       this.$store.filter.raw = "";
     },
     focus($event) {
-      if ($event.target.tagName === "INPUT") {
+      if ($event && $event.target.tagName === "INPUT") {
         return;
       }
       setTimeout(() => this.$refs.input.focus(), 0);

data/app/assets/lookbook/js/components/inspector.js

@@ -1,17 +1,54 @@
+import sizeObserver from "./sizes";
+
 export default function inspector() {
   return {
+    width: 0,
+    height: 0,
+    init() {
+      const ro = new ResizeObserver((entries) => {
+        const rect = entries[0].contentRect;
+        this.width = Math.round(rect.width);
+        this.height = Math.round(rect.height);
+      });
+      ro.observe(this.$el);
+      this.width = Math.round(this.$el.clientWidth);
+      this.height = Math.round(this.$el.clientHeight);
+    },
+    get orientation() {
+      return this.$store.inspector.drawer.orientation;
+    },
+    get view() {
+      return this.$store.inspector.preview.view;
+    },
+    get horizontal() {
+      return this.canBeVertical ? this.orientation === "horizontal" : true;
+    },
+    get vertical() {
+      return !this.horizontal;
+    },
+    get canBeVertical() {
+      return this.width > 800;
+    },
+    get drawerHidden() {
+      return this.$store.inspector.drawer.hidden;
+    },
     isActivePanel(panel) {
-      return this.$store.inspector.panels.active == panel;
+      return this.$store.inspector.drawer.active == panel;
     },
     switchPanel(panel) {
-      this.$store.inspector.panels.active = panel;
+      this.$store.inspector.drawer.active = panel;
+    },
+    toggleView() {
+      this.$store.inspector.preview.view =
+        this.view === "html" ? "preview" : "html";
     },
-    get showSource() {
-      return this.$store.inspector.preview.source;
+    toggleOrientation() {
+      this.$store.inspector.drawer.orientation =
+        this.orientation === "horizontal" ? "vertical" : "horizontal";
     },
-    toggleSource() {
-      this.$store.inspector.preview.source =
-        !this.$store.inspector.preview.source;
+    toggleDrawer() {
+      this.$store.inspector.drawer.hidden =
+        !this.$store.inspector.drawer.hidden;
     },
     preview: {
       width: null,

data/app/assets/lookbook/js/components/nav-group.js

@@ -15,7 +15,7 @@ export default function navGroup() {
     },
     getChildren() {
       return this.$refs.items
-        ? Array.from(this.$refs.items.querySelectorAll(":scope > li"))
+        ? Array.from(this.$refs.items.querySelectorAll(":scope > li > div"))
         : [];
     },
     navigateToFirstChild() {

data/app/assets/lookbook/js/components/nav-item.js

@@ -15,6 +15,7 @@ export default function navItem(matchers) {
       this.$store.sidebar.open = false;
     },
     filter(text) {
+      this.hidden = false;
       if (text.length) {
         const matched = matchers.map((m) => m.includes(text));
         this.hidden = !matched.filter((m) => m).length;

data/app/assets/lookbook/js/components/nav.js

@@ -22,7 +22,7 @@ export default function nav() {
     },
     getChildren() {
       return this.$refs.items
-        ? Array.from(this.$refs.items.querySelectorAll(":scope > li"))
+        ? Array.from(this.$refs.items.querySelectorAll(":scope > li > div"))
         : [];
     },
     setActive() {

data/app/assets/lookbook/js/components/page.js

@@ -1,5 +1,21 @@
 import createSocket from "../lib/socket";
 
+const morphOpts = {
+  key(el) {
+    return el.getAttribute("key") ? el.getAttribute("key") : el.id;
+  },
+  updating(el, toEl, childrenOnly, skip) {
+    if (
+      el.getAttribute &&
+      el.getAttribute("data-morph-strategy") === "replace"
+    ) {
+      el.innerHTML = toEl.innerHTML;
+      return skip();
+    }
+  },
+  lookahead: true,
+};
+
 export default function page() {
   return {
     init() {
@@ -22,11 +38,7 @@ export default function page() {
     },
     morph(dom) {
       const pageHtml = dom.getElementById(this.$root.id).outerHTML;
-      Alpine.morph(this.$root, pageHtml, {
-        key(el) {
-          return el.getAttribute("key") ? el.getAttribute("key") : el.id;
-        },
-      });
+      Alpine.morph(this.$root, pageHtml, morphOpts);
       this.$dispatch("page:morphed");
     },
   };

data/app/assets/lookbook/js/components/param.js

@@ -1,18 +1,34 @@
-export default function param() {
+import debounce from "debounce";
+
+export default function param(name, value, opts = {}) {
   return {
-    setFocus() {
-      if (this.$refs.input) {
-        setTimeout(() => this.$refs.input.focus(), 0);
+    name,
+    value,
+    updating: false,
+    init() {
+      if (opts.debounce) {
+        this.$watch(
+          "value",
+          debounce(() => this.updateIfValid(), opts.debounce)
+        );
+      } else {
+        this.$watch("value", () => this.updateIfValid());
       }
     },
-    update(name, value) {
+    setFocus() {
+      setTimeout(() => this.$root.focus(), 0);
+    },
+    updateIfValid() {
+      if (this.validate()) this.update();
+    },
+    update() {
       const searchParams = new URLSearchParams(window.location.search);
-      searchParams.set(name, value);
+      searchParams.set(this.name, this.value);
       const path = location.href.replace(location.search, "");
       this.setLocation(`${path}?${searchParams.toString()}`);
     },
     validate() {
-      return this.$el.reportValidity ? this.$el.reportValidity() : true;
+      return this.$root.reportValidity ? this.$root.reportValidity() : true;
     },
   };
 }

data/app/assets/lookbook/js/components/preview-window.js

@@ -1,37 +1,106 @@
 export default function preview() {
   return {
-    onResize(e) {
-      const size =
-        this.resizeStartSize - (this.resizeStartPosition - e.pageX) * 2;
-      const parentSize = this.$root.parentElement.clientWidth;
-      const percentSize = (Math.round(size) / parentSize) * 100;
-      const minWidth = (300 / parentSize) * 100;
-      this.$store.inspector.preview.width = `${Math.min(
-        Math.max(percentSize, minWidth),
-        100
-      )}%`;
+    get store() {
+      return this.$store.inspector.preview;
     },
-    onResizeStart(e) {
+    get maxWidth() {
+      return this.store.width === "100%" ? "100%" : `${this.store.width}px`;
+    },
+    get maxHeight() {
+      return this.store.height === "100%" ? "100%" : `${this.store.height}px`;
+    },
+    get parentWidth() {
+      return Math.round(this.$root.parentElement.clientWidth);
+    },
+    get parentHeight() {
+      return Math.round(this.$root.parentElement.clientHeight);
+    },
+    start() {
       this.$store.layout.reflowing = true;
-      this.onResize = this.onResize.bind(this);
-      this.onResizeEnd = this.onResizeEnd.bind(this);
-      this.resizeStartPosition = e.pageX;
-      this.resizeStartSize = this.$root.clientWidth;
-      window.addEventListener("pointermove", this.onResize);
-      window.addEventListener("pointerup", this.onResizeEnd);
-    },
-    onResizeEnd() {
-      window.removeEventListener("pointermove", this.onResize);
-      window.removeEventListener("pointerup", this.onResizeEnd);
+      this.store.resizing = true;
+    },
+    end() {
       this.$store.layout.reflowing = false;
+      this.store.resizing = false;
+    },
+    onResizeStart(e) {
+      this.onResizeWidthStart(e);
+      this.onResizeHeightStart(e);
+    },
+    toggleFullSize() {
+      const { height, width } = this.store;
+      if (height === "100%" && width === "100%") {
+        this.toggleFullHeight();
+        this.toggleFullWidth();
+      } else {
+        if (height !== "100%") this.toggleFullHeight();
+        if (width !== "100%") this.toggleFullWidth();
+      }
+    },
+    onResizeWidth(e) {
+      const width =
+        this.resizeStartWidth - (this.resizeStartPositionX - e.pageX) * 2;
+      const boundedWidth = Math.min(
+        Math.max(Math.round(width), 200),
+        this.parentWidth
+      );
+      this.store.width =
+        boundedWidth === this.parentWidth ? "100%" : boundedWidth;
+    },
+    onResizeWidthStart(e) {
+      this.start();
+      this.onResizeWidth = this.onResizeWidth.bind(this);
+      this.onResizeWidthEnd = this.onResizeWidthEnd.bind(this);
+      this.resizeStartPositionX = e.pageX;
+      this.resizeStartWidth = this.$root.clientWidth;
+      window.addEventListener("pointermove", this.onResizeWidth);
+      window.addEventListener("pointerup", this.onResizeWidthEnd);
+    },
+    onResizeWidthEnd() {
+      window.removeEventListener("pointermove", this.onResizeWidth);
+      window.removeEventListener("pointerup", this.onResizeWidthEnd);
+      this.end();
     },
     toggleFullWidth() {
-      const preview = this.$store.inspector.preview;
-      if (preview.width === "100%" && preview.lastWidth) {
-        preview.width = preview.lastWidth;
+      const { width, lastWidth } = this.store;
+      if (width === "100%" && lastWidth) {
+        this.store.width = lastWidth;
+      } else {
+        this.store.lastWidth = width;
+        this.store.width = "100%";
+      }
+    },
+    onResizeHeight(e) {
+      const height =
+        this.resizeStartHeight - (this.resizeStartPositionY - e.pageY);
+      const boundedHeight = Math.min(
+        Math.max(Math.round(height), 200),
+        this.parentHeight
+      );
+      this.$store.inspector.preview.height =
+        boundedHeight === this.parentHeight ? "100%" : boundedHeight;
+    },
+    onResizeHeightStart(e) {
+      this.start();
+      this.onResizeHeight = this.onResizeHeight.bind(this);
+      this.onResizeHeightEnd = this.onResizeHeightEnd.bind(this);
+      this.resizeStartPositionY = e.pageY;
+      this.resizeStartHeight = this.$root.clientHeight;
+      window.addEventListener("pointermove", this.onResizeHeight);
+      window.addEventListener("pointerup", this.onResizeHeightEnd);
+    },
+    onResizeHeightEnd() {
+      window.removeEventListener("pointermove", this.onResizeHeight);
+      window.removeEventListener("pointerup", this.onResizeHeightEnd);
+      this.end();
+    },
+    toggleFullHeight() {
+      const { height, lastHeight } = this.store;
+      if (height === "100%" && lastHeight) {
+        this.store.height = lastHeight;
       } else {
-        preview.lastWidth = preview.width;
-        preview.width = "100%";
+        this.store.lastHeight = height;
+        this.store.height = "100%";
       }
     },
   };

data/app/assets/lookbook/js/components/tabs.js

@@ -0,0 +1,50 @@
+import tippy from "tippy.js";
+
+export default function tabs() {
+  return {
+    width: 0,
+    tabsWidth: 0,
+    init() {
+      const ro = new ResizeObserver((entries) => {
+        this.width = Math.round(entries[0].contentRect.width);
+      });
+      ro.observe(this.$refs.tabs);
+      this.dropdown = tippy(this.$refs.toggle, {
+        allowHTML: true,
+        interactive: true,
+        trigger: "click",
+        placement: "bottom-end",
+        theme: "menu",
+        content: this.$refs.dropdown,
+      });
+    },
+    get tabs() {
+      return Array.from(this.$refs.tabs.querySelectorAll(":scope > a"));
+    },
+    get visibleTabCount() {
+      let cumulativeWidth = 0;
+      for (let i = 0; i < this.tabs.length; i++) {
+        const el = this.tabs[i];
+        const margin = parseInt(
+          window
+            .getComputedStyle(el)
+            .getPropertyValue("margin-left")
+            .replace("px", ""),
+          10
+        );
+        cumulativeWidth += el.clientWidth + margin;
+        if (cumulativeWidth > this.width) {
+          this.tabsWidth = cumulativeWidth - el.clientWidth;
+          return i;
+        }
+      }
+      return this.tabs.length;
+    },
+    get hiddenTabs() {
+      return this.tabs.slice(this.visibleTabCount, -1);
+    },
+    hideDropdown() {
+      this.dropdown.hide();
+    },
+  };
+}

data/app/assets/lookbook/js/config.js

@@ -3,12 +3,18 @@ export default {
   sidebar: {
     defaultWidth: 280,
     minWidth: 200,
-    maxWidth: 500,
+    maxWidth: 350,
   },
   inspector: {
-    tabs: {
-      default: "source",
+    drawer: {
+      orientation: "horizontal",
+      defaultPanel: "source",
       defaultHeight: 200,
+      defaultWidth: 500,
+      minWidth: 350,
+    },
+    preview: {
+      view: "preview",
     },
   },
 };

data/app/assets/lookbook/js/lib/socket.js

@@ -10,7 +10,7 @@ export default function socket(endpoint) {
         received: debounce((data) => {
           console.log("Lookbook files changed");
           callback(data);
-        }, 300),
+        }, 200),
         connected() {
           console.log("Lookbook websocket connected");
         },

data/app/assets/lookbook/js/stores/inspector.js

@@ -1,17 +1,24 @@
 import config from "../config";
 
 export default function createInspectorStore(Alpine) {
-  const { tabs } = config.inspector;
+  const { drawer, preview } = config.inspector;
   return {
-    panels: {
-      active: Alpine.$persist(tabs.default).as("inspector-panel-active"),
-      height: Alpine.$persist(tabs.defaultHeight).as("inspector-height"),
+    drawer: {
+      hidden: Alpine.$persist(false).as("drawer-hidden"),
+      orientation: Alpine.$persist(drawer.orientation).as("drawer-orientation"),
+      active: Alpine.$persist(drawer.defaultPanel).as("drawer-active"),
+      height: Alpine.$persist(drawer.defaultHeight).as("drawer-height"),
+      width: Alpine.$persist(drawer.defaultWidth).as("drawer-width"),
+      minWidth: drawer.minWidth,
+      visibleTabCount: Infinity,
     },
     preview: {
       width: Alpine.$persist("100%").as("preview-width"),
       height: Alpine.$persist("100%").as("preview-height"),
-      source: Alpine.$persist(false).as("preview-source"),
+      view: Alpine.$persist(preview.view).as("preview-view"),
       lastWidth: null,
+      lastHeight: null,
+      resizing: false,
     },
   };
 }

data/app/controllers/lookbook/app_controller.rb

@@ -27,7 +27,9 @@ module Lookbook
         begin
           set_params
           @examples = examples_data
-          @preview_srcdoc = render_examples(examples_data).gsub("\"", """)
+          @preview_srcdoc = if Lookbook.config.preview_srcdoc
+            render_examples(examples_data).gsub("\"", """)
+          end
           @panels = panels.filter { |name, panel| panel[:show] }
         rescue *EXCEPTIONS
           render "error"

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

@@ -13,7 +13,7 @@
       window.SOCKET_PATH = "<%= Lookbook::Engine.websocket_mount_path %>";
     </script>
   <% end %>
-  <script src="/lookbook-assets/js/app.js?v=<%= Lookbook::VERSION %>" defer></script>
+  <script src="/lookbook-assets/js/app.js?v=<%= Lookbook.version %>" defer></script>
   
   <title><%= [@example&.label, @preview&.label, "Lookbook"].compact.join(" :: ") %></title>
 </head>
@@ -44,9 +44,13 @@
       x-effect="$store.sidebar.width = Math.min(splits[0] || $store.sidebar.width, $store.sidebar.maxWidth)"
       x-cloak
     >
-      <div class="w-[9px] h-full bg-transparent hover:bg-indigo-100 hover:bg-opacity-20 transition absolute top-0 bottom-0 transform -translate-x-1/2 cursor-[col-resize] z-10"></div>
+      <div class="w-[9px] h-full bg-transparent hover:bg-indigo-100 hover:bg-opacity-20 transition absolute top-0 bottom-0 -translate-x-1/2 cursor-[col-resize] z-10"></div>
     </div>
-    <main id="main" class="h-full overflow-hidden w-full" x-show="$store.layout.desktop || !$store.sidebar.open" x-cloak>
+    <main
+      id="main"
+      class="h-full overflow-hidden w-full"
+      x-show="$store.layout.desktop || !$store.sidebar.open" x-cloak
+    >
       <%= yield %>
     </main>
   </div>