protos 0.7.0 → 1.0.0

data/lib/protos/diff.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Protos
+  class Diff < Component
+    autoload :Item, "protos/diff/item"
+    autoload :Resizer, "protos/diff/resizer"
+
+    def view_template(&)
+      figure(**attrs, &)
+    end
+
+    def item_one(*, **, &) = render Item.new(*, order: :one, **, &)
+    def item_two(*, **, &) = render Item.new(*, order: :two, **, &)
+    def resizer(...) = render Resizer.new(...)
+
+    private
+
+    def default_attrs
+      {
+        tabindex: 0
+      }
+    end
+
+    def theme
+      {
+        container: "diff"
+      }
+    end
+  end
+end

data/lib/protos/dropdown/menu.rb

@@ -8,8 +8,8 @@ module Protos
       # dropdowns comes from there.
 
       def view_template(&block)
-        template_tag(**template_attrs) do
-          ul(**attrs, &block)
+        template(**template_attrs) do
+          render ::Protos::Menu.new(**attrs, &block)
         end
       end
 
@@ -18,11 +18,8 @@ module Protos
       def theme
         {
           container: %w[
-            menu
             dropdown-content
             z-10
-            bg-base-100
-            rounded-box
           ]
         }
       end

data/lib/protos/list/item.rb

@@ -7,6 +7,9 @@ module Protos
       # work for list items, including border radius. E.g. only the first and
       # last items will have border radius on the top and bottom.
 
+      option :wrap, Types::Bool, default: -> { false }, reader: :private
+      option :grow, Types::Bool, default: -> { false }, reader: :private
+
       def view_template(&)
         li(**attrs, &)
       end
