Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/webpack-5.76.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dkilgore-eightfold committed Jun 21, 2023
2 parents f2f5425 + 0bc661e commit 0ca44bb
Show file tree
Hide file tree
Showing 164 changed files with 10,523 additions and 7,104 deletions.
57 changes: 57 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,63 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.40.0](https://github.com/EightfoldAI/octuple/compare/v2.39.1...v2.40.0) (2023-06-20)

### Bug Fixes

- linkbutton: ensure default width matches min and max width ([#640](https://github.com/EightfoldAI/octuple/issues/640)) ([ffe5abf](https://github.com/EightfoldAI/octuple/commits/ffe5abf86ecefc1626f05a6b40cd2bd6d92b68e5))
- matchscore: color contrast and vertical alignment fix up ([#641](https://github.com/EightfoldAI/octuple/issues/641)) ([5353f90](https://github.com/EightfoldAI/octuple/commits/5353f90646321aea40de68425dc2d47b72b57594))
- table: various accessibility improvements ([#644](https://github.com/EightfoldAI/octuple/issues/644)) ([4cec71c](https://github.com/EightfoldAI/octuple/commits/4cec71cf06a041f28dd4c20279998fadef4f6746))
- tabs: pill variant color contrast fix up ([#642](https://github.com/EightfoldAI/octuple/issues/642)) ([33646f6](https://github.com/EightfoldAI/octuple/commits/33646f6929a70ab34ecdc783ff7e059eb0754e6c))

### [2.39.1](https://github.com/EightfoldAI/octuple/compare/v2.39.0...v2.39.1) (2023-06-14)

### Bug Fixes

- select: revert update selected option based on defaultValue when isLoading ([#643](https://github.com/EightfoldAI/octuple/issues/643)) ([6a481f7](https://github.com/EightfoldAI/octuple/commits/6a481f7361c4dcde666beeea27064198434293b4))

## [2.39.0](https://github.com/EightfoldAI/octuple/compare/v2.38.0...v2.39.0) (2023-06-12)

### Features

- icon: add collapse icon for kanban ([#637](https://github.com/EightfoldAI/octuple/issues/637)) ([0f05959](https://github.com/EightfoldAI/octuple/commits/0f0595977081d62dab8341ec0dabcdf3ae6cdb98))
- icon: add icons to support integration system simplification ([#634](https://github.com/EightfoldAI/octuple/issues/634)) ([693ee85](https://github.com/EightfoldAI/octuple/commits/693ee85436c32099183acc3d7240e8b5c85a9497))
- icon: add icons to support kanban view ([#632](https://github.com/EightfoldAI/octuple/issues/632)) ([f94efac](https://github.com/EightfoldAI/octuple/commits/f94efac518d04d004ff367f400ff34958c246c1f))

### Bug Fixes

- button: ensure loading dots use text color and enable two state loader ([#636](https://github.com/EightfoldAI/octuple/issues/636)) ([94f7759](https://github.com/EightfoldAI/octuple/commits/94f77599b00b2ca72017352306a95a5a356e76c0))
- select: Update selected option based on defaultValue when isLoading changes. ([#631](https://github.com/EightfoldAI/octuple/issues/631)) ([1e0417a](https://github.com/EightfoldAI/octuple/commits/1e0417a6a8d01b68bcb739bdd75c1a7c62c7a240))
- slider: increase vertical hit target and handle segmented gap clicks ([#635](https://github.com/EightfoldAI/octuple/issues/635)) ([b4cad7b](https://github.com/EightfoldAI/octuple/commits/b4cad7b8dde7e01e78cc1aab9eb333e3d7058c5f))

## [2.38.0](https://github.com/EightfoldAI/octuple/compare/v2.37.0...v2.38.0) (2023-06-02)

### Features

- messagebar: add message bar component ([#622](https://github.com/EightfoldAI/octuple/issues/622)) ([421d785](https://github.com/EightfoldAI/octuple/commits/421d7854baea35cb062fa04e5e7b1d9c1e639ae0))
- rename background-color to background ([#628](https://github.com/EightfoldAI/octuple/issues/628)) ([71c490b](https://github.com/EightfoldAI/octuple/commits/71c490b3a6a52beaa44f56932a89f875375d810f))
- table: adds column border and disable row bg hover color props ([#624](https://github.com/EightfoldAI/octuple/issues/624)) ([78a333d](https://github.com/EightfoldAI/octuple/commits/78a333dc5d047674ce2b838859b31fe4321a1527))

### Bug Fixes

- css: global css variable name alignment with design specification ([#625](https://github.com/EightfoldAI/octuple/issues/625)) ([26c16fd](https://github.com/EightfoldAI/octuple/commits/26c16fd7913f8e5efbaa2300e927a841fba8c174))
- pill: ensure pill heights match latest design specification ([#626](https://github.com/EightfoldAI/octuple/issues/626)) ([3576613](https://github.com/EightfoldAI/octuple/commits/357661381851d3d38c66368bb0c6ed170fd320ef))
- select: ensure medium and large pills fit inside inputs of same size ([#630](https://github.com/EightfoldAI/octuple/issues/630)) ([156800d](https://github.com/EightfoldAI/octuple/commits/156800d0bebc49d0e0f6ce2a8fd611d427e9e008))
- table: fix loading compare and updates default spinner size and position ([#627](https://github.com/EightfoldAI/octuple/issues/627)) ([b0b830e](https://github.com/EightfoldAI/octuple/commits/b0b830e25f10ff9cf5cdb2d03fb831b0ce0d7639))

## [2.37.0](https://github.com/EightfoldAI/octuple/compare/v2.36.2...v2.37.0) (2023-05-23)

### Features

- empty: enable themes and adds two additional modes ([#619](https://github.com/EightfoldAI/octuple/issues/619)) ([2ac0cd0](https://github.com/EightfoldAI/octuple/commits/2ac0cd089880997c00d55d46caed2e4a0b68e2bc))

### Bug Fixes

- button: pass disruptive down from props to button from defaultbutton ([#614](https://github.com/EightfoldAI/octuple/issues/614)) ([ab4a4c9](https://github.com/EightfoldAI/octuple/commits/ab4a4c91e3fc1274aea392c045cbbe5d755318bf))
- dropdown: fix visible prop ([#616](https://github.com/EightfoldAI/octuple/issues/616)) ([5e9f147](https://github.com/EightfoldAI/octuple/commits/5e9f147ea0a50508fed2c9b85160feaee7526d54))
- dropdown: tweak css slideupin animation ([#618](https://github.com/EightfoldAI/octuple/issues/618)) ([7a26de0](https://github.com/EightfoldAI/octuple/commits/7a26de00096dbf145eaa558b082247aaebc36338))
- locale: add support for hi locale ([#602](https://github.com/EightfoldAI/octuple/issues/602)) ([4232b01](https://github.com/EightfoldAI/octuple/commits/4232b01915618c5521531e3a57ef1ffd1007e874))

### [2.36.2](https://github.com/EightfoldAI/octuple/compare/v2.36.1...v2.36.2) (2023-05-09)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eightfold.ai/octuple",
"version": "2.36.2",
"version": "2.40.0",
"license": "MIT",
"main": "lib/octuple.js",
"types": "lib/octuple.d.ts",
Expand Down
34 changes: 16 additions & 18 deletions src/components/Avatar/Avatar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,24 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
hashingFunction: () => 0,
size: '32px',
outline: {
// outlineColor: 'var(--green-color-60)',
outlineOffset: '1px',
// outlineStyle: 'solid',
outlineWidth: '2px',
},
statusItems: {
[StatusItemsPosition.Bottom]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--green-color-20)',
color: 'var(--green-color-70)',
backgroundColor: 'var(--green-background2-color)',
color: 'var(--green-secondary-color)',
wrapperStyle: { padding: '2px' },
path: IconName.mdiHome,
size: '6px',
},
[StatusItemsPosition.TopRight]: {
...statusItemProps,
ariaLabel: 'Pencil icon',
backgroundColor: 'var(--green-color-20)',
color: 'var(--green-color-70)',
backgroundColor: 'var(--green-background2-color)',
color: 'var(--green-secondary-color)',
wrapperStyle: { padding: '2px' },
path: IconName.mdiPencil,
size: '6px',
Expand All @@ -134,7 +132,7 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
fontSize: '48px',
hashingFunction: () => 0,
outline: {
outlineColor: 'var(--blue-color-60)',
outlineColor: 'var(--blue-tertiary-color)',
outlineOffset: '2px',
outlineStyle: 'solid',
outlineWidth: '4px',
Expand All @@ -143,11 +141,11 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.TopRight]: {
...statusItemProps,
ariaLabel: 'Pencil icon',
backgroundColor: 'var(--red-color-20)',
color: 'var(--red-color-70)',
backgroundColor: 'var(--red-background2-color)',
color: 'var(--red-secondary-color)',
onClick: () => alert('Clicked pencil icon'),
outline: {
outlineColor: 'var(--red-color-60)',
outlineColor: 'var(--red-tertiary-color)',
outlineOffset: '0px',
outlineStyle: 'solid',
outlineWidth: '2px',
Expand All @@ -156,8 +154,8 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.Bottom]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--grey-color-10)',
color: 'var(--grey-color-70)',
backgroundColor: 'var(--grey-background1-color)',
color: 'var(--grey-secondary-color)',
onClick: () => alert('Clicked clock icon'),
outline: {},
path: IconName.mdiClock,
Expand Down Expand Up @@ -193,28 +191,28 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.Left]: {
...statusItemProps,
ariaLabel: 'Magnify icon',
backgroundColor: 'var(--blue-color-20)',
backgroundColor: 'var(--blue-background2-color)',
onClick: () => alert('Clicked magnify icon'),
path: IconName.mdiMagnify,
},
[StatusItemsPosition.TopLeft]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--red-color-30)',
backgroundColor: 'var(--red-background3-color)',
onClick: () => alert('Clicked clock icon'),
path: IconName.mdiClock,
text: '3000',
},
[StatusItemsPosition.Top]: {
...statusItemProps,
backgroundColor: 'var(--red-color-30)',
backgroundColor: 'var(--red-background3-color)',
path: IconName.mdiBell,
text: '4',
textMaxLength: 2,
},
[StatusItemsPosition.Right]: {
...statusItemProps,
backgroundColor: 'var(--blue-color-20)',
backgroundColor: 'var(--blue-background2-color)',
path: IconName.mdiCalendar,
text: '20',
alignIcon: StatusItemIconAlign.Left,
Expand Down Expand Up @@ -267,7 +265,7 @@ Avatar_Icon.args = {
path: IconName.mdiBell,
},
style: {
backgroundColor: 'var(--accent-color-20)',
backgroundColor: 'var(--accent-background2-color)',
},
};

Expand All @@ -284,7 +282,7 @@ Avatar_Round_Icon.args = {
path: IconName.mdiBell,
},
style: {
backgroundColor: 'var(--accent-color-20)',
backgroundColor: 'var(--accent-background2-color)',
},
type: 'round',
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ const MinStatusItemFontSize: number = 12;
const StatusItemFontDiff: string = '2px';

const StatusItemOutlineDefaults: React.CSSProperties = {
outlineColor: 'var(--grey-color-80)',
outlineColor: 'var(--grey-color)',
outlineOffset: '0px',
outlineStyle: 'solid',
outlineWidth: '2px',
};

const AvatarOutlineDefaults: React.CSSProperties = {
outlineColor: 'var(--green-color-60)',
outlineColor: 'var(--green-tertiary-color)',
outlineOffset: '2px',
outlineStyle: 'solid',
outlineWidth: '4px',
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/Avatar.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export interface StatusItemsProps extends IconProps {
/**
* Status item outline
*
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--grey-color-80)', outlineOffset: '0px', outlineStyle: 'solid', outlineWidth: '2px' }`
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--grey-color)', outlineOffset: '0px', outlineStyle: 'solid', outlineWidth: '2px' }`
*/
outline?: AvatarOutlineProps;
/**
Expand Down Expand Up @@ -124,7 +124,7 @@ export interface BaseAvatarProps extends OcBaseProps<HTMLDivElement> {
/**
* Avatar outline
*
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--green-color-60)', outlineOffset: '2px', outlineStyle: 'solid', outlineWidth: '4px' }`
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--green-tertiary-color)', outlineOffset: '2px', outlineStyle: 'solid', outlineWidth: '4px' }`
*/
outline?: AvatarOutlineProps;
/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/Avatar/Styles/group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

&-max-count {
background-color: var(--grey-color-20);
background-color: var(--grey-background2-color);
color: var(--text-secondary-color);
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/components/Avatar/avatar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,51 @@
justify-content: center;

&.red {
background-color: var(--red-color-60);
background-color: var(--red-tertiary-color);
}

&.orange {
background-color: var(--orange-color-60);
background-color: var(--orange-tertiary-color);
}

&.red-orange {
background-color: var(--redorange-color-60);
background-color: var(--redorange-tertiary-color);
}

&.yellow {
background-color: var(--yellow-color-60);
background-color: var(--yellow-tertiary-color);
}

&.yellow-green {
background-color: var(--yellowgreen-color-60);
background-color: var(--yellowgreen-tertiary-color);
}

&.green {
background-color: var(--green-color-60);
background-color: var(--green-tertiary-color);
}

&.blue-green {
background-color: var(--bluegreen-color-60);
background-color: var(--bluegreen-tertiary-color);
}

&.blue {
background-color: var(--blue-color-60);
background-color: var(--blue-tertiary-color);
}

&.blue-violet {
background-color: var(--blueviolet-color-60);
background-color: var(--blueviolet-tertiary-color);
}

&.violet {
background-color: var(--violet-color-60);
background-color: var(--violet-tertiary-color);
}

&.violet-red {
background-color: var(--violetred-color-60);
background-color: var(--violetred-tertiary-color);
}

&.grey {
background-color: var(--grey-color-60);
background-color: var(--grey-tertiary-color);
}
}

Expand Down
8 changes: 7 additions & 1 deletion src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,13 @@ export const Button: FC<ButtonProps> = React.forwardRef(
};

const getButtonLoader = (): JSX.Element =>
loading && <Loader classNames={styles.loader} size={getLoaderSize()} />;
loading && (
<Loader
classNames={styles.loader}
dotClassNames={styles.loaderDot}
size={getLoaderSize()}
/>
);

const getButtonIcon = (): JSX.Element => (
<Icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Two_State_Button.args = {
'data-test-id': 'myTwoStateButtonIconTwoTestId',
},
id: 'myTwoStateButton',
loading: false,
shape: ButtonShape.Pill,
size: ButtonSize.Medium,
style: {},
Expand Down
Loading

0 comments on commit 0ca44bb

Please sign in to comment.