fix: solve merge conflicts, types cleanup

CHANGELOG.md

@@ -1,22 +1,22 @@
-# [1.32.0-ant-update.2](https://github.com/mParticle/aquarium/compare/v1.32.0-ant-update.1...v1.32.0-ant-update.2) (2024-09-24)
+# [1.32.0](https://github.com/mParticle/aquarium/compare/v1.31.1...v1.32.0) (2024-09-23)
 
 ### Bug Fixes
 
-- update cascader dropdown postion ([d855a09](https://github.com/mParticle/aquarium/commit/d855a09eebada16614428c8ce637a9db8df731ae))
-- update dropdown ([660663b](https://github.com/mParticle/aquarium/commit/660663b19c65a7a76d71d09d9e90b115e58f309a))
+- notification center export z-index ([#422](https://github.com/mParticle/aquarium/issues/422)) ([ce01227](https://github.com/mParticle/aquarium/commit/ce012272401ab507473ef3d2c91cbaa5af8b5a30))
 
-# [1.32.0-ant-update.1](https://github.com/mParticle/aquarium/compare/v1.31.1...v1.32.0-ant-update.1) (2024-09-23)
+### Features
+
+- add datepicker example ([#408](https://github.com/mParticle/aquarium/issues/408)) ([0b4b46b](https://github.com/mParticle/aquarium/commit/0b4b46b201986cc240224142a308e76186133821))
+
+# [1.32.0-fix-notification-center-export-zindex.1](https://github.com/mParticle/aquarium/compare/v1.31.1...v1.32.0-fix-notification-center-export-zindex.1) (2024-09-20)
 
 ### Bug Fixes
 
-- fix ts erros ([90864de](https://github.com/mParticle/aquarium/commit/90864de25d875953f7279542797d6a35d4d3b55e))
-- remove @esbuild/darwin-arm64@0.23.1 ([54c96e6](https://github.com/mParticle/aquarium/commit/54c96e6d51d5ce0ab407d076a8567d96d11f3e45))
+- export zIndex ([dc4fede](https://github.com/mParticle/aquarium/commit/dc4fede4cfb350de5dbeb2587e8d7599ffc0df04))
 
 ### Features
 
 - add datepicker example ([#408](https://github.com/mParticle/aquarium/issues/408)) ([0b4b46b](https://github.com/mParticle/aquarium/commit/0b4b46b201986cc240224142a308e76186133821))
-- antd upgrade ([e3bb862](https://github.com/mParticle/aquarium/commit/e3bb862ce26a75c27387cfb888a6c1419c6b7bfb))
-- upgrade style ([8d61675](https://github.com/mParticle/aquarium/commit/8d6167573ed29844b4dcdd08cc9aaaebbb4cc8e0))
 
 ## [1.31.1](https://github.com/mParticle/aquarium/compare/v1.31.0...v1.31.1) (2024-09-18)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/aquarium",
-  "version": "1.32.0-ant-update.2",
+  "version": "1.32.0",
   "description": "mParticle Component Library",
   "license": "Apache-2.0",
   "keywords": [

src/components/index.ts

@@ -109,8 +109,8 @@ export type {
   IWorkspaceSelectorDisplayItem,
   IWorkspaceSelectorItem,
 } from './navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelectorItems'
-export type {
-  INotificationCenterProps,
+export {
+  type INotificationCenterProps,
   NotificationCenterZIndex,
 } from './navigation/GlobalNavigation/NotificationCenter'
 export { SuiteLogo } from './navigation/GlobalNavigation/SuiteLogo'

src/components/navigation/GlobalNavigation/NavigationCreate.tsx

@@ -1,6 +1,4 @@
-import { type MenuProps } from 'antd'
-
-import { Icon } from 'src/components'
+import { Icon, type MenuItemGroupType, type MenuItemType } from 'src/components'
 import { Center } from 'src/components'
 import { Menu } from 'src/components'
 import type { IMenuProps } from 'src/components'
@@ -10,8 +8,6 @@ import { Tooltip } from 'src/components'
 import { Spin } from 'src/components'
 import { type IMenuInfo } from 'src/components'
 
-export type MenuItemType = Required<MenuProps>['items'][number]
-export type MenuItemGroupType = Required<MenuProps>['items'][number] // Same as menu item type
 export interface INavigationCreateProps {
   createItems: Array<INavigationCreateItem | INavigationCreateGroup>
 }

src/components/navigation/GlobalNavigation/NavigationList.tsx

@@ -1,5 +1,4 @@
-import { Menu } from 'src/components'
-import { type MenuProps } from 'antd'
+import { Menu, type MenuItemGroupType } from 'src/components'
 import { NavigationIcon } from 'src/components/navigation/GlobalNavigation/NavigationIcon'
 import { NavigationItem } from 'src/components/navigation/GlobalNavigation/NavigationItem'
 import { Center } from 'src/components'
@@ -9,8 +8,6 @@ import { Fragment } from 'react'
 import { buildLinkFromHrefOptions } from 'src/utils/utils'
 import { NavigationButtonItem } from 'src/components/navigation/GlobalNavigation/NavigationButtonItem'
 
-export type MenuItemGroupType = Required<MenuProps>['items'][number] // This works for both groups and items
-
 export interface INavigationListProps {
   items: IGlobalNavigationItem[]
 }

src/components/navigation/Menu/Menu.tsx

@@ -3,20 +3,20 @@ import { type MenuProps as AntMenuProps } from 'antd'
 import { type MenuInfo as RCMenuInfo } from 'rc-menu/lib/interface'
 import { ConfigProvider } from 'src/components'
 
-export type AndMenuItemType = Required<MenuProps>['items'][number]
-export type AndMenuItemGroupType = Required<MenuProps>['items'][number] // Same type used for menu groups
-export type AndMenuDividerType = Required<MenuProps>['items'][number] // Menu divider uses the same type
-export type AndSubMenuType = Required<MenuProps>['items'][number] // Submenu is also part of 'items'
+type AntDMenuItemType = Required<MenuProps>['items'][number]
+type AntDMenuItemGroupType = Required<MenuProps>['items'][number]
+type AntDMenuDividerType = Required<MenuProps>['items'][number]
+type AntDSubMenuType = Required<MenuProps>['items'][number]
 
 export interface IMenuProps extends AntMenuProps {}
 
 export interface IMenuInfo extends RCMenuInfo {}
 
 export {
-  type AndMenuItemType as MenuItemType,
-  type AndMenuItemGroupType as MenuItemGroupType,
-  type AndMenuDividerType as MenuDividerType,
-  type AndSubMenuType as SubMenuType,
+  type AntDMenuItemType as MenuItemType,
+  type AntDMenuItemGroupType as MenuItemGroupType,
+  type AntDMenuDividerType as MenuDividerType,
+  type AntDSubMenuType as SubMenuType,
 }
 
 export const Menu = (props: IMenuProps) => {