@@ -15,9 +18,10 @@ module Protos
 
       def theme
         {
-          container: %w[
-            join-item
-            [&:not(:first-child)]:border-t-0
+          container: [
+            "list-row",
+            ("list-col-wrap" if wrap),
+            ("list-col-grow" if grow)
           ]
         }
       end

data/lib/protos/list.rb

@@ -19,7 +19,7 @@ module Protos
 
     def theme
       {
-        container: "join join-vertical"
+        container: "list"
       }
     end
 

data/lib/protos/menu/item.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Protos
+  class Menu
+    class Item < Component
+      option :title, type: Types::Bool, default: -> { false }
+
+      def view_template(&)
+        li(**attrs, &)
+      end
+
+      private
+
+      def theme
+        {
+          container: [
+            ("menu-title" if title)
+          ]
+        }
+      end
+    end
+  end
+end

data/lib/protos/menu.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Protos
+  class Menu < Component
+    # DOCS: A menu of links or actions.
+    # https://daisyui.com/components/menu/
+
+    Directions = Types::Coercible::Symbol.enum(:vertical, :horizontal)
+    Sizes = Types::Coercible::Symbol.enum(:xs, :sm, :md, :lg, :xl)
+
+    DIRECTIONS = {
+      vertical: "",
+      horizontal: "menu-horizontal"
+    }.freeze
+
+    SIZES = {
+      xs: "menu-xs",
+      sm: "menu-sm",
+      md: "menu-md",
+      lg: "menu-lg",
+      xl: "menu-xl"
+    }.freeze
+
+    autoload :Item, "protos/menu/item"
+
+    option :size,
+      type: Sizes,
+      default: -> { :md },
+      reader: :private
+
+    option :direction,
+      type: Directions,
+      default: -> { :vertical },
+      reader: :private
+
+    def view_template(&)
+      ul(**attrs, &)
+    end
+
+    def item(...)
+      render Item.new(...)
+    end
+
+    private
+
+    def theme
+      {
+        container: [
+          "menu",
+          DIRECTIONS[direction],
+          SIZES[size]
+        ]
+      }
+    end
+  end
+end

data/lib/protos/mix.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 module Protos
-  class Mix
+  module Mix
     # DOCS: This class is responsible for safely merging in both user supplied
     # and default attributes. When a user adds { data: { controller: "foo" }} to
     # their component. This will merge the value in so that any default
     # controllers do not get overridden.
 
-    MERGEABLE_ATTRIBUTES = Set.new(%i[class data]).freeze
+    module_function
 
-    def self.call(...) = new.call(...)
+    MERGEABLE_ATTRIBUTES = Set.new(%i[class data]).freeze
 
     def call(old_hash, *hashes)
       hashes
@@ -19,8 +19,6 @@ module Protos
         end
     end
 
-    private
-
     def merge(old_hash, new_hash, top_level: false) # rubocop:disable Metrics/PerceivedComplexity
       old_hash.merge!(new_hash) do |key, old, new|
         next old unless new

data/lib/protos/popover/content.rb

@@ -11,7 +11,7 @@ module Protos
       # TODO: Move away from using template
 
       def view_template(&block)
-        template_tag(**template_attrs) do
+        template(**template_attrs) do
           div(**attrs, &block)
         end
       end

data/lib/protos/status.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Protos
+  class Status < Component
+    STYLES = {
+      default: "",
+      accent: "status-accent",
+      error: "status-error",
+      info: "status-info",
+      neutral: "status-neutral",
+      primary: "status-primary",
+      secondary: "status-secondary",
+      success: "status-success",
+      warning: "status-warning"
+    }.freeze
+
+    Sizes = Types::Coercible::Symbol.enum(:xs, :sm, :md, :lg, :xl)
+
+    SIZES = {
+      xs: "status-xs",
+      sm: "status-sm",
+      md: "status-md",
+      lg: "status-lg",
+      xl: "status-xl"
+    }.freeze
+
+    option :type, type: Types::Styles, default: -> { :primary }
+    option :size, type: Sizes, default: -> { :md }
+
+    def view_template(&)
+      div(**attrs, &)
+    end
+
+    private
+
+    def theme
+      {
+        container: [
+          "status",
+          STYLES.fetch(@type),
+          SIZES.fetch(@size)
+        ]
+      }
+    end
+  end
+end

data/lib/protos/steps/step.rb

@@ -5,17 +5,6 @@ module Protos
     class Step < Protos::Component
       # DOCS: Step component that contains a single step in a list of steps
 
-      Styles = Types::Coercible::Symbol.enum(
-        :default,
-        :primary,
-        :secondary,
-        :accent,
-        :info,
-        :success,
-        :warning,
-        :error
-      )
-
       STYLES = {
         default: "",
         primary: "step-primary",
@@ -27,7 +16,7 @@ module Protos
         error: "step-error"
       }.freeze
 
-      option :type, reader: false, type: Styles, default: -> { :default }
+      option :type, reader: false, type: Types::Styles, default: -> { :default }
 
       def view_template(&)
         li(**attrs, &)

data/lib/protos/table/caption.rb

@@ -5,6 +5,8 @@ module Protos
     class Caption < Component
       # DOCS: The caption of a table
 
+      Sides = Types::Coercible::Symbol.enum(:bottom, :top)
+
       SIDES = {
         bottom: "caption-bottom",
         top: "caption-top"
@@ -12,7 +14,7 @@ module Protos
 
       option :side,
         reader: false,
-        type: Types::Coercible::Symbol.enum(:bottom, :top),
+        type: Sides,
         default: -> { :bottom }
 
       def view_template(&)

data/lib/protos/table.rb

@@ -13,6 +13,13 @@ module Protos
     autoload :Row, "protos/table/row"
     autoload :Cell, "protos/table/cell"
 
+    Sizes = Types::Coercible::Symbol.enum(
+      :xs,
+      :sm,
+      :md,
+      :lg
+    )
+
     SIZES = {
       xs: "table-xs",
       sm: "table-sm",
@@ -26,12 +33,7 @@ module Protos
     option :size,
       default: -> { :md },
       reader: false,
-      type: Types::Coercible::Symbol.enum(
-        :xs,
-        :sm,
-        :md,
-        :lg
-      )
+      type: Sizes
 
     def view_template(&block)
       div(**attrs) do

data/lib/protos/tabs.rb

@@ -7,6 +7,27 @@ module Protos
 
     autoload :Tab, "protos/tabs/tab"
 
+    Styles = Types::Coercible::Symbol.enum(
+      :default,
+      :boxed,
+      :bordered,
+      :lifted
+    )
+
+    Sizes = Types::Coercible::Symbol.enum(
+      :xs,
+      :sm,
+      :md,
+      :lg
+    )
+
+    STYLES = {
+      default: "",
+      bordered: "tabs-bordered",
+      boxed: "tabs-boxed",
+      lifted: "tabs-lifted"
+    }.freeze
+
     SIZES = {
       xs: "tabs-xs",
       sm: "tabs-sm",
@@ -17,21 +38,11 @@ module Protos
     option :type,
       default: -> { :default },
       reader: false,
-      type: Types::Coercible::Symbol.enum(
-        :default,
-        :boxed,
-        :bordered,
-        :lifted
-      )
+      type: Styles
     option :size,
       default: -> { :md },
       reader: false,
-      type: Types::Coercible::Symbol.enum(
-        :xs,
-        :sm,
-        :md,
-        :lg
-      )
+      type: Sizes
 
     def view_template(&)
       div(**attrs, &)
@@ -46,12 +57,7 @@ module Protos
     end
 
     def type
-      {
-        bordered: "tabs-bordered",
-        boxed: "tabs-boxed",
-        lifted: "tabs-lifted",
-        default: ""
-      }.fetch(@type)
+      STYLES.fetch(@type)
     end
 
     def default_attrs

data/lib/protos/tailwind_merge.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Protos
+  class TailwindMerge
+    DEFAULTS = ::TailwindMerge::Config::DEFAULTS
+    DAISY_CLASS_GROUPS = {
+      alert: [
+        alert: Protos::Alert::Styles.values.map(&:to_s)
+      ],
+      mask: [
+        mask: Protos::Avatar::MaskShapes.values.map(&:to_s)
+      ],
+      avatar: [
+        avatar: Protos::Avatar::Indicators.values.map(&:to_s)
+      ],
+      badge: [
+        badge: Protos::Badge::Styles.values.map(&:to_s)
+      ],
+      card: [
+        card: Protos::Card::Sizes.values.map(&:to_s)
+      ],
+      carousel: [
+        carousel: Protos::Carousel::Positions.values.map(&:to_s)
+      ],
+      "chat-bubble": [
+        { "chat-bubble": Protos::ChatBubble::Positions.values.map(&:to_s) },
+        {
+          "chat-bubble": Types::Styles.values.map(&:to_s)
+        }
+      ],
+      menu: [
+        menu: Protos::Menu::Sizes.values.map(&:to_s)
+      ],
+      table: [
+        table: Protos::Table::Sizes.values.map(&:to_s)
+      ],
+      tab: [
+        tab: Protos::Tabs::Sizes.values.map(&:to_s)
+      ],
+      caption: [
+        caption: Protos::Table::Caption::Sides.values.map(&:to_s)
+      ],
+      swap: [
+        swap: %w[on off]
+      ],
+      step: [
+        step: Types::Styles.values.map(&:to_s)
+      ]
+    }.freeze
+
+    def initialize
+      @merger = ::TailwindMerge::Merger.new(
+        config: DEFAULTS.merge(
+          ignore_empty_cache: true,
+          cache_size: 500,
+          class_groups: DEFAULTS[:class_groups].merge(DAISY_CLASS_GROUPS)
+        )
+      )
+    end
+
+    def merge(...)
+      @merger.merge(...)
+    end
+  end
+end

data/lib/protos/theme.rb

@@ -9,29 +9,38 @@ module Protos
 
     class << self
       def merger
-        @merger ||= TailwindMerge::Merger.new.freeze
+        # This could be a class variable to save memory for subclasses being
+        # used along side this class, but seeing as how its an
+        # internal class I don't see much benefit at the moment.
+        @merger ||= TailwindMerge.new
       end
     end
 
     def initialize(theme = {}, tailwind_merge: true, **kwargs)
-      @tailwind_merge = tailwind_merge
+      @should_merge = tailwind_merge
 
       @theme = Hash.new do |hash, key|
         hash[key] = TokenList.new
       end
 
+      return if kwargs.empty? && theme.empty?
+
       theme.merge!(kwargs).each do |key, value|
         @theme[key].add(value)
       end
     end
 
+    # Key can be a symbol or string, they will be merged together for the final
+    # css class.
+    # - A symbol will be used to fetch a `TokenList` from the theme at that key.
+    # - A string is used as a plain css value
     def [](*keys)
-      symbols, strings = keys.partition { |key| key.is_a?(Symbol) }
-      values = @theme.values_at(*symbols).join(" ")
-      values += " #{strings.join(" ")}" unless strings.empty?
+      symbols, strings = keys.partition { |key| key.instance_of?(Symbol) }
+      values = @theme.values_at(*symbols).map!(&:to_s).reject(&:empty?)
+      values.concat(strings) unless strings.empty?
 
       return nil if values.empty?
-      return values unless @tailwind_merge
+      return values unless @should_merge
 
       self.class.merger.merge(values)
     end
@@ -47,42 +56,34 @@ module Protos
     end
 
     def remove(key, value)
-      @theme[key].remove(value)
-      @theme.delete(key) if @theme[key].empty?
+      token_list = @theme[key].remove(value)
+      @theme.delete(key) if token_list.empty?
     end
 
     def set(key, value)
       return if value.nil?
 
-      @theme[key].clear.add(value)
+      if @theme.key?(key)
+        @theme[key].clear.add(value)
+      else
+        @theme[key].add(value)
+      end
     end
 
     def merge(hash)
       return self unless hash
 
       hash.each do |key, value|
-        if key?(key)
-          add(key, value)
-        elsif negation?(key)
-          remove(key[1..].to_sym, value)
-        elsif override?(key)
-          set(key[..-2].to_sym, value)
-        else
-          set(key, value)
-        end
+        next add(key, value) if key?(key.to_sym)
+        # Handle negation
+        next remove(key[1..].to_sym, value) if key.start_with?("!")
+        # handle override
+        next set(key[..-2].to_sym, value) if key.end_with?("!")
+
+        set(key.to_sym, value)
       end
 
       self
     end
-
-    private
-
-    def negation?(key)
-      key.start_with?("!")
-    end
-
-    def override?(key)
-      key.end_with?("!")
-    end
   end
 end

data/lib/protos/types.rb

@@ -3,5 +3,16 @@
 module Protos
   module Types
     include Dry.Types()
+
+    Styles = Types::Coercible::Symbol.enum(
+      :default,
+      :primary,
+      :secondary,
+      :accent,
+      :info,
+      :success,
+      :warning,
+      :error
+    )
   end
 end

data/lib/protos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Protos
-  VERSION = "0.7.0"
+  VERSION = "1.0.0"
 end

data/lib/protos.rb

@@ -16,6 +16,7 @@ module Protos
   autoload :Theme, "protos/theme"
   autoload :Mix, "protos/mix"
   autoload :Attributes, "protos/attributes"
+  autoload :TailwindMerge, "protos/tailwind_merge"
 
   # Components
   autoload :Accordion, "protos/accordion"
@@ -28,13 +29,16 @@ module Protos
   autoload :ChatBubble, "protos/chat_bubble"
   autoload :Collapse, "protos/collapse"
   autoload :Command, "protos/command"
+  autoload :Diff, "protos/diff"
   autoload :Drawer, "protos/drawer"
   autoload :Hero, "protos/hero"
   autoload :List, "protos/list"
+  autoload :Menu, "protos/menu"
   autoload :Modal, "protos/modal"
   autoload :Popover, "protos/popover"
   autoload :Stats, "protos/stats"
   autoload :Steps, "protos/steps"
+  autoload :Status, "protos/status"
   autoload :Swap, "protos/swap"
   autoload :Tabs, "protos/tabs"
   autoload :Table, "protos/table"

data/protos.gemspec

@@ -46,11 +46,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "dry-core", "~> 1.0"
-  spec.add_dependency "dry-initializer", "~> 3.1"
-  spec.add_dependency "dry-types", "~> 1.7"
-  spec.add_dependency "phlex", "~> 1.10"
-  spec.add_dependency "tailwind_merge", "~> 0.10"
+  spec.add_dependency "dry-initializer", "~> 3.2"
+  spec.add_dependency "dry-types", "~> 1.8"
+  spec.add_dependency "phlex", "~> 2"
+  spec.add_dependency "tailwind_merge", "~> 1"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html