diff --git a/changelog.d/emoji-count-button.fix b/changelog.d/emoji-count-button.fix new file mode 100644 index 000000000..946f6d554 --- /dev/null +++ b/changelog.d/emoji-count-button.fix @@ -0,0 +1 @@ +Switch from class hack to normalButton attr for emoji count popover diff --git a/changelog.d/focus-visible.fix b/changelog.d/focus-visible.fix new file mode 100644 index 000000000..86f8df615 --- /dev/null +++ b/changelog.d/focus-visible.fix @@ -0,0 +1 @@ +Make sure hover style is also applied to :focus-visible diff --git a/changelog.d/focus.fix b/changelog.d/focus.fix new file mode 100644 index 000000000..e69de29bb diff --git a/changelog.d/subject-hidden-popover-trigger.fix b/changelog.d/subject-hidden-popover-trigger.fix new file mode 100644 index 000000000..816df5a43 --- /dev/null +++ b/changelog.d/subject-hidden-popover-trigger.fix @@ -0,0 +1 @@ +Remove focusability on hidden popover in subject input diff --git a/changelog.d/temp-changes.skip b/changelog.d/temp-changes.skip new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json index cb5378a86..fa4b59eba 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "iso-639-1": "3.1.5", "lodash": "4.17.21", "msw": "2.7.3", - "nightwatch": "3.12.0", + "nightwatch": "3.12.1", "ora": "0.4.1", "playwright": "1.49.1", "postcss": "8.5.3", @@ -100,7 +100,7 @@ "selenium-server": "3.141.59", "semver": "7.7.1", "serve-static": "1.16.2", - "shelljs": "0.9.1", + "shelljs": "0.9.2", "sinon": "15.2.0", "sinon-chai": "3.7.0", "stylelint": "14.16.1", diff --git a/src/components/button.style.js b/src/components/button.style.js index fb5d30b64..887ff91b5 100644 --- a/src/components/button.style.js +++ b/src/components/button.style.js @@ -9,9 +9,9 @@ export default { // However, cascading still works, so resulting state will be result of merging of all relevant states/variants // normal: '' // normal state is implicitly added, it is always included toggled: '.toggled', - focused: ':focus-visible', + focused: ':focus-within', pressed: ':focus:active', - hover: ':hover:not(:disabled)', + hover: ':is(:hover, :focus-visible):not(:disabled)', disabled: ':disabled' }, // Variants are mutually exclusive, each component implicitly has "normal" variant, and all other variants inherit from it. @@ -89,6 +89,13 @@ export default { shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] } }, + { + state: ['toggled', 'focused'], + directives: { + background: '--accent,-24.2', + shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] + } + }, { state: ['toggled', 'disabled'], directives: { diff --git a/src/components/button_unstyled.style.js b/src/components/button_unstyled.style.js index a387ed954..9e1a2ca90 100644 --- a/src/components/button_unstyled.style.js +++ b/src/components/button_unstyled.style.js @@ -6,8 +6,8 @@ export default { states: { toggled: '.toggled', disabled: ':disabled', - hover: ':hover:not(:disabled)', - focused: ':focus-within' + hover: ':is(:hover, :focus-visible):not(:disabled)', + focused: ':focus-within:not(:is(:focus-visible))' }, validInnerComponents: [ 'Text', diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 9bd5c8f4e..c90f079d9 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -55,7 +55,7 @@ ref="suggestorPopover" class="autocomplete-panel" placement="bottom" - :trigger-attrs="{ 'aria-hidden': true }" + :hide-trigger="true" >