Skip to content

Commit

Permalink
Merge pull request #38 from certego/develop
Browse files Browse the repository at this point in the history
* build(deps): bump terser from 4.8.0 to 4.8.1 (#36)

Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: mlodic <30625432+mlodic@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added optional extraNavComponent support in RouterTabs (#37)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aditya Pratap Singh <adityapratapsingh51@gmail.com>
  • Loading branch information
3 people authored Sep 6, 2022
2 parents 12c782c + b23d7ea commit 327fb3d
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 94 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

**[Get it on npm](https://www.npmjs.com/package/certego-ui)**

## [v0.1.2](https://github.com/certego/certego-ui/releases/tag/v0.1.2)
Added extraNavComponent support in RouterTabs.

## [v0.1.1](https://github.com/certego/certego-ui/releases/tag/v0.1.1)
Added NewJsonRenderer.

Expand Down
2 changes: 1 addition & 1 deletion example/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 example/src/layouts/AppFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FaTwitter } from "react-icons/fa";
import { Toaster, ScrollToTopButton, useToastr } from "@certego/certego-ui";

// constants
const CERTEGO_UI_VERSION = "v0.1.1";
const CERTEGO_UI_VERSION = "v0.1.2";
const selector = (state) => state.toasts;

function AppFooter() {
Expand Down
152 changes: 62 additions & 90 deletions 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": "@certego/certego-ui",
"version": "0.1.1",
"version": "0.1.2",
"description": "certego components library (react.js, reactstrap, etc)",
"author": "certego",
"license": "MIT",
Expand Down
5 changes: 4 additions & 1 deletion src/components/tabs/RouterTabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import useRouterTabs from "./useRouterTabs";
*/
function RouterTabs(props) {
// props
const { routes, className, overflow, redirect, children, ...rest } = props;
const { routes, className, overflow, redirect, children, extraNavComponent, ...rest } = props;

const navClasses = classnames("nav-tabs", className);

Expand All @@ -37,6 +37,7 @@ function RouterTabs(props) {
<>
<Nav tabs className={navClasses} {...rest}>
{renderNavItems()}
{extraNavComponent}
</Nav>
<div className="mt-3">{renderRoutes()}</div>
</>
Expand All @@ -57,13 +58,15 @@ RouterTabs.propTypes = {
overflow: PropTypes.bool,
className: PropTypes.string,
children: PropTypes.node,
extraNavComponent: PropTypes.node,
};

RouterTabs.defaultProps = {
redirect: true,
overflow: false,
className: undefined,
children: null,
extraNavComponent: null,
};

export default RouterTabs;

0 comments on commit 327fb3d

Please sign in to comment.