@quintype/native-components 2.29.9 → 2.30.0--alt-story-layout-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/native-components",
-  "version": "2.29.9",
+  "version": "2.30.0--alt-story-layout-beta",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/components/AudioPlayer/index.js

@@ -1,7 +1,7 @@
 import React, { memo } from "react";
 import PropTypes from "prop-types";
 import { useProgress, usePlaybackState, State } from "react-native-track-player";
-import { TouchableOpacity, ActivityIndicator, View, ViewPropTypes, useWindowDimensions } from "react-native";
+import { TouchableOpacity, ActivityIndicator, View, useWindowDimensions } from "react-native";
 import Icon from "react-native-vector-icons/AntDesign";
 import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
 import { playerStyles } from "./styles";
@@ -135,7 +135,6 @@ ControlButton.propTypes = {
 };
 
 PlayerBase.propTypes = {
-  style: ViewPropTypes.style,
   onTogglePlayback: PropTypes.func.isRequired,
   testID: PropTypes.string,
 };

package/src/components/BackNavigator/index.js

@@ -5,7 +5,6 @@ import {
   StyleSheet,
   TouchableOpacity,
   View,
-  ViewPropTypes,
 } from 'react-native';
 import Icon from 'react-native-vector-icons/AntDesign';
 import { COMP_GENERAL_CONSTANTS } from '../../constants/component-constants/general-constants/constants';
