notionsoft-ui 1.0.34 → 1.0.36

package/src/notion-ui/sidebar/sidebar-item.tsx

@@ -0,0 +1,198 @@
+import { useMemo, useCallback, memo, useEffect, useState } from "react";
+import { ChevronRight } from "lucide-react";
+import { useLocation } from "react-router";
+import CachedSvg, {
+  CachedSvgProps,
+} from "@/components/notion-ui/cached-svg/cached-svg";
+import AnimatedItem from "@/components/notion-ui/animated-item";
+import { cn } from "@/utils/cn";
+
+export interface SubPermission {
+  id: number;
+  name: string;
+  is_category: boolean;
+}
+
+export type Permission = {
+  id: number;
+  visible: boolean;
+  permission: string;
+  icon: string;
+  sub: Map<number, SubPermission>;
+};
+
+export interface SidebarItemProps {
+  path: string;
+  isActive: boolean;
+  permission: Permission;
+  icon: CachedSvgProps;
+  navigateTo: (path: string) => void;
+  translate?: (key: string) => string;
+  classNames?: {};
+}
+
+export const SidebarItem = memo(function SidebarItem({
+  isActive,
+  navigateTo,
+  permission,
+  path,
+  icon,
+  translate,
+}: SidebarItemProps) {
+  const location = useLocation();
+  const [showDropdown, setShowDropdown] = useState(false);
+
+  // Calculate categories and selectedSubId
+  const { categories, selectedSubId } = useMemo(() => {
+    const subs = Array.from(permission.sub.values()).filter(
+      (sub) => sub.is_category
+    );
+    const selectedId = Number(location.pathname.split("/").pop());
+    return { categories: subs, selectedSubId: selectedId };
+  }, [permission.sub, location.pathname]);
+
+  // Auto-open dropdown if current URL matches any category
+  useEffect(() => {
+    const matched = categories.find((sub) =>
+      location.pathname.includes(`${path}/${sub.id}`)
+    );
+    setShowDropdown(matched ? true : false);
+  }, [location.pathname, categories, path]);
+  useEffect(() => {
+    const handleCloseDropdowns = (e: Event) => {
+      const customEvent = e as CustomEvent;
+      if (customEvent.detail?.forceClose) {
+        setShowDropdown(false);
+      }
+    };
+
+    // Listen for close events
+    window.addEventListener("sidebar-close-dropdowns", handleCloseDropdowns);
+
+    return () => {
+      window.removeEventListener(
+        "sidebar-close-dropdowns",
+        handleCloseDropdowns
+      );
+    };
+  }, []);
+  const handleClick = useCallback(
+    (e: React.MouseEvent) => {
+      if (categories.length === 0) {
+        navigateTo(path);
+      } else {
+        setShowDropdown((prev) => !prev);
+        // Dispatch custom event to parent (Sidebar)
+        const expandEvent = new CustomEvent("sidebar-item-expand", {
+          bubbles: true, // This makes the event bubble up through DOM
+          composed: true, // This allows it to cross shadow DOM boundaries if any
+          detail: {
+            hasChildren: true,
+          },
+        });
+
+        // Dispatch from the clicked element
+        e.currentTarget.dispatchEvent(expandEvent);
+      }
+    },
+    [categories.length, navigateTo, path]
+  );
+
+  const handleCategoryClick = useCallback(
+    (cat: SubPermission) => {
+      navigateTo(`${path}/${cat.id}`);
+    },
+    [navigateTo, path]
+  );
+
+  const spring = useMemo(
+    () => ({
+      springProps: {
+        from: { opacity: 0, transform: "translateY(-8px)" },
+        config: { mass: 1, tension: 210, friction: 20 },
+        to: { opacity: 1, transform: "translateY(0px)" },
+      },
+      intersectionArgs: { rootMargin: "-10% 0%", once: true },
+    }),
+    []
+  );
+
+  const dropdownContent = useMemo(() => {
+    if (!showDropdown || categories.length === 0) return null;
+    return (
+      <div className="relative ltr:ml-5 rtl:mr-5 mt-1 mb-4 space-y-1 ltr:pl-2 rtl:pr-2 before:absolute before:top-3 before:bottom-0 rtl:before:right-1 ltr:before:left-1 before:w-px rounded-full before:bg-primary/30">
+        {categories.map((cat, index) => {
+          const selected = selectedSubId === cat.id;
+          return (
+            <AnimatedItem
+              key={cat.id}
+              springProps={{
+                ...spring.springProps,
+                delay: index * 100,
+                to: {
+                  ...spring.springProps.to,
+                  delay: index * 100,
+                },
+              }}
+              intersectionArgs={spring.intersectionArgs}
+            >
+              <div className="relative flex items-center before:absolute ltr:before:left-1 rtl:before:right-1 before:top-1/2 before:w-3 before:h-px before:bg-primary/40">
+                <button
+                  onClick={handleCategoryClick.bind(null, cat)}
+                  className={`cursor-pointer text-primary/80 ltr:ml-5 rtl:mr-5 rtl:text-sm rtl:font-bold ltr:text-xs flex items-center gap-x-2 py-1 px-2 w-[85%] rounded-sm transition-colors ${
+                    selected
+                      ? "font-semibold bg-tertiary/10 text-primary"
+                      : "hover:opacity-75"
+                  }`}
+                >
+                  {translate ? translate(cat.name) : cat.name}
+                </button>
+              </div>
+            </AnimatedItem>
+          );
+        })}
+      </div>
+    );
+  }, [
+    showDropdown,
+    categories,
+    selectedSubId,
+    spring,
+    handleCategoryClick,
+    translate,
+  ]);
+  return (
+    <>
+      <div
+        onClick={handleClick}
+        className={cn(
+          `grid grid-cols-[1fr_auto] ltr:py-2 rtl:p-1 ltr:pl-2.5 rtl:pr-2 ltr:mx-1 rtl:mx-1.5 text-primary items-center rtl:text-lg ltr:text-xs cursor-pointer rounded-md ${
+            isActive
+              ? `bg-tertiary/90 text-card font-semibold`
+              : "hover:opacity-75"
+          }`
+        )}
+        key={permission.permission}
+      >
+        <div className="flex items-center gap-x-4 w-full">
+          <CachedSvg {...icon} className={cn("rtl", icon.className)} />
+          <h1 className="truncate">
+            {translate
+              ? translate(permission.permission)
+              : permission.permission}
+          </h1>
+        </div>
+
+        {categories.length > 0 && (
+          <ChevronRight
+            className={`size-3.5 min-h-3.5 min-w-3.5 text-primary ltr:mr-2 transition-transform duration-300 ease-in-out ${
+              showDropdown ? "rotate-90" : "rtl:rotate-180"
+            }`}
+          />
+        )}
+      </div>
+
+      {dropdownContent}
+    </>
+  );
+}); // Pass custom comparison function

