diff --git a/lib/generators/ruby_ui/javascript_utils.rb b/lib/generators/ruby_ui/javascript_utils.rb index be70aaf0..f91e1aa4 100644 --- a/lib/generators/ruby_ui/javascript_utils.rb +++ b/lib/generators/ruby_ui/javascript_utils.rb @@ -49,7 +49,6 @@ def pin_tippy_js inject_into_file Rails.root.join("config/importmap.rb"), <<~RUBY pin "tippy.js", to: "https://cdn.jsdelivr.net/npm/tippy.js@6.3.7/+esm" - pin "@popperjs/core", to: "https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/+esm"\n RUBY end end diff --git a/lib/ruby_ui/context_menu/context_menu_controller.js b/lib/ruby_ui/context_menu/context_menu_controller.js index 23510570..bfa1bad9 100644 --- a/lib/ruby_ui/context_menu/context_menu_controller.js +++ b/lib/ruby_ui/context_menu/context_menu_controller.js @@ -38,16 +38,6 @@ export default class extends Controller { this.removeEventListeners(); this.deselectAll(); }, - popperOptions: { - modifiers: [ - { - name: "offset", - options: { - offset: [0, 4] - }, - }, - ], - } }; const mergedOptions = { ...this.optionsValue, ...defaultOptions }; @@ -62,7 +52,7 @@ export default class extends Controller { setContentWidth(instance) { // box-sizing: border-box - const content = instance.popper.querySelector('.tippy-content'); + const content = this.tippy.popper.querySelector('.tippy-content'); if (content) { content.style.width = `${instance.reference.offsetWidth}px`; } diff --git a/lib/ruby_ui/hover_card/hover_card_controller.js b/lib/ruby_ui/hover_card/hover_card_controller.js index 23510570..bfa1bad9 100644 --- a/lib/ruby_ui/hover_card/hover_card_controller.js +++ b/lib/ruby_ui/hover_card/hover_card_controller.js @@ -38,16 +38,6 @@ export default class extends Controller { this.removeEventListeners(); this.deselectAll(); }, - popperOptions: { - modifiers: [ - { - name: "offset", - options: { - offset: [0, 4] - }, - }, - ], - } }; const mergedOptions = { ...this.optionsValue, ...defaultOptions }; @@ -62,7 +52,7 @@ export default class extends Controller { setContentWidth(instance) { // box-sizing: border-box - const content = instance.popper.querySelector('.tippy-content'); + const content = this.tippy.popper.querySelector('.tippy-content'); if (content) { content.style.width = `${instance.reference.offsetWidth}px`; } diff --git a/test/ruby_ui/context_menu_test.rb b/test/ruby_ui/context_menu_test.rb index 1dc50dab..02c64431 100644 --- a/test/ruby_ui/context_menu_test.rb +++ b/test/ruby_ui/context_menu_test.rb @@ -25,5 +25,9 @@ def test_render_with_all_items end assert_match(/Right click here/, output) + assert_match(/Back/, output) + assert_match(/Show Bookmarks Bar/, output) + assert_match(/Developer Tools/, output) + refute_match(/popper/i, output) end end diff --git a/yarn.lock b/yarn.lock index 8e213b76..c89d0485 100644 --- a/yarn.lock +++ b/yarn.lock @@ -92,11 +92,6 @@ hey-listen "^1.0.8" tslib "^2.3.1" -"@popperjs/core@^2.9.0": - version "2.11.8" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" - integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== - chart.js@^4.4.1: version "4.4.3" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.3.tgz#3b2e11e7010fefa99b07d0349236f5098e5226ad" @@ -160,8 +155,6 @@ tippy.js@^6.3.7: version "6.3.7" resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ== - dependencies: - "@popperjs/core" "^2.9.0" tslib@^2.3.1: version "2.6.3"