From 6729293403fcc861b7da1219bcb458a46055a51c Mon Sep 17 00:00:00 2001 From: Bjorn Forsberg Date: Mon, 26 Feb 2024 15:35:49 +0100 Subject: [PATCH 1/3] Fix for filter popovers without using append_to_body (which breaks Stimulus controllers) --- app/assets/stylesheets/polaris_view_components/custom.pcss | 3 ++- app/components/polaris/filters_component.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/polaris_view_components/custom.pcss b/app/assets/stylesheets/polaris_view_components/custom.pcss index 3d026763..ba4baf7a 100644 --- a/app/assets/stylesheets/polaris_view_components/custom.pcss +++ b/app/assets/stylesheets/polaris_view_components/custom.pcss @@ -65,9 +65,10 @@ a.Polaris-Tag__Button { } /* Filters */ - .Polaris-LegacyFilters-ConnectedFilterControl__RightContainer { .Polaris-LegacyFilters-ConnectedFilterControl__Item { + z-index: auto; + & > div > div > button { margin-right: -1px; border-radius: 0; diff --git a/app/components/polaris/filters_component.rb b/app/components/polaris/filters_component.rb index df4aaba4..f46f5631 100644 --- a/app/components/polaris/filters_component.rb +++ b/app/components/polaris/filters_component.rb @@ -77,7 +77,7 @@ def popover_arguments style: ("width: #{@width}" if @width.present?), position: :below, alignment: :left, - append_to_body: true + append_to_body: false } end From 3c3d2cc24184b757abe15888470d9ac99f9417de Mon Sep 17 00:00:00 2001 From: Bjorn Forsberg Date: Mon, 26 Feb 2024 15:36:39 +0100 Subject: [PATCH 2/3] Update main css file --- app/assets/stylesheets/polaris_view_components.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/polaris_view_components.css b/app/assets/stylesheets/polaris_view_components.css index fa3b9f32..f72ced2b 100644 --- a/app/assets/stylesheets/polaris_view_components.css +++ b/app/assets/stylesheets/polaris_view_components.css @@ -381,7 +381,9 @@ }.Polaris-Popover__PopoverOverlay--closed { visibility: hidden; pointer-events: none; -}/* Filters */.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item > div > div > button { +}/* Filters */.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item { + z-index: auto; + }.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item > div > div > button { margin-right: -1px; border-radius: 0; }.Polaris-LegacyFilters-ConnectedFilterControl__RightContainer .Polaris-LegacyFilters-ConnectedFilterControl__Item:first-of-type > div > div > button { From e4379b268c345b276fa28f9fe30723afeac9d231 Mon Sep 17 00:00:00 2001 From: Bjorn Forsberg Date: Thu, 7 Mar 2024 11:44:59 +0100 Subject: [PATCH 3/3] Fix test filter_component --- test/components/polaris/filters_component_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/components/polaris/filters_component_test.rb b/test/components/polaris/filters_component_test.rb index de4a7e77..48479342 100644 --- a/test/components/polaris/filters_component_test.rb +++ b/test/components/polaris/filters_component_test.rb @@ -26,9 +26,9 @@ def test_default_filters assert_selector "[data-polaris-popover-target='activator']" do assert_selector ".Polaris-Button", text: "Filter" end + assert_selector "[data-polaris-popover-target='popover']", text: "Content" end end - assert_selector "[data-polaris-popover-target='template']", visible: :hidden end end end