fix(AppLayout): add asChild to dropdown menu trigger

sikka-software · May 21, 2024 · f0d61ec · f0d61ec
1 parent a0b2199
commit f0d61ec
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 4 deletions.
diff --git a/apps/docs/CHANGELOG.md b/apps/docs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # hawa-docs
 
+## 0.0.67
+
+### Patch Changes
+
+- Updated dependencies
+  - @sikka/hawa@0.35.3
+
 ## 0.0.66
 
 ### Patch Changes

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawa-docs",
-  "version": "0.0.66",
+  "version": "0.0.67",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3001",

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sikka/hawa
 
+## 0.35.3
+
+### Patch Changes
+
+- Ability to pass `triggerProps` to `DropdownMenu` components
+- Make dropdown menu trigger `asChild: true` by default in `AppLayout`
+
 ## 0.35.2
 
 ### Patch Changes

diff --git a/packages/components/elements/dropdownMenu/DropdownMenu.tsx b/packages/components/elements/dropdownMenu/DropdownMenu.tsx
@@ -295,6 +295,7 @@ interface DropdownMenuProps {
   direction?: DirectionType;
   className?: ExtendedDropdownMenuContentProps["className"];
   triggerClassname?: ExtendedDropdownMenuTriggerProps["className"];
+  triggerProps?: DropdownMenuPrimitive.DropdownMenuTriggerProps;
   sideOffset?: ExtendedDropdownMenuContentProps["sideOffset"];
   side?: ExtendedDropdownMenuContentProps["side"];
   align?: ExtendedDropdownMenuContentProps["align"];
@@ -315,6 +316,7 @@ const DropdownMenu: React.FC<DropdownMenuProps> = ({
   side,
   className,
   triggerClassname,
+  triggerProps,
   align,
   alignOffset,
   onItemSelect,
@@ -346,7 +348,11 @@ const DropdownMenu: React.FC<DropdownMenuProps> = ({
       modal={false}
       dir={direction}
     >
-      <DropdownMenuTrigger asChild className={triggerClassname}>
+      <DropdownMenuTrigger
+        asChild
+        className={triggerClassname}
+        {...triggerProps}
+      >
         {trigger}
       </DropdownMenuTrigger>
       <DropdownMenuPortal>

diff --git a/packages/components/layout/appLayout/AppLayout.tsx b/packages/components/layout/appLayout/AppLayout.tsx
@@ -240,6 +240,7 @@ export const AppLayout: React.FunctionComponent<AppLayoutTypes> = ({
               direction={direction}
               items={props.profileMenuItems || []}
               onItemSelect={(e: any) => console.log("selecting item ", e)}
+              triggerProps={{ asChild: true }}
               trigger={
                 <div
                   onClick={onAvatarClick}

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hawa",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "Modern UI Kit made with Tailwind",
   "author": {
     "name": "Sikka Software",

diff --git a/packages/storybook/CHANGELOG.md b/packages/storybook/CHANGELOG.md
@@ -1,5 +1,12 @@
 # hawa-storybook
 
+## 0.26.88
+
+### Patch Changes
+
+- Updated dependencies
+  - @sikka/hawa@0.35.3
+
 ## 0.26.87
 
 ### Patch Changes

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawa-storybook",
-  "version": "0.26.87",
+  "version": "0.26.88",
   "description": "Modern UI Kit made with Tailwind",
   "author": {
     "name": "Sikka Software",