Skip to content

Commit

Permalink
Merge pull request #297 from dabapps/Set-overflow-to-null-instead-of-…
Browse files Browse the repository at this point in the history
…initial-to-support-IE11

Set overflow to null instead of initial to support IE
  • Loading branch information
JakeSidSmith authored Mar 7, 2019
2 parents 689fe15 + e7bdb7e commit 3b678ed
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dabapps/roe",
"version": "0.9.24",
"version": "0.9.25",
"description": "A collection of React components, styles, mixins, and atomic CSS classes to aid with the development of web applications.",
"main": "dist/js/index.js",
"types": "dist/js/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion src/ts/components/misc/collapse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export class Collapse extends PureComponent<CollapseProps, CollapseState> {
minHeight,
maxHeight: opened ? null : height,
position: 'relative' as 'relative',
overflow: (!opened ? 'hidden' : 'initial') as 'hidden' | 'initial',
overflow: (opened ? null : 'hidden') as 'hidden' | null,
transition: `ease-in-out ${animationDuration}ms max-height`,
};

Expand Down
10 changes: 5 additions & 5 deletions tests/__snapshots__/collapse.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ exports[`Collapse should close to custom height 1`] = `
Object {
"maxHeight": null,
"minHeight": null,
"overflow": "initial",
"overflow": null,
"position": "relative",
"transition": "ease-in-out 200ms max-height",
}
Expand Down Expand Up @@ -200,7 +200,7 @@ exports[`Collapse should close to default height 1`] = `
Object {
"maxHeight": null,
"minHeight": null,
"overflow": "initial",
"overflow": null,
"position": "relative",
"transition": "ease-in-out 200ms max-height",
}
Expand Down Expand Up @@ -336,7 +336,7 @@ exports[`Collapse should match snapshot when expanded 1`] = `
Object {
"maxHeight": null,
"minHeight": null,
"overflow": "initial",
"overflow": null,
"position": "relative",
"transition": "ease-in-out 200ms max-height",
}
Expand Down Expand Up @@ -554,7 +554,7 @@ exports[`Collapse should open from custom height 4`] = `
Object {
"maxHeight": null,
"minHeight": null,
"overflow": "initial",
"overflow": null,
"position": "relative",
"transition": "ease-in-out 200ms max-height",
}
Expand Down Expand Up @@ -679,7 +679,7 @@ exports[`Collapse should open from default height 4`] = `
Object {
"maxHeight": null,
"minHeight": null,
"overflow": "initial",
"overflow": null,
"position": "relative",
"transition": "ease-in-out 200ms max-height",
}
Expand Down

0 comments on commit 3b678ed

Please sign in to comment.