@@ -70,9 +69,6 @@ export const BackNavigator = (props) => {
 
 BackNavigator.propTypes = {
   title: PropTypes.string,
-  style: ViewPropTypes.style,
-  container: ViewPropTypes.style,
-  titleStyle: ViewPropTypes.style,
   testID: PropTypes.string,
   onPress: PropTypes.func.isRequired,
 };

package/src/components/Button/index.js

@@ -3,8 +3,7 @@ import React, { useContext } from "react";
 import {
   StyleSheet,
   TouchableOpacity,
-  View,
-  ViewPropTypes,
+  View
 } from "react-native";
 import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
 import { AppTheme } from "../../utils";
@@ -37,7 +36,5 @@ export const Button = (props) => {
 Button.propTypes = {
   icon: PropTypes.element,
   text: PropTypes.string,
-  onPress: PropTypes.func,
-  style: ViewPropTypes.style,
-  textStyle: ViewPropTypes.style,
+  onPress: PropTypes.func
 };

package/src/components/Header/index.js

@@ -3,8 +3,7 @@ import React, { useContext } from "react";
 import {
   StyleSheet,
   TouchableOpacity,
-  View,
-  ViewPropTypes,
+  View
 } from "react-native";
 
 import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants";
@@ -46,7 +45,6 @@ Header.propTypes = {
   rightComponent: PropTypes.element,
   leftComponent: PropTypes.element,
   logoComponent: PropTypes.element,
-  style: ViewPropTypes.style,
   logoComponentStyle: PropTypes.object,
   onPress: PropTypes.func,
   noBorder: PropTypes.bool,

package/src/components/IconText/index.js

@@ -4,7 +4,6 @@ import {
   StyleSheet,
   TouchableOpacity,
   View,
-  ViewPropTypes,
 } from "react-native";
 import Icon from "react-native-vector-icons/FontAwesome";
 import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
@@ -80,8 +79,6 @@ IconText.propTypes = {
   iconSize: PropTypes.number,
   onPress: PropTypes.func,
   disabled: PropTypes.bool,
-  iconStyle: ViewPropTypes.style,
-  labelStyle: ViewPropTypes.style,
 };
 
 export { IconText };

package/src/components/RadioButton/index.js

@@ -3,8 +3,7 @@ import React, { useContext } from "react";
 import {
   StyleSheet,
   TouchableOpacity,
-  View,
-  ViewPropTypes,
+  View
 } from "react-native";
 import { AppTheme } from "../../utils";
 import { radioButtonStyles } from "./styles";
@@ -41,6 +40,4 @@ export const RadioButton = ({
 RadioButton.propTypes = {
   onPress: PropTypes.func.isRequired,
   isChecked: PropTypes.bool,
-  circleStyle: ViewPropTypes.style,
-  checkedCircleStyle: ViewPropTypes.style,
 };

package/src/components/References/index.js

@@ -5,7 +5,7 @@ import { Linking, View, TouchableOpacity } from 'react-native';
 import { AppTheme } from '../../utils';
 import { Text } from '../Text';
 import { styles } from './styles';
-import Icon from "react-native-vector-icons/FontAwesome5";
+import Icon from "react-native-vector-icons/FontAwesome";
 
 export const References = ({
   card, referenceNameTestId, referenceDescTestID, referenceContainerTestID,
@@ -22,7 +22,7 @@ export const References = ({
       <View style={referenceStyles.container} testID={referenceContainerTestID}>
         <View>
         <View style={referenceStyles.topSubContainer}>
-          <Icon name={'external-link-alt'} size={FONT_SIZE.h2} style={referenceStyles.iconStyle} testID="referenceStoryIcon" />
+          <Icon name={'external-link'} size={FONT_SIZE.h2} style={referenceStyles.iconStyle} testID="referenceStoryIcon" />
           <Text style={referenceStyles.referenceText}>{'REFERENCE'}</Text>
         </View>
         <Text style={referenceStyles.name} testID={referenceNameTestId}>

package/src/components/References/styles.js

@@ -16,7 +16,6 @@ export const styles = (COLORS, FONT_SIZE, FONT_FAMILY) => StyleSheet.create({
   },
   name: {
     fontSize: FONT_SIZE.h1,
-    fontWeight: 'bold',
     marginTop:15,
     textDecorationLine:'underline',
     lineHeight:24,
@@ -31,8 +30,8 @@ export const styles = (COLORS, FONT_SIZE, FONT_FAMILY) => StyleSheet.create({
   },
   referenceText: {
     marginLeft:5,
-    fontWeight:'700',
-    fontSize: FONT_SIZE.h3
+    fontSize: FONT_SIZE.h3,
+    color:COLORS.BRAND_1,
   },
   topSubContainer:{
     display: 'flex',

package/src/components/Search/index.js

@@ -2,7 +2,7 @@ import React, {
   useEffect, useRef, useContext, useState,
 } from 'react';
 import {
-  View, TextInput, StyleSheet, ViewPropTypes, TouchableOpacity,
+  View, TextInput, StyleSheet, TouchableOpacity,
 } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import PropTypes from 'prop-types';
@@ -78,8 +78,6 @@ Search.propTypes = {
     addListener: PropTypes.func,
   }),
   icon: PropTypes.element,
-  style: ViewPropTypes.style,
-  inputStyle: ViewPropTypes.style,
   onEnter: PropTypes.func,
   testID: PropTypes.string,
 };

package/src/components/Story/index.js

@@ -151,7 +151,8 @@ export const Story = ({
   setShowTTSPlayer,
   gaTrigerredTTS,
   commentData,
-  commentLoader
+  commentLoader,
+  storyLayout
 }) => {
   const { theme } = useContext(AppTheme);
   const { COLORS, FONT_SIZE, locale, DARK_MODE,translate, enableComments } = theme;
@@ -374,6 +375,7 @@ export const Story = ({
         story={story}
         onAuthorPress={onAuthorPress}
         onSectionPress={onSectionPress}
+        storyLayout={storyLayout}
       />
   { storyHasAccess === 'granted' && audioS3Key && (!showPlayer ?
   (<TouchableOpacity onPress={async()=>{

package/src/components/StoryHeader/index.js

@@ -65,7 +65,7 @@ const getHeroComponent = (props) => {
 };
 
 export const StoryHeader = (props) => {
-  const { story, firstVideoElement } = props;
+  const { story, firstVideoElement, storyLayout } = props;
   const sectionData = get(story, ['sections', 0], {});
   const { theme } = useContext(AppTheme);
 
@@ -81,13 +81,14 @@ export const StoryHeader = (props) => {
   const reviewTitle = story['metadata'] && story['metadata']['review-title'];
   const reviewData = story['metadata'] && story['metadata']['review-rating'];
 
-  const showAttribution = () => {
+  const showAttribution = (storyLayout) => {
+    const captionStyle = storyLayout === 'headline-priority' ? styles.headlinePriority.captionStyle : styles.captionStyle;
     if (!caption && !attribution) {
       return null;
     }
     return (
       <View style={styles.captionContainerStyle}>
-        {caption && !firstVideoElement && <CustomHtmlParser text={caption} textStyle={styles.captionStyle} containerStyle={{marginTop:-6, marginBottom:-15}}/>}
+        {caption && !firstVideoElement && <CustomHtmlParser text={caption} textStyle={captionStyle} containerStyle={{marginTop:-6, marginBottom:-15}}/>}
         {attribution && !firstVideoElement && <CustomHtmlParser text={attribution} textStyle={styles.attributionStyle} containerStyle={{marginTop:-6, marginBottom:-10}}/>}
       </View>
     );
@@ -102,23 +103,59 @@ export const StoryHeader = (props) => {
     slug && props.onSectionPress(slug);
   };
 
+  const getSectionName = (storyLayout = 'default') => {
+    const style = storyLayout === 'headline-priority' ? styles.headlinePriority.sectionText : styles.sectionText
+    return <TouchableOpacity onPress={navigateToSection}>
+      <Text
+        style={style}
+        testID={COMP_CONTENT_CONSTANTS.sectionName}
+      >
+        {sectionData['display-name'] || ''}
+      </Text>
+    </TouchableOpacity>
+  }
+
+  const getAuthorRow = () => {
+    return <AuthorRow
+      authors={story.authors}
+      onPress={props.onAuthorPress}
+      cdn={props.cdn}
+      readtime={story['read-time']}
+    />
+  }
+
+  const getDateTime = () => {
+    return <Text
+      style={styles.dateText}
+      testID={COMP_CONTENT_CONSTANTS.publishedDate}
+    >
+      {getTimeInFormat(story['published-at'], DATE_FORMAT, locale)}
+    </Text>
+  }
+
+  if (storyLayout === 'headline-priority') {
+    return (
+      <View testID={props.testID}>
+        {getSectionName(storyLayout)}
+        <StoryTitle title={story.headline} subTitle={story.subheadline} isPremiumStory={isPremiumStory} />
+        {getHeroComponent(props)}
+        {showAttribution(storyLayout)}
+        <View style={styles.dateBlock}>
+          {getDateTime()}
+        </View>
+        {getAuthorRow()}
+        {reviewTitle && <RatingLayout reviewTitle={reviewTitle} ratingValue={reviewData?.value} ratingLabel={reviewData?.label} />}
+      </View>
+    );
+  }
+
   return (
     <View testID={props.testID}>
       {getHeroComponent(props)}
-
       {showAttribution()}
-
       <View style={styles.dateBlock}>
-        <TouchableOpacity onPress={navigateToSection}>
-          <Text
-            style={styles.sectionText}
-            testID={COMP_CONTENT_CONSTANTS.sectionName}
-          >
-            {sectionData['display-name'] || ''}
-          </Text>
-        </TouchableOpacity>
+        {getSectionName()}
         <View style={styles.divider} />
-
         {/* TODO: check why published at is undefined for some stories */}
         <Text
           style={styles.dateText}
@@ -128,12 +165,7 @@ export const StoryHeader = (props) => {
         </Text>
       </View>
         <StoryTitle title={story.headline} subTitle={story.subheadline} isPremiumStory={isPremiumStory}/>
-      <AuthorRow
-        authors={story.authors}
-        onPress={props.onAuthorPress}
-        cdn={props.cdn}
-        readtime={story['read-time']}
-      />
+        {getAuthorRow()}
       {reviewTitle && <RatingLayout reviewTitle={reviewTitle} ratingValue={reviewData?.value} ratingLabel={reviewData?.label}/>}
     </View>
   );

package/src/components/StoryHeader/styles.js

@@ -49,4 +49,16 @@ export const storyHeaderStyles = (COLORS, FONT_FAMILY) => StyleSheet.create({
     width: 1.3,
     backgroundColor: COLORS.BRAND_6,
   },
+  headlinePriority: {
+    sectionText: {
+      color: COLORS.BRAND_1,
+      marginLeft: 10,
+      marginTop: 10,
+    },
+    captionStyle: {
+      color: COLORS.BRAND_BLACK,
+      fontFamily: FONT_FAMILY.secondary,
+      fontWeight: "bold",
+    },
+  }
 });