refactor: upgrade pswui to latest

src/pswui/components/Dialog/Component.tsx

@@ -1,9 +1,4 @@
-import {
-  ServerSideDocumentFallback,
-  Slot,
-  type VariantProps,
-  vcn,
-} from "@pswui-lib";
+import { Slot, type VariantProps, useDocument, vcn } from "@pswui-lib";
 import React, { type ReactNode, useState } from "react";
 import ReactDOM from "react-dom";
 
@@ -88,32 +83,31 @@ const DialogOverlay = React.forwardRef<HTMLDivElement, DialogOverlay>(
     const { children, closeOnClick, onClick, ...otherPropsExtracted } =
       otherPropsCompressed;
 
-    return (
-      <ServerSideDocumentFallback>
-        {ReactDOM.createPortal(
-          <div
-            {...otherPropsExtracted}
-            ref={ref}
-            className={dialogOverlayVariant(variantProps)}
-            onClick={(e) => {
-              if (closeOnClick) {
-                setContext((p) => ({ ...p, opened: false }));
-              }
-              onClick?.(e);
-            }}
-          >
-            <div
-              className={
-                "w-screen max-w-full min-h-screen flex flex-col justify-center items-center"
-              }
-            >
-              {/* Layer for overflow positioning */}
-              {children}
-            </div>
-          </div>,
-          document.body,
-        )}
-      </ServerSideDocumentFallback>
+    const document = useDocument();
+    if (!document) return null;
+
+    return ReactDOM.createPortal(
+      <div
+        {...otherPropsExtracted}
+        ref={ref}
+        className={dialogOverlayVariant(variantProps)}
+        onClick={(e) => {
+          if (closeOnClick) {
+            setContext((p) => ({ ...p, opened: false }));
+          }
+          onClick?.(e);
+        }}
+      >
+        <div
+          className={
+            "w-screen max-w-full min-h-screen flex flex-col justify-center items-center"
+          }
+        >
+          {/* Layer for overflow positioning */}
+          {children}
+        </div>
+      </div>,
+      document.body,
     );
   },
 );

src/pswui/components/Drawer.tsx