package/src/notion-ui/sidebar/sidebar.stories.tsx

@@ -0,0 +1,181 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { MemoryRouter, Route, Routes } from "react-router";
+import { I18nextProvider } from "react-i18next";
+import i18n from "i18next";
+import { initReactI18next } from "react-i18next";
+
+import { LucideCircleArrowOutDownLeft } from "lucide-react";
+import { useCallback, useMemo, useState } from "react";
+import { SidebarItem } from "@/components/notion-ui/sidebar/sidebar-item";
+import Sidebar, { Separator } from "@/components/notion-ui/sidebar/sidebar";
+import Button from "@/components/notion-ui/button";
+
+/* ------------------ i18n Mock ------------------ */
+i18n.use(initReactI18next).init({
+  lng: "en",
+  fallbackLng: "en",
+  resources: {
+    en: {
+      translation: {
+        app_name: "My App",
+        dashboard: "Dashboard",
+        settings: "Settings",
+        users: "Users",
+        roles: "Roles",
+        exit_dashb: "Exit",
+      },
+    },
+  },
+});
+
+/* ------------------ Mock Data ------------------ */
+
+const permissions = new Map([
+  [
+    "users",
+    {
+      id: 1,
+      visible: true,
+      permission: "users",
+      icon: "icons/users.svg",
+      sub: new Map([
+        [1, { id: 1, name: "roles", is_category: true }],
+        [2, { id: 2, name: "permissions", is_category: true }],
+      ]),
+    },
+  ],
+  [
+    "reports",
+    {
+      id: 2,
+      visible: true,
+      permission: "reports",
+      icon: "icons/reports.svg",
+      sub: new Map(),
+    },
+  ],
+]);
+
+/* ------------------ Story Component ------------------ */
+
+function StorySidebar() {
+  const [collapsed, setCollapsed] = useState(false);
+
+  const navigateTo = useCallback((path: string) => {
+    console.log("Navigate:", path);
+  }, []);
+
+  const sidebarItems = useMemo(() => {
+    return (
+      <>
+        <SidebarItem
+          path="/dashboard"
+          permission={{
+            id: 0,
+            visible: true,
+            permission: "dashboard",
+            icon: "icons/home.svg",
+            sub: new Map(),
+          }}
+          isActive
+          navigateTo={navigateTo}
+          translate={(k) => i18n.t(k)}
+          icon={{
+            apiConfig: {
+              src: "https://www.svgrepo.com/show/521994/bag.svg",
+            },
+          }}
+        />
+
+        {Array.from(permissions.values()).map((perm) => (
+          <SidebarItem
+            key={perm.permission}
+            path={`/dashboard/${perm.permission}`}
+            permission={perm}
+            isActive={false}
+            navigateTo={navigateTo}
+            translate={(k) => i18n.t(k)}
+            icon={{
+              apiConfig: {
+                src: "https://www.svgrepo.com/show/521994/bag.svg",
+              },
+            }}
+          />
+        ))}
+
+        <Separator className="my-4" />
+
+        <SidebarItem
+          path="/dashboard/settings"
+          permission={{
+            id: 99,
+            visible: true,
+            permission: "settings",
+            icon: "icons/settings.svg",
+            sub: new Map(),
+          }}
+          isActive={false}
+          navigateTo={navigateTo}
+          translate={(k) => i18n.t(k)}
+          icon={{
+            apiConfig: {
+              src: "https://www.svgrepo.com/show/521994/bag.svg",
+            },
+          }}
+        />
+      </>
+    );
+  }, [navigateTo]);
+
+  return (
+    <Sidebar collapsed={collapsed} setCollapsed={setCollapsed}>
+      <Sidebar.Header>
+        <img
+          src="https://placehold.co/48x40"
+          className="w-12 h-10 rounded-lg"
+        />
+        <h1 className={`text-sm font-semibold ${collapsed && "lg:hidden"}`}>
+          {i18n.t("app_name")}
+        </h1>
+      </Sidebar.Header>
+
+      <Sidebar.Content className="pt-5">{sidebarItems}</Sidebar.Content>
+
+      <Sidebar.Footer>
+        <Button
+          variant="icon"
+          onClick={() => console.log("Exit")}
+          className="mb-4 mx-auto text-xs font-semibold"
+        >
+          <LucideCircleArrowOutDownLeft className="size-[18px]" />
+          <span className={collapsed ? "lg:hidden" : ""}>
+            {i18n.t("exit_dashb")}
+          </span>
+        </Button>
+      </Sidebar.Footer>
+    </Sidebar>
+  );
+}
+
+/* ------------------ Storybook Meta ------------------ */
+
+const meta: Meta = {
+  title: "Layout/AppSidebar",
+  parameters: {
+    layout: "fullscreen",
+  },
+};
+
+export default meta;
+
+export const Default: StoryObj = {
+  render: () => (
+    <MemoryRouter initialEntries={["/dashboard"]}>
+      <I18nextProvider i18n={i18n}>
+        <Routes>
+          <Route path="*" element={<StorySidebar />} />
+        </Routes>
+      </I18nextProvider>
+    </MemoryRouter>
+  ),
+};

