@quintype/native-components 2.20.26 → 2.21.0-beta.0

package/bin-dev-scripts/standard-version-release.sh

@@ -12,4 +12,4 @@ else
   npx standard-version --prerelease "$(git symbolic-ref --short HEAD | sed s:/:-:g )" --skip.changelog=true
 fi
 
-git push --follow-tags origin "$BRANCH"
+git push --follow-tags origin "$BRANCH"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/native-components",
-  "version": "2.20.26",
+  "version": "2.21.0-beta.0",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "rn-fetch-blob": "^0.10.16"
   },
   "peerDependencies": {
-    "@react-navigation/native": ">=5.7.3",
+    "@react-navigation/native": ">=6.1.17",
     "lodash": ">=4.17.20",
     "react": ">=17.0.2",
     "react-native": ">=0.67.5",
@@ -33,14 +33,12 @@
     "react-native-pdf": ">=6.2.0",
     "react-native-webview": ">=11.0.0",
     "rn-fetch-blob": ">=0.12.0",
-    "react-native-vector-icons": "^10.0.0",
-    "react-native-linear-gradient": "^2.8.3"
+    "react-native-vector-icons": "^10.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.11.1",
     "@babel/runtime": "^7.11.2",
     "@react-native-community/eslint-config": "^2.0.0",
-    "@react-navigation/native": "^5.7.1",
     "@testing-library/jest-native": "^3.4.3",
     "@testing-library/react-native": "^7.1.0",
     "babel-jest": "^26.3.0",
@@ -53,10 +51,9 @@
     "husky": "^4.2.5",
     "jest": "^26.4.0",
     "metro-react-native-babel-preset": "^0.62.0",
-    "react": "17.0.2",
-    "react-native": "0.67.4",
+    "react": "18.2.0",
+    "react-native": "0.71.17",
     "react-native-device-info": "^5.6.5",
-    "react-native-gesture-handler": "^1.9.0",
     "react-native-svg": "^12.3.0",
     "react-navigation-hooks": "^1.1.0",
     "react-test-renderer": "16.13.1"
@@ -65,7 +62,6 @@
     "preset": "react-native",
     "setupFilesAfterEnv": [
       "./jest-setup.js",
-      "./node_modules/react-native-gesture-handler/jestSetup.js",
       "@testing-library/jest-native/extend-expect"
     ],
     "moduleNameMapper": {

package/src/components/References/index.js

@@ -1,8 +1,7 @@
 import { get } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { useContext } from 'react';
-import { Linking, View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { Linking, View, TouchableOpacity } from 'react-native';
 import { AppTheme } from '../../utils';
 import { Text } from '../Text';
 import { styles } from './styles';

package/src/components/Story/index.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useEffect, useContext } from 'react';
-import { View, I18nManager } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { View, I18nManager, TouchableOpacity } from 'react-native';
 import { Text } from '../index';
 import { StoryHeader } from '../StoryHeader';
 import { StoryContent } from '../StoryContent';
@@ -15,8 +14,6 @@ import { storyStyles } from './styles';
 import { isStoryFree, mutateDataBeforeAccess, getFirstVideoElement } from '../../utils/story';
 import { isMiddleIndexOfArray } from '../../utils/arrayUtils';
 
-
-
 const getLiveBlogTimeStamp = (card, DATE_FORMAT, share, styles, locale) => {
   const slug = `?cardId=${card.id}`;
   return (
@@ -78,9 +75,8 @@ const getStoryCards = (
   currentLayout,
   getAd,
   locale,
-) => cards.map((card, index, source) => {
-  console.log('risi - vstf', card, source)
- return  <View key={card?.id}>
+) => cards.map((card, index, source) => (
+  <View key={card?.id}>
     {isLiveBlog
         && getLiveBlogTimeStamp(card, DATE_FORMAT, share, styles, locale)}
 
@@ -110,6 +106,7 @@ const getStoryCards = (
           {/* ^ 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}
             key={storyElement?.id}
@@ -126,7 +123,7 @@ const getStoryCards = (
       );
     })}
   </View>
-});
+));
 
 export const Story = ({
   cdn,
@@ -189,7 +186,6 @@ export const Story = ({
 
   return (
     <>
-    <View>
       <StoryHeader
         firstVideoElement={firstVideoElement}
         testID={headerTestID}
@@ -221,10 +217,6 @@ export const Story = ({
         getAd,
         locale,
       )}
-      <View style={styles.overlay} />
-      </View>
-
-
 
       {accessComponent(story, storyHasAccess)}
 

package/src/components/Story/styles.js

@@ -37,13 +37,4 @@ export const storyStyles = (COLORS, FONT_SIZE) => StyleSheet.create({
     color: COLORS.BRAND_1,
     fontSize: FONT_SIZE.title,
   },
-  overlay: {
-    position: 'absolute',
-    bottom: -10,
-    left: 0,
-    right: 0,
-    height: 180, // Adjust the height as needed
-    backgroundColor: 'rgba(150, 0, 0, 0.2)',
-    marginHorizontal:10
-  },
 });

package/src/components/StoryImage/index.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useContext } from 'react';
-import { View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { View, TouchableOpacity } from 'react-native';
 import { ShareIcon } from '../../Icons/ShareIcon';
 import { AppTheme, getScreenPercentageWidth, stripHTML } from '../../utils';
 import { Text } from '../index';

package/src/components/StorySlideshow/index.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useContext, useRef, useState } from 'react';
-import { TouchableOpacity, View } from 'react-native';
-import { FlatList } from 'react-native-gesture-handler';
+import { TouchableOpacity, View, FlatList } from 'react-native';
 import Icon from 'react-native-vector-icons/AntDesign';
 import { AppTheme } from '../../utils';
 import { SlideshowStoryCard } from '../SlideshowStoryCard';

package/src/components/Table/index.js

@@ -1,7 +1,6 @@
 import React, { useContext } from 'react';
-import { View } from 'react-native';
+import { View , ScrollView } from 'react-native';
 import get from 'lodash/get';
-import { ScrollView } from 'react-native-gesture-handler';
 import { formatData } from '../../utils/tableUtils';
 import { tableStyles } from './styles';
 import { Text } from '../index';

package/src/utils/colorUtils.js

@@ -2,6 +2,7 @@ export const hexToRgb = (hex, alpha=1) => {
   let rgbCode = hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i,(m, r, g, b) => '#' + r + r + g + g + b + b)
   .substring(1).match(/.{2}/g)
   .map(x => parseInt(x, 16));
+  console.log('risi -  color', `rgb(${rgbCode[0]}, ${rgbCode[1]}, ${rgbCode[2]}, ${alpha})`)
   return `rgba(${rgbCode[0]}, ${rgbCode[1]}, ${rgbCode[2]}, ${alpha})`;
 }
 

package/src/utils/story.js

@@ -50,35 +50,13 @@ export const mutateDataBeforeAccess = (item, storyHasAccess) => {
     return item;
   }
   /* The following steps are necessary to keep argument mutation at bay */
-  // console.log('riteshh - ittem',  item.cards)
-  const firstCardObject = get(item, ['cards', 2], {});
+  const firstCardObject = get(item, ['cards', 0], {});
   const firstCardElement = get(firstCardObject, !STORY_TYPES.VIDEO_STORY && ['story-elements', 0], {});
-  let visibleContentsForBlockedStory = [];
-  let textStoryFound = false;
-  if(item.cards && item.cards.length > 0){
-    for(let i = 0; i < Math.min(item.cards.length, 2); i++){
-      let storyElement = [];
-      for(let j=0; j<item.cards[i]['story-elements'].length; j++){
-        let tempStoryElement = item.cards[i]['story-elements'][j];
-        if(tempStoryElement?.type !== 'text'){
-          storyElement.push(tempStoryElement);
-        } else {
-          textStoryFound = true;
-          storyElement.push(tempStoryElement);
-          break;
-        }
-      }
-      // console.log('risi - temp - item', item.cards[i])
-      visibleContentsForBlockedStory.push({...item.cards[i],'story-elements' : storyElement});
-      if(textStoryFound) break;
-    }
-  }
-
 
   return {
     ...item,
     ...{
-      cards: visibleContentsForBlockedStory,
+      cards: [{ ...firstCardObject, 'story-elements': [firstCardElement] }],
     },
   };
 };