@quintype/native-components 2.19.16 → 2.19.19

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.19.19](https://github.com/quintype/native-components/compare/v2.19.18...v2.19.19) (2022-08-24)
+
+
+### Bug Fixes
+
+* **Ads:** Change midcontentAd logic for video-story :hammer: ([#186](https://github.com/quintype/native-components/issues/186)) ([b04a16c](https://github.com/quintype/native-components/commit/b04a16cb74f06c3a3f5639df31b39b2ecd4b6704))
+* **deps:** Fixes dependency-conflict due to incorrect react-native version :hammer: ([b43e8ae](https://github.com/quintype/native-components/commit/b43e8ae0e4cf92d3fce21336c3cdd6c2d73db582))
+
+### [2.19.18](https://github.com/quintype/native-components/compare/v2.19.17...v2.19.18) (2022-07-04)
+
+### [2.19.17](https://github.com/quintype/native-components/compare/v2.19.14...v2.19.17) (2022-06-29)
+
+
+### Bug Fixes
+
+* **story-page:** Fixes crash if image-metadata is null 🔨  ([#184](https://github.com/quintype/native-components/issues/184)) ([8f703d1](https://github.com/quintype/native-components/commit/8f703d19c90c4a5c7844e2251c6691263f9b3d4b))
+* **story-template:** Fixed story-template-icon color :hammer: ([#182](https://github.com/quintype/native-components/issues/182)) ([95f750d](https://github.com/quintype/native-components/commit/95f750d7df5f7cc400095317be26900c0cffd3e1))
+
 ### [2.19.16](https://github.com/quintype/native-components/compare/v2.19.15...v2.19.16) (2022-05-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/native-components",
-  "version": "2.19.16",
+  "version": "2.19.19",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -29,8 +29,8 @@
   "peerDependencies": {
     "@react-navigation/native": ">=5.7.3",
     "lodash": ">=4.17.20",
-    "react": ">=16.13.1",
-    "react-native": ">=0.63.2",
+    "react": ">=17.0.2",
+    "react-native": ">=0.67.4",
     "react-native-fast-image": ">=8.3.2",
     "react-native-pdf": ">=6.2.0",
     "react-native-webview": ">=11.0.0",
@@ -53,8 +53,8 @@
     "husky": "^4.2.5",
     "jest": "^26.4.0",
     "metro-react-native-babel-preset": "^0.62.0",
-    "react": "^16.13.1",
-    "react-native": "^0.68.0",
+    "react": "17.0.2",
+    "react-native": "0.67.4",
     "react-native-device-info": "^5.6.5",
     "react-native-gesture-handler": "^1.9.0",
     "react-native-svg": "^12.3.0",

package/src/components/Story/index.js

@@ -47,7 +47,7 @@ const getLiveBlogTimeStamp = (card, DATE_FORMAT, share, styles, locale) => {
 
 /* Mutate the data during access check to limit the content shown */
 const mutateDataBeforeAccess = (item, storyHasAccess) => {
-  if (isStoryFree(item)) {
+  if (isStoryFree(item) === 0 || storyHasAccess === 'granted') {
     return item;
   }
   if (storyHasAccess !== 'loading' && storyHasAccess === 'granted') {
@@ -55,7 +55,7 @@ const mutateDataBeforeAccess = (item, storyHasAccess) => {
   }
   /* The following steps are necessary to keep argument mutation at bay */
   const firstCardObject = get(item, ['cards', 0], {});
-  const firstCardElement = get(firstCardObject, ['story-elements', 0], {});
+  const firstCardElement = get(firstCardObject, !STORY_TYPES.VIDEO_STORY && ['story-elements', 0], {});
 
   return {
     ...item,
@@ -119,9 +119,11 @@ const getStoryCards = (
     )}
     {/* Skip first card if it's a listicle */}
 
-    {source.length > 1 && (!STORY_TYPES.VIDEO_STORY || source.length > 2) && isMiddleIndexOfArray(index, source) && getAd(true)}
-    {/* ^ Requesting Ad if there are multiple cards. Sending param true for mid-content ad
-    If the story is from video template and have single card then not showing mid-ad */}
+    {source.length > (storyType === STORY_TYPES.VIDEO_STORY ? 2 : 1)
+      && isMiddleIndexOfArray(index, source)
+      && getAd(true)}
+    {/* ^ Requesting mid-content-ad if there are > 1 card
+      (> 2 cards in case of video story since the 1st card gets rendered in header). */}
 
     {(card['story-elements'] || []).map((storyElement, index, source) => {
       /* Skip the first video element for video story */
@@ -130,10 +132,12 @@ const getStoryCards = (
       return (
         <>
           {cards.length === 1
-              && source.length > 1
-              && isMiddleIndexOfArray(index, source)
-              && getAd(true)}
-          {/* ^ Requesting Ad if there's just one card but multiple elements. Sending param true for mid-content ad */}
+            && source.length > (storyType === STORY_TYPES.VIDEO_STORY ? 2 : 1)
+            && isMiddleIndexOfArray(index, source)
+            && getAd(true)}
+          {/* ^ In the case of a story having just 1 card,
+            requesting mid-content-Ad if there are > 1 story-elements in that card
+            (> 2 story-elements in case of video story since the 1st story-element gets rendered in header). */}
 
           <StoryContent
             testID={contentTestID}
@@ -195,9 +199,8 @@ export const Story = ({
 
   const shouldShowComments = () => {
     if (!enableFbComments) return null;
-
     if (
-      isStoryFree(story)
+      isStoryFree(story) === 0
       || (storyHasAccess !== 'loading' && storyHasAccess === 'granted')
     ) {
       return (

package/src/components/StoryImage/styles.js

@@ -1,8 +1,8 @@
 import { StyleSheet } from 'react-native';
 import { getImageHeight } from '../../utils';
 
-export const storyImageStyles = ({ COLORS, FONT_SIZE }, metadata) => {
-  const { width, height } = metadata;
+export const storyImageStyles = ({ COLORS, FONT_SIZE }, metadata = {}) => {
+  const { width, height } = metadata || {};
   const imageHeight = getImageHeight(width, height);
 
   return StyleSheet.create({

package/src/utils/story.js

@@ -7,10 +7,14 @@ import get from 'lodash/get';
  */
 
 export const isStoryFree = (story = {}) => {
-  if (!('access' in story)) {
-    return true;
+  switch (story.access) {
+    case 'login':
+      return 1;
+    case 'subscription':
+      return 2;
+    default:
+      return 0;
   }
-  return story.access === 'public' || Object.is(story.access, null);
 };
 
 /**