package/src/notion-ui/sidebar/sidebar.tsx

@@ -0,0 +1,284 @@
+import React, { forwardRef, useEffect, useRef, useState } from "react";
+import { cn } from "@/utils/cn";
+import { AlignLeft, type LucideIcon } from "lucide-react";
+
+export interface SidebarProps extends React.HTMLAttributes<HTMLElement> {
+  children: React.ReactNode;
+  collapsed?: boolean;
+  setCollapsed?: (open: boolean) => void;
+  mobileHamburgerIcon?: {
+    icon: LucideIcon;
+    className?: string;
+    onClick?: (e: React.MouseEvent<SVGSVGElement, MouseEvent>) => void;
+  };
+  desktopHamburgerIcon?: {
+    icon: LucideIcon;
+    className?: string;
+    onClick?: (e: React.MouseEvent<SVGSVGElement, MouseEvent>) => void;
+  };
+  classNames?: {
+    wrapperClassName?: string;
+  };
+}
+interface SidebarExpandEventDetail {
+  hasChildren: boolean;
+}
+type SidebarCompound = React.FC<SidebarProps> & {
+  Header: typeof SidebarHeader;
+  Footer: typeof SidebarFooter;
+  Content: typeof SidebarContent;
+};
+
+const Sidebar: SidebarCompound = ({
+  children,
+  className,
+  collapsed,
+  setCollapsed,
+  mobileHamburgerIcon = { icon: AlignLeft },
+  desktopHamburgerIcon = { icon: AlignLeft },
+  classNames,
+  ...rest
+}) => {
+  const { wrapperClassName } = classNames || {};
+  const [internalCollapsed, setInternalCollapsed] = useState<boolean>(() => {
+    const stored = localStorage.getItem("sidebar_collapsed");
+    return stored ? JSON.parse(stored) : false;
+  });
+  const sidebarRef = useRef<HTMLElement>(null); // This is already your nav ref
+  const open = collapsed ?? internalCollapsed;
+  const [hideSiderbar, setHideSiderbar] = useState(false);
+
+  useEffect(() => {
+    const handleExpandEvent = (e: Event) => {
+      const customEvent = e as CustomEvent;
+      const detail = customEvent.detail as SidebarExpandEventDetail;
+      if (detail?.hasChildren) {
+        if (open) {
+          if (setCollapsed) {
+            // Controlled: call parent callback
+            setCollapsed(false);
+          } else {
+            // Uncontrolled: update internal state + localStorage
+            setInternalCollapsed(() => {
+              localStorage.setItem("sidebar_collapsed", JSON.stringify(false));
+              return false;
+            });
+          }
+        }
+      }
+    };
+
+    if (sidebarRef.current) {
+      sidebarRef.current.addEventListener(
+        "sidebar-item-expand",
+        handleExpandEvent
+      );
+    }
+
+    return () => {
+      if (sidebarRef.current) {
+        sidebarRef.current.removeEventListener(
+          "sidebar-item-expand",
+          handleExpandEvent
+        );
+      }
+    };
+  }, [open]);
+  const toggle = (e: React.MouseEvent<SVGSVGElement, MouseEvent>) => {
+    if (desktopHamburgerIcon.onClick) desktopHamburgerIcon.onClick(e);
+    if (setCollapsed) {
+      // Controlled: call parent callback
+      setCollapsed(!open);
+    } else {
+      // Uncontrolled: update internal state + localStorage
+      setInternalCollapsed((prev) => {
+        const newValue = !prev;
+        localStorage.setItem("sidebar_collapsed", JSON.stringify(newValue));
+        return newValue;
+      });
+    }
+  };
+
+  let header: React.ReactNode = null;
+  let footer: React.ReactNode = null;
+  let content: React.ReactNode = null;
+
+  React.Children.forEach(children, (child) => {
+    if (!React.isValidElement(child)) return;
+
+    switch (child.type) {
+      case SidebarHeader:
+        header = child;
+        break;
+      case SidebarFooter:
+        footer = child;
+        break;
+      case SidebarContent:
+        content = child;
+        break;
+    }
+  });
+  // In Sidebar component, add this useEffect
+  useEffect(() => {
+    const closeAllDropdowns = () => {
+      if (open) {
+        // When sidebar is collapsed (w-12)
+        // Dispatch an event to tell all sidebar items to close their dropdowns
+        const closeEvent = new CustomEvent("sidebar-close-dropdowns", {
+          bubbles: true,
+          composed: true,
+          detail: { forceClose: true },
+        });
+
+        if (sidebarRef.current) {
+          sidebarRef.current.dispatchEvent(closeEvent);
+        }
+      }
+    };
+
+    closeAllDropdowns();
+  }, [open]); // Run whenever collapsed state changes
+
+  return (
+    <>
+      <div
+        onClick={() => setHideSiderbar(false)}
+        className={cn(
+          "fixed z-50 ltr:left-0 rtl:right-0 lg:hidden top-0 px-2 pt-1",
+          hideSiderbar
+            ? "w-screen h-screen bg-black/20" // Full screen with semi-transparent bg
+            : "w-auto h-auto", // Just icon size
+          wrapperClassName
+        )}
+      >
+        <mobileHamburgerIcon.icon
+          onClick={(e) => {
+            e.stopPropagation(); // Prevent event from bubbling to parent
+            if (mobileHamburgerIcon.onClick) mobileHamburgerIcon.onClick(e);
+            setHideSiderbar(true);
+          }}
+          className={cn(
+            `size-5 mt-2 text-tertiary hover:scale-105 transition-transform mx-auto cursor-pointer`,
+            hideSiderbar ? "hidden" : "block",
+            mobileHamburgerIcon.className
+          )}
+        />
+      </div>
+      <nav
+        ref={sidebarRef}
+        {...rest}
+        className={cn(
+          "overflow-x-hidden bg-card fixed grid lg:grid-rows-[auto_auto_1fr_auto] grid-rows-[auto_1fr_auto] overflow-hidden z-50 transition-all duration-200 dark:text-card-foreground text-primary-foreground h-screen",
+          // Mobile behavior
+          hideSiderbar
+            ? "ltr:left-0 rtl:right-0"
+            : "ltr:left-[-300px] rtl:right-[-300px]",
+          // Desktop behavior - always visible with proper width
+          "lg:relative! lg:left-0! lg:right-0! lg:w-[280px]!", // Default desktop width
+          // Collapsed state on desktop
+          open ? "lg:w-12!" : "lg:w-[280px]",
+          // Mobile width
+          `w-[280px]`, // Set a proper width for mobile too
+          className
+        )}
+      >
+        <desktopHamburgerIcon.icon
+          onClick={toggle}
+          className={cn(
+            `size-5 mt-2 text-tertiary hidden lg:block hover:scale-105 transition-transform mx-auto cursor-pointer`,
+            desktopHamburgerIcon.className
+          )}
+        />
+        {header}
+        {content}
+        {footer}
+      </nav>
+    </>
+  );
+};
+export interface SidebarContentProps
+  extends React.HTMLAttributes<HTMLDivElement> {}
+
+// Use forwardRef to accept ref prop
+export const SidebarContent = forwardRef<HTMLDivElement, SidebarContentProps>(
+  function SidebarContent({ children, className, ...rest }, ref) {
+    return (
+      <div
+        ref={ref} // Pass the ref here
+        {...rest}
+        className={cn(
+          "overflow-y-auto flex flex-col overflow-x-hidden pb-12",
+          className
+        )}
+      >
+        {children}
+      </div>
+    );
+  }
+);
+
+SidebarContent.displayName = "SidebarContent";
+
+export interface SidebarFooterProps
+  extends React.HTMLAttributes<HTMLDivElement> {}
+
+export const SidebarFooter = forwardRef<HTMLDivElement, SidebarContentProps>(
+  ({ children, className, ...rest }, ref) => {
+    return (
+      <div
+        ref={ref}
+        {...rest}
+        className={cn(
+          "sticky w-full overflow-x-hidden bottom-0 z-50 flex flex-col items-center gap-y-1 border-t border-secondary-foreground/15 pt-4 mt-4 bg-transparent",
+          className
+        )}
+      >
+        {children}
+      </div>
+    );
+  }
+);
+
+SidebarFooter.displayName = "SidebarFooter";
+
+export interface SidebarHeaderProps
+  extends React.HTMLAttributes<HTMLDivElement> {}
+
+export const SidebarHeader = forwardRef<HTMLDivElement, SidebarContentProps>(
+  ({ children, className, ...rest }, ref) => {
+    return (
+      <div
+        ref={ref}
+        {...rest}
+        className={cn(
+          "sticky w-full overflow-x-hidden top-0 z-50 flex flex-col justify-center items-center gap-y-1 border-b border-secondary-foreground/15 pb-4 mt-2 bg-transparent",
+          className
+        )}
+      >
+        {children}
+      </div>
+    );
+  }
+);
+
+SidebarHeader.displayName = "SidebarHeader";
+
+export interface SeparatorProps
+  extends Omit<React.HTMLAttributes<HTMLDivElement>, "children"> {}
+
+export function Separator({ className, ...rest }: SeparatorProps) {
+  return (
+    <div
+      {...rest}
+      className={cn("w-full bg-secondary-foreground/15 h-px", className)}
+    />
+  );
+}
+Separator.displayName = "Separator";
+
+/* Compound attachments */
+Sidebar.Header = SidebarHeader;
+Sidebar.Footer = SidebarFooter;
+Sidebar.Content = SidebarContent;
+
+export default Sidebar;

