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
Admin: fixed turbo button jumpy width
Damian Legawiec9470cee050e4
diff --git a/admin/app/helpers/spree/admin/turbo_helper.rb b/admin/app/helpers/spree/admin/turbo_helper.rbindex c9e5e82d14..421b55fff0 100644--- a/admin/app/helpers/spree/admin/turbo_helper.rb+++ b/admin/app/helpers/spree/admin/turbo_helper.rb@@ -33,8 +33,13 @@ module Spreeopts[:class] ||= 'btn btn-primary text-center'opts[:class] << ' d-flex align-items-center justify-content-center' if opts[:class].exclude?('d-block') && opts[:class].exclude?('d-flex')- opts['data-turbo-submits-with'] ||= "#{content_tag(:span, '', class: 'spinner-border spinner-border-sm mr-2', role: 'status')}Saving..."+ opts['data-turbo-submits-with'] ||= "#{content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')}"opts['data-enable-button-target'] = 'button'+ if opts['data-controller'].present?+ opts['data-controller'] += ' turbo-submit-button'+ else+ opts['data-controller'] = 'turbo-submit-button'+ endif block_given?button_tag opts, &blockdiff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.jsindex 213cdc94bd..a461d7c859 100644--- a/admin/app/javascript/spree/admin/application.js+++ b/admin/app/javascript/spree/admin/application.js@@ -85,6 +85,7 @@ import StockTransferController from 'spree/admin/controllers/stock_transfer_contimport StoreFormController from 'spree/admin/controllers/store_form_controller'import TabsController from 'spree/admin/controllers/tabs_controller'import TooltipController from 'spree/admin/controllers/tooltip_controller'+import TurboSubmitButtonController from 'spree/admin/controllers/turbo_submit_button_controller'import UnitSystemController from 'spree/admin/controllers/unit_system_controller'import VariantsFormController from 'spree/admin/controllers/variants_form_controller'import AddressAutocompleteController from 'spree/core/controllers/address_autocomplete_controller'@@ -148,6 +149,7 @@ application.register('stock-transfer', StockTransferController)application.register('store-form', StoreFormController)application.register('tabs', TabsController)application.register('tooltip', TooltipController)+application.register('turbo-submit-button', TurboSubmitButtonController)application.register('textarea-autogrow', TextareaAutogrow)application.register('unit-system', UnitSystemController)application.register('variants-form', VariantsFormController)diff --git a/admin/app/javascript/spree/admin/controllers/turbo_submit_button_controller.js b/admin/app/javascript/spree/admin/controllers/turbo_submit_button_controller.jsnew file mode 100644index 0000000000..0a8d7eedf6--- /dev/null+++ b/admin/app/javascript/spree/admin/controllers/turbo_submit_button_controller.js@@ -0,0 +1,19 @@+import { Controller } from '@hotwired/stimulus'++export default class extends Controller {+ // we need to preserve the width of the button so it won't change after we replace the text with the spinner+ connect() {+ // Handle hidden elements or dynamically added elements by checking if dimensions are available+ if (this.element.offsetWidth > 0 && this.element.offsetHeight > 0) {+ this.originalWidth = this.element.offsetWidth+ this.originalHeight = this.element.offsetHeight+ } else {+ // For hidden elements, get computed style dimensions or use a reasonable default+ const computedStyle = window.getComputedStyle(this.element)+ this.originalWidth = parseInt(computedStyle.width) || this.element.scrollWidth || 100+ this.originalHeight = parseInt(computedStyle.height) || this.element.scrollHeight || 36+ }+ this.element.style.width = `${this.originalWidth}px`+ this.element.style.height = `${this.originalHeight}px`+ }+}\ No newline at end of file