Merge remote-tracking branch 'origin/main' into lift-position-wrapper

timolins · Jan 21, 2021 · 802fe9e · 802fe9e
2 parents b43caa1 + 1aa0596
commit 802fe9e
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,11 @@
 <a href="https://twitter.com/timolins">Twitter</a>
 </div>
 
+<br />
+<div align="center">
+  <sub>Cooked by <a href="https://twitter.com/timolins">Timo Lins</a> 👨‍🍳</sub>
+</div>
+
 <br />
 
 ## Features
@@ -65,7 +70,3 @@ const App = () => {
 ## Documentation
 
 Find the full API reference on [official documentation](https://react-hot-toast.com/docs).
-
-## Credits
-
-**react-hot-toast** was cooked by [Timo Lins](https://timo.sh) 👨‍🍳
diff --git a/site/components/sections/footer.tsx b/site/components/sections/footer.tsx
@@ -28,6 +28,14 @@ export function Footer() {
           </a>
         </span>
       </div>
+      <div>
+        <a href="https://splitbee.io">
+          <img
+            src="https://splitbee.io/splitbee-badge.svg"
+            alt="Splitbee Analytics"
+          />
+        </a>
+      </div>
     </footer>
   );
 }
diff --git a/site/components/sections/toast-example.tsx b/site/components/sections/toast-example.tsx
@@ -34,7 +34,7 @@ const examples: Array<{
   saveSettings(settings),
    {
      loading: 'Saving...',
-     success: <b>Settings saved!</b>,,
+     success: <b>Settings saved!</b>,
      error: <b>Could not save.</b>,
    }
  );`,

diff --git a/site/components/sections/toaster-example.tsx b/site/components/sections/toaster-example.tsx
@@ -81,10 +81,6 @@ export const ToasterExample: React.FC<{
           }
         );
 
-        (window as any).splitbee?.track('Change Position', {
-          position: p,
-        });
-
         onPosition(p);
       }}
     >

diff --git a/site/pages/_app.tsx b/site/pages/_app.tsx
@@ -28,7 +28,7 @@ function MyApp({ Component, pageProps }) {
   return (
     <>
       <Head>
-        <script async data-api="/_hive" src="/bee.js"></script>
+        <script async data-no-cookie data-api="/_hive" src="/bee.js"></script>
         <link rel="shortcut icon" href="/favicon.png" type="image/x-icon" />
       </Head>
       <MDXProvider components={components}>

diff --git a/src/components/toast-bar.tsx b/src/components/toast-bar.tsx
@@ -70,8 +70,10 @@ export const ToastBar: React.FC<ToastBarProps> = React.memo(
   ({ toast, position, onHeight }) => {
     const ref = useCallback((el: HTMLElement | null) => {
       if (el) {
-        const boundingRect = el.getBoundingClientRect();
-        onHeight(boundingRect.height);
+        setTimeout(() => {
+          const boundingRect = el.getBoundingClientRect();
+          onHeight(boundingRect.height);
+        });
       }
     }, []);
 

diff --git a/src/core/store.ts b/src/core/store.ts
@@ -9,7 +9,6 @@ export enum ActionType {
   UPSERT_TOAST,
   DISMISS_TOAST,
   REMOVE_TOAST,
-  TOAST,
   START_PAUSE,
   END_PAUSE,
 }

diff --git a/src/core/toast.ts b/src/core/toast.ts
@@ -46,8 +46,19 @@ toast.error = createHandler('error');
 toast.success = createHandler('success');
 toast.loading = createHandler('loading');
 
-toast.dismiss = (toastId?: string) =>
-  dispatch({ type: ActionType.DISMISS_TOAST, toastId });
+toast.dismiss = (toastId?: string) => {
+  dispatch({
+    type: ActionType.DISMISS_TOAST,
+    toastId,
+  });
+  setTimeout(() => {
+    dispatch({
+      type: ActionType.REMOVE_TOAST,
+      toastId,
+    });
+  }, 1000);
+};
+
 toast.remove = (toastId?: string) =>
   dispatch({ type: ActionType.REMOVE_TOAST, toastId });
 

diff --git a/src/core/use-toaster.ts b/src/core/use-toaster.ts
@@ -1,5 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import { dispatch, ActionType, useStore } from './store';
+import { toast } from './toast';
 import { DefaultToastOptions } from './types';
 
 export const useToaster = (toastOptions?: DefaultToastOptions) => {
@@ -16,26 +17,13 @@ export const useToaster = (toastOptions?: DefaultToastOptions) => {
       const durationLeft =
         (t.duration || 0) + t.pauseDuration - (now - t.createdAt);
 
-      const dismiss = () => {
-        dispatch({
-          type: ActionType.DISMISS_TOAST,
-          toastId: t.id,
-        });
-        setTimeout(() => {
-          dispatch({
-            type: ActionType.REMOVE_TOAST,
-            toastId: t.id,
-          });
-        }, 1000);
-      };
-
       if (durationLeft < 0) {
         if (t.visible) {
-          dismiss();
+          toast.dismiss(t.id);
         }
         return;
       }
-      return setTimeout(dismiss, durationLeft);
+      return setTimeout(() => toast.dismiss(t.id), durationLeft);
     });
 
     return () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,10 +81,6 @@ export const ToasterExample: React.FC<{ @@
               }
             );
-            (window as any).splitbee?.track('Change Position', {
-              position: p,
-            });
             onPosition(p);
           }}
         >
@@ Expand Down @@