chore: dev: merge latest main into dev (#657)

* chore: dev: merge latest main into dev * chore: dev: update merge of dropdown story * chore: dev: replace invalid sass var with css var * chore: dev: fix var missed in auto merge
EightfoldAI · Jun 27, 2023 · 80938a5 · 80938a5
1 parent c4f374b
commit 80938a5
Show file tree

Hide file tree

Showing 205 changed files with 11,731 additions and 6,862 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  plugins: ['babel-plugin-named-exports-order'],
+};
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eightfold.ai/octuple",
-  "version": "2.39.0",
+  "version": "2.40.0",
   "license": "MIT",
   "main": "lib/octuple.js",
   "types": "lib/octuple.d.ts",
@@ -120,6 +120,7 @@
     "babel-jest": "27.4.2",
     "babel-loader": "8.2.3",
     "babel-plugin-named-asset-import": "0.3.8",
+    "babel-plugin-named-exports-order": "0.0.2",
     "babel-preset-react-app": "10.0.1",
     "bfj": "7.0.2",
     "browserslist": "4.18.1",
@@ -180,7 +181,7 @@
     "resolve-url-loader": "4.0.0",
     "sass": "1.47.0",
     "sass-loader": "12.3.0",
-    "semver": "7.3.5",
+    "semver": "7.5.2",
     "sinon": "14.0.1",
     "source-map-loader": "3.0.0",
     "standard-version": "9.5.0",
@@ -198,7 +199,7 @@
     "typescript": "4.6.2",
     "typescript-plugin-css-modules": "3.4.0",
     "url-loader": "4.1.1",
-    "webpack": "5.64.4",
+    "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",
     "webpack-dev-middleware": "4.1.0",

diff --git a/src/components/Accordion/Accordion.stories.tsx b/src/components/Accordion/Accordion.stories.tsx
@@ -82,19 +82,20 @@ const Single_Story: ComponentStory<typeof Accordion> = (args) => (
   <Accordion {...args} />
 );
 
-export const Single = Single_Story.bind({});
-
-const List_Vertical_Story: ComponentStory<typeof List> = (args) => (
-  <List {...args} />
-);
-
-export const List_Vertical = List_Vertical_Story.bind({});
+const List_Story: ComponentStory<typeof List> = (args) => <List {...args} />;
 
-const List_Horizontal_Story: ComponentStory<typeof List> = (args) => (
-  <List {...args} />
-);
+export const Single = Single_Story.bind({});
+export const List_Vertical = List_Story.bind({});
+export const List_Horizontal = List_Story.bind({});
 
