bump DFL to fix modals, Router -> Navigation in some places

This commit is contained in:
AAGaming
2022-12-15 21:16:22 -05:00
parent 2a6bf75f02
commit 346f80beb3
5 changed files with 14 additions and 12 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
} }
}, },
"dependencies": { "dependencies": {
"decky-frontend-lib": "^3.14.0", "decky-frontend-lib": "^3.18.4",
"react-file-icon": "^1.2.0", "react-file-icon": "^1.2.0",
"react-icons": "^4.4.0", "react-icons": "^4.4.0",
"react-markdown": "^8.0.3", "react-markdown": "^8.0.3",
+4 -4
View File
@@ -10,7 +10,7 @@ specifiers:
'@types/react-file-icon': ^1.0.1 '@types/react-file-icon': ^1.0.1
'@types/react-router': 5.1.18 '@types/react-router': 5.1.18
'@types/webpack': ^5.28.0 '@types/webpack': ^5.28.0
decky-frontend-lib: ^3.14.0 decky-frontend-lib: ^3.18.4
husky: ^8.0.1 husky: ^8.0.1
import-sort-style-module: ^6.0.0 import-sort-style-module: ^6.0.0
inquirer: ^8.2.4 inquirer: ^8.2.4
@@ -30,7 +30,7 @@ specifiers:
typescript: ^4.7.4 typescript: ^4.7.4
dependencies: dependencies:
decky-frontend-lib: 3.14.0 decky-frontend-lib: 3.18.4
react-file-icon: 1.2.0_wcqkhtmu7mswc6yz4uyexck3ty react-file-icon: 1.2.0_wcqkhtmu7mswc6yz4uyexck3ty
react-icons: 4.4.0_react@16.14.0 react-icons: 4.4.0_react@16.14.0
react-markdown: 8.0.3_vshvapmxg47tngu7tvrsqpq55u react-markdown: 8.0.3_vshvapmxg47tngu7tvrsqpq55u
@@ -944,8 +944,8 @@ packages:
dependencies: dependencies:
ms: 2.1.2 ms: 2.1.2
/decky-frontend-lib/3.14.0: /decky-frontend-lib/3.18.4:
resolution: {integrity: sha512-cBGgS960ftGgpF/oDlRj02nISWq7rwKHIUzG7RJeHchLmz/M4W4OwDL2/oEYO+0WeSx/AWRHTIfLU27jdHiZYQ==} resolution: {integrity: sha512-i3TAe3RJtT1TK0rJgW9Ek5jxMWZRCYLDvqHDylGVieUvuyI7c8X+cogz30pP4cqeGOaA1d/MxBEbhlpD3JhVvg==}
dev: false dev: false
/decode-named-character-reference/1.0.2: /decode-named-character-reference/1.0.2:
@@ -1,4 +1,4 @@
import { ConfirmModal, QuickAccessTab, Router, Spinner, staticClasses } from 'decky-frontend-lib'; import { ConfirmModal, Navigation, QuickAccessTab, Spinner, staticClasses } from 'decky-frontend-lib';
import { FC, useState } from 'react'; import { FC, useState } from 'react';
interface PluginInstallModalProps { interface PluginInstallModalProps {
@@ -20,7 +20,7 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({ artifact, version, ha
onOK={async () => { onOK={async () => {
setLoading(true); setLoading(true);
await onOK(); await onOK();
setTimeout(() => Router.OpenQuickAccessMenu(QuickAccessTab.Decky), 250); setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 250);
setTimeout(() => window.DeckyPluginLoader.checkPluginUpdates(), 1000); setTimeout(() => window.DeckyPluginLoader.checkPluginUpdates(), 1000);
}} }}
onCancel={async () => { onCancel={async () => {
+3 -3
View File
@@ -2,8 +2,8 @@ import {
DialogButton, DialogButton,
Dropdown, Dropdown,
Focusable, Focusable,
Navigation,
QuickAccessTab, QuickAccessTab,
Router,
SingleDropdownOption, SingleDropdownOption,
SuspensefulImage, SuspensefulImage,
joinClassNames, joinClassNames,
@@ -38,8 +38,8 @@ const PluginCard: FC<PluginCardProps> = ({ plugin }) => {
}} }}
onCancel={(_: CustomEvent) => { onCancel={(_: CustomEvent) => {
if (containerRef.current!.querySelectorAll('* :focus').length === 0) { if (containerRef.current!.querySelectorAll('* :focus').length === 0) {
Router.NavigateBackOrOpenMenu(); Navigation.NavigateBack();
setTimeout(() => Router.OpenQuickAccessMenu(QuickAccessTab.Decky), 1000); setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 1000);
} else { } else {
containerRef.current!.focus(); containerRef.current!.focus();
} }
+4 -2
View File
@@ -1,4 +1,5 @@
import { import {
Navigation,
ReactRouter, ReactRouter,
Router, Router,
fakeRenderComponent, fakeRenderComponent,
@@ -74,13 +75,14 @@ export async function startup() {
window.DFL = { window.DFL = {
findModuleChild, findModuleChild,
findModule, findModule,
Navigation,
Router,
ReactRouter,
ReactUtils: { ReactUtils: {
fakeRenderComponent, fakeRenderComponent,
findInReactTree, findInReactTree,
findInTree, findInTree,
}, },
Router,
ReactRouter,
classes: { classes: {
scrollClasses, scrollClasses,
staticClasses, staticClasses,