chore: loading prop has been added to Action Button (#344)

Co-authored-by: mparticle-automation <[email protected]>
Co-authored-by: jdickman <[email protected]>

CHANGELOG.md

@@ -1,4 +1,4 @@
-# [1.22.0](https://github.com/mParticle/aquarium/compare/v1.21.1...v1.22.0) (2024-07-26)
+# [1.22.0-chore-loading-prop-queryitem-action.1](https://github.com/mParticle/aquarium/compare/v1.21.1...v1.22.0-chore-loading-prop-queryitem-action.1) (2024-07-30)
 
 ### Features
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/aquarium",
-  "version": "1.22.0",
+  "version": "1.22.0-chore-loading-prop-queryitem-action.1",
   "description": "mParticle Component Library",
   "license": "Apache-2.0",
   "keywords": [

src/components/data-entry/QueryItem/Action.stories.tsx

@@ -49,3 +49,10 @@ export const OnClick: Story = {
     },
   },
 }
+export const Loading: Story = {
+  args: {
+    text: 'Loading',
+    type: 'disabled',
+    loading: true,
+  },
+}

src/components/data-entry/QueryItem/Action.tsx

@@ -1,11 +1,11 @@
-
 import { Icon, Button, type IButtonProps } from 'src/components'
 import './query-item.css'
 
 export interface IActionProps {
   type?: 'disabled' | 'primary' | 'default'
   text?: string
   onClick?: () => void
+  loading?: IButtonProps['loading']
 }
 
 const Action = (props: IActionProps) => {
@@ -18,6 +18,7 @@ const Action = (props: IActionProps) => {
     type: props.type === 'disabled' ? 'default' : 'primary',
     disabled: props.type === 'disabled',
     onClick: props.onClick,
+    loading: props.loading,
   }
 
   let iconColor: 'primary' | 'default' = 'primary'
@@ -34,4 +35,4 @@ const Action = (props: IActionProps) => {
   )
 }
 
-export default Action
+export default Action

src/components/data-entry/QueryItem/Cascader.tsx

@@ -20,7 +20,7 @@ export interface ICascaderOption {
   disabled?: boolean
 }
 
-export interface ICascaderProps {
+export interface IQueryItemCascaderProps {
   options: ICascaderOption[]
   icon?: keyof Pick<typeof Icons, 'empty' | 'event' | 'userAttribute' | 'eventAttribute'>
   errorMessage?: string
@@ -30,7 +30,7 @@ export interface ICascaderProps {
   value?: Array<number | string>
 }
 
-const Cascader = (props: ICascaderProps) => {
+const Cascader = (props: IQueryItemCascaderProps) => {
   type DefaultOptionType = GetProp<IBaseCascaderProps, 'options'>[number]
 
   const options: ICascaderOption[] = []
@@ -74,7 +74,7 @@ const Cascader = (props: ICascaderProps) => {
 
   const baseProps: IBaseCascaderProps = {
     getPopupContainer: triggerNode => triggerNode.parentElement,
-    searchValue: searchValue,
+    searchValue,
     value: selectedValue,
     onChange: (values: Array<number | string>, selectedOptions: any): void => {
       setSelectedValue(values as string[])

src/components/index.ts

@@ -21,6 +21,7 @@ export { TimePicker, type ITimePickerProps } from './data-entry/TimePicker/TimeP
 export { Transfer, type ITransferProps } from './data-entry/Transfer/Transfer'
 export { QueryItem } from './data-entry/QueryItem/QueryItem'
 export type { IQueryItemQualifierOption } from './data-entry/QueryItem/Qualifier'
+export type { IQueryItemCascaderProps } from './data-entry/QueryItem/Cascader'
 export type { INumberInputProps } from './data-entry/QueryItem/NumberInput'
 export type { ITextInputProps } from './data-entry/QueryItem/TextInput'
 export { Collapse, type ICollapseProps } from './data-display/Collapse/Collapse'