@jobber/components-native 0.45.0 → 0.45.1

package/dist/types/src/AutoLink/utils.d.ts

@@ -1,6 +1,6 @@
 import { Match } from "autolinker";
-import { MessageDescriptor } from "react-intl";
+import { useAtlantisI18nValue } from "../hooks/useAtlantisI18n";
 export declare function shouldIgnoreURL(text: string, match: Match): boolean;
 export declare function getUrl(match: Match, immediateOpen?: boolean): string;
-export declare function onLongPressLink(match: Match, bottomTabsVisible: boolean, formatMessage: (message: MessageDescriptor) => string): void;
+export declare function onLongPressLink(match: Match, bottomTabsVisible: boolean, t: useAtlantisI18nValue["t"]): void;
 export declare function onPressLink(match: Match): void;

package/dist/types/src/hooks/useAtlantisI18n/useAtlantisI18n.d.ts

@@ -1,6 +1,7 @@
 import en from "./locales/en.json";
+export type I18nKeys = keyof typeof en;
 export interface useAtlantisI18nValue {
     readonly locale: string;
-    readonly t: (message: keyof typeof en, values?: Record<string, string>) => string;
+    readonly t: (message: I18nKeys, values?: Record<string, string>) => string;
 }
 export declare function useAtlantisI18n(): useAtlantisI18nValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -84,5 +84,5 @@
     "react-native-reanimated": "^2.17.0",
     "react-native-safe-area-context": "^4.5.2"
   },
-  "gitHead": "90e9d2a124e1d65d678364063f6ef57e066939af"
+  "gitHead": "8764198c93cfc2812f504b6f6509595ad6b3195c"
 }

package/src/AutoLink/AutoLink.test.tsx

@@ -2,7 +2,6 @@ import React from "react";
 import { fireEvent, render } from "@testing-library/react-native";
 import { copyTextToClipboard } from "./clipboard";
 import { AutoLink } from "./AutoLink";
