pg_rails 7.6.3 → 7.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c827faeb7ffa9b904395708a6f9c6184a930ee22663bcec472b600046497baa
-  data.tar.gz: bb256bb482b6697302d7e3b2131f5cd9e3ddeaa17447f739b943091a6b90c431
+  metadata.gz: d093a397aa4021d053313ee524475eb24295290e56974623fdf03b0ab14691ee
+  data.tar.gz: b0ae6c35558a26ff88d59e4949341a2d1046bd0ff81ff83279961b70d20813dd
 SHA512:
-  metadata.gz: c06b67c6b8bdeb5462db606077e29b1d1a68bc58ee65a6df7c9e21a13615f723d68189a497b769faf401160875741caf946010f6b162659aa5d9c8dffec6f35d
-  data.tar.gz: 471922d32d56e46a8e7d20ecd0fe2793d22849a66d813c8fc103a51a8e1d44d4d8229f1b04457d0b3f16f9a9c6ab6ea052dac95dcd43605b9120ddaf8eeb8a88
+  metadata.gz: 2c1d7f92c914bf3ca632cfcb04cdcb9a52870e69a057085df1b68bc7e402a4831f7ce1b008f9aa3a6e50bd3436ce192225f795f52841b939bb0733024c4c98fa
+  data.tar.gz: 87b8d08575eca14e090029038176c1dcf352047a340f41b3f908bfaf21b06614e952d5543a595e02503f25bb47d0dd45cb5ba86d74c089f0d4c35cde4b23db96

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -204,9 +204,18 @@ input[type=datetime-local], input[type=datetime] {
 // Inline edit
 
 .inline-edit {
-  // text-decoration: underline;
-  // text-decoration-style: dotted;
-  // text-decoration-color: #262626;
+  border-bottom: 1px dotted #333;
+  padding-bottom: 1px;
+
+  &:not(:has(.trix-content)) .edit-link {
+    margin-right: 0.25em;
+  }
+
+  &:has(.trix-content) .edit-link {
+    margin-bottom: 0.55em;
+    display: inline-block;
+    border-bottom: 1px dotted #333;
+  }
 
   a:hover {
     i {
@@ -214,7 +223,45 @@ input[type=datetime-local], input[type=datetime] {
     }
   }
 
+  form {
+    display: flex;
+    align-items: start;
+    gap: 0.25rem;
+
+    &:has(trix-editor) {
+      display: block;
+
+      .actions {
+        margin-top: 0.25rem;
+      }
+    }
+  }
+
   input[type=text] {
     min-width: 22em;
   }
+
+  select {
+    max-width: 45em;
+  }
+
+  // To display correctly in tables with fixed witdh columns
+  .form-select {
+    width: initial;
+  }
+}
+
+// WIP, inline rich text en listados
+.listado {
+  .inline-edit {
+    display: flex!important;
+    align-items: center;
+    gap: 0.25em;
+
+    &:has(.trix-content) .edit-link {
+      margin-bottom: 0;
+      display: inline;
+      border-bottom: none;
+    }
+  }
 }

data/pg_engine/app/components/inline_edit/inline_component.rb

@@ -0,0 +1,27 @@
+class InlineComponent < ViewComponent::Base
+  def initialize(model, attribute)
+    @model = model
+    @attribute = attribute
+    @unsuffixed_attribute = unsuffixed(attribute)
+    @frame_id = dom_id(model, "#{attribute}_inline_edit")
+
+    super
+  end
+
+  def before_render
+    return unless controller.in_modal?
+
+    controller.instance_variable_set(:@using_modal, true)
+  end
+
+  SUFIJOS = %i[f text].freeze
+  def unsuffixed(attribute)
+    ret = attribute.to_s.dup
+
+    SUFIJOS.each do |sufijo|
+      ret.gsub!(/_#{sufijo}$/, '')
+    end
+
+    ret
+  end
+end

data/pg_engine/app/components/inline_edit/inline_edit_component.html.slim

@@ -1,14 +1,14 @@
 = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
-  = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings,
-                        html: { class: 'd-flex align-items-start gap-1' }) do |f|
+  = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings) do |f|
     = hidden_field_tag :inline_attribute, @attribute
 
-    = f.field @attribute, label: false, html5: true
+    = f.field @unsuffixed_attribute, label: false, html5: true
 
-    = button_tag class: 'btn btn-sm btn-primary',
-                 data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
-      i.bi.bi-check-lg
-    = link_to users_inline_show_path(model: @model.to_gid, attribute: @attribute),
-              class: 'btn btn-sm btn-secondary',
-              data: { controller: 'tooltip', 'bs-title': 'Cancelar' } do
-      i.bi.bi-x-lg
+    .actions.d-flex.gap-1
+      = button_tag class: 'btn btn-sm btn-primary',
+                   data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
+        i.bi.bi-check-lg
+      = link_to users_inline_show_path(model: @model.to_gid, attribute: @attribute),
+                class: 'btn btn-sm btn-secondary',
+                data: { controller: 'tooltip', 'bs-title': 'Cancelar' } do
+        i.bi.bi-x-lg

data/pg_engine/app/components/inline_edit/inline_edit_component.rb

@@ -1,11 +1,7 @@
-class InlineEditComponent < ViewComponent::Base
-  def initialize(model, attribute)
-    @model = model
-    @attribute = attribute
-    @frame_id = dom_id(model, "#{attribute}_inline_edit")
-
+class InlineEditComponent < InlineComponent
+  def initialize(*)
     @wrapper_mappings = {
-      string: :inline_form_control,
+      string: :inline_form_grow,
       pg_associable: :inline_form_control,
       date: :inline_form_control,
       datetime: :inline_form_control,
@@ -14,10 +10,4 @@ class InlineEditComponent < ViewComponent::Base
 
     super
   end
-
-  def before_render
-    return unless controller.in_modal?
-
-    controller.instance_variable_set(:@using_modal, true)
-  end
 end

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -1,8 +1,8 @@
-- if @model.class.inline_editable?(@attribute) && helpers.policy(@model).edit?
+- if @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
   = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
-    span = @model.decorate.send(@attribute)
     = link_to users_inline_edit_path(model: @model.to_gid, attribute: @attribute),
-              class: 'text-body-tertiary ms-1', style: 'font-size: 0.8em' do
+              class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
       i.bi.bi-pencil
+    span = @model.decorate.send(@attribute)
 - else
   = @model.decorate.send(@attribute)

data/pg_engine/app/components/inline_edit/inline_show_component.rb

@@ -1,15 +1,2 @@
-class InlineShowComponent < ViewComponent::Base
-  def initialize(model, attribute)
-    @model = model
-    @attribute = attribute
-    @frame_id = dom_id(model, "#{attribute}_inline_edit")
-
-    super
-  end
-
-  def before_render
-    return unless controller.in_modal?
-
-    controller.instance_variable_set(:@using_modal, true)
-  end
+class InlineShowComponent < InlineComponent
 end

data/pg_engine/app/lib/pg_form_builder.rb

@@ -31,6 +31,8 @@ class PgFormBuilder < SimpleForm::FormBuilder
 
     if find_on_all_associations(model.class, attribute_name).present?
       pg_associable(attribute_name, options)
+    elsif model.respond_to?("rich_text_#{attribute_name}")
+      rich_text_area attribute_name
     else
       input(attribute_name, options, &)
     end

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -270,6 +270,21 @@ SimpleForm.setup do |config|
   # inline forms
   #
   # inline default_wrapper
+  config.wrappers :inline_form_grow, class: 'flex-grow-1' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'visually-hidden'
+
+    b.use :input, class: 'form-control form-control-sm', error_class: 'is-invalid'
+    b.use :error, wrap_with: { class: 'invalid-feedback' }
+    b.optional :hint, wrap_with: { class: 'form-text' }
+  end
+
   config.wrappers :inline_form_control, class: '' do |b|
     b.use :html5
     b.use :placeholder

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.3'
+  VERSION = '7.6.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.3
+  version: 7.6.5
 platform: ruby
 authors:
 - Martín Rosso
@@ -674,6 +674,7 @@ files:
 - pg_engine/app/components/date_selector_component.html.slim
 - pg_engine/app/components/date_selector_component.rb
 - pg_engine/app/components/flash_container_component.rb
+- pg_engine/app/components/inline_edit/inline_component.rb
 - pg_engine/app/components/inline_edit/inline_edit_component.html.slim
 - pg_engine/app/components/inline_edit/inline_edit_component.rb
 - pg_engine/app/components/inline_edit/inline_show_component.html.slim