@@ -1,8 +1,8 @@
 import {
   type AsChild,
-  ServerSideDocumentFallback,
   Slot,
   type VariantProps,
+  useDocument,
   vcn,
 } from "@pswui-lib";
 import React, {
@@ -125,26 +125,25 @@ const DrawerOverlay = forwardRef<HTMLDivElement, DrawerOverlayProps>(
           : 1
     })`;
 
-    return (
-      <ServerSideDocumentFallback>
-        {createPortal(
-          <Comp
-            {...restPropsExtracted}
-            className={drawerOverlayVariant({
-              ...variantProps,
-              opened: state.isDragging ? true : state.opened,
-            })}
-            onClick={onOutsideClick}
-            style={{
-              backdropFilter,
-              WebkitBackdropFilter: backdropFilter,
-              transitionDuration: state.isDragging ? "0s" : undefined,
-            }}
-            ref={ref}
-          />,
-          document.body,
-        )}
-      </ServerSideDocumentFallback>
+    const document = useDocument();
+    if (!document) return null;
+
+    return createPortal(
+      <Comp
+        {...restPropsExtracted}
+        className={drawerOverlayVariant({
+          ...variantProps,
+          opened: state.isDragging ? true : state.opened,
+        })}
+        onClick={onOutsideClick}
+        style={{
+          backdropFilter,
+          WebkitBackdropFilter: backdropFilter,
+          transitionDuration: state.isDragging ? "0s" : undefined,
+        }}
+        ref={ref}
+      />,
+      document.body,
     );
   },
 );

src/pswui/components/Toast/Component.tsx

@@ -1,4 +1,4 @@
-import { type VariantProps, vcn, withServerSideDocument } from "@pswui-lib";
+import { type VariantProps, useDocument, vcn } from "@pswui-lib";
 import React, { useEffect, useId, useRef } from "react";
 import ReactDOM from "react-dom";
 
@@ -145,71 +145,73 @@ interface ToasterProps
   muteDuplicationWarning?: boolean;
 }
 
-const Toaster = withServerSideDocument(
-  React.forwardRef<HTMLDivElement, ToasterProps>((props, ref) => {
-    const id = useId();
-    const [variantProps, otherPropsCompressed] =
-      resolveToasterVariantProps(props);
-    const { defaultOption, muteDuplicationWarning, ...otherPropsExtracted } =
-      otherPropsCompressed;
+const Toaster = React.forwardRef<HTMLDivElement, ToasterProps>((props, ref) => {
+  const id = useId();
+  const [variantProps, otherPropsCompressed] =
+    resolveToasterVariantProps(props);
+  const { defaultOption, muteDuplicationWarning, ...otherPropsExtracted } =
+    otherPropsCompressed;
 
-    const [toastList, setToastList] = React.useState<typeof toasts>(toasts);
-    const internalRef = useRef<HTMLDivElement | null>(null);
+  const [toastList, setToastList] = React.useState<typeof toasts>(toasts);
+  const internalRef = useRef<HTMLDivElement | null>(null);
 
-    useEffect(() => {
-      return subscribe(() => {
-        setToastList(getSnapshot());
-      });
-    }, []);
+  useEffect(() => {
+    return subscribe(() => {
+      setToastList(getSnapshot());
+    });
+  }, []);
 
-    const option = React.useMemo(() => {
-      return {
-        ...defaultToastOption,
-        ...defaultOption,
-      };
-    }, [defaultOption]);
+  const option = React.useMemo(() => {
+    return {
+      ...defaultToastOption,
+      ...defaultOption,
+    };
+  }, [defaultOption]);
 
-    const toasterInstance = document.querySelector("div[data-toaster-root]");
-    if (toasterInstance && id !== toasterInstance.id) {
-      if (process.env.NODE_ENV === "development" && !muteDuplicationWarning) {
-        console.warn(
-          "Multiple Toaster instances detected. Only one Toaster is allowed.",
-        );
-      }
-      return null;
+  const document = useDocument();
+
+  if (!document) return null;
+
+  const toasterInstance = document.querySelector("div[data-toaster-root]");
+  if (toasterInstance && id !== toasterInstance.id) {
+    if (process.env.NODE_ENV === "development" && !muteDuplicationWarning) {
+      console.warn(
+        "Multiple Toaster instances detected. Only one Toaster is allowed.",
+      );
     }
+    return null;
+  }
 
-    return (
-      <>
-        {ReactDOM.createPortal(
-          <div
-            {...otherPropsExtracted}
-            data-toaster-root={true}
-            className={toasterVariant(variantProps)}
-            ref={(el) => {
-              internalRef.current = el;
-              if (typeof ref === "function") {
-                ref(el);
-              } else if (ref) {
-                ref.current = el;
-              }
-            }}
-            id={id}
-          >
-            {Object.entries(toastList).map(([id]) => (
-              <ToastTemplate
-                key={id}
-                id={id as `${number}`}
-                globalOption={option}
-              />
-            ))}
-          </div>,
-          document.body,
-        )}
-      </>
-    );
-  }),
-);
+  return (
+    <>
+      {ReactDOM.createPortal(
+        <div
+          {...otherPropsExtracted}
+          data-toaster-root={true}
+          className={toasterVariant(variantProps)}
+          ref={(el) => {
+            internalRef.current = el;
+            if (typeof ref === "function") {
+              ref(el);
+            } else if (ref) {
+              ref.current = el;
+            }
+          }}
+          id={id}
+        >
+          {Object.entries(toastList).map(([id]) => (
+            <ToastTemplate
+              key={id}
+              id={id as `${number}`}
+              globalOption={option}
+            />
+          ))}
+        </div>,
+        document.body,
+      )}
+    </>
+  );
+});
 Toaster.displayName = "Toaster";
 
 export { Toaster };

src/pswui/lib/index.ts

@@ -1,4 +1,3 @@
 export * from "./vcn";
 export * from "./Slot";
-export * from "./ssrFallback";
-export * from "./withSSD";
+export * from "./useDocument";

src/pswui/lib/ssrFallback.tsx

@@ -1,20 +0,0 @@
-import { type ReactNode, useEffect, useState } from "react";
-
-/**
- * This component allows components to use `document` as like they're always in the client side.
- * Return null if there is no `document` (which represents it's server side) or initial render(to avoid hydration error).
- */
-function ServerSideDocumentFallback({ children }: { children: ReactNode }) {
-  const [initialRender, setInitialRender] = useState<boolean>(true);
-
-  useEffect(() => {
-    setInitialRender(false);
-  }, []);
-
-  if (typeof document === "undefined" /* server side */ || initialRender)
-    return null;
-
-  return children;
-}
-
-export { ServerSideDocumentFallback };

src/pswui/lib/useDocument.ts

@@ -0,0 +1,21 @@
+"use client";
+
+import { useEffect, useState } from "react";
+
+/**
+ * This hook allows components to use `document` as like they're always in the client side.
+ * Return undefined if there is no `document` (which represents it's server side) or initial render(to avoid hydration error).
+ */
+function useDocument(): undefined | Document {
+  const [initialRender, setInitialState] = useState(true);
+
+  useEffect(() => {
+    setInitialState(false);
+  }, []);
+
+  if (typeof document === "undefined" || initialRender) return undefined;
+
+  return document;
+}
+
+export { useDocument };

src/pswui/lib/withSSD.tsx

@@ -1,16 +0,0 @@
-import type { ComponentType } from "react";
-import { ServerSideDocumentFallback } from "./ssrFallback";
-
-function withServerSideDocument<P extends {}>(
-  Component: ComponentType<P>,
-): ComponentType<P> {
-  return (props) => {
-    return (
-      <ServerSideDocumentFallback>
-        <Component {...props} />
-      </ServerSideDocumentFallback>
-    );
-  };
-}
-
-export { withServerSideDocument };