Skip to content

Commit

Permalink
Merge branch 'feat/new-storybook-structure' of https://github.com/mPa…
Browse files Browse the repository at this point in the history
…rticle/aquarium into feat/new-storybook-structure
  • Loading branch information
tibuurcio committed Sep 25, 2024
2 parents d212218 + 7028945 commit a6cb11c
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 5 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# [1.32.0](https://github.com/mParticle/aquarium/compare/v1.31.1...v1.32.0) (2024-09-23)

### Bug Fixes

- notification center export z-index ([#422](https://github.com/mParticle/aquarium/issues/422)) ([ce01227](https://github.com/mParticle/aquarium/commit/ce012272401ab507473ef3d2c91cbaa5af8b5a30))

### 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

- 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))

## [1.31.1](https://github.com/mParticle/aquarium/compare/v1.31.0...v1.31.1) (2024-09-18)

### Bug Fixes
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mparticle/aquarium",
"version": "1.31.1",
"version": "1.32.0",
"description": "mParticle Component Library",
"license": "Apache-2.0",
"keywords": [
Expand Down
6 changes: 6 additions & 0 deletions src/components/data-entry/QueryItem/Cascader.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ export const LoadData: Story = {
},
}

export const SuffixIcon: Story = {
args: {
suffixIcon: <Icon name="dropdownOpen" size="sm" />,
},
}

export const Loading: Story = {
args: {
placeholder: 'Loading Story',
Expand Down
3 changes: 3 additions & 0 deletions src/components/data-entry/QueryItem/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface IQueryItemCascaderProps {
disabled?: boolean
placement?: IBaseCascaderProps['placement']
defaultOpen?: IBaseCascaderProps['defaultOpen']
suffixIcon?: IBaseCascaderProps['suffixIcon']
}

const Cascader = (props: IQueryItemCascaderProps) => {
Expand Down Expand Up @@ -102,6 +103,7 @@ const Cascader = (props: IQueryItemCascaderProps) => {
const baseProps: IBaseCascaderProps = {
getPopupContainer: triggerNode => triggerNode.parentElement,
searchValue,
suffixIcon: props.suffixIcon,
disabled: props.disabled,
value: selectedValue,
defaultOpen: props.defaultOpen,
Expand Down Expand Up @@ -168,6 +170,7 @@ const Cascader = (props: IQueryItemCascaderProps) => {
status={props.errorMessage ? 'error' : undefined}
className={inputClasses}
value={displayValue}
suffix={props.suffixIcon}
prefix={getIcon()}
/>
</BaseCascader>
Expand Down
4 changes: 2 additions & 2 deletions src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit a6cb11c

Please sign in to comment.