Skip to content

Commit

Permalink
Merge branch 'master' into toggle-on-disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@kodiakhq
kodiakhq[bot] authored Oct 2, 2020
2 parents c584766 + 90fe63e commit 309b90c
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 0 deletions.
21 changes: 21 additions & 0 deletions packages/components/docs/sass.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25001,6 +25001,13 @@ Tile styles

&:focus {
@include focus-outline('outline');

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
outline: 3px solid transparent;
outline-offset: -3px;
}
}
}

Expand Down Expand Up @@ -25084,6 +25091,13 @@ Tile styles
transform-origin: center;
transition: $duration--fast-02 motion(standard, productive);
fill: $ui-05;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
}

&:hover {
Expand Down Expand Up @@ -25147,6 +25161,13 @@ Tile styles
> .#{$prefix}--tile__checkmark
svg {
fill: $ui-05;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
}

.#{$prefix}--tile-content {
Expand Down
21 changes: 21 additions & 0 deletions packages/components/src/components/tile/_tile.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@

&:focus {
@include focus-outline('outline');

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
outline: 3px solid transparent;
outline-offset: -3px;
}
}
}

Expand Down Expand Up @@ -113,6 +120,13 @@
transform-origin: center;
transition: $duration--fast-02 motion(standard, productive);
fill: $ui-05;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
}

&:hover {
Expand Down Expand Up @@ -176,6 +190,13 @@
> .#{$prefix}--tile__checkmark
svg {
fill: $ui-05;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
}

.#{$prefix}--tile-content {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/TreeView/TreeNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ export default function TreeNode({

const treeNodeProps = {
...rest,
['aria-current']: isActive || null,
['aria-selected']: disabled ? null : isSelected,
['aria-disabled']: disabled,
className: treeNodeClasses,
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/TreeView/TreeView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ export default function TreeView({
{...rest}
aria-label={hideLabel ? label : null}
aria-labelledby={!hideLabel ? labelId : null}
aria-multiselectable={multiselect || null}
className={treeClasses}
onKeyDown={handleKeyDown}
ref={treeRootRef}
Expand Down
16 changes: 16 additions & 0 deletions packages/react/src/components/TreeView/__snapshots__/TreeView-test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ exports[`TreeView should render 1`] = `
<ul
aria-label={null}
aria-labelledby="id1__label"
aria-multiselectable={null}
className="bx--tree"
onKeyDown={[Function]}
role="tree"
Expand All @@ -41,6 +42,7 @@ exports[`TreeView should render 1`] = `
value="1"
>
<li
aria-current={null}
aria-selected={true}
className="bx--tree-node bx--tree-node--selected bx--tree-leaf-node"
id="1"
Expand Down Expand Up @@ -75,6 +77,7 @@ exports[`TreeView should render 1`] = `
value="2"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-leaf-node"
id="2"
Expand Down Expand Up @@ -109,6 +112,7 @@ exports[`TreeView should render 1`] = `
value="5"
>
<li
aria-current={null}
aria-expanded={true}
aria-selected={false}
className="bx--tree-node bx--tree-parent-node"
Expand Down Expand Up @@ -182,6 +186,7 @@ exports[`TreeView should render 1`] = `
value="5-1"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-leaf-node"
id="5-1"
Expand Down Expand Up @@ -214,6 +219,7 @@ exports[`TreeView should render 1`] = `
value="5-2"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-leaf-node"
id="5-2"
Expand Down Expand Up @@ -247,6 +253,7 @@ exports[`TreeView should render 1`] = `
value="5-3"
>
<li
aria-current={null}
aria-expanded={true}
aria-selected={false}
className="bx--tree-node bx--tree-parent-node"
Expand Down Expand Up @@ -320,6 +327,7 @@ exports[`TreeView should render 1`] = `
value="5-4"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-leaf-node"
id="5-4"
Expand Down Expand Up @@ -367,6 +375,7 @@ exports[`TreeView should render with icons 1`] = `
<ul
aria-label={null}
aria-labelledby="id3__label"
aria-multiselectable={null}
className="bx--tree"
onKeyDown={[Function]}
role="tree"
Expand All @@ -393,6 +402,7 @@ exports[`TreeView should render with icons 1`] = `
value="1"
>
<li
aria-current={null}
aria-selected={true}
className="bx--tree-node bx--tree-node--selected bx--tree-node--with-icon bx--tree-leaf-node"
id="1"
Expand Down Expand Up @@ -464,6 +474,7 @@ exports[`TreeView should render with icons 1`] = `
value="2"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-leaf-node"
id="2"
Expand Down Expand Up @@ -536,6 +547,7 @@ exports[`TreeView should render with icons 1`] = `
value="5"
>
<li
aria-current={null}
aria-expanded={true}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-parent-node"
Expand Down Expand Up @@ -644,6 +656,7 @@ exports[`TreeView should render with icons 1`] = `
value="5-1"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-leaf-node"
id="5-1"
Expand Down Expand Up @@ -714,6 +727,7 @@ exports[`TreeView should render with icons 1`] = `
value="5-2"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-leaf-node"
id="5-2"
Expand Down Expand Up @@ -785,6 +799,7 @@ exports[`TreeView should render with icons 1`] = `
value="5-3"
>
<li
aria-current={null}
aria-expanded={true}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-parent-node"
Expand Down Expand Up @@ -893,6 +908,7 @@ exports[`TreeView should render with icons 1`] = `
value="5-4"
>
<li
aria-current={null}
aria-selected={false}
className="bx--tree-node bx--tree-node--with-icon bx--tree-leaf-node"
id="5-4"
Expand Down

0 comments on commit 309b90c

Please sign in to comment.