-export const List_Horizontal = List_Horizontal_Story.bind({});
+// Storybook 6.5 using Webpack >= 5.76.0 automatically alphabetizes exports,
+// this line ensures they are exported in the desired order.
+// See https://www.npmjs.com/package/babel-plugin-named-exports-order
+export const __namedExportsOrder = [
+  'Single',
+  'List_Vertical',
+  'List_Horizontal',
+];
 
 Single.args = {
   children: (

diff --git a/src/components/Avatar/Avatar.stories.tsx b/src/components/Avatar/Avatar.stories.tsx
@@ -47,42 +47,22 @@ const imageProps = {
   alt: 'random profile image',
 };
 
-const Avatar_Default_Story: ComponentStory<typeof Avatar> = (args) => (
+const Avatar_Story: ComponentStory<typeof Avatar> = (args) => (
   <Avatar {...args} />
 );
 
-export const Avatar_Default = Avatar_Default_Story.bind({});
-
-const Avatar_Icon_Story: ComponentStory<typeof Avatar> = (args) => (
-  <Avatar {...args} />
-);
-
-export const Avatar_Icon = Avatar_Icon_Story.bind({});
-
 const Avatar_Round_Story: ComponentStory<typeof Avatar> = (args) => (
   <Avatar popupProps={{ content: 'A popup' }} {...args} />
 );
 
-export const Avatar_Round = Avatar_Round_Story.bind({});
-
-const Avatar_Round_Icon_Story: ComponentStory<typeof Avatar> = (args) => (
-  <Avatar {...args} />
-);
-
-export const Avatar_Round_Icon = Avatar_Round_Icon_Story.bind({});
-
 const Avatar_Fallback_Theme_Story: ComponentStory<typeof Avatar> = (args) => (
   <Avatar {...args} theme="green" />
 );
 
-export const Avatar_Fallback_Theme = Avatar_Fallback_Theme_Story.bind({});
-
 const Avatar_Fallback_Hashing_Story: ComponentStory<typeof Avatar> = (args) => (
   <Avatar {...args} hashingFunction={() => 3} />
 );
 
-export const Avatar_Fallback_Hashing = Avatar_Fallback_Hashing_Story.bind({});
-
 const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
   const avatarSize = 100;
   const [statusItemSize] = getStatusItemSizeAndPadding(avatarSize);
@@ -230,14 +210,33 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
   );
 };
 
-export const Avatar_StatusItem = Avatar_StatusItem_Story.bind({});
-
 const Avatar_Tooltip_Story: ComponentStory<typeof Avatar> = (args) => (
   <Avatar {...args} theme="red" />
 );
 
+export const Avatar_Default = Avatar_Story.bind({});
+export const Avatar_Icon = Avatar_Story.bind({});
+export const Avatar_Round = Avatar_Round_Story.bind({});
+export const Avatar_Round_Icon = Avatar_Story.bind({});
+export const Avatar_Fallback_Theme = Avatar_Fallback_Theme_Story.bind({});
+export const Avatar_Fallback_Hashing = Avatar_Fallback_Hashing_Story.bind({});
+export const Avatar_StatusItem = Avatar_StatusItem_Story.bind({});
 export const Avatar_Tooltip = Avatar_Tooltip_Story.bind({});
 
+// Storybook 6.5 using Webpack >= 5.76.0 automatically alphabetizes exports,
+// this line ensures they are exported in the desired order.
+// See https://www.npmjs.com/package/babel-plugin-named-exports-order
+export const __namedExportsOrder = [
+  'Avatar_Default',
+  'Avatar_Icon',
+  'Avatar_Round',
+  'Avatar_Round_Icon',
+  'Avatar_Fallback_Theme',
+  'Avatar_Fallback_Hashing',
+  'Avatar_StatusItem',
+  'Avatar_Tooltip',
+];
+
 const avatarArgs: Object = {
   children: 'JD',
   classNames: 'my-avatar-class',

diff --git a/src/components/Avatar/AvatarGroup.stories.tsx b/src/components/Avatar/AvatarGroup.stories.tsx
@@ -198,12 +198,6 @@ const Basic_Story: ComponentStory<typeof AvatarGroup> = (args) => (
   </AvatarGroup>
 );
 
-export const Basic = Basic_Story.bind({});
-
-export const Basic_Spaced = Basic_Story.bind({});
-
-export const Basic_Max_Props_Exceed_Children = Basic_Story.bind({});
-
 const List_Story: ComponentStory<typeof AvatarGroup> = (args) => (
   <AvatarGroup
     animateOnHover
@@ -246,12 +240,25 @@ const List_Story: ComponentStory<typeof AvatarGroup> = (args) => (
   />
 );
 
+export const Basic = Basic_Story.bind({});
+export const Basic_Spaced = Basic_Story.bind({});
+export const Basic_Max_Props_Exceed_Children = Basic_Story.bind({});
 export const List_Group = List_Story.bind({});
-
 export const List_Group_Spaced = List_Story.bind({});
-
 export const List_Group_Max_Props_Exceed_Children = List_Story.bind({});
 
+// Storybook 6.5 using Webpack >= 5.76.0 automatically alphabetizes exports,
+// this line ensures they are exported in the desired order.
+// See https://www.npmjs.com/package/babel-plugin-named-exports-order
+export const __namedExportsOrder = [
+  'Basic',
+  'Basic_Spaced',
+  'Basic_Max_Props_Exceed_Children',
+  'List_Group',
+  'List_Group_Spaced',
+  'List_Group_Max_Props_Exceed_Children',
+];
+
 const avatarGroupArgs: Object = {
   classNames: 'my-avatar-group-class',
   'data-test-id': 'my-avatar-group-test-id',

diff --git a/src/components/Badge/Badge.stories.tsx b/src/components/Badge/Badge.stories.tsx
@@ -28,23 +28,20 @@ export default {
   },
 } as ComponentMeta<typeof Badge>;
 
-const Badge_Default_Story: ComponentStory<typeof Badge> = (args) => (
-  <Badge {...args} />
-);
+const Badge_Story: ComponentStory<typeof Badge> = (args) => <Badge {...args} />;
 
-export const Badge_Default = Badge_Default_Story.bind({});
+export const Badge_Default = Badge_Story.bind({});
+export const Badge_Active = Badge_Story.bind({});
+export const Badge_Disruptive = Badge_Story.bind({});
 
-const Badge_Active_Story: ComponentStory<typeof Badge> = (args) => (
-  <Badge {...args} />
-);
-
-export const Badge_Active = Badge_Active_Story.bind({});
-
-const Badge_Disruptive_Story: ComponentStory<typeof Badge> = (args) => (
-  <Badge {...args} />
-);
-
-export const Badge_Disruptive = Badge_Disruptive_Story.bind({});
+// Storybook 6.5 using Webpack >= 5.76.0 automatically alphabetizes exports,
+// this line ensures they are exported in the desired order.
+// See https://www.npmjs.com/package/babel-plugin-named-exports-order
+export const __namedExportsOrder = [
+  'Badge_Default',
+  'Badge_Active',
+  'Badge_Disruptive',
+];
 
 const badgeArgs: Object = {
   active: false,