chore(release): 3.18.7 [CI SKIP]

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [3.18.7](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.6...v3.18.7) (2023-01-16)
+
+
+### Bug Fixes
+
+* un-break navigation on stable ([2e66e5a](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/2e66e5a555f44009d24e332eca82453ba930baf7))
+
+## [3.18.6](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.5...v3.18.6) (2023-01-13)
+
+
+### Bug Fixes
+
+* **Router:** fix Navigation for the millionth time ([aac2d52](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/aac2d520a68b1074ba1ae988d6c92f7881a296d7))
+
+## [3.18.5](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.4...v3.18.5) (2022-12-21)
+
+
+### Bug Fixes
+
+* fixed prop interfaces ([#70](https://github.com/SteamDeckHomebrew/decky-frontend-lib/issues/70)) ([0b50f2c](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/0b50f2cf0baa76fc00aa0a41a8435d7a512bff19))
+
 ## [3.18.4](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.18.3...v3.18.4) (2022-12-16)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decky-frontend-lib",
-  "version": "3.18.4",
+  "version": "3.18.7",
   "description": "A library for building decky plugins",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/deck-components/Marquee.tsx

@@ -1,4 +1,4 @@
-import { CSSProperties, FC, ReactNode } from 'react';
+import { CSSProperties, FC } from 'react';
 
 import { findModuleChild } from '../webpack';
 
@@ -12,7 +12,7 @@ export interface MarqueeProps {
   resetOnPause?: boolean;
   style?: CSSProperties;
   className?: string;
-  children: ReactNode;
+  children: React.ReactNode;
 }
 
 export const Marquee: FC<MarqueeProps> = findModuleChild((m) => {

src/deck-components/Panel.tsx

@@ -1,10 +1,11 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 
 import { findModuleChild } from '../webpack';
 
 export interface PanelSectionProps {
   title?: string;
   spinner?: boolean;
+  children?: ReactNode
 }
 
 const [panelSection, mod] = findModuleChild((mod: any) => {
@@ -18,6 +19,10 @@ const [panelSection, mod] = findModuleChild((mod: any) => {
 
 export const PanelSection = panelSection as FC<PanelSectionProps>;
 
+export interface PanelSectionRowProps {
+  children?: ReactNode
+}
+
 export const PanelSectionRow = Object.values(mod).filter(
   (exp: any) => !exp?.toString()?.includes('.PanelSection'),
-)[0] as FC;
+)[0] as FC<PanelSectionRowProps>;

src/deck-components/Router.tsx

@@ -107,6 +107,16 @@ export const Router = findModuleChild((m: Module) => {
   }
 }) as Router;
 
+// With how much Valve is changing these, you really shouldn't use them directly, instead see Navigation
+export const InternalNavigators = findModuleChild((m: any) => {
+  if (typeof m !== 'object') return undefined;
+  for (let prop in m) {
+    if (m[prop]?.GetNavigator) {
+      return m[prop];
+    }
+  }
+})?.GetNavigator()
+
 export interface Navigation {
   Navigate(path: string): void;
   NavigateBack(): void;
@@ -125,32 +135,38 @@ export interface Navigation {
   CloseSideMenus(): void;
 }
 
-export const Navigation = {
-  Navigate: Router.Navigate.bind(Router),
-  NavigateBack: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateBack.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  NavigateToAppProperties: Router.NavigateToAppProperties.bind(Router),
-  NavigateToExternalWeb: Router.NavigateToExternalWeb.bind(Router),
-  NavigateToInvites: Router.NavigateToInvites.bind(Router),
-  NavigateToChat: Router.NavigateToChat.bind(Router),
-  NavigateToLibraryTab: Router.NavigateToLibraryTab.bind(Router),
-  NavigateToLayoutPreview: Router.NavigateToLayoutPreview.bind(Router),
-  NavigateToSteamWeb: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToSteamWeb.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  NavigateToWebRoute: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToWebRoute.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance,
-  ),
-  OpenSideMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenSideMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  OpenQuickAccessMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenQuickAccessMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  OpenMainMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenMainMenu.bind(
-    Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
-  ),
-  CloseSideMenus: Router.CloseSideMenus.bind(Router),
-  OpenPowerMenu: Router.OpenPowerMenu.bind(Router),
-} as Navigation;
+export let Navigation = {} as Navigation;
+
+try {
+  Navigation = {
+    Navigate: Router.Navigate.bind(Router),
+    NavigateBack: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateBack.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance,
+    ),
+    NavigateToAppProperties: InternalNavigators?.AppProperties || Router.NavigateToAppProperties.bind(Router),
+    NavigateToExternalWeb: Router.NavigateToExternalWeb.bind(Router),
+    NavigateToInvites: InternalNavigators?.Invites || Router.NavigateToInvites.bind(Router),
+    NavigateToChat: Router.NavigateToChat.bind(Router),
+    NavigateToLibraryTab: InternalNavigators?.LibraryTab || Router.NavigateToLibraryTab.bind(Router),
+    NavigateToLayoutPreview: Router.NavigateToLayoutPreview.bind(Router),
+    NavigateToSteamWeb: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToSteamWeb.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance,
+    ),
+    NavigateToWebRoute: Router.WindowStore?.GamepadUIMainWindowInstance?.NavigateToWebRoute.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance,
+    ),
+    OpenSideMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenSideMenu.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+    ),
+    OpenQuickAccessMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenQuickAccessMenu.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+    ),
+    OpenMainMenu: Router.WindowStore?.GamepadUIMainWindowInstance?.MenuStore.OpenMainMenu.bind(
+      Router.WindowStore.GamepadUIMainWindowInstance.MenuStore,
+    ),
+    CloseSideMenus: Router.CloseSideMenus.bind(Router),
+    OpenPowerMenu: Router.OpenPowerMenu.bind(Router),
+  } as Navigation;
+} catch (e) {
+  console.error("[DFL:Router]: Error initializing Navigation interface", e)
+}

src/plugin.tsx

@@ -21,52 +21,6 @@ interface ServerResponseError {
 
 export type ServerResponse<TRes> = ServerResponseSuccess<TRes> | ServerResponseError;
 
-export interface MainMenuItem {
-  /** Called when clicking this menu item, useful if you do not want to navigate to a route.
-   * For navigating to a route, use route instead. */
-  action?: () => void;
-  /** The route this menu item navigates to @example "/steamweb" */
-  route?: string;
-  /** Props for the route this item navigates to. Currently only used for /steamweb to determine what webpack to navigate to @example {url: 'https://store.steampowered.com/'} */
-  routeState?: any;
-  /** Label for this menu item, @example "Store" */
-  label: ReactNode;
-  /** Runs when this item is selected. Defaults to setting the focused app to null.
-   * If you override this you must also call the original to retain proper behaivour */
-  onFocus?: () => void;
-  /** Icon of this menu item, you probably want a react SVG node */
-  children: ReactNode;
-}
-
-export interface CustomMainMenuItem extends MainMenuItem {
-  index: number;
-}
-
-export interface MainMenuItemReactNode {
-  props: MainMenuItem;
-  type: ComponentType;
-  key: any;
-}
-
-export interface OverlayReactNode {
-  props: MainMenuItem;
-  type: ComponentType;
-}
-
-export type ItemPatch = (item: MainMenuItemReactNode) => MainMenuItemReactNode;
-export type OverlayPatch = (overlay: OverlayReactNode) => OverlayReactNode;
-
-export interface MenuHook {
-  addItem(item: CustomMainMenuItem): CustomMainMenuItem;
-  addPatch(path: string, patch: ItemPatch): ItemPatch;
-  addOverlayPatch(patch: OverlayPatch): OverlayPatch;
-  addOverlayComponent(component: ReactNode): ReactNode;
-  removePatch(path: string, patch: ItemPatch): void;
-  removeOverlayPatch(patch: OverlayPatch): void;
-  removeOverlayComponent(component: ReactNode): void;
-  removeItem(item: CustomMainMenuItem): void;
-}
-
 export type RoutePatch = (route: RouteProps) => RouteProps;
 
 export interface RouterHook {
@@ -105,7 +59,6 @@ export interface FilePickerRes {
 
 export interface ServerAPI {
   routerHook: RouterHook;
-  menuHook: MenuHook;
   toaster: Toaster;
   openFilePicker(startPath: string, includeFiles?: boolean, regex?: RegExp): Promise<FilePickerRes>;
   callPluginMethod<TArgs = {}, TRes = {}>(methodName: string, args: TArgs): Promise<ServerResponse<TRes>>;