diff --git a/packages/propel/src/combobox/combobox.tsx b/packages/propel/src/combobox/combobox.tsx
index 94b307533c..2aa45d3491 100644
--- a/packages/propel/src/combobox/combobox.tsx
+++ b/packages/propel/src/combobox/combobox.tsx
@@ -220,11 +220,14 @@ function ComboboxOption({ value, children, disabled, className }: ComboboxOption
   );
 }
 
-// Compound component export
-const Combobox = Object.assign(ComboboxRoot, {
-  Button: ComboboxButton,
-  Options: ComboboxOptions,
-  Option: ComboboxOption,
-});
+
+const Combobox = ComboboxRoot as typeof ComboboxRoot & {
+  Button: typeof ComboboxButton;
+  Options: typeof ComboboxOptions;
+  Option: typeof ComboboxOption;
+};
+Combobox.Button = ComboboxButton;
+Combobox.Options = ComboboxOptions;
+Combobox.Option = ComboboxOption;
 
 export { Combobox };
diff --git a/packages/propel/src/command/command.tsx b/packages/propel/src/command/command.tsx
index e462a7f2d7..31aca50ddd 100644
--- a/packages/propel/src/command/command.tsx
+++ b/packages/propel/src/command/command.tsx
@@ -31,11 +31,15 @@ function CommandItem({ ...props }: React.ComponentProps<typeof CommandPrimitive.
   return <CommandPrimitive.Item data-slot="command-item" {...props} />;
 }
 
-const Command = Object.assign(CommandComponent, {
-  Input: CommandInput,
-  List: CommandList,
-  Empty: CommandEmpty,
-  Item: CommandItem,
-});
+const Command = CommandComponent as typeof CommandComponent & {
+  Input: typeof CommandInput;
+  List: typeof CommandList;
+  Empty: typeof CommandEmpty;
+  Item: typeof CommandItem;
+};
+Command.Input = CommandInput;
+Command.List = CommandList;
+Command.Empty = CommandEmpty;
+Command.Item = CommandItem;
 
 export { Command };
diff --git a/packages/propel/src/context-menu/context-menu.tsx b/packages/propel/src/context-menu/context-menu.tsx
index 494cceb670..1a880ae211 100644
--- a/packages/propel/src/context-menu/context-menu.tsx
+++ b/packages/propel/src/context-menu/context-menu.tsx
@@ -128,15 +128,23 @@ ContextMenuItem.displayName = "ContextMenuItem";
 ContextMenuSeparator.displayName = "ContextMenuSeparator";
 ContextMenuSubmenuTrigger.displayName = "ContextMenuSubmenuTrigger";
 
-// compound components
-const ContextMenu = Object.assign(ContextMenuRoot, {
-  Trigger: ContextMenuTrigger,
-  Portal: ContextMenuPortal,
-  Content: ContextMenuContent,
-  Item: ContextMenuItem,
-  Separator: ContextMenuSeparator,
-  Submenu: ContextMenuSubmenu,
-  SubmenuTrigger: ContextMenuSubmenuTrigger,
-});
+
+const ContextMenu = ContextMenuRoot as typeof ContextMenuRoot & {
+  Trigger: typeof ContextMenuTrigger;
+  Portal: typeof ContextMenuPortal;
+  Content: typeof ContextMenuContent;
+  Item: typeof ContextMenuItem;
+  Separator: typeof ContextMenuSeparator;
+  Submenu: typeof ContextMenuSubmenu;
+  SubmenuTrigger: typeof ContextMenuSubmenuTrigger;
+};
+
+ContextMenu.Trigger = ContextMenuTrigger;
+ContextMenu.Portal = ContextMenuPortal;
+ContextMenu.Content = ContextMenuContent;
+ContextMenu.Item = ContextMenuItem;
+ContextMenu.Separator = ContextMenuSeparator;
+ContextMenu.Submenu = ContextMenuSubmenu;
+ContextMenu.SubmenuTrigger = ContextMenuSubmenuTrigger;
 
 export { ContextMenu };
