Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix issues with page builder: setting colors, links in the image with text section (#12354)
Łukasz Adamczyk2a8d9d718725
diff --git a/admin/app/javascript/spree/admin/controllers/color_picker_controller.js b/admin/app/javascript/spree/admin/controllers/color_picker_controller.jsindex 6d4af139fb..4e1aca13e2 100644--- a/admin/app/javascript/spree/admin/controllers/color_picker_controller.js+++ b/admin/app/javascript/spree/admin/controllers/color_picker_controller.js@@ -2,8 +2,8 @@ import { Controller } from "@hotwired/stimulus"import Pickr from '@simonwep/pickr'export default class extends Controller {- static targets = ["picker", "input", "value"]- static values = { clear: Boolean }+ static targets = ["picker", "input", "display", "value"]+ static values = { clear: Boolean, defaultColor: String }initialize() {this.initPicker();@@ -13,7 +13,7 @@ export default class extends Controller {this.picker = Pickr.create({el: this.pickerTarget,theme: 'classic',- default: this.inputTarget.value,+ default: this.inputTarget.value.length > 0 ? this.inputTargetValue : this.defaultColorValue,useAsButton: true,components: {diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erbindex 1fa3c0012d..c24b8d3931 100644--- a/admin/app/views/spree/admin/page_blocks/edit.html.erb+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb@@ -27,10 +27,10 @@<div class="tab-pane fade <%= tab_selected == :design ? 'show active' : '' %>" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab"><%= render 'spree/admin/page_sections/fields/top_padding', f: f %><%= render 'spree/admin/page_sections/fields/bottom_padding', f: f %>- <% if @page_block.respond_to?(:text_color) %>+ <% if @page_block.respond_to?(:preferred_text_color) %><%= render 'spree/admin/page_sections/fields/text_color', f: f %><% end %>- <% if @page_block.respond_to?(:background_color) %>+ <% if @page_block.respond_to?(:preferred_background_color) %><%= render 'spree/admin/page_sections/fields/background_color', f: f %><% end %><%= render 'spree/admin/page_sections/fields/button', f: f %>diff --git a/admin/app/views/spree/admin/page_builder/_color_picker.html.erb b/admin/app/views/spree/admin/page_builder/_color_picker.html.erbindex edfd4ccc8d..8a2c5e8681 100644--- a/admin/app/views/spree/admin/page_builder/_color_picker.html.erb+++ b/admin/app/views/spree/admin/page_builder/_color_picker.html.erb@@ -1,4 +1,10 @@-<div data-controller="color-picker" class="mb-4 form-group" data-color-picker-clear-value="<%= defined?(clear) ? clear : false %>">+<% color_picker_value ||= value || @theme_preview&.try(:send, field) %>++<div+ class="mb-4 form-group"+ data-controller="color-picker"+ data-color-picker-clear-value="<%= defined?(clear) ? clear : false %>"+ data-color-picker-default-color-value="<%= color_picker_value %>"><div class="d-flex align-items-center"><%= f.hidden_field field, class: 'form-control mr-2', data: {'color-picker-target': 'input',@@ -9,11 +15,11 @@<label class="mb-0"><%= label %></label><br /><span data-color-picker-target="value" class="text-muted">- <%= value&.upcase || "Not set" %>+ <%= color_picker_value&.upcase || Spree.t('admin.page_builder.not_set') %></span></div><div class="ml-auto d-flex align-items-center" style="width:40px">- <div data-color-picker-target="picker" class="border d-inline-block rounded-circle <% unless value.present? %>checkered-background<% end %>" style="height: 40px;width: 40px; background-color: <%= value %>;">+ <div data-color-picker-target="picker" class="border d-inline-block rounded-circle <% unless color_picker_value.present? %>checkered-background<% end %>" style="height: 40px;width: 40px; background-color: <%= color_picker_value %>;"></div></div></div>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erbindex e820522f58..271f20b8b6 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb@@ -26,10 +26,14 @@<% if section.blocks_available? %><div class="d-flex flex-column ml-1 mb-2"><%= turbo_frame_tag [:blocks, section.id].join('_'), class: 'list-group-flush collapse show' do %>+ <% if section.can_sort_blocks? %><div data-controller="sortable"data-sortable-handle-value=".handle-block"data-sortable-resource-name-value="page_block"data-sortable-response-kind-value="turbo-stream">+ <% else %>+ <div>+ <% end %><%= render partial: 'spree/admin/page_builder/sidebar_block', collection: section.blocks.includes(:rich_text_text), as: :block %></div><% end %>diff --git a/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erbindex 8708fe1286..a5cac7dfcd 100644--- a/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb+++ b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb@@ -11,5 +11,5 @@<% elsif page_link.linkable_type == 'Spree::Vendor' %><%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_vendors_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %><% else %>- <%= text_field_tag "#{form_name}[url]", page_link.url, class: "form-control", placeholder: 'eg. google.com', data: { action: 'blur->auto-submit#submit' } %>+ <%= text_field_tag "#{form_name}[url]", page_link.url, class: "form-control", required: true, placeholder: 'eg. google.com', data: { action: 'blur->auto-submit#submit' } %><% end %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erbindex a0d22a59e4..9039478973 100644--- a/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erb+++ b/admin/app/views/spree/admin/page_sections/fields/_background_color.html.erb@@ -1,4 +1,6 @@<%= render 'spree/admin/page_builder/color_picker',- f: f, field: :preferred_background_color, value: f.object.preferred_background_color.presence || @theme_preview.preferred_background_color,+ f: f,+ field: :preferred_background_color,+ value: f.object.preferred_background_color.presence,label: Spree.t('admin.page_builder.background_color'),action: 'change->auto-submit#submit' %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erbindex 020a0dde8e..979e59a50e 100644--- a/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erb+++ b/admin/app/views/spree/admin/page_sections/fields/_border_color.html.erb@@ -1,5 +1,7 @@<%= render 'spree/admin/page_builder/color_picker',- f: f, field: :preferred_border_color, value: @page_section.preferred_border_color.presence || @theme_preview.preferred_border_color,+ f: f,+ field: :preferred_border_color,+ value: f.object.preferred_border_color.presence,label: Spree.t('admin.page_builder.border_color'),action: 'change->auto-submit#submit' %>diff --git a/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erb b/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erbindex 25a3eeb845..832698b371 100644--- a/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erb+++ b/admin/app/views/spree/admin/page_sections/fields/_text_color.html.erb@@ -1,7 +1,7 @@<%= render 'spree/admin/page_builder/color_picker',f: f,field: :preferred_text_color,- value: @page_section.preferred_text_color.presence || @theme_preview.preferred_text_color,+ value: f.object.preferred_text_color.presence,label: Spree.t('admin.page_builder.text_color'),action: 'change->auto-submit#submit'%>diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.ymlindex 415c944e68..f81c6cb15e 100644--- a/admin/config/locales/en.yml+++ b/admin/config/locales/en.yml@@ -372,3 +372,4 @@ en:text_color: Text colortop_padding: Top paddingbutton_alignment: Button alignment+ not_set: Not setdiff --git a/core/app/models/spree/page_sections/announcement_bar.rb b/core/app/models/spree/page_sections/announcement_bar.rbindex 7c2abbca16..95f5ae6be0 100644--- a/core/app/models/spree/page_sections/announcement_bar.rb+++ b/core/app/models/spree/page_sections/announcement_bar.rb@@ -5,7 +5,6 @@ module Spreebefore_validation :set_default_text, on: :create- TEXT_COLOR_DEFAULT = '#000000'BACKGROUND_COLOR_DEFAULT = '#F5F5F4'TOP_PADDING_DEFAULT = 8BOTTOM_PADDING_DEFAULT = 8