fix(fix toast props and types): fix toast types and props

trycourier · Jul 9, 2024 · eaace00 · eaace00
1 parent a46dd24
commit eaace00
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 50 deletions.
diff --git a/packages/client-graphql/package.json b/packages/client-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/client-graphql",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/components",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "private": true,
   "description": "Beautiful, easy React toast notifications",
   "author": "Courier <[email protected]>",
@@ -18,11 +18,11 @@
   "license": "MIT",
   "dependencies": {
     "@trycourier/courier": "^1.3.0",
-    "@trycourier/react-brand-designer": "^6.2.0",
-    "@trycourier/react-inbox": "^6.2.0",
-    "@trycourier/react-preferences": "^6.2.0",
-    "@trycourier/react-provider": "^6.2.0",
-    "@trycourier/react-toast": "^6.2.0",
+    "@trycourier/react-brand-designer": "^6.2.1",
+    "@trycourier/react-inbox": "^6.2.1",
+    "@trycourier/react-preferences": "^6.2.1",
+    "@trycourier/react-provider": "^6.2.1",
+    "@trycourier/react-toast": "^6.2.1",
     "babel-loader": "^8.0.6",
     "babel-preset-preact": "^2.0.0",
     "camel-case": "^4.1.2",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/core",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",

diff --git a/packages/react-brand-designer/package.json b/packages/react-brand-designer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-brand-designer",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "Embeddable brand designer for multi-channel notifications",
   "homepage": "https://github.com/trycourier/courier-react/tree/main/packages/react-elements#readme",
   "license": "ISC",
@@ -29,7 +29,7 @@
     "url": "https://github.com/trycourier/courier-react/issues"
   },
   "dependencies": {
-    "@trycourier/react-elements": "^6.2.0",
+    "@trycourier/react-elements": "^6.2.1",
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {

diff --git a/packages/react-elements/package.json b/packages/react-elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-elements",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "Shareable components for each Courier package",
   "author": "Drew Youngwerth <[email protected]>",
   "homepage": "https://github.com/trycourier/courier-react/tree/main/packages/react-elements#readme",

diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-hooks",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
@@ -20,8 +20,8 @@
     "concat-md": "^0.3.5"
   },
   "dependencies": {
-    "@trycourier/client-graphql": "^6.2.0",
-    "@trycourier/core": "^6.2.0",
+    "@trycourier/client-graphql": "^6.2.1",
+    "@trycourier/core": "^6.2.1",
     "deep-extend": "^0.6.0",
     "rimraf": "^3.0.2"
   },

diff --git a/packages/react-inbox-next/package.json b/packages/react-inbox-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-inbox-next",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "private": true,
   "main": "dist/index.js",

diff --git a/packages/react-inbox/package.json b/packages/react-inbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-inbox",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
@@ -19,10 +19,10 @@
   "dependencies": {
     "@fontsource/poppins": "^4.5.9",
     "@tippyjs/react": "^4.2.3",
-    "@trycourier/client-graphql": "^6.2.0",
-    "@trycourier/react-elements": "^6.2.0",
-    "@trycourier/react-hooks": "^6.2.0",
-    "@trycourier/react-preferences": "^6.2.0",
+    "@trycourier/client-graphql": "^6.2.1",
+    "@trycourier/react-elements": "^6.2.1",
+    "@trycourier/react-hooks": "^6.2.1",
+    "@trycourier/react-preferences": "^6.2.1",
     "classnames": "^2.2.6",
     "date-fns": "^2.19.0",
     "deep-extend": "^0.6.0",

diff --git a/packages/react-preferences/package.json b/packages/react-preferences/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-preferences",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
   "scripts": {
@@ -24,7 +24,7 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "@trycourier/react-hooks": "^6.2.0",
+    "@trycourier/react-hooks": "^6.2.1",
     "date-fns": "^2.19.0",
     "react-toggle": "^4.1.2"
   }

diff --git a/packages/react-provider/package.json b/packages/react-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-provider",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
@@ -15,10 +15,10 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@trycourier/client-graphql": "^6.2.0",
-    "@trycourier/core": "^6.2.0",
+    "@trycourier/client-graphql": "^6.2.1",
+    "@trycourier/core": "^6.2.1",
     "@trycourier/courier-js": "^1.4.2",
-    "@trycourier/transport": "^6.2.0",
+    "@trycourier/transport": "^6.2.1",
     "buffer": "^6.0.3",
     "jwt-decode": "^3.1.2",
     "react-use": "^17.2.1",

diff --git a/packages/react-toast/package.json b/packages/react-toast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/react-toast",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "Beautiful, easy React toast notifications",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
@@ -24,7 +24,7 @@
     "concat-md": "^0.3.5"
   },
   "dependencies": {
-    "@trycourier/react-hooks": "^6.2.0",
+    "@trycourier/react-hooks": "^6.2.1",
     "deep-extend": "^0.6.0",
     "markdown-to-jsx": "7.1.7",
     "react-toastify": "^9.1.3",

diff --git a/packages/react-toast/src/components/Body/index.tsx b/packages/react-toast/src/components/Body/index.tsx
@@ -62,31 +62,36 @@ const NonClickableContainer = styled.div(({ theme }) => {
 });
 
 const Body: React.FunctionComponent<{
-  icon: IInboxMessagePreview["icon"] | ReactElement;
-  markdownOptions?: MarkdownToJSX.Options;
   message: IInboxMessagePreview;
+  markdownOptions?: MarkdownToJSX.Options;
+  toastProps?: ToastOptions;
   onClick?: (event: React.MouseEvent) => void;
-  preview?: IInboxMessagePreview["preview"] | ReactElement;
+  icon: IInboxMessagePreview["icon"] | ReactElement;
   title?: IInboxMessagePreview["title"] | ReactElement;
-  toastProps?: ToastOptions;
+  preview?: IInboxMessagePreview["preview"] | ReactElement;
 }> = ({
   message,
   onClick,
   title,
   preview,
-  markdownOptions,
   icon,
+  markdownOptions,
   ...props
 }) => {
   const { actions, data, messageId } = message;
-  const courier = useCourier();
+  title = message.title ?? title;
+  preview = message.preview ?? preview;
+  icon = message.icon ?? icon;
+
   const [, { config }] = useToast();
 
+  const courier = useCourier();
+  const { brand: courierBrand } = courier;
+  const brand = config?.brand ?? courierBrand;
+
   const { toastProps } = props;
-  const { brand: courierBrand } = useCourier();
   const { markMessageRead, trackClick } = useInbox();
 
-  const brand = config?.brand ?? courierBrand;
   const { openLinksInNewTab } = config;
 
   const handleOnClickDismiss = useCallback(

diff --git a/packages/react-toast/src/hooks/index.ts b/packages/react-toast/src/hooks/index.ts
@@ -4,13 +4,15 @@ import { IToastConfig } from "../types";
 import { UseToast, ToastCaller } from "./types";
 
 export const useToast: UseToast = () => {
-  const { toast, clientKey } =
+  const courier =
     useCourier<{
       toast?: {
         toast: ToastCaller;
         config?: IToastConfig;
       };
     }>();
+
+  const { toast, clientKey } = courier ?? {};
   const toastCaller = toast?.toast ? toast.toast : () => {};
   return [
     toastCaller,

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/storybook",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "private": true,
   "description": "Beautiful, easy React toast notifications",
   "author": "Courier <[email protected]>",
@@ -23,12 +23,12 @@
     "@storybook/addon-links": "^6.5.9",
     "@storybook/addon-viewport": "^6.5.9",
     "@storybook/react": "^6.5.9",
-    "@trycourier/components": "^6.2.0",
-    "@trycourier/react-brand-designer": "^6.2.0",
-    "@trycourier/react-inbox": "^6.2.0",
-    "@trycourier/react-preferences": "^6.2.0",
-    "@trycourier/react-provider": "^6.2.0",
-    "@trycourier/react-toast": "^6.2.0",
+    "@trycourier/components": "^6.2.1",
+    "@trycourier/react-brand-designer": "^6.2.1",
+    "@trycourier/react-inbox": "^6.2.1",
+    "@trycourier/react-preferences": "^6.2.1",
+    "@trycourier/react-provider": "^6.2.1",
+    "@trycourier/react-toast": "^6.2.1",
     "react-frame-component": "^5.2.3",
     "react-markdown": "^8.0.1",
     "rehype-raw": "^6.1.1",

diff --git a/packages/storybook/stories/toast/index.stories.tsx b/packages/storybook/stories/toast/index.stories.tsx
@@ -28,7 +28,8 @@ const ExampleButton: React.FunctionComponent<{ text?: string }> = ({
 
   const handleOnClick = () => {
     toast({
-      title: "Hello World",
+      preview: "Hello World",
+      title: "foo",
     });
   };
 
@@ -41,7 +42,7 @@ export const Props = () => {
   const autoCloseTimeout = number("Auto Close Timeout", 5000);
 
   return (
-    <CourierProvider>
+    <CourierProvider clientKey="foobar">
       <ReactMarkdown>{propsMd}</ReactMarkdown>
       <ReactMarkdown>{`## Example`}</ReactMarkdown>
       <Toast
@@ -103,7 +104,7 @@ export const Theme = () => {
         null,
         2
       )}\n\`\`\``}</ReactMarkdown>
-      <CourierProvider>
+      <CourierProvider clientKey="foobar">
         <ToastBody message={{} as any} title="Title" theme={theme} />
       </CourierProvider>
     </>

diff --git a/packages/transport/package.json b/packages/transport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/transport",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
@@ -14,7 +14,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@trycourier/core": "^6.2.0",
+    "@trycourier/core": "^6.2.1",
     "jwt-decode": "^3.1.2",
     "reconnecting-websocket": "^4.4.0",
     "rimraf": "^3.0.2"

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@trycourier/types",
   "private": true,
-  "version": "6.2.0",
+  "version": "6.2.1",
   "main": "index.d.ts",
   "types": "index.d.ts",
   "scripts": {}