lookbook 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8ca9a9db0798d392083b4470397bf94260811a1f82f8b89dee0e5646fca156
-  data.tar.gz: 24fe83948823edd7387b11ca2ee5628f778a15034173491bfdfd20347d6b1484
+  metadata.gz: 18630747bc279477cc077cccfd3f2df3611d6d277c1140f1d63616cb9fc4cc4e
+  data.tar.gz: 40ca16f9e0f8ad6a44b93c7678700f728fdeaf149e1bc14cd36efd17a2c58b8b
 SHA512:
-  metadata.gz: 1463db9307bc67d9224a4a96f21ee404902fe0e266b40b0456c84e551a26b96a779e816f2780b5c1ea30189b8d94e3e5dfc16ab6d2f0b3df3a0e06d8f2705282
-  data.tar.gz: ea867f97d2cb0d532e59c3c62de31405dca1fe29e7f9ade020fe6b7eb2cb3d2b04d16d7b110e3479eaa54316d6df9ba3328594c73c659e37f6c513867325ad54
+  metadata.gz: 8c13c64ca2591b32c832efbd7624106562990e2eda63bb1260af07ac1ed26727d1f716751b43a82470b638158374e16fa5128871d6f6a656c9fca59c2f00669f
+  data.tar.gz: 6ccd1a92b40b72734a27568a6461158cffd59ca0a6d87eb4f997453ce3a60fa30face2b0cbe1ed83facc181b9d1c6b6373559e32fd6c0d026406c024b09be309

data/app/components/lookbook/nav/directory/component.html.erb

@@ -1,10 +1,12 @@
 <%= render_component_tag :li,
   id: id,
+  key: "#{id}-directory",
   class: "list-none",
   "x-show": "!filteredOut",
   data: { "entity-type": :directory },
   cloak: true do %>
   <%= lookbook_tag :button,
+    key: "#{id}-action",
     class: "nav-action",
     style: "padding-left: #{left_pad}px",
     "x-bind": "bindings.toggle" do %>

data/app/components/lookbook/nav/entity/component.html.erb

@@ -1,11 +1,13 @@
 <%= render_component_tag :li,
   id: id,
+  key: "#{id}-entity-#{type}",
   class: "list-none",
   "x-show": "!filteredOut",
   data: { "entity-type": type },
   cloak: true do %>
   <%= lookbook_tag href.present? ? :a : :button,
     href: href,
+    key: "#{id}-action",
     class: "nav-action",
     style: "padding-left: #{left_pad}px",
     "x-bind": "bindings.#{href.present? ? "link" : "toggle"}" do %>

data/app/components/lookbook/nav/entity/component.rb

@@ -8,7 +8,7 @@ module Lookbook
     }.freeze
 
     def nav_icon
-      ICONS[type] || :file
+      ICONS[collapsed? ? :preview : node.type] || :file
     end
 
     def href

data/app/components/lookbook/nav/item/component.rb

@@ -19,7 +19,7 @@ module Lookbook
     end
 
     def children
-      @children ||= node.map { |node| render_item(node) }
+      @children ||= node.sort.map { |node| render_item(node) }
     end
 
     def nav_icon

data/lib/lookbook/entities/collections/concerns/hierarchical_collection.rb

@@ -18,10 +18,6 @@ module Lookbook
           entities.append(node.content? ? node.content : collect_ordered_entities(node))
         end.flatten
       end
-
-      def sort_entities
-        @entities.sort_by! { |entity| [entity.depth, entity.position, entity.label] }
-      end
     end
   end
 end

data/lib/lookbook/entities/collections/entity_collection.rb

@@ -12,53 +12,48 @@ module Lookbook
       add(entities)
     end
 
-    def add(entities = nil)
-      Array(entities).each do |entity|
+    def add(to_add = nil)
+      Array(to_add).each do |entity|
         unless find_by_path(entity.path)
-          clear_cache
           @entities.push(entity)
         end
       end
-      sort_entities
+      clear_cache
     end
 
     def find_by_id(id)
       id = Utils.id(id)
-      find { |entity| entity.id == id }
+      entities.find { |entity| entity.id == id }
     end
 
     def find_by_path(path)
-      find { |entity| entity.path.to_s == path.to_s }
+      entities.find { |entity| entity.path.to_s == path.to_s }
     end
 
     def next(entity)
-      index = find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.path == entity.path }
       entities[index + 1] unless index.nil?
     end
 
     def previous(entity)
-      index = find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.path == entity.path }
       entities[index - 1] if !index.nil? && index > 0
     end
 
     def each(&block)
       if block
-        entities.each { |entity| yield entity }
+        entities.sort.each { |entity| yield entity }
       else
         to_enum(:each)
       end
     end
 
     def flat_map(...)
-      map(...).map(&:to_a).flatten
+      entities.map(...).map(&:to_a).flatten
     end
 
     protected
 