diff --git a/packages/propel/src/dialog/root.tsx b/packages/propel/src/dialog/root.tsx
index 018a3418aa..cdc58571c3 100644
--- a/packages/propel/src/dialog/root.tsx
+++ b/packages/propel/src/dialog/root.tsx
@@ -45,7 +45,7 @@ const getPositionClassNames = (position: DialogPosition) =>
     "top-8 left-1/2 -translate-x-1/2": position === "top",
   });
 
-const DialogPortal = memo(function DialogPortal({ children, ...props }) {
+const DialogPortal = memo(function DialogPortal({ children, ...props }: React.ComponentProps<typeof BaseDialog.Portal>) {
   return (
     <BaseDialog.Portal data-slot="dialog-portal" {...props}>
       {children}
@@ -54,12 +54,12 @@ const DialogPortal = memo(function DialogPortal({ children, ...props }) {
 });
 DialogPortal.displayName = "DialogPortal";
 
-const DialogOverlay = memo(function DialogOverlay({ className, ...props }) {
+const DialogOverlay = memo(function DialogOverlay({ className, ...props }: React.ComponentProps<typeof BaseDialog.Backdrop>) {
   return <BaseDialog.Backdrop data-slot="dialog-overlay" className={cn(OVERLAY_CLASSNAME, className)} {...props} />;
 });
 DialogOverlay.displayName = "DialogOverlay";
 
-const DialogComponent = memo(function DialogComponent({ children, ...props }) {
+const DialogComponent = memo<DialogProps>(function DialogComponent({ children, ...props }: DialogProps) {
   return (
     <BaseDialog.Root data-slot="dialog" {...props}>
       {children}
@@ -68,7 +68,7 @@ const DialogComponent = memo(function DialogComponent({ children, ...props }) {
 });
 DialogComponent.displayName = "Dialog";
 
-const DialogTrigger = memo(function DialogTrigger({ children, ...props }) {
+const DialogTrigger = memo(function DialogTrigger({ children, ...props }: React.ComponentProps<typeof BaseDialog.Trigger>) {
   return (
     <BaseDialog.Trigger data-slot="dialog-trigger" {...props}>
       {children}
@@ -100,7 +100,7 @@ const DialogPanel = forwardRef(function DialogPanel(
 });
 DialogPanel.displayName = "DialogPanel";
 
-const DialogTitle = memo(function DialogTitle({ className, children, ...props }) {
+const DialogTitle = memo<DialogTitleProps>(function DialogTitle({ className, children, ...props }: DialogTitleProps) {
   return (
     <BaseDialog.Title
       data-slot="dialog-title"
@@ -115,12 +115,11 @@ const DialogTitle = memo(function DialogTitle({ className, children, ...props })
 DialogTitle.displayName = "DialogTitle";
 
 // Create the compound Dialog component with proper typing
-const Dialog = Object.assign(DialogComponent, {
-  Panel: DialogPanel,
-  Title: DialogTitle,
-}) as typeof DialogComponent & {
+const Dialog = DialogComponent as typeof DialogComponent & {
   Panel: typeof DialogPanel;
   Title: typeof DialogTitle;
 };
+Dialog.Panel = DialogPanel;
+Dialog.Title = DialogTitle;
 
 export { Dialog, DialogTitle, DialogPanel };
diff --git a/packages/propel/src/popover/root.tsx b/packages/propel/src/popover/root.tsx
index 1dc0cffe38..57377e746d 100644
--- a/packages/propel/src/popover/root.tsx
+++ b/packages/propel/src/popover/root.tsx
@@ -13,7 +13,7 @@ export interface PopoverContentProps extends React.ComponentProps<typeof BasePop
 }
 
 // PopoverContent component
-const PopoverContent = React.memo(function PopoverContent({
+const PopoverContent = React.memo<PopoverContentProps>(function PopoverContent({
   children,
   className,
   placement,
@@ -23,7 +23,7 @@ const PopoverContent = React.memo(function PopoverContent({
   containerRef,
   positionerClassName,
   ...props
-}) {
+}: PopoverContentProps) {
   // side and align calculations
   const { finalSide, finalAlign } = React.useMemo(() => {
     if (placement) {
@@ -45,28 +45,29 @@ const PopoverContent = React.memo(function PopoverContent({
 });
 
 // wrapper components
-const PopoverTrigger = React.memo(function PopoverTrigger(props) {
+const PopoverTrigger = React.memo(function PopoverTrigger(props: React.ComponentProps<typeof BasePopover.Trigger>) {
   return <BasePopover.Trigger data-slot="popover-trigger" {...props} />;
 });
 
-const PopoverPortal = React.memo(function PopoverPortal(props) {
+const PopoverPortal = React.memo(function PopoverPortal(props: React.ComponentProps<typeof BasePopover.Portal>) {
   return <BasePopover.Portal data-slot="popover-portal" {...props} />;
 });
 
-const PopoverPositioner = React.memo(function PopoverPositioner(props) {
+const PopoverPositioner = React.memo(function PopoverPositioner(props: React.ComponentProps<typeof BasePopover.Positioner>) {
   return <BasePopover.Positioner data-slot="popover-positioner" {...props} />;
 });
 
 // compound components
-const Popover = Object.assign(
-  React.memo<React.ComponentProps<typeof BasePopover.Root>>(function Popover(props) {
-    return <BasePopover.Root data-slot="popover" {...props} />;
-  }),
-  {
-    Button: PopoverTrigger,
-    Panel: PopoverContent,
-  }
-);
+const PopoverRoot = React.memo<React.ComponentProps<typeof BasePopover.Root>>(function Popover(props) {
+  return <BasePopover.Root data-slot="popover" {...props} />;
+});
+
+const Popover = PopoverRoot as typeof PopoverRoot & {
+  Button: typeof PopoverTrigger;
+  Panel: typeof PopoverContent;
+};
+Popover.Button = PopoverTrigger;
+Popover.Panel = PopoverContent;
 
 // display names
 PopoverContent.displayName = "PopoverContent";
diff --git a/packages/propel/src/skeleton/root.tsx b/packages/propel/src/skeleton/root.tsx
index bc899c24dd..a62467120f 100644
--- a/packages/propel/src/skeleton/root.tsx
+++ b/packages/propel/src/skeleton/root.tsx
@@ -2,12 +2,18 @@ import React from "react";
 // helpers
 import { cn } from "../utils/classname";
 
-type SkeletonProps = {
+export type SkeletonProps = {
   children: React.ReactNode;
   className?: string;
   ariaLabel?: string;
 };
 
+export type SkeletonItemProps = {
+  height?: string;
+  width?: string;
+  className?: string;
+};
+
 function SkeletonRoot({ children, className = "", ariaLabel = "Loading content" }: SkeletonProps) {
   return (
     <div data-slot="skeleton" className={cn("animate-pulse", className)} role="status" aria-label={ariaLabel}>
@@ -16,13 +22,7 @@ function SkeletonRoot({ children, className = "", ariaLabel = "Loading content"
   );
 }
 
-type ItemProps = {
-  height?: string;
-  width?: string;
-  className?: string;
-};
-
-function SkeletonItem({ height = "auto", width = "auto", className = "" }: ItemProps) {
+function SkeletonItem({ height = "auto", width = "auto", className = "" }: SkeletonItemProps) {
   return (
     <div
       data-slot="skeleton-item"
@@ -32,9 +32,12 @@ function SkeletonItem({ height = "auto", width = "auto", className = "" }: ItemP
   );
 }
 
-const Skeleton = Object.assign(SkeletonRoot, { Item: SkeletonItem });
-
 SkeletonRoot.displayName = "plane-ui-skeleton";
 SkeletonItem.displayName = "plane-ui-skeleton-item";
 
-export { Skeleton };
+const Skeleton = SkeletonRoot as typeof SkeletonRoot & {
+  Item: typeof SkeletonItem;
+};
+Skeleton.Item = SkeletonItem;
+
+export { Skeleton, SkeletonRoot, SkeletonItem };
diff --git a/packages/propel/src/tabs/tabs.tsx b/packages/propel/src/tabs/tabs.tsx
index 08cec2d954..9509246cfd 100644
--- a/packages/propel/src/tabs/tabs.tsx
+++ b/packages/propel/src/tabs/tabs.tsx
@@ -2,23 +2,6 @@ import * as React from "react";
 import { Tabs as TabsPrimitive } from "@base-ui-components/react/tabs";
 import { cn } from "../utils/classname";
 
-type TabsCompound = React.ForwardRefExoticComponent<
-  React.ComponentProps<typeof TabsPrimitive.Root> & React.RefAttributes<React.ElementRef<typeof TabsPrimitive.Root>>
-> & {
-  List: React.ForwardRefExoticComponent<
-    React.ComponentProps<typeof TabsPrimitive.List> & React.RefAttributes<React.ElementRef<typeof TabsPrimitive.List>>
-  >;
-  Trigger: React.ForwardRefExoticComponent<
-    React.ComponentProps<typeof TabsPrimitive.Tab> & { size?: "sm" | "md" | "lg" } & React.RefAttributes<
-        React.ElementRef<typeof TabsPrimitive.Tab>
-      >
-  >;
-  Content: React.ForwardRefExoticComponent<
-    React.ComponentProps<typeof TabsPrimitive.Panel> & React.RefAttributes<React.ElementRef<typeof TabsPrimitive.Panel>>
-  >;
-  Indicator: React.ForwardRefExoticComponent<React.ComponentProps<"div"> & React.RefAttributes<HTMLDivElement>>;
-};
-
 const TabsRoot = React.forwardRef(function TabsRoot(
   { className, ...props }: React.ComponentProps<typeof TabsPrimitive.Root>,
   ref: React.ForwardedRef<React.ElementRef<typeof TabsPrimitive.Root>>
@@ -104,11 +87,21 @@ const TabsIndicator = React.forwardRef(function TabsIndicator(
   );
 });
 
-export const Tabs = Object.assign(TabsRoot, {
-  List: TabsList,
-  Trigger: TabsTrigger,
-  Content: TabsContent,
-  Indicator: TabsIndicator,
-}) satisfies TabsCompound;
+TabsRoot.displayName = "TabsRoot";
+TabsList.displayName = "TabsList";
+TabsTrigger.displayName = "TabsTrigger";
+TabsContent.displayName = "TabsContent";
+TabsIndicator.displayName = "TabsIndicator";
 
-export { TabsList, TabsTrigger, TabsContent, TabsIndicator };
+const Tabs = TabsRoot as typeof TabsRoot & {
+  List: typeof TabsList;
+  Trigger: typeof TabsTrigger;
+  Content: typeof TabsContent;
+  Indicator: typeof TabsIndicator;
+};
+Tabs.List = TabsList;
+Tabs.Trigger = TabsTrigger;
+Tabs.Content = TabsContent;
+Tabs.Indicator = TabsIndicator;
+
+export { Tabs };
diff --git a/packages/propel/src/toolbar/toolbar.tsx b/packages/propel/src/toolbar/toolbar.tsx
index b939ad1caf..06c8e05942 100644
--- a/packages/propel/src/toolbar/toolbar.tsx
+++ b/packages/propel/src/toolbar/toolbar.tsx
@@ -165,11 +165,15 @@ ToolbarSeparator.displayName = "ToolbarSeparator";
 ToolbarSubmitButton.displayName = "ToolbarSubmitButton";
 
 // compound components
-const Toolbar = Object.assign(ToolbarRoot, {
-  Group: ToolbarGroup,
-  Item: ToolbarItem,
-  Separator: ToolbarSeparator,
-  SubmitButton: ToolbarSubmitButton,
-});
+const Toolbar = ToolbarRoot as typeof ToolbarRoot & {
+  Group: typeof ToolbarGroup;
+  Item: typeof ToolbarItem;
+  Separator: typeof ToolbarSeparator;
+  SubmitButton: typeof ToolbarSubmitButton;
+};
+Toolbar.Group = ToolbarGroup;
+Toolbar.Item = ToolbarItem;
+Toolbar.Separator = ToolbarSeparator;
+Toolbar.SubmitButton = ToolbarSubmitButton;
 
 export { Toolbar };