Skip to content

Commit

Permalink
Merge pull request #458 from sebgroup/develop
Browse files Browse the repository at this point in the history
A release that mostly fixes button type issue
  • Loading branch information
DanSallau authored Aug 14, 2020
2 parents 658d609 + 9872301 commit 341cd72
Show file tree
Hide file tree
Showing 14 changed files with 567 additions and 627 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

1 change: 1 addition & 0 deletions src/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ const Dropdown: React.FunctionComponent<DropdownProps> = (props: DropdownProps):
return (
<React.Fragment key={item.id}>
<button
type="button"
tabIndex={0}
ref={listRefs[index]}
className={`${item.className}${currentFocused === index ? " highlighted" : ""}`}
Expand Down
1 change: 1 addition & 0 deletions src/Notification/notification-style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ $small: 12px;
.notification-message {
font-size: $small;
padding-right: 18px;
word-break: break-word;
user-select: none;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Pagination/Pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ export const Pagination: React.FunctionComponent<PaginationProps> = React.memo(
<ul className={"pagination"}>
{props.value !== 1 && props.useFirstAndLast && (
<li className="page-item" onClick={() => props.onChange(1)}>
<button className="page-link" title={props.firstText}>
<button className="page-link" title={props.firstText} type="button">
<span className="nav-action">{props.useTextNav ? (props.firstText ? props.firstText : "First") : angleDoubleLeftIcon}</span>
<span className="sr-only">{props.firstText || "First"}</span>
</button>
</li>
)}
{props.value !== 1 && (
<li className="page-item" onClick={() => props.onChange(props.value - 1)}>
<button className="page-link" title={props.previousText}>
<button className="page-link" type="button" title={props.previousText}>
<span className="nav-action">{props.useTextNav ? (props.previousText ? props.previousText : "Previous") : angleLeftIcon}</span>
<span className="sr-only">{props.previousText || "Previous"}</span>
</button>
Expand All @@ -119,7 +119,7 @@ export const Pagination: React.FunctionComponent<PaginationProps> = React.memo(
{list.map((num: number) => {
return (
<li className={"page-item" + (props.value === num ? " active" : "")} key={num} onClick={() => props.onChange(num)} value={num}>
<button className={"page-link" + (props.value === num ? " active" : "")}>
<button className={"page-link" + (props.value === num ? " active" : "")} type="button">
<span className="nav-num">{num}</span>
<span className="sr-only">{num}</span>
</button>
Expand All @@ -129,7 +129,7 @@ export const Pagination: React.FunctionComponent<PaginationProps> = React.memo(

{props.value !== pagingSize && (
<li className="page-item" onClick={() => props.onChange(props.value + 1)}>
<button className="page-link" title={props.nextText}>
<button className="page-link" title={props.nextText} type="button">
<span className="nav-action">{props.useTextNav ? (props.nextText ? props.nextText : "Next") : angleRightIcon}</span>
<span className="sr-only">{props.nextText || "Next"}</span>
</button>
Expand All @@ -138,7 +138,7 @@ export const Pagination: React.FunctionComponent<PaginationProps> = React.memo(

{props.value !== pagingSize && props.useFirstAndLast && (
<li className="page-item" onClick={() => props.onChange(pagingSize)}>
<button className="page-link" title={props.lastText}>
<button className="page-link" title={props.lastText} type="button">
<span className="nav-action">{props.useTextNav ? (props.lastText ? props.lastText : "Last") : angleDoubleRightIcon}</span>
<span className="sr-only">{props.lastText || "Last"}</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/Table/Table.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ describe("Component: Table", () => {
mode: null,
};

const selector: string = "tbody tr.parent-row td .form-group.input-box-group";
const selector: string = "tbody tr.parent-row td .form-group";

const updatedSelectedRows: Array<TableRow> = smallData?.slice(0, 2).map((row: TableRow) => ({ ...row, selected: true }));

Expand Down
Loading

0 comments on commit 341cd72

Please sign in to comment.