From be6261c51fc554abbb240e89203d036d587b2fe7 Mon Sep 17 00:00:00 2001
From: Andrew Musgrave <andrew.musgrave@shopify.com>
Date: Wed, 17 Apr 2019 13:46:34 -0400
Subject: [PATCH 1/2] Fix action visibility on different breakpoints

---
 .../ResourceList/components/Item/Item.scss       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/ResourceList/components/Item/Item.scss b/src/components/ResourceList/components/Item/Item.scss
index efd1849717a..37ca21b6198 100644
--- a/src/components/ResourceList/components/Item/Item.scss
+++ b/src/components/ResourceList/components/Item/Item.scss
@@ -125,6 +125,14 @@
   margin: (-1 * resource-list-item(padding)) spacing(extra-tight)
     (-1 * resource-list-item(padding)) resource-list-item(control-indent);
   display: flex;
+
+  @include breakpoint-before(resource-list(breakpoint-small)) {
+    visibility: hidden;
+
+    .selectMode & {
+      visibility: visible;
+    }
+  }
 }
 
 .selectable {
@@ -173,6 +181,10 @@
   .focused & {
     @include action-unhide;
   }
+
+  @include page-content-when-partially-condensed {
+    display: none;
+  }
 }
 
 .persistActions {
@@ -202,6 +214,10 @@
   min-height: resource-list-item(min-height);
   pointer-events: initial;
 
+  .selectMode & {
+    display: none;
+  }
+
   @include breakpoint-after(resource-list(breakpoint-small)) {
     right: -1 * spacing(loose);
   }

From 53cdd411bdaa1de7a94978aff8e068dc83c4db2b Mon Sep 17 00:00:00 2001
From: Andrew Musgrave <andrew.musgrave@shopify.com>
Date: Wed, 17 Apr 2019 13:59:26 -0400
Subject: [PATCH 2/2] changelog

---
 UNRELEASED.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UNRELEASED.md b/UNRELEASED.md
index ec343016110..7d963abf6ca 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -29,6 +29,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 
 ### Bug fixes
 
+- Fixed `ResourceList` actions from show at incorrect breakpoints or while in select mode ([#1333](https://github.com/Shopify/polaris-react/pull/1333))
 - Fixed Search overlay stretching below the viewport ([#1260](https://github.com/Shopify/polaris-react/pull/1260))
 - Added `onChange` and `value` to select `AppProvider` examples to remove console errors ([#1320](https://github.com/Shopify/polaris-react/pull/1320))
 - Fixed promoted bulk actions in `ResourceList` not properly disabling ([#1317](https://github.com/Shopify/polaris-react/pull/1317)) (thanks [@jineshshah36](https://github.com/jineshshah36) for the [issue report](https://github.com/Shopify/polaris-react/issues/1316))