Skip to content

Commit 7419f84

Browse files
vicky-comeauvicky-comeau
committed
Merge branch 'main' of https://github.com/gsoft-inc/ov-igloo-ui into feature/IGL-115-action-menu_drodpown-props
2 parents c6250e0 + 278e7ec commit 7419f84

File tree

97 files changed

+531
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+531
-108
lines changed

‎packages/ActionMenu/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# @igloo-ui/action-menu
22

3+
## 1.3.5
4+
5+
### Patch Changes
6+
7+
- ed3dc67: Added optional helper text prop to be passed to dropdown
8+
9+
## 1.3.4
10+
11+
### Patch Changes
12+
13+
- cfb5619: Updated hopper token versions and button versions.
14+
- Updated dependencies [cfb5619]
15+
- @igloo-ui/dropdown@1.6.6
16+
- @igloo-ui/list@0.5.5
17+
318
## 1.3.3
419

520
### Patch Changes

‎packages/ActionMenu/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/action-menu",
3-
"version": "1.3.3",
3+
"version": "1.3.5",
44
"main": "dist/ActionMenu.js",
55
"module": "dist/ActionMenu.js",
66
"types": "dist/ActionMenu.d.ts",
@@ -25,14 +25,15 @@
2525
},
2626
"dependencies": {
2727
"@igloo-ui/tokens": "^2.0.0",
28-
"@igloo-ui/dropdown": "^1.6.5",
29-
"@igloo-ui/list": "^0.5.4",
28+
"@igloo-ui/dropdown": "^1.6.6",
29+
"@igloo-ui/list": "^0.5.5",
3030
"@hopper-ui/tokens": "^3.1.3",
3131
"classnames": "^2.3.2"
3232
},
3333
"devDependencies": {
3434
"@igloo-ui/icons": "^1.12.2",
3535
"@igloo-ui/button": "^0.7.4",
36+
"@igloo-ui/helper-text": "^0.2.16",
3637
"@igloo-ui/icon-button": "^1.1.6"
3738
},
3839
"browserslist": [

‎packages/ActionMenu/src/ActionMenu.stories.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import isChromatic from 'chromatic/isChromatic';
33

44
import IconButton from '@igloo-ui/icon-button';
55
import Button from '@igloo-ui/button';
6+
import HelperText from '@igloo-ui/helper-text';
67
import Kebab from '@igloo-ui/icons/dist/Kebab';
78
import AddSolid from '@igloo-ui/icons/dist/AddSolid';
89
import Delete from '@igloo-ui/icons/dist/Delete';
@@ -278,3 +279,15 @@ export const Events = () => {
278279
</ChromaticWrapper>
279280
);
280281
};
282+
283+
export const WithFooter = () => {
284+
return (
285+
<ChromaticWrapper>
286+
<ActionMenu
287+
renderReference={kebab}
288+
options={actionMenuListEvents}
289+
footer={<HelperText>Helper text</HelperText>}
290+
/>
291+
</ChromaticWrapper>
292+
);
293+
};

‎packages/ActionMenu/src/ActionMenu.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ export interface ActionMenuProps extends React.ComponentProps<"div"> {
5555
renderReference: (
5656
props: React.HTMLProps<HTMLButtonElement>,
5757
) => React.ReactElement;
58+
/** Footer to display helper text or other content below the options */
59+
footer?: React.ReactNode;
5860
}
5961