-    def sort_entities
-      @entities.sort_by! { |entity| [entity.label] }
-    end
-
     def clear_cache
       @_cache = {}
     end

data/lib/lookbook/entities/collections/preview_example_collection.rb

@@ -1,9 +1,4 @@
 module Lookbook
   class PreviewExampleCollection < EntityCollection
-    protected
-
-    def sort_entities
-      @entities.sort_by!(&:label) if Lookbook.config.sort_examples
-    end
   end
 end

data/lib/lookbook/entities/concerns/navigable.rb

@@ -12,16 +12,32 @@ module Lookbook
       end
 
       def position
-        if @position_prefixes && respond_to?(:file_name)
-          PositionPrefixParser.call(file_name).first || 10000
+        return @_position if @_position
+
+        pos = if @position_prefixes && respond_to?(:file_name)
+          PositionPrefixParser.call(file_name).first || default_position
         else
-          fetch_config(:position, 10000)
+          fetch_config(:position, default_position)
         end
+
+        @_position ||= pos.to_i
       end
 
       def depth
         path.split("/").size
       end
+
+      def default_position
+        @default_position || 10000
+      end
+
+      def <=>(other)
+        if respond_to?(:sort_handler, true)
+          sort_handler(other)
+        else
+          [position, label] <=> [other.position, other.label]
+        end
+      end
     end
   end
 end

data/lib/lookbook/entities/entity.rb

@@ -1,5 +1,6 @@
 module Lookbook
   class Entity
+    include Comparable
     include Lookbook::Engine.routes.url_helpers
 
     def initialize(lookup_path = nil)
@@ -36,6 +37,10 @@ module Lookbook
       @_type ||= self.class.name.demodulize.underscore.downcase.to_sym
     end
 
+    def <=>(other)
+      label <=> other.label
+    end
+
     alias_method :path, :lookup_path
     alias_method :logical_path, :lookup_path
 

data/lib/lookbook/entities/preview.rb

@@ -81,7 +81,7 @@ module Lookbook
     def example_entities
       public_methods = preview_class.public_instance_methods(false)
       method_objects = code_object.meths.select { |m| public_methods.include?(m.name) }
-      method_objects.map { |code_object| PreviewExample.new(code_object, self) }
+      method_objects.map.with_index { |code_object, i| PreviewExample.new(code_object, self, position: i) }
     end
   end
 end

data/lib/lookbook/entities/preview_example.rb

@@ -8,9 +8,10 @@ module Lookbook
 
     attr_reader :preview
 
-    def initialize(code_object, preview)
+    def initialize(code_object, preview, position: nil)
       @code_object = code_object
       @preview = preview
+      @default_position = position
       @lookup_path = "#{parent.lookup_path}/#{name}"
     end
 
@@ -65,6 +66,14 @@ module Lookbook
 
     protected
 
+    def sort_handler(other_entity)
+      if Lookbook.config.sort_examples
+        label <=> other_entity.label
+      else
+        [position, label] <=> [other_entity.position, other_entity.label]
+      end
+    end
+
     def format_source(source)
       source.sub(/^def \w+\s?(\([^)]+\))?/m, "").split("\n")[0..-2].join("\n")
     end

data/lib/lookbook/services/data/resolvers/file_resolver.rb

@@ -22,7 +22,7 @@ module Lookbook
     end
 
     def resolve_path(path, base_dir)
-      path.start_with?(".") ? File.expand_path(path, base_dir) : Rails.root.join(path)
+      Pathname(path.start_with?(".") ? File.expand_path(path, base_dir) : Rails.root.join(path))
     end
   end
 end

data/lib/lookbook/support/tree_node.rb

@@ -1,6 +1,7 @@
 module Lookbook
   class TreeNode
     include Enumerable
+    include Comparable
 
     delegate_missing_to :content
 
@@ -40,7 +41,6 @@ module Lookbook
 
     def add_child(name, content = nil, position: 10000)
       children << TreeNode.new("#{path}/#{name}", content, position: position)
-      sort_children
     end
 
     def has_child?(name)
@@ -57,7 +57,7 @@ module Lookbook
 
     def each(&block)
       if block
-        children.each do |child|
+        children.sort.each do |child|
           yield child
         end
       else
@@ -65,6 +65,14 @@ module Lookbook
       end
     end
 
+    def <=>(other)
+      if content?
+        content <=> (other.content? ? other.content : other)
+      else
+        [position, label] <=> [other.position, other.label]
+      end
+    end
+
     protected
 
     def content_value(method_name, fallback = nil)
@@ -72,10 +80,6 @@ module Lookbook
       value || fallback
     end
 
-    def sort_children
-      @children.sort_by! { |child| [child.position, child.label] }
-    end
-
     def segments
       path.split("/")
     end

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

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

@@ -7705,7 +7705,7 @@ function $5439cede634b2921$var$toCamel(s) {
 }
 
 
