protos 0.6.0 → 1.0.0

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/popover.rb

@@ -12,6 +12,9 @@ module Protos
     # Tippy.js options can be passed in via the `options` attribute or, more
     # conveniently by the typed options listed below.
 
+    autoload :Trigger, "protos/popover/trigger"
+    autoload :Content, "protos/popover/content"
+
     Positions = Types::Coercible::Symbol.enum(
       :top,
       :top_start,
@@ -52,33 +55,33 @@ module Protos
     )
 
     option :position,
-           type: Positions,
-           default: -> { :top },
-           reader: false
+      type: Positions,
+      default: -> { :top },
+      reader: false
     option :animation,
-           type: Animations,
-           default: -> { :fade },
-           reader: false
+      type: Animations,
+      default: -> { :fade },
+      reader: false
     option :duration,
-           type: Types::Integer | Types::Array.of(Types::Integer),
-           default: -> { [300, 250] },
-           reader: false
+      type: Types::Integer | Types::Array.of(Types::Integer),
+      default: -> { [300, 250] },
+      reader: false
     option :hide_on_click,
-           type: Types::Bool | Types.Value(:toggle),
-           default: -> { true },
-           reader: false
+      type: Types::Bool | Types.Value(:toggle),
+      default: -> { true },
+      reader: false
     option :z_index,
-           type: Types::Integer,
-           default: -> { 9999 },
-           reader: false
+      type: Types::Integer,
+      default: -> { 9999 },
+      reader: false
     option :options,
-           default: -> { {} },
-           reader: false,
-           type: Types::Hash
+      default: -> { {} },
+      reader: false,
+      type: Types::Hash
     option :trigger,
-           default: -> { %i[mouseenter focus] },
-           reader: false,
-           type: Triggers | Types::Array.of(Triggers)
+      default: -> { %i[mouseenter focus] },
+      reader: false,
+      type: Triggers | Types::Array.of(Triggers)
 
     def view_template(&)
       div(**attrs, &)

data/lib/protos/stats.rb

@@ -5,6 +5,13 @@ module Protos
     # DOCS: Stats component that contains a collection of stats
     # https://daisyui.com/components/stat/
 
+    autoload :Actions, "protos/stats/actions"
+    autoload :Description, "protos/stats/description"
+    autoload :Figure, "protos/stats/figure"
+    autoload :Stat, "protos/stats/stat"
+    autoload :Title, "protos/stats/title"
+    autoload :Value, "protos/stats/value"
+
     def view_template(&)
       div(**attrs, &)
     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/steps.rb

@@ -5,6 +5,8 @@ module Protos
     # DOCS: Steps can be used to show a list of steps in a process.
     # https://daisyui.com/components/steps/
 
+    autoload :Step, "protos/steps/step"
+
     option :vertical, type: Types::Bool, default: -> { false }
 
     def view_template(&)
@@ -17,10 +19,10 @@ module Protos
 
     def theme
       {
-        container: tokens(
+        container: [
           "steps",
-          vertical: "steps-vertical"
-        )
+          ("steps-vertical" if vertical)
+        ]
       }
     end
   end

data/lib/protos/swap.rb

@@ -6,6 +6,9 @@ module Protos
     # display different content.
     # https://daisyui.com/components/swap/
 
+    autoload :On, "protos/swap/on"
+    autoload :Off, "protos/swap/off"
+
     def view_template
       label(**attrs) do
         input(

data/lib/protos/table/caption.rb

@@ -5,15 +5,17 @@ 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"
       }.freeze
 
       option :side,
-             reader: false,
-             type: Types::Coercible::Symbol.enum(:bottom, :top),
-             default: -> { :bottom }
+        reader: false,
+        type: Sides,
+        default: -> { :bottom }
 
       def view_template(&)
         caption(**attrs, &)

data/lib/protos/table/cell.rb

@@ -12,9 +12,9 @@ module Protos
       }.freeze
 
       option :align,
-             type: Types::Coercible::Symbol.enum(:left, :center, :right),
-             reader: false,
-             default: -> { :left }
+        type: Types::Coercible::Symbol.enum(:left, :center, :right),
+        reader: false,
+        default: -> { :left }
 
       def view_template(&)
         td(**attrs, &)

data/lib/protos/table/head.rb

@@ -12,9 +12,9 @@ module Protos
       }.freeze
 
       option :align,
-             type: Types::Coercible::Symbol.enum(:left, :center, :right),
-             reader: false,
-             default: -> { :left }
+        type: Types::Coercible::Symbol.enum(:left, :center, :right),
+        reader: false,
+        default: -> { :left }
 
       def view_template(&)
         th(**attrs, &)

data/lib/protos/table.rb

@@ -5,6 +5,21 @@ module Protos
     # DOCS: A table component
     # https://daisyui.com/components/table/
 
+    autoload :Caption, "protos/table/caption"
+    autoload :Header, "protos/table/header"
+    autoload :Head, "protos/table/head"
+    autoload :Body, "protos/table/body"
+    autoload :Footer, "protos/table/footer"
+    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",
@@ -16,14 +31,9 @@ module Protos
     option :pin_columns, default: -> { false }, type: Types::Bool
     option :striped, default: -> { false }, type: Types::Bool
     option :size,