-import { messages } from "./messages";
 
 const mockOpenUrl = jest.fn();
 jest.mock("react-native/Libraries/Linking/Linking", () => ({
@@ -48,7 +47,7 @@ describe("AutoLink", () => {
       fireEvent(getByText(linkText), "onLongPress");
 
       const expectedToastConfig = {
-        message: messages.urlCopied.defaultMessage,
+        message: "URL copied",
         bottomTabsVisible: true,
       };
       expect(copyTextToClipboard).toHaveBeenCalledWith(
@@ -104,7 +103,7 @@ describe("AutoLink", () => {
       fireEvent(getByText(emailText), "onLongPress");
 
       const expectedToastConfig = {
-        message: messages.emailCopied.defaultMessage,
+        message: "Email copied",
         bottomTabsVisible: true,
       };
       expect(copyTextToClipboard).toHaveBeenCalledWith(
@@ -158,7 +157,7 @@ describe("AutoLink", () => {
       fireEvent(getByText(phoneText), "onLongPress");
 
       const expectedToastConfig = {
-        message: messages.phoneCopied.defaultMessage,
+        message: "Phone number copied",
         bottomTabsVisible: true,
       };
       expect(copyTextToClipboard).toHaveBeenCalledWith(

package/src/AutoLink/components/ComposeTextWithLinks/ComposeTextWithLinks.tsx

@@ -1,10 +1,10 @@
 import React from "react";
-import { useIntl } from "react-intl";
 import { Platform } from "react-native";
 import { ComposeTextWithLinksProps } from "../../types";
 import { onLongPressLink, onPressLink } from "../../utils";
 import { Link } from "../Link/Link";
 import { Text } from "../../../Text";
+import { useAtlantisI18n } from "../../../hooks/useAtlantisI18n";
 
 export function ComposeTextWithLinks({
   part,
@@ -13,7 +13,7 @@ export function ComposeTextWithLinks({
   bottomTabsVisible,
   selectable = true,
 }: ComposeTextWithLinksProps): JSX.Element {
-  const { formatMessage } = useIntl();
+  const { t } = useAtlantisI18n();
 
   const isLink = match?.getType();
 
@@ -26,7 +26,7 @@ export function ComposeTextWithLinks({
           if (selectable && Platform.OS === "android") {
             return;
           }
-          onLongPressLink(match, bottomTabsVisible, formatMessage);
+          onLongPressLink(match, bottomTabsVisible, t);
         }}
       >
         {match.getAnchorText()}

package/src/AutoLink/utils.ts

@@ -1,9 +1,7 @@
 import { EmailMatch, Match, PhoneMatch } from "autolinker";
-import { MessageDescriptor } from "react-intl";
 import { Linking } from "react-native";
-import { messages } from "./messages";
-import { LinkType } from "./types";
 import { copyTextToClipboard } from "./clipboard";
+import { I18nKeys, useAtlantisI18nValue } from "../hooks/useAtlantisI18n";
 
 function hasPrefix(text: string, prefixes: string[]): boolean {
   return prefixes.some(prefix => text.includes(prefix));
@@ -46,12 +44,12 @@ export function getUrl(match: Match, immediateOpen = true): string {
 export function onLongPressLink(
   match: Match,
   bottomTabsVisible: boolean,
-  formatMessage: (message: MessageDescriptor) => string,
+  t: useAtlantisI18nValue["t"],
 ): void {
   const linkUrl = getUrl(match, false);
 
   const toastConfig = {
-    message: formatMessage(messages[`${match.getType() as LinkType}Copied`]),
+    message: t(getMessageKey(match)),
     bottomTabsVisible,
   };
   copyTextToClipboard(linkUrl, toastConfig);
@@ -61,3 +59,16 @@ export function onPressLink(match: Match): void {
   const linkUrl = getUrl(match);
   Linking.openURL(linkUrl);
 }
+
+function getMessageKey(match: Match): I18nKeys {
+  switch (match.getType()) {
+    case "email":
+      return "AutoLink.emailCopied";
+    case "phone":
+      return "AutoLink.phoneCopied";
+    case "url":
+      return "AutoLink.urlCopied";
+    default:
+      return "copied";
+  }
+}

package/src/hooks/useAtlantisI18n/locales/en.json

@@ -1,6 +1,10 @@
 {
+  "AutoLink.emailCopied": "Email copied",
+  "AutoLink.phoneCopied": "Phone number copied",
+  "AutoLink.urlCopied": "URL copied",
   "cancel": "Cancel",
   "confirm": "Confirm",
+  "copied": "Copied",
   "date": "Date",
   "dismiss": "Dismiss",
   "done": "Done",

package/src/hooks/useAtlantisI18n/locales/es.json

@@ -1,6 +1,10 @@
 {
+  "AutoLink.emailCopied": "Correo electrónico copiado",
+  "AutoLink.phoneCopied": "Número de teléfono copiado",
+  "AutoLink.urlCopied": "URL copiada",
   "cancel": "Cancelar",
   "confirm": "Confirmar",
+  "copied": "Copiado",
   "date": "Fecha",
   "dismiss": "Descartar",
   "done": "Listo",

package/src/hooks/useAtlantisI18n/useAtlantisI18n.ts

@@ -2,12 +2,11 @@ import en from "./locales/en.json";
 import es from "./locales/es.json";
 import { useAtlantisContext } from "../../AtlantisContext";
 
+export type I18nKeys = keyof typeof en;
+
 export interface useAtlantisI18nValue {
   readonly locale: string;
-  readonly t: (
-    message: keyof typeof en,
-    values?: Record<string, string>,
-  ) => string;
+  readonly t: (message: I18nKeys, values?: Record<string, string>) => string;
 }
 
 export function useAtlantisI18n(): useAtlantisI18nValue {

package/dist/src/AutoLink/messages.js

@@ -1,18 +0,0 @@
-import { defineMessages } from "react-intl";
-export const messages = defineMessages({
-    phoneCopied: {
-        id: "phoneCopied",
-        defaultMessage: "Phone number copied",
-        description: "Message shown after copying a phone number",
-    },
-    emailCopied: {
-        id: "emailCopied",
-        defaultMessage: "Email copied",
-        description: "Message shown after copying an email",
-    },
-    urlCopied: {
-        id: "urlCopied",
-        defaultMessage: "URL copied",
-        description: "Message shown after copying a URL",
-    },
-});

package/dist/types/src/AutoLink/messages.d.ts

@@ -1,17 +0,0 @@
-export declare const messages: {
-    phoneCopied: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    emailCopied: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    urlCopied: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-};

package/src/AutoLink/messages.ts

@@ -1,19 +0,0 @@
-import { defineMessages } from "react-intl";
-
-export const messages = defineMessages({
-  phoneCopied: {
-    id: "phoneCopied",
-    defaultMessage: "Phone number copied",
-    description: "Message shown after copying a phone number",
-  },
-  emailCopied: {
-    id: "emailCopied",
-    defaultMessage: "Email copied",
-    description: "Message shown after copying an email",
-  },
-  urlCopied: {
-    id: "urlCopied",
-    defaultMessage: "URL copied",
-    description: "Message shown after copying a URL",
-  },
-});