-var $4ae691aa3fe187ba$exports = {};
+var $068816311f4006ce$exports = {};
 var $cbd28b10fa9798c7$exports = {};
 
 $parcel$defineInteropFlag($cbd28b10fa9798c7$exports);
@@ -11327,6 +11327,31 @@ function $e398acaded942bbe$export$2e2bcd8739ae039(targetSelector) {
 }
 
 
+var $e9904a14dabf652d$exports = {};
+
+$parcel$defineInteropFlag($e9904a14dabf652d$exports);
+
+$parcel$export($e9904a14dabf652d$exports, "default", () => $e9904a14dabf652d$export$2e2bcd8739ae039);
+function $e9904a14dabf652d$export$2e2bcd8739ae039(store) {
+    return {
+        focussed: false,
+        get active () {
+            return store.active;
+        },
+        get text () {
+            return store.text;
+        },
+        clear () {
+            if (store.raw === "") this.$refs.input.blur();
+            else store.raw = "";
+        },
+        focus () {
+            this.$refs.input.focus();
+        }
+    };
+}
+
+
 var $e1f51f020443edd4$exports = {};
 
 $parcel$defineInteropFlag($e1f51f020443edd4$exports);
@@ -12201,43 +12226,6 @@ function $e1f51f020443edd4$export$2e2bcd8739ae039(id, embedStore) {
 }
 
 
-var $e9904a14dabf652d$exports = {};
-
-$parcel$defineInteropFlag($e9904a14dabf652d$exports);
-
-$parcel$export($e9904a14dabf652d$exports, "default", () => $e9904a14dabf652d$export$2e2bcd8739ae039);
-function $e9904a14dabf652d$export$2e2bcd8739ae039(store) {
-    return {
-        focussed: false,
-        get active () {
-            return store.active;
-        },
-        get text () {
-            return store.text;
-        },
-        clear () {
-            if (store.raw === "") this.$refs.input.blur();
-            else store.raw = "";
-        },
-        focus () {
-            this.$refs.input.focus();
-        }
-    };
-}
-
-
-var $36506012e0c6e9e3$exports = {};
-
-$parcel$defineInteropFlag($36506012e0c6e9e3$exports);
-
-$parcel$export($36506012e0c6e9e3$exports, "default", () => $36506012e0c6e9e3$export$2e2bcd8739ae039);
-function $36506012e0c6e9e3$export$2e2bcd8739ae039(iconName) {
-    return {
-        iconName: iconName
-    };
-}
-
-
 var $d92d9d5253f84566$exports = {};
 
 $parcel$defineInteropFlag($d92d9d5253f84566$exports);
@@ -12282,6 +12270,18 @@ function $d92d9d5253f84566$export$2e2bcd8739ae039(store) {
 }
 
 
+var $36506012e0c6e9e3$exports = {};
+
+$parcel$defineInteropFlag($36506012e0c6e9e3$exports);
+
+$parcel$export($36506012e0c6e9e3$exports, "default", () => $36506012e0c6e9e3$export$2e2bcd8739ae039);
+function $36506012e0c6e9e3$export$2e2bcd8739ae039(iconName) {
+    return {
+        iconName: iconName
+    };
+}
+
+
 var $506dabb2bf255b38$exports = {};
 
 $parcel$defineInteropFlag($506dabb2bf255b38$exports);
@@ -13078,15 +13078,15 @@ function $6d64716f0b34fdf4$export$2e2bcd8739ae039(store) {
 }
 
 
-$4ae691aa3fe187ba$exports = {
+$068816311f4006ce$exports = {
     "button": $cbd28b10fa9798c7$exports,
     "code": $99486586f6691564$exports,
     "copy_button": $47a1c62621be0c54$exports,
     "dimensions_display": $e398acaded942bbe$exports,
-    "embed": $e1f51f020443edd4$exports,
     "filter": $e9904a14dabf652d$exports,
-    "icon": $36506012e0c6e9e3$exports,
+    "embed": $e1f51f020443edd4$exports,
     "nav": $d92d9d5253f84566$exports,
+    "icon": $36506012e0c6e9e3$exports,
     "split_layout": $506dabb2bf255b38$exports,
     "tabs": $0db07828cadc68e0$exports,
     "tab_panels": $a87dacf5139b5e2f$exports,
@@ -13379,7 +13379,7 @@ const $d73574cc5e9b9e72$var$prefix = window.APP_NAME;
 // Components
 (0, $caa9439642c6336c$export$2e2bcd8739ae039).data("app", (0, $d709d0f4027033b2$export$2e2bcd8739ae039));
 [
-    $4ae691aa3fe187ba$exports,
+    $068816311f4006ce$exports,
     $fe98e3f2bf49b28f$exports,
     $6c10158820e535ef$exports
 ].forEach((scripts)=>{