diff --git a/changelog.d/emoji-count-button.fix b/changelog.d/emoji-count-button.fix deleted file mode 100644 index 946f6d554..000000000 --- a/changelog.d/emoji-count-button.fix +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 86f8df615..000000000 --- a/changelog.d/focus-visible.fix +++ /dev/null @@ -1 +0,0 @@ -Make sure hover style is also applied to :focus-visible diff --git a/changelog.d/focus.fix b/changelog.d/focus.fix deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/subject-hidden-popover-trigger.fix b/changelog.d/subject-hidden-popover-trigger.fix deleted file mode 100644 index 816df5a43..000000000 --- a/changelog.d/subject-hidden-popover-trigger.fix +++ /dev/null @@ -1 +0,0 @@ -Remove focusability on hidden popover in subject input diff --git a/changelog.d/temp-changes.skip b/changelog.d/temp-changes.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/package.json b/package.json index fa4b59eba..cb5378a86 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.1", + "nightwatch": "3.12.0", "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.2", + "shelljs": "0.9.1", "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 887ff91b5..fb5d30b64 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-within', + focused: ':focus-visible', pressed: ':focus:active', - hover: ':is(:hover, :focus-visible):not(:disabled)', + hover: ':hover:not(:disabled)', disabled: ':disabled' }, // Variants are mutually exclusive, each component implicitly has "normal" variant, and all other variants inherit from it. @@ -89,13 +89,6 @@ 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 9e1a2ca90..a387ed954 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: ':is(:hover, :focus-visible):not(:disabled)', - focused: ':focus-within:not(:is(:focus-visible))' + hover: ':hover:not(:disabled)', + focused: ':focus-within' }, validInnerComponents: [ 'Text', diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index c90f079d9..9bd5c8f4e 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" - :hide-trigger="true" + :trigger-attrs="{ 'aria-hidden': true }" >