6062
const ActionMenu: React.FunctionComponent<ActionMenuProps> = ({
@@ -70,6 +72,7 @@ const ActionMenu: React.FunctionComponent<ActionMenuProps> = ({
7072
options,
7173
position = "bottom-end",
7274
renderReference,
75+
footer,
7376
...rest
7477
}: ActionMenuProps) => {
7578
const actionMenuOptions = options.map((option): OptionType => {
@@ -81,7 +84,7 @@ const ActionMenu: React.FunctionComponent<ActionMenuProps> = ({
8184

8285
const [showMenu, setShowMenu] = React.useState(isOpen);
8386
const [currentFocusedOption, setCurrentFocusedOption] =
84-
React.useState<OptionType>();
87+
React.useState<OptionType>();
8588

8689
const isOptionDisabled = (option: OptionType | undefined): boolean => {
8790
if (option?.type === "list") {
@@ -138,7 +141,7 @@ const ActionMenu: React.FunctionComponent<ActionMenuProps> = ({
138141
const enabledOptions = actionMenuOptions.filter(
139142
option => !isOptionDisabled(option)
140143
);
141-
if (!enabledOptions.length) {return;}
144+
if (!enabledOptions.length) { return; }
142145

143146
let currentFocusedIndex = -1;
144147
if (currentFocusedOption) {
@@ -265,6 +268,7 @@ const ActionMenu: React.FunctionComponent<ActionMenuProps> = ({
265268
className: "ids-action-menu__trigger"
266269
});
267270
}}
271+
footer={footer}
268272
/>
269273
</div>
270274
);

‎packages/ActionMenu/src/action-menu.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
}
1212

1313
[data-brand="workleap"] {
14-
--ids-action-menu-font-family: var(--hop-body-sm-font-family);
14+
--ids-action-menu-font-family: var(--hop-body-sm-font-family);
1515
--ids-action-menu-font-size: var(--hop-body-sm-font-size);
1616
}
1717

1818
.ids-action-menu {
1919
font-family: var(--ids-action-menu-font-family);
2020
font-size: var(--ids-action-menu-font-size);
21-
}
22-
21+
}

‎packages/Alert/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# @igloo-ui/alert
22

3+
## 0.6.5
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
- Updated dependencies [cfb5619]
9+
- Updated dependencies [cfb5619]
10+
- @igloo-ui/button@0.7.7
11+
- @igloo-ui/icon-button@1.1.7
12+
313
## 0.6.4
414

515
### Patch Changes

‎packages/Alert/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/alert",
3-
"version": "0.6.4",
3+
"version": "0.6.5",
44
"main": "dist/Alert.js",
55
"module": "dist/Alert.js",
66
"types": "dist/Alert.d.ts",
@@ -24,15 +24,15 @@
2424
"build": "rollup -c rollup.config.js"
2525
},
2626
"dependencies": {
27-
"@igloo-ui/button": "^0.7.4",
28-
"@igloo-ui/icon-button": "^1.1.6",
27+
"@igloo-ui/button": "^0.7.7",
28+
"@igloo-ui/icon-button": "^1.1.7",
2929
"@igloo-ui/icons": "^1.12.2",
3030
"@igloo-ui/tokens": "^2.0.0",
3131
"@hopper-ui/tokens": "^3.1.3",
3232
"classnames": "^2.3.2"
3333
},
3434
"devDependencies": {
35-
"@igloo-ui/tooltip": "^3.4.3",
36-
"@igloo-ui/hyperlink": "^0.3.3"
35+
"@igloo-ui/tooltip": "^3.4.4",
36+
"@igloo-ui/hyperlink": "^0.3.4"
3737
}
3838
}

‎packages/AreaChart/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/area-chart
22

3+
## 1.1.1
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 1.1.0
410

511
### Minor Changes

‎packages/AreaChart/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/area-chart",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"main": "dist/AreaChart.js",
55
"module": "dist/AreaChart.js",
66
"types": "dist/AreaChart.d.ts",

‎packages/Avatar/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/avatar
22

3+
## 0.2.4
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.2.3
410

511
### Patch Changes

‎packages/Avatar/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/avatar",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44
"main": "dist/Avatar.js",
55
"module": "dist/Avatar.js",
66
"types": "dist/Avatar.d.ts",

‎packages/BarChart/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/bar-chart
22

3+
## 0.3.4
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.3.3
410

511
### Patch Changes

‎packages/BarChart/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/bar-chart",
3-
"version": "0.3.3",
3+
"version": "0.3.4",
44
"main": "dist/BarChart.js",
55
"module": "dist/BarChart.js",
66
"types": "dist/BarChart.d.ts",

‎packages/Breadcrumb/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/breadcrumb
22

3+
## 0.2.5
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.2.4
410

511
### Patch Changes

‎packages/Breadcrumb/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/breadcrumb",
3-
"version": "0.2.4",
3+
"version": "0.2.5",
44
"main": "dist/Breadcrumb.js",
55
"module": "dist/Breadcrumb.js",
66
"types": "dist/Breadcrumb.d.ts",

‎packages/Button/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## 0.7.7
4+
5+
### Patch Changes
6+
7+
- cfb5619: Fixed button padding. Also removed styles on loader buttons so they don't show up on focus.
8+
- cfb5619: Updated hopper token versions and button versions.
9+
10+
## 0.7.6
11+
12+
### Patch Changes
13+
14+
- 5c12940: Fixed button padding. Also removed styles on loader buttons so they don't show up on focus.
15+
316
## 0.7.5
417

518
### Patch Changes

‎packages/Button/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/button",
3-
"version": "0.7.5",
3+
"version": "0.7.7",
44
"main": "dist/Button.js",
55
"module": "dist/Button.js",
66
"types": "dist/Button.d.ts",

‎packages/ButtonGroup/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/button-group
22

3+
## 0.3.5
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.3.4
410

511
### Patch Changes

‎packages/ButtonGroup/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/button-group",
3-
"version": "0.3.4",
3+
"version": "0.3.5",
44
"main": "dist/ButtonGroup.js",
55
"module": "dist/ButtonGroup.js",
66
"types": "dist/ButtonGroup.d.ts",
@@ -35,6 +35,6 @@
3535
],
3636
"devDependencies": {
3737
"@igloo-ui/icons": "^1.12.2",
38-
"@igloo-ui/tooltip": "^3.4.3"
38+
"@igloo-ui/tooltip": "^3.4.4"
3939
}
4040
}

‎packages/Card/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/card
22

3+
## 0.1.4
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.1.3
410

511
### Patch Changes

‎packages/Card/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/card",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"main": "dist/Card.js",
55
"module": "dist/Card.js",
66
"types": "dist/Card.d.ts",

‎packages/Carousel/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/carousel
22

3+
## 0.2.4
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.2.3
410

511
### Patch Changes

‎packages/Carousel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/carousel",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44
"main": "dist/Carousel.js",
55
"module": "dist/Carousel.js",
66
"types": "dist/Carousel.d.ts",
@@ -29,7 +29,7 @@
2929
"classnames": "^2.3.2"
3030
},
3131
"devDependencies": {
32-
"@igloo-ui/button": "^0.7.4"
32+
"@igloo-ui/button": "^0.7.7"
3333
},
3434
"browserslist": [
3535
"> 1%",

‎packages/Checkbox/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/checkbox
22

3+
## 0.2.7
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.2.6
410

511
### Patch Changes

‎packages/Checkbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/checkbox",
3-
"version": "0.2.6",
3+
"version": "0.2.7",
44
"main": "dist/Checkbox.js",
55
"module": "dist/Checkbox.js",
66
"types": "dist/Checkbox.d.ts",

‎packages/Color/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @igloo-ui/color
22

3+
## 0.3.3
4+
5+
### Patch Changes
6+
7+
- cfb5619: Updated hopper token versions and button versions.
8+
39
## 0.3.2
410

511
### Patch Changes

‎packages/Color/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igloo-ui/color",
3-
"version": "0.3.2",
3+
"version": "0.3.3",
44
"main": "dist/Color.js",
55
"module": "dist/Color.js",
66
"types": "dist/Color.d.ts",

0 commit comments

Comments
 (0)