From 7af1a89b1ab98a2a1aefe746ea4c2e970f3dd4b9 Mon Sep 17 00:00:00 2001 From: stephann <3025661+stephannv@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:31:29 -0300 Subject: [PATCH] Remove Phlex version conditionals --- lib/ruby_ui/alert_dialog/alert_dialog_content.rb | 2 +- lib/ruby_ui/base.rb | 9 --------- lib/ruby_ui/calendar/calendar_days.rb | 2 +- lib/ruby_ui/calendar/calendar_weekdays.rb | 2 +- lib/ruby_ui/codeblock/codeblock.rb | 14 +------------- lib/ruby_ui/command/command_dialog_content.rb | 2 +- lib/ruby_ui/context_menu/context_menu_content.rb | 2 +- lib/ruby_ui/dialog/dialog_content.rb | 2 +- lib/ruby_ui/hover_card/hover_card_content.rb | 2 +- lib/ruby_ui/sheet/sheet_content.rb | 2 +- 10 files changed, 9 insertions(+), 30 deletions(-) diff --git a/lib/ruby_ui/alert_dialog/alert_dialog_content.rb b/lib/ruby_ui/alert_dialog/alert_dialog_content.rb index eee13407..907c8f27 100644 --- a/lib/ruby_ui/alert_dialog/alert_dialog_content.rb +++ b/lib/ruby_ui/alert_dialog/alert_dialog_content.rb @@ -3,7 +3,7 @@ module RubyUI class AlertDialogContent < Base def view_template(&block) - all_template_tag(**attrs) do + template(**attrs) do div(data: {controller: "rbui--alert-dialog"}) do background container(&block) diff --git a/lib/ruby_ui/base.rb b/lib/ruby_ui/base.rb index 16ccc7db..8f66dc13 100644 --- a/lib/ruby_ui/base.rb +++ b/lib/ruby_ui/base.rb @@ -22,15 +22,6 @@ def before_template private - def all_template_tag(**attrs, &) - current_version = Gem.loaded_specs["phlex"].version - if current_version.segments[0] >= 2 - template(**attrs, &) - else - template_tag(**attrs, &) - end - end - def default_attrs {} end diff --git a/lib/ruby_ui/calendar/calendar_days.rb b/lib/ruby_ui/calendar/calendar_days.rb index 070de3a5..83954bfb 100644 --- a/lib/ruby_ui/calendar/calendar_days.rb +++ b/lib/ruby_ui/calendar/calendar_days.rb @@ -87,7 +87,7 @@ def render_other_month_date_template end def date_template(target, &block) - all_template_tag(data: {ruby_ui__calendar_target: target}) do + template(data: {ruby_ui__calendar_target: target}) do td( class: "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected])]:rounded-md", diff --git a/lib/ruby_ui/calendar/calendar_weekdays.rb b/lib/ruby_ui/calendar/calendar_weekdays.rb index 9aa4c64a..7853381b 100644 --- a/lib/ruby_ui/calendar/calendar_weekdays.rb +++ b/lib/ruby_ui/calendar/calendar_weekdays.rb @@ -5,7 +5,7 @@ class CalendarWeekdays < Base DAYS = %w[Monday Tuesday Wednesday Thursday Friday Saturday Sunday].freeze def view_template - all_template_tag(data: {ruby_ui__calendar_target: "weekdaysTemplate"}) do + template(data: {ruby_ui__calendar_target: "weekdaysTemplate"}) do thead(**attrs) do tr(class: "flex") do DAYS.each do |day| diff --git a/lib/ruby_ui/codeblock/codeblock.rb b/lib/ruby_ui/codeblock/codeblock.rb index e214d4ef..e47b11dd 100644 --- a/lib/ruby_ui/codeblock/codeblock.rb +++ b/lib/ruby_ui/codeblock/codeblock.rb @@ -54,19 +54,7 @@ def with_clipboard def codeblock div(**attrs) do div(class: "after:content-none") do - pre do - current_version = Gem.loaded_specs["phlex"].version - - if current_version.segments[0] >= 2 - # Any 2.x version (including betas) - raw(safe(FORMATTER.format(lexer.lex(@code)))) - else - # Any 1.x version - unsafe_raw FORMATTER.format( - lexer.lex(@code) - ) - end - end + pre { raw(safe(FORMATTER.format(lexer.lex(@code)))) } end end end diff --git a/lib/ruby_ui/command/command_dialog_content.rb b/lib/ruby_ui/command/command_dialog_content.rb index 7616c6bb..5ada024f 100644 --- a/lib/ruby_ui/command/command_dialog_content.rb +++ b/lib/ruby_ui/command/command_dialog_content.rb @@ -17,7 +17,7 @@ def initialize(size: :md, **attrs) end def view_template(&block) - all_template_tag(data: {ruby_ui__command_target: "content"}) do + template(data: {ruby_ui__command_target: "content"}) do div(data: {controller: "ruby-ui--command"}) do backdrop div(**attrs, &block) diff --git a/lib/ruby_ui/context_menu/context_menu_content.rb b/lib/ruby_ui/context_menu/context_menu_content.rb index 6ff51082..4e5a948f 100644 --- a/lib/ruby_ui/context_menu/context_menu_content.rb +++ b/lib/ruby_ui/context_menu/context_menu_content.rb @@ -3,7 +3,7 @@ module RubyUI class ContextMenuContent < Base def view_template(&block) - all_template_tag(data: {ruby_ui__context_menu_target: "content"}) do + template(data: {ruby_ui__context_menu_target: "content"}) do div(**attrs, &block) end end diff --git a/lib/ruby_ui/dialog/dialog_content.rb b/lib/ruby_ui/dialog/dialog_content.rb index 226ae0df..3c9df6db 100644 --- a/lib/ruby_ui/dialog/dialog_content.rb +++ b/lib/ruby_ui/dialog/dialog_content.rb @@ -17,7 +17,7 @@ def initialize(size: :md, **attrs) end def view_template - all_template_tag(data: {ruby_ui__dialog_target: "content"}) do + template(data: {ruby_ui__dialog_target: "content"}) do div(data_controller: "ruby-ui--dialog") do backdrop div(**attrs) do diff --git a/lib/ruby_ui/hover_card/hover_card_content.rb b/lib/ruby_ui/hover_card/hover_card_content.rb index 068356cd..5358d2b4 100644 --- a/lib/ruby_ui/hover_card/hover_card_content.rb +++ b/lib/ruby_ui/hover_card/hover_card_content.rb @@ -3,7 +3,7 @@ module RubyUI class HoverCardContent < Base def view_template(&block) - all_template_tag(data: {ruby_ui__hover_card_target: "content"}) do + template(data: {ruby_ui__hover_card_target: "content"}) do div(**attrs, &block) end end diff --git a/lib/ruby_ui/sheet/sheet_content.rb b/lib/ruby_ui/sheet/sheet_content.rb index 8dc5bf03..60f733da 100644 --- a/lib/ruby_ui/sheet/sheet_content.rb +++ b/lib/ruby_ui/sheet/sheet_content.rb @@ -16,7 +16,7 @@ def initialize(side: :right, **attrs) end def view_template(&block) - all_template_tag(data: {ruby_ui__sheet_target: "content"}) do + template(data: {ruby_ui__sheet_target: "content"}) do div(data: {controller: "ruby-ui--sheet-content"}) do backdrop div(**attrs) do