package/src/notion-ui/textarea/Textarea.stories.tsx

@@ -1,5 +1,5 @@
+import Textarea from "./textarea";
 import type { Meta, StoryObj } from "@storybook/react";
-import { Textarea } from "./textarea";
 
 const meta: Meta<typeof Textarea> = {
   title: "Form/Textarea",

package/src/notion-ui/textarea/textarea.tsx

@@ -44,7 +44,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
       >
         <div
           className={cn(
-            "relative text-start select-none h-fit rtl:text-lg-rtl ltr:text-lg-ltr"
+            "relative text-start select-none h-fit rtl:text-[17px] ltr:text-[13px]"
           )}
         >
           {/* Required Hint */}
@@ -64,7 +64,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
             <label
               htmlFor={label}
               className={cn(
-                "font-semibold rtl:text-xl-rtl ltr:text-lg-ltr inline-block pb-1"
+                "font-semibold rtl:text-md ltr:text-[13px] inline-block pb-1"
               )}
             >
               {label}
@@ -108,7 +108,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
             }}
             intersectionArgs={{ once: true, rootMargin: "-5% 0%" }}
           >
-            <h1 className="text-red-400 text-start capitalize rtl:text-sm rtl:font-medium ltr:text-sm-ltr">
+            <h1 className="text-red-400 text-start capitalize rtl:text-sm rtl:font-medium ltr:text-[11px]">
               {errorMessage}
             </h1>
           </AnimatedItem>