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.

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

Bootstrap 5 support #646

Merged
merged 55 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
277a236
Alert
tcbegley Aug 13, 2021
e90cbe6
Badge
tcbegley Aug 13, 2021
e778c16
Button
tcbegley Aug 13, 2021
ebb6f07
ButtonGroup
tcbegley Aug 13, 2021
63fc30d
Carousel
tcbegley Aug 13, 2021
4fa4b02
Collapse
tcbegley Aug 13, 2021
1edb13e
Fade
tcbegley Aug 14, 2021
fb7d43e
Add shim for html components that don't have class_name defined yet
tcbegley Aug 15, 2021
c44f53c
Update block button docs
tcbegley Aug 15, 2021
7123398
Update docs for Bootstrap 5
tcbegley Aug 15, 2021
cf68a38
RIP Jumbotron
tcbegley Aug 15, 2021
ac33e0e
Add react-bootstrap beta
tcbegley Aug 15, 2021
5c5af30
Layout
tcbegley Aug 15, 2021
54148ef
Docs fix
tcbegley Aug 15, 2021
6134398
Label
tcbegley Aug 15, 2021
c8c2949
Clean up example
tcbegley Aug 15, 2021
5f780b0
Monkeypatch doc tests
tcbegley Aug 15, 2021
42403e3
New components - Offcanvas and pagination (#643)
glsdown Aug 15, 2021
3412cca
Progress
tcbegley Aug 15, 2021
226791f
Format tests
tcbegley Aug 15, 2021
164207f
Spinner
tcbegley Aug 15, 2021
98d44e7
Table
tcbegley Aug 15, 2021
1f81d56
Toast
tcbegley Aug 15, 2021
793b3c1
New component Accordion (#645)
glsdown Aug 15, 2021
2b33232
flake8 config
tcbegley Aug 15, 2021
67dd011
List group updated to Bootstrap 5 (#647)
glsdown Aug 16, 2021
14fdeed
Bug fixes
tcbegley Aug 16, 2021
285e284
Tabs
tcbegley Aug 16, 2021
717d7b7
Form
tcbegley Aug 16, 2021
38a562e
Form updates + examples
tcbegley Aug 17, 2021
bfd42b0
Checklist / RadioItems
tcbegley Aug 18, 2021
a857394
Select
tcbegley Aug 18, 2021
ab47de0
themes
tcbegley Aug 18, 2021
a65f47e
BS5 updates for docs
tcbegley Aug 18, 2021
5fc033a
Fix doc tests
tcbegley Aug 18, 2021
e4c29bb
InputGroup
tcbegley Aug 18, 2021
80e5d36
Fix JS tests
tcbegley Aug 18, 2021
f9b53af
Checkbox/Radio
tcbegley Aug 18, 2021
5aea7e3
format js
tcbegley Aug 18, 2021
1ef7b40
Modal
tcbegley Aug 18, 2021
506a000
Modal docs
tcbegley Aug 18, 2021
b0ed5a4
Fix format command
tcbegley Aug 19, 2021
932cb0a
Card, Nav and Navbar (#648)
AnnMarieW Aug 20, 2021
bc22e9e
DropdownMenu
tcbegley Aug 20, 2021
d4d760d
NavbarToggler
tcbegley Aug 21, 2021
57716c6
Tooltip+Popover
tcbegley Aug 21, 2021
ce07d3e
Consistent imports
tcbegley Aug 21, 2021
d70f885
Fix accordion tests
tcbegley Aug 22, 2021
8431e7d
Initial breadcrumb component
tcbegley Aug 22, 2021
47dced1
Set accordion to first component
tcbegley Aug 22, 2021
3151b6a
Format code
tcbegley Aug 22, 2021
a0aef08
Update Breadcrumb
tcbegley Aug 22, 2021
dee3f2a
Snippet test fixes for breadcrumb
tcbegley Aug 22, 2021
54de8a0
Popover - minor prop updates (#652)
AnnMarieW Aug 24, 2021
7a539e1
Use size prop consistently
tcbegley Aug 24, 2021
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
Prev Previous commit
Next Next commit
Bug fixes
  • Loading branch information
tcbegley committed Aug 16, 2021
commit 14fdeedf1864fe4cfc1686f35cc0cb85e3753f43
2 changes: 2 additions & 0 deletions src/components/Collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ const Collapse = props => {
loading_state,
className,
class_name,
tag,
...otherProps
} = props;
return (
<RBCollapse
in={is_open}
as={tag}
className={class_name || className}
{...omit(['setProps'], otherProps)}
data-dash-is-loading={
Expand Down
4 changes: 2 additions & 2 deletions src/components/Fade.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ import {default as RBFade} from 'react-bootstrap/Fade';
const Fade = props => {
const {
children,
base_class,
base_class_active,
is_in,
loading_state,
style,
className,
class_name,
tag,
...otherProps
} = props;

Expand All @@ -30,6 +29,7 @@ const Fade = props => {
onEnter={() => setHidden(false)}
onExited={() => setHidden(true)}
className={class_name || className}
as={tag}
{...omit(['setProps'], otherProps)}
data-dash-is-loading={
(loading_state && loading_state.is_loading) || undefined
Expand Down
6 changes: 3 additions & 3 deletions src/components/__tests__/Progress.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ describe('Progress', () => {
container: {firstChild: progress}
} = render(
<Progress>
<Progress value={25} color="success" />
<Progress value={25} color="warning" />
<Progress value={25} color="danger" />
<Progress value={25} color="success" bar />
<Progress value={25} color="warning" bar />
<Progress value={25} color="danger" bar />
</Progress>
);

Expand Down