Merge branch 'master' into adjust-personal-data-request-page

artsy · Jun 29, 2020 · 2d023c6 · 2d023c6
2 parents 0353818 + fa34d2f
commit 2d023c6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/data/schema.graphql b/data/schema.graphql
@@ -7165,6 +7165,13 @@ type Query {
     id: String!
   ): OrderedSet
 
+  # A collection of OrderedSets
+  orderedSets(
+    # Key to the OrderedSet or group of OrderedSets
+    key: String!
+    public: Boolean = true
+  ): [OrderedSet]
+
   # A Partner
   partner(
     # The slug or ID of the Partner
@@ -8981,6 +8988,13 @@ type Viewer {
     id: String!
   ): OrderedSet
 
+  # A collection of OrderedSets
+  orderedSets(
+    # Key to the OrderedSet or group of OrderedSets
+    key: String!
+    public: Boolean = true
+  ): [OrderedSet]
+
   # A Partner
   partner(
     # The slug or ID of the Partner

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "babel-core": "7.0.0-bridge.0"
   },
   "dependencies": {
-    "@artsy/cohesion": "1.13.0",
+    "@artsy/cohesion": "1.14.0",
     "@artsy/palette": "11.0.2",
     "@mapbox/react-native-mapbox-gl": "6.1.3",
     "@react-native-community/async-storage": "1.6.3",

diff --git a/...Collection/Components/CollectionHubsRails/FeaturedCollections/FeaturedCollectionsRail.tsx b/...Collection/Components/CollectionHubsRails/FeaturedCollections/FeaturedCollectionsRail.tsx
@@ -1,13 +1,14 @@
 import { color, Flex, Sans, Spacer } from "@artsy/palette"
 import { FeaturedCollectionsRail_collection } from "__generated__/FeaturedCollectionsRail_collection.graphql"
 import { FeaturedCollectionsRail_collectionGroup } from "__generated__/FeaturedCollectionsRail_collectionGroup.graphql"
+import { AboveTheFoldFlatList } from "lib/Components/AboveTheFoldFlatList"
 import ImageView from "lib/Components/OpaqueImageView/OpaqueImageView"
 import SwitchBoard from "lib/NativeModules/SwitchBoard"
 import { defaultRules } from "lib/utils/renderMarkdown"
 import { renderMarkdown } from "lib/utils/renderMarkdown"
 import { Schema } from "lib/utils/track"
 import React, { useRef } from "react"
-import { FlatList, TouchableHighlight } from "react-native"
+import { TouchableHighlight } from "react-native"
 import { createFragmentContainer, graphql } from "react-relay"
 import { useTracking } from "react-tracking"
 import styled from "styled-components/native"
@@ -50,7 +51,7 @@ export const FeaturedCollectionsRail: React.SFC<FeaturedCollectionsRailProps> =
           {collectionGroup.name}
         </Sans>
       </Flex>
-      <FlatList<FeaturedCollection>
+      <AboveTheFoldFlatList<FeaturedCollection>
         horizontal
         showsHorizontalScrollIndicator={false}
         data={collections as FeaturedCollection[]}

diff --git a/yarn.lock b/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@artsy/auto-config/-/auto-config-1.0.2.tgz#b79f6fd0d0bda0c5e0764ced55e014cf58174d6f"
   integrity sha512-mJyuKNDMYZcgc2oLIkvmpVIr1RexklV71JmU+to5qs3Y9pv5dsj4WHl8+wf9g74EQNOyhWH2SYMGBm1JoPYh/Q==
 
-"@artsy/cohesion@1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@artsy/cohesion/-/cohesion-1.13.0.tgz#90308ee773786e0297bbf167f6db39d09339a851"
-  integrity sha512-nu/DsHuvpqFstO/glR8a1XVk9/iBgKliimLTGSzM3lOU7YAJXq8p0ziAx1sY4ySJZmrq6ruJdNWcd5RLZEb0kA==
+"@artsy/cohesion@1.14.0":
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/@artsy/cohesion/-/cohesion-1.14.0.tgz#155564ef116d9d09edc7fd0b430706bc7772a1a4"
+  integrity sha512-NvIjxZ3gtlb69AVHfJnMO/Ae++fbLjEfdG2EuHKcduaomBO2ykanpNfSmk5Ubt+8AhD4qDZ+h7mKSbwOuyI6iA==
 
 "@artsy/palette@11.0.2":
   version "11.0.2"