-           default: -> { :md },
-           reader: false,
-           type: Types::Coercible::Symbol.enum(
-             :xs,
-             :sm,
-             :md,
-             :lg
-           )
+      default: -> { :md },
+      reader: false,
+      type: Sizes
 
     def view_template(&block)
       div(**attrs) do
@@ -54,13 +64,13 @@ module Protos
     def theme
       {
         container: "w-full overflow-x-auto",
-        table: tokens(
+        table: [
           "table",
           size,
-          pin_rows: "table-pin-rows",
-          pin_columns: "table-pin-columns",
-          striped: "table-striped"
-        )
+          ("table-pin-rows" if pin_rows),
+          ("table-pin-columns" if pin_columns),
+          ("table-striped" if striped)
+        ]
       }
     end
   end

data/lib/protos/tabs/tab.rb

@@ -22,11 +22,11 @@ module Protos
 
       def theme
         {
-          container: tokens(
+          container: [
             "tab",
-            disabled: "tab-disabled",
-            active: "tab-active"
-          )
+            ("tab-disabled" if disabled),
+            ("tab-active" if active)
+          ]
         }
       end
     end

data/lib/protos/tabs.rb

@@ -5,6 +5,29 @@ module Protos
     # DOCS: A component that contains many Protos::Tab components
     # https://daisyui.com/components/tab/
 
+    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",
@@ -13,23 +36,13 @@ module Protos
     }.freeze
 
     option :type,
-           default: -> { :default },
-           reader: false,
-           type: Types::Coercible::Symbol.enum(
-             :default,
-             :boxed,
-             :bordered,
-             :lifted
-           )
+      default: -> { :default },
+      reader: false,
+      type: Styles
     option :size,
-           default: -> { :md },
-           reader: false,
-           type: Types::Coercible::Symbol.enum(
-             :xs,
-             :sm,
-             :md,
-             :lg
-           )
+      default: -> { :md },
+      reader: false,
+      type: Sizes
 
     def view_template(&)
       div(**attrs, &)
@@ -44,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,30 +9,40 @@ module Protos
 
     class << self
       def merger
-        @merger ||= TailwindMerge::Merger.new
+        # 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
 
-    def [](key)
-      return nil unless key?(key)
+    # 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.instance_of?(Symbol) }
+      values = @theme.values_at(*symbols).map!(&:to_s).reject(&:empty?)
+      values.concat(strings) unless strings.empty?
 
-      value = @theme[key].to_s
-      return nil if value.empty?
-      return value unless @tailwind_merge
+      return nil if values.empty?
+      return values unless @should_merge
 
-      self.class.merger.merge(value)
+      self.class.merger.merge(values)
     end
 
     def key?(key)
@@ -46,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/timeline.rb

@@ -5,6 +5,11 @@ module Protos
     # DOCS: A timeline component
     # https://daisyui.com/components/timeline/
 
+    autoload :Item, "protos/timeline/item"
+    autoload :Left, "protos/timeline/left"
+    autoload :Center, "protos/timeline/center"
+    autoload :Right, "protos/timeline/right"
+
     option :vertical, type: Types::Bool, default: -> { false }
 
     def view_template(&)
@@ -23,10 +28,10 @@ module Protos
 
     def theme
       {
-        container: tokens(
+        container: [
           "timeline",
-          vertical: "timeline-vertical"
-        )
+          ("timeline-vertical" if vertical)
+        ]
       }
     end
   end

data/lib/protos/toast.rb

@@ -6,6 +6,8 @@ module Protos
     # that popup at a fixed position on the screen.
     # https://daisyui.com/components/toast/
 
+    autoload :CloseButton, "protos/toast/close_button"
+
     Positions = Types::Symbol.enum(
       :top_start,
       :top_center,
@@ -31,9 +33,9 @@ module Protos
     }.freeze
 
     option :position,
-           type: Positions,
-           default: -> { :bottom_end },
-           reader: false
+      type: Positions,
+      default: -> { :bottom_end },
+      reader: false
 
     def view_template(&)
       dialog(**attrs, &)

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/typography/paragraph.rb

@@ -15,10 +15,10 @@ module Protos
 
       def theme
         {
-          container: tokens(
+          container: [
             "leading-relaxed",
-            margin: "[&:not(:first-child)]:mt-sm"
-          )
+            ("[&:not(:first-child)]:mt-sm" if margin)
+          ]
         }
       end
     end

data/lib/protos/typography.rb

@@ -5,6 +5,10 @@ module Protos
     # DOCS: The core typography module that can be mixedin to override the
     # default elements with custom elements.
 
+    autoload :Heading, "protos/typography/heading"
+    autoload :Paragraph, "protos/typography/paragraph"
+    autoload :InlineLink, "protos/typography/inline_link"
+
     def h1(**, &)
       render Heading.new(level: 1, size: :xl, **, &)
     end

data/lib/protos/version.rb

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