Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(table): add tooltips to buttons and shrink icon size to 16 px, upgrade Carbon to v10.12.0 #1238

Merged
merged 14 commits into from
Jun 2, 2020
Merged

feat(table): add tooltips to buttons and shrink icon size to 16 px, upgrade Carbon to v10.12.0 #1238

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0d895ea
fix(table): set toolbar buttons to correct size
scottdickerson May 27, 2020
5289496
chore(carbon): upgrade carbon components
scottdickerson May 28, 2020
32b77ce
feat(tabletoolbar): show active state of buttons
scottdickerson May 28, 2020
cb28008
fix(toolbartooltips): hide the tooltip if the button is active
scottdickerson May 28, 2020
d4c65b8
fix(tabletoolbar): allow overflow on top of table
scottdickerson May 28, 2020
6a8334b
test(tilegallery): remove expand/collapse i18n no longer used
scottdickerson May 28, 2020
c24475b
Update package.json
scottdickerson May 28, 2020
1979338
Merge branch 'master' into fix-table-toolbarbuttons
scottdickerson May 28, 2020
c798956
fix(package): undo heap size
scottdickerson May 29, 2020
7f1d48b
Merge branch 'fix-table-toolbarbuttons' of https://github.com/IBM/car…
scottdickerson May 29, 2020
e6070ac
fix(tabletoolbar): switch to default tooltip as carbon one is too int…
scottdickerson May 29, 2020
4d590cd
fix(cardbuttons): the sizes need to match table button
scottdickerson Jun 1, 2020
e8474a4
Merge branch 'master' of github.com:IBM/carbon-addons-iot-react into …
tay1orjones Jun 2, 2020
05764e4
Merge branch 'master' into fix-table-toolbarbuttons
tay1orjones Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions .storybook/__snapshots__/Welcome.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
onAnimationEnd={[Function]}
>
<button
aria-controls="accordion-item-1"
aria-expanded={false}
className="bx--accordion__heading"
onClick={[Function]}
onKeyDown={[Function]}
title="Expand/Collapse"
title="Exports table"
type="button"
>
<svg
aria-label="Expand/Collapse"
aria-hidden={true}
className="bx--accordion__arrow"
focusable="false"
height={16}
preserveAspectRatio="xMidYMid meet"
role="img"
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
<path
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
/>
</svg>
<div
Expand All @@ -89,6 +89,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
</button>
<div
className="bx--accordion__content"
id="accordion-item-1"
>
<p>
The following table shows a comparison of exports from carbon-components-react and this library. These are primarily used for snapshot purposes to track and ensure that as the exports change upstream in Carbon we continue to provide parity with their package.
Expand Down Expand Up @@ -591,9 +592,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
</div>
<div
className="bx--structured-list-td"
>
TableToolbarSearch
</div>
/>
</div>
<div
className="bx--structured-list-row"
Expand Down Expand Up @@ -757,6 +756,18 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
Form
</div>
</div>
<div
className="bx--structured-list-row"
>
<div
className="bx--structured-list-td"
>
FluidForm
</div>
<div
className="bx--structured-list-td"
/>
</div>
<div
className="bx--structured-list-row"
>
Expand Down Expand Up @@ -1913,6 +1924,18 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
NumberInputSkeleton
</div>
</div>
<div
className="bx--structured-list-row"
>
<div
className="bx--structured-list-td"
>
PaginationSkeleton
</div>
<div
className="bx--structured-list-td"
/>
</div>
<div
className="bx--structured-list-row"
>
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"@carbon/layout": "10.7.1",
"@carbon/motion": "10.6.0",
"@carbon/themes": "10.10.3",
"carbon-components": "10.10.3",
"carbon-components-react": "7.10.3",
"carbon-components": "^10.12.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be pinned to specific version.

Suggested change
"carbon-components": "^10.12.0",
"carbon-components": "10.12.0",

"carbon-components-react": "7.12.0",
"carbon-icons": "7.0.7",
"classnames": "^2.2.5",
"core-js": "3.6.4",
Expand Down
22 changes: 12 additions & 10 deletions src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
onAnimationEnd={[Function]}
>
<button
aria-controls="accordion-item-2"
aria-expanded={false}
className="bx--accordion__heading"
onClick={[Function]}
onKeyDown={[Function]}
title="Expand/Collapse"
title="A section without deferred content rendering"
type="button"
>
<svg
aria-label="Expand/Collapse"
aria-hidden={true}
className="bx--accordion__arrow"
focusable="false"
height={16}
preserveAspectRatio="xMidYMid meet"
role="img"
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
<path
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
/>
</svg>
<div
Expand All @@ -58,6 +58,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
</button>
<div
className="bx--accordion__content"
id="accordion-item-2"
>
<p>
This content is always rendered to the DOM, no matter if the accordion item has been open or closed.
Expand All @@ -71,26 +72,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
onAnimationEnd={[Function]}
>
<button
aria-controls="accordion-item-3"
aria-expanded={false}
className="bx--accordion__heading"
onClick={[Function]}
onKeyDown={[Function]}
title="Expand/Collapse"
title="A section with deferred content rendering"
type="button"
>
<svg
aria-label="Expand/Collapse"
aria-hidden={true}
className="bx--accordion__arrow"
focusable="false"
height={16}
preserveAspectRatio="xMidYMid meet"
role="img"
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
<path
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
/>
</svg>
<div
Expand All @@ -101,6 +102,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
</button>
<div
className="bx--accordion__content"
id="accordion-item-3"
/>
</li>
</ul>
Expand Down
5 changes: 1 addition & 4 deletions src/components/Card/__snapshots__/Card.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,11 +1920,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Card
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
/>
<path
d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
/>
<path
d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
Expand Down
36 changes: 18 additions & 18 deletions src/components/ComposedModal/__snapshots__/ComposedModal.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -195,8 +195,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -309,8 +309,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -378,8 +378,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -575,8 +575,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -702,8 +702,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -807,8 +807,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -925,8 +925,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down Expand Up @@ -1090,8 +1090,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
width={20}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
<path
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
/>
</svg>
</button>
Expand Down
Loading