diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index f94292cdb..9f926e973 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -36,7 +36,7 @@ jobs: - name: Install xmlstarlet run: sudo apt -y install xmlstarlet - name: Create Version Variable - uses: bluwy/substitute-string-action@v2 + uses: bluwy/substitute-string-action@v3 id: sub with: _input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }} diff --git a/.github/workflows/remove-outdated-labels.yml b/.github/workflows/remove-outdated-labels.yml index c72ce19e1..8ea7ee1d4 100644 --- a/.github/workflows/remove-outdated-labels.yml +++ b/.github/workflows/remove-outdated-labels.yml @@ -11,7 +11,7 @@ jobs: if: github.event.pull_request.merged runs-on: ubuntu-latest steps: - - uses: mondeja/remove-labels-gh-action@v1.1.1 + - uses: mondeja/remove-labels-gh-action@v2.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -27,7 +27,7 @@ jobs: if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review') runs-on: ubuntu-latest steps: - - uses: mondeja/remove-labels-gh-action@v1.1.1 + - uses: mondeja/remove-labels-gh-action@v2.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -43,7 +43,7 @@ jobs: if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft' runs-on: ubuntu-latest steps: - - uses: mondeja/remove-labels-gh-action@v1.1.1 + - uses: mondeja/remove-labels-gh-action@v2.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -54,7 +54,7 @@ jobs: if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review' runs-on: ubuntu-latest steps: - - uses: mondeja/remove-labels-gh-action@v1.1.1 + - uses: mondeja/remove-labels-gh-action@v2.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | diff --git a/package.json b/package.json index 52472b28b..d86e68a44 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "autolinker": "^4.0.0", "electron-context-menu": "^3.6.1", "lodash.debounce": "^4.0.8", - "marked": "^12.0.0", + "marked": "^12.0.1", "path-browserify": "^1.0.1", "process": "^0.11.10", "swiper": "^11.0.7", @@ -80,43 +80,43 @@ "youtubei.js": "^9.1.0" }, "devDependencies": { - "@babel/core": "^7.24.0", - "@babel/eslint-parser": "^7.23.10", + "@babel/core": "^7.24.3", + "@babel/eslint-parser": "^7.24.1", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/preset-env": "^7.24.0", + "@babel/preset-env": "^7.24.3", "@double-great/stylelint-a11y": "^3.0.2", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "css-minimizer-webpack-plugin": "^6.0.0", - "electron": "^29.1.0", + "electron": "^29.1.5", "electron-builder": "^24.13.3", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsonc": "^2.13.0", + "eslint-plugin-jsonc": "^2.14.1", "eslint-plugin-n": "^16.6.2", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-unicorn": "^51.0.1", - "eslint-plugin-vue": "^9.22.0", + "eslint-plugin-vue": "^9.23.0", "eslint-plugin-vuejs-accessibility": "^2.2.1", - "eslint-plugin-yml": "^1.12.2", + "eslint-plugin-yml": "^1.13.2", "html-webpack-plugin": "^5.6.0", "js-yaml": "^4.1.0", "json-minimizer-webpack-plugin": "^5.0.0", - "lefthook": "^1.6.4", + "lefthook": "^1.6.7", "mini-css-extract-plugin": "^2.8.1", "npm-run-all": "^4.1.5", - "postcss": "^8.4.35", + "postcss": "^8.4.38", "postcss-scss": "^4.0.9", "prettier": "^2.8.8", "rimraf": "^5.0.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "sass-loader": "^14.1.1", - "stylelint": "^16.2.1", - "stylelint-config-sass-guidelines": "^11.0.0", + "stylelint": "^16.3.0", + "stylelint-config-sass-guidelines": "^11.1.0", "stylelint-config-standard": "^36.0.0", "stylelint-high-performance-animation": "^1.10.0", "stylelint-use-logical-spec": "^5.0.1", @@ -124,9 +124,9 @@ "vue-devtools": "^5.1.4", "vue-eslint-parser": "^9.4.2", "vue-loader": "^15.10.0", - "webpack": "^5.90.3", + "webpack": "^5.91.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.2", + "webpack-dev-server": "^5.0.4", "webpack-watch-external-files-plugin": "^3.0.0", "yaml-eslint-parser": "^1.2.2" } diff --git a/src/main/index.js b/src/main/index.js index e3e82240a..96ddd311e 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -174,10 +174,6 @@ function runApp() { app.commandLine.appendSwitch('enable-features', 'VaapiVideoDecodeLinuxGL') } - // Work around for context menus in the devtools being displayed behind the window - // https://github.com/electron/electron/issues/38790 - app.commandLine.appendSwitch('disable-features', 'WidgetLayering') - // command line switches need to be added before the app ready event first // that means we can't use the normal settings system as that is asynchronous, // doing it synchronously ensures that we add it before the event fires diff --git a/src/renderer/components/ft-card/ft-card.vue b/src/renderer/components/ft-card/ft-card.vue index 641a0100f..90171ebc7 100644 --- a/src/renderer/components/ft-card/ft-card.vue +++ b/src/renderer/components/ft-card/ft-card.vue @@ -1,7 +1,6 @@ diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js index 701380f70..fb6b4a3a9 100644 --- a/src/renderer/components/ft-icon-button/ft-icon-button.js +++ b/src/renderer/components/ft-icon-button/ft-icon-button.js @@ -116,6 +116,11 @@ export default defineComponent({ } }, + handleDropdownEscape: function () { + this.$refs.iconButton.focus() + // handleDropdownFocusOut will hide the dropdown for us + }, + handleDropdownClick: function ({ url, index }) { if (this.returnIndex) { this.$emit('click', index) diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue index 6699d948b..afc4c68f4 100644 --- a/src/renderer/components/ft-icon-button/ft-icon-button.vue +++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue @@ -66,6 +66,7 @@ top: dropdownPositionY === 'top' }" @focusout="handleDropdownFocusOut" + @keydown.esc.stop="handleDropdownEscape" >