@quintype/native-components 2.20.0-fix-rtl-issues.1 → 2.20.0

package/src/constants/component-constants/general-constants/constants.js

@@ -1,16 +1,27 @@
+import { I18nManager } from 'react-native';
+
 export const COMP_GENERAL_CONSTANTS = {
-  secondaryStoryCard: 'COMP_GENERAL_SECONDARY_STORY',
-  primaryStoryCard: 'COMP_GENERAL_PRIMARY_STORY',
-  secondaryStoryAuthor: 'COMP_GENERAL_SECONDARY_STORY_AUTHOR',
-  secondaryStoryPubishedAt: 'COMP_GENERAL_SECONDARY_STORY_PUBLISHEDATE',
-  primaryStoryAuthor: 'COMP_GENERAL_PRIMARY_STORY_AUTHOR',
-  primaryStoryPubishedAt: 'COMP_GENERAL_PRIMARY_STORY_PUBLISHEDATE',
-  secondaryStoryHeadline: 'COMP_GENERAL_SECONDARY_STORY_HEADLINE',
-  primaryStoryHeadline: 'COMP_GENERAL_PRIMARY_STORY_HEADLINE',
-  iconTextTouch: 'COMP_GENERAL_ICON_TEXT_TOUCH',
-  iconTextLabel: 'COMP_GENERAL_ICON_TEXT_LABEL',
-  collectionTitleTouch: 'COMP_GENERAL_COLLECTION_TITLE',
-  collectionTitleText: 'COMP_GENERAL_COLLECTION_TITLE_TEXT',
-  backNavigatorText: 'COMP_GENERAL_BACK_NAVIGATOR_TEXT',
-  backNavigatorTouch: 'COMP_GENERAL_BACK_NAVIGATOR_TOUCH',
+  secondaryStoryCard: "COMP_GENERAL_SECONDARY_STORY",
+  primaryStoryCard: "COMP_GENERAL_PRIMARY_STORY",
+  secondaryStoryAuthor: "COMP_GENERAL_SECONDARY_STORY_AUTHOR",
+  secondaryStoryPubishedAt: "COMP_GENERAL_SECONDARY_STORY_PUBLISHEDATE",
+  primaryStoryAuthor: "COMP_GENERAL_PRIMARY_STORY_AUTHOR",
+  primaryStoryPubishedAt: "COMP_GENERAL_PRIMARY_STORY_PUBLISHEDATE",
+  secondaryStoryHeadline: "COMP_GENERAL_SECONDARY_STORY_HEADLINE",
+  primaryStoryHeadline: "COMP_GENERAL_PRIMARY_STORY_HEADLINE",
+  iconTextTouch: "COMP_GENERAL_ICON_TEXT_TOUCH",
+  iconTextLabel: "COMP_GENERAL_ICON_TEXT_LABEL",
+  collectionTitleTouch: "COMP_GENERAL_COLLECTION_TITLE",
+  collectionTitleText: "COMP_GENERAL_COLLECTION_TITLE_TEXT",
+  backNavigatorText: "COMP_GENERAL_BACK_NAVIGATOR_TEXT",
+  backNavigatorTouch: "COMP_GENERAL_BACK_NAVIGATOR_TOUCH",
+  customSwitch: "COMP_GENERAL_CUSTOM_SWITCH",
+  primaryStoryReadTime: "COMP_GENERAL_PRIMARY_STORY_READTIME",
+  secondaryStoryReadTime: "COMP_GENERAL_SECONDARY_STORY_READTIME",
+  actionTextTouch: "COMP_GENERAL_ACTION_TEXT_TOUCH",
+  buttonTouch: "COMP_GENERAL_BUTTON_TOUCH",
+  headerLogoTouch: "COMP_GENERAL_HEADER_LOGO_TOUCH",
+  radioButtonTouch: "COMP_GENERAL_RADIO",
+  shareButtonTouch: "COMP_GENERAL_SHARE",
+  textAlignment: I18nManager.isRTL ? "left" : "auto",
 };

package/src/constants/renderHTML.js

@@ -59,5 +59,15 @@ export const customHTMLStyles = () => {
       color: COLORS.BRAND_BLACK,
       opacity: 0.85,
     },
+    sup: {
+      marginBottom: 16,
+      lineHeight: FONT_SIZE.p1 * 0.3,
+      fontSize: FONT_SIZE.p1 * 0.5,
+    },
+    sub: {
+      marginBottom: 16,
+      lineHeight: FONT_SIZE.p1 * 0.3,
+      fontSize: FONT_SIZE.p1 * 0.5,
+    },
   };
 };

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);
 };
 
 /**

package/src/utils/timeUtils.js

@@ -1,9 +1,9 @@
-import { formatDistanceToNow, differenceInMinutes, format as dateFormat } from 'date-fns';
+import { formatDistanceToNowStrict, differenceInMinutes, format as dateFormat } from 'date-fns';
 import * as dateFNSlocale from 'date-fns/locale';
 
 export function getTimeAgo(date) {
   if (date) {
-    return formatDistanceToNow(new Date(date));
+    return formatDistanceToNowStrict(new Date(date));
   }
   return '';
 }
@@ -15,14 +15,23 @@ export function getTimeInFormat(date, format, localTime) {
   return '';
 }
 
-export const getTimeForStoryCards = (date, format, localTime) => {
+export const getTimeForStoryCards = (
+  date,
+  format,
+  localTime,
+  translate,
+  reverseTimeAdverbPosition = false,
+) => {
   if (date) {
     const currentDate = new Date();
     const dateToFormat = new Date(date);
     const locale = dateFNSlocale[localTime];
     const distanceInMinutes = differenceInMinutes(currentDate, dateToFormat);
     if (distanceInMinutes <= 1440) {
-      return `published ${formatDistanceToNow(dateToFormat, { locale })} ago`;
+      const timeDistance = formatDistanceToNowStrict(dateToFormat, { locale });
+      return reverseTimeAdverbPosition
+        ? `${translate('ago')} ${timeDistance}`
+        : `${timeDistance} ${translate('ago')}`;
     }
     return dateFormat(dateToFormat, format, { locale });
   }