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

fix(extension): adjust reflow of scan section when narrow #1887

Merged
merged 4 commits into from
Apr 16, 2024
Merged

fix(extension): adjust reflow of scan section when narrow #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffadf24
Numbers reflow
drjoho Apr 2, 2024
d5fcf7d
lot's of itty bitty reflow...
drjoho Apr 2, 2024
b853e75
Merge branch 'master' into joho-fixNarrowReflow-1830
drjoho Apr 15, 2024
4a0283e
Fix conflict
drjoho Apr 15, 2024
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
7 changes: 4 additions & 3 deletions accessibility-checker-extension/src/ts/devtools/components/reportSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@

.totalCountDisable {
@include type-style("label-02");
margin-top: 10px;
margin-top: 3px;
pointer-events: none;
color: $text-disabled;
text-align: right;
}
.totalCountEnable {
@include type-style("label-02");
margin-top: 10px;
margin-top: 3px;
pointer-events: auto;
text-align: right;
}
Expand All @@ -63,10 +63,11 @@
}

.viewMulti {
float:right;
width: 230px;
.cds--list-box {
max-height: 2rem;
border-left: solid $gray-40 1px
border: solid $gray-40 1px;
}
}

Expand Down
147 changes: 71 additions & 76 deletions accessibility-checker-extension/src/ts/devtools/components/reportSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,89 +222,84 @@ export class ReportSection extends React.Component<ReportSectionProps, ReportSec
let viewFilterSection = <>
<div className="reportFilterBorder" />
{this.state.filterShown && <Grid className="reportViewFilterSection">
<Column sm={4} md={8} lg={8} style={{ marginRight: "0px" }}>
<div style={{display: "flex", flexWrap: "wrap", gap: "1rem", float: "right"}}>
<div style={{flex: "0 1 8.75rem"}}>
<div style={{display: "flex"}}>
<div style={{flex: "1 1 8.75rem", maxWidth: "8.75rem", marginRight: "8px" }}>
{!this.state.viewState || !this.state.viewState!.kcm &&
<Dropdown
className="viewMulti"
ariaLabel="Select report view"
disabled={totalCount === 0}
id="reportView"
size="sm"
items={viewItems}
light={false}
type="default"
style={{width:"160px"}}
selectedItem={this.state.reportViewState}
onChange={async (evt: any) => {
// set state
this.setState({ reportViewState: evt.selectedItem });
}}
/>
<Column sm={4} md={8} lg={8}>
<div style={{display: "flex", flexWrap: "wrap", float: "right", gap: "1px 0px"}}>
<div style={{flex: "1 1 auto", margin: "-1px 0px" }}></div>
<div style={{flex: "1 1 0", marginRight: "0px", margin: "-1px 0px" }}>
{!this.state.viewState || !this.state.viewState!.kcm &&
<Dropdown
className="viewMulti"
ariaLabel="Select report view"
disabled={totalCount === 0}
id="reportView"
size="sm"
items={viewItems}
light={false}
type="default"
style={{width:"160px", float: "right"}}
selectedItem={this.state.reportViewState}
onChange={async (evt: any) => {
// set state
this.setState({ reportViewState: evt.selectedItem });
}}
/>
}
</div>
<div style={{flex: "1 1 0", margin: "-1px 0px"}}>
{
<MultiSelect
className="viewMulti"
ariaLabel="Issue type filter"
label="Filter"
size="sm"
hideLabel={true}
disabled={totalCount === 0}
id="filterSelection"
items={filterItems}
itemToString={(item:any) => (item ? item.text : '')}
itemToElement={(item:any) => {
if (item && item.id === "0") {
return <span>{UtilIssueReact.valueSingToIcon("Violation", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "1") {
return <span>{UtilIssueReact.valueSingToIcon("Needs review", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "2") {
return <span>{UtilIssueReact.valueSingToIcon("Recommendation", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "3") {
return <span>{UtilIssueReact.valueSingToIcon("ViewOff", "reportSecIcon")} {item.text}</span>
}
return <></>
}
</div>
<div style={{flex: "1 1 8.75rem"}}>
{
<MultiSelect
className="viewMulti"
ariaLabel="Issue type filter"
label="Filter"
size="sm"
hideLabel={true}
disabled={totalCount === 0}
id="filterSelection"
items={filterItems}
itemToString={(item:any) => (item ? item.text : '')}
itemToElement={(item:any) => {
if (item && item.id === "0") {
return <span>{UtilIssueReact.valueSingToIcon("Violation", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "1") {
return <span>{UtilIssueReact.valueSingToIcon("Needs review", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "2") {
return <span>{UtilIssueReact.valueSingToIcon("Recommendation", "reportSecIcon")} {item.text}</span>
} else if (item && item.id === "3") {
return <span>{UtilIssueReact.valueSingToIcon("ViewOff", "reportSecIcon")} {item.text}</span>
}
return <></>
}
}
light={false}
type="default"
style={{ float: "right" }}
selectedItems={levelSelectedItems}
initialSelectedItems={levelSelectedItems}
onChange={async (evt: any) => {
let checked = appController.getLevelFilters();
if (evt.selectedItems != undefined) {
checked["Violation"] = evt.selectedItems.some((item: any) => item.text === "Violations");
checked["Needs review"] = evt.selectedItems.some((item: any) => item.text === "Needs review");
checked["Recommendation"] = evt.selectedItems.some((item: any) => item.text === "Recommendations");
checked["Hidden"] = evt.selectedItems.some((item: any) => item.text === "Hidden");
}
appController.setLevelFilters(checked);
}}
/>
}
light={false}
type="default"
selectedItems={levelSelectedItems}
initialSelectedItems={levelSelectedItems}
onChange={async (evt: any) => {
let checked = appController.getLevelFilters();
if (evt.selectedItems != undefined) {
checked["Violation"] = evt.selectedItems.some((item: any) => item.text === "Violations");
checked["Needs review"] = evt.selectedItems.some((item: any) => item.text === "Needs review");
checked["Recommendation"] = evt.selectedItems.some((item: any) => item.text === "Recommendations");
checked["Hidden"] = evt.selectedItems.some((item: any) => item.text === "Hidden");
}
</div>
<div style={{flex: "1 1 8.75rem"}}>
<div>
<Button
kind="tertiary"
disabled={totalCount === 0}
style={{ float: "right", marginRight: "16px", minHeight: "18px", maxHeight: "32px" }}
onClick={() => devtoolsController.exportXLS("last") }
>Export scan</Button>
</div>
</div>
appController.setLevelFilters(checked);
}}
/>
}
</div>
<div style={{flex: "1 1 0", margin: "-1px 0px"}}>
<div>
<Button
kind="tertiary"
disabled={totalCount === 0}
style={{ float: "right", minHeight: "18px", maxHeight: "32px", minWidth: "10rem" }}
onClick={() => devtoolsController.exportXLS("last") }
>Export XLS</Button>
</div>
</div>
</div>
</Column>
</Grid>}
<div className="reportFilterBorder" />
</>

return (<>
Expand Down
16 changes: 8 additions & 8 deletions accessibility-checker-extension/src/ts/devtools/components/scanSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
}
.totalCountDisable {
@include type-style("label-02");
margin-top: 10px;
margin-top: 3px;
pointer-events: none;

text-align: right;
Expand All @@ -100,7 +100,7 @@
}
.totalCountEnable {
@include type-style("label-02");
margin-top: 10px;
margin-top: 3px;
pointer-events: auto;
text-align: right;
.darkLink {
Expand All @@ -119,9 +119,9 @@

.countCol {
@media (max-width:400px) {
position: absolute;
top: 1.5rem;
left: 0rem;
// position: absolute;
// top: 1.5rem;
// left: 0rem;
}
white-space: nowrap;
}
Expand All @@ -148,9 +148,9 @@
}
.countCol {
@media (max-width:400px) {
position: absolute;
top: 1.5rem;
left: 0rem;
// position: absolute;
// top: 1.5rem;
// left: 0rem;
}
white-space: nowrap;
}
Expand Down
Loading
Loading