chore(release): 3.7.1 [CI SKIP]

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.7.1](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.7.0...v3.7.1) (2022-10-24)
+
+
+### Bug Fixes
+
+* **Tabs:** temp remove until we have a way to grab it on beta ([25c33b2](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/25c33b2a05a30c3c72008c5f459c3b77f819db5a))
+
+# [3.7.0](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.6.1...v3.7.0) (2022-10-24)
+
+
+### Features
+
+* **modal:** support for latest steamos preview ([5f0470c](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/5f0470c351dc4ecb24ea3e928ff0b0199c399fa4))
+
 ## [3.6.1](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v3.6.0...v3.6.1) (2022-10-19)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "decky-frontend-lib",
-  "version": "3.6.1",
+  "version": "3.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "decky-frontend-lib",
-      "version": "3.6.1",
+      "version": "3.7.1",
       "license": "LGPL-2.1",
       "dependencies": {
         "minimist": "^1.2.6"

package.json

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

src/deck-components/Modal.tsx

@@ -1,4 +1,5 @@
 import { FC, ReactNode } from 'react';
+import { findSP } from '../utils';
 import { findModuleChild } from '../webpack';
 
 // All of the popout options + strTitle are related. Proper usage is not yet known...
@@ -27,7 +28,7 @@ export interface ShowModalResult {
   Update: (modal: ReactNode) => void;
 }
 
-export const showModal: (modal: ReactNode, parent?: EventTarget, props?: ShowModalProps) => Promise<ShowModalResult> = findModuleChild((m) => {
+const showModalRaw: (modal: ReactNode, parent?: EventTarget, props?: ShowModalProps) => Promise<ShowModalResult> = findModuleChild((m) => {
   if (typeof m !== 'object') return undefined;
   for (let prop in m) {
     if (typeof m[prop] === 'function' && m[prop].toString().includes('bHideMainWindowForPopouts:!0')) {
@@ -36,6 +37,10 @@ export const showModal: (modal: ReactNode, parent?: EventTarget, props?: ShowMod
   }
 });
 
+export const showModal = (modal: ReactNode, parent?: EventTarget, props?: ShowModalProps): Promise<ShowModalResult> => {
+  return showModalRaw(modal, parent || findSP(), props)
+}
+
 export interface ModalRootProps {
   children?: ReactNode;
   onCancel?(): void;

src/deck-components/Tabs.tsx

@@ -1,74 +1,74 @@
-import { FC, ReactNode } from 'react';
+// import { FC, ReactNode } from 'react';
-import { findModule } from '../webpack';
+// import { findModule } from '../webpack';
-import { FooterLegendProps } from './FooterLegend';
+// import { FooterLegendProps } from './FooterLegend';
 
-/**
+// /**
- * Individual tab objects for the Tabs component
+//  * Individual tab objects for the Tabs component
- * 
+//  * 
- * `id` ID of this tab, can be used with activeTab to auto-focus a given tab
+//  * `id` ID of this tab, can be used with activeTab to auto-focus a given tab
- * `title` Title shown in the header bar
+//  * `title` Title shown in the header bar
- * `renderTabAddon` Return a {@link ReactNode} to render it next to the tab title, i.e. the counts for each tab on the Media page
+//  * `renderTabAddon` Return a {@link ReactNode} to render it next to the tab title, i.e. the counts for each tab on the Media page
- * `content` Content of the tab
+//  * `content` Content of the tab
- * `footer` Sets up button handlers and labels
+//  * `footer` Sets up button handlers and labels
- */
+//  */
-export interface Tab {
+// export interface Tab {
-    id: string;
+//     id: string;
-    title: string;
+//     title: string;
-    renderTabAddon?: () => ReactNode;
+//     renderTabAddon?: () => ReactNode;
-    content: ReactNode;
+//     content: ReactNode;
-    footer?: FooterLegendProps;
+//     footer?: FooterLegendProps;
-}
+// }
 
-/**
+// /**
- * Props for the {@link Tabs}
+//  * Props for the {@link Tabs}
- * 
+//  * 
- * `tabs` array of {@link Tab}
+//  * `tabs` array of {@link Tab}
- * `activeTab` tab currently active, needs to be one of the tabs {@link Tab.id}, must be set using a `useState` in the `onShowTab` handler
+//  * `activeTab` tab currently active, needs to be one of the tabs {@link Tab.id}, must be set using a `useState` in the `onShowTab` handler
- * `onShowTab` Called when the active tab should change, needs to set `activeTab`. See example.
+//  * `onShowTab` Called when the active tab should change, needs to set `activeTab`. See example.
- * `autoFocusContents` Whether to automatically focus the tab contents or not.
+//  * `autoFocusContents` Whether to automatically focus the tab contents or not.
- * `footer` Sets up button handlers and labels
+//  * `footer` Sets up button handlers and labels
- * 
+//  * 
- * @example
+//  * @example
- * const Component: FC = () => {
+//  * const Component: FC = () => {
- * const [currentTab, setCurrentTab] = useState<string>("Tab1");
+//  * const [currentTab, setCurrentTab] = useState<string>("Tab1");
- *
+//  *
- * return (
+//  * return (
- *   <Tabs
+//  *   <Tabs
- *     title="Theme Manager"
+//  *     title="Theme Manager"
- *     activeTab={currentTabRoute}
+//  *     activeTab={currentTabRoute}
- *     onShowTab={(tabID: string) => {
+//  *     onShowTab={(tabID: string) => {
- *        setCurrentTabRoute(tabID);
+//  *        setCurrentTabRoute(tabID);
- *     }}
+//  *     }}
- *     tabs={[
+//  *     tabs={[
- *       {
+//  *       {
- *         title: "Tab 1",
+//  *         title: "Tab 1",
- *         content: <Tab1Component />,
+//  *         content: <Tab1Component />,
- *         id: "Tab1",
+//  *         id: "Tab1",
- *       },
+//  *       },
- *       {
+//  *       {
- *         title: "Tab 2",
+//  *         title: "Tab 2",
- *         content: <Tab2Component />,
+//  *         content: <Tab2Component />,
- *         id: "Tab2",
+//  *         id: "Tab2",
- *       },
+//  *       },
- *     ]}
+//  *     ]}
- *   />
+//  *   />
- *  );
+//  *  );
- * };
+//  * };
- */
+//  */
-export interface TabsProps {
+// export interface TabsProps {
-    tabs: Tab[];
+//     tabs: Tab[];
-    activeTab: string;
+//     activeTab: string;
-    onShowTab: (tab: string) => void;
+//     onShowTab: (tab: string) => void;
-    autoFocusContents?: boolean;
+//     autoFocusContents?: boolean;
-}
+// }
 
-/**
+// /**
- * Tabs component as used in the library and media tabs. See {@link TabsProps}
+//  * Tabs component as used in the library and media tabs. See {@link TabsProps}
- */
+//  */
-export const Tabs = Object.values(findModule((m) => {
+// export const Tabs = Object.values(findModule((m) => {
-    if (typeof m !== 'object') return false;
+//     if (typeof m !== 'object') return false;
-    for (let prop in m) {
+//     for (let prop in m) {
-        if (m[prop]?.Unbleed) return true;
+//         if (m[prop]?.Unbleed) return true;
-    }
+//     }
-    return false;
+//     return false;
-})).find((x: any) => x?.type?.toString()?.includes("((function(){")) as FC<TabsProps>;
+// })).find((x: any) => x?.type?.toString()?.includes("((function(") && x?.type?.toString()?.includes("[\"tabs\"")) as FC<TabsProps>;

src/utils/index.ts

@@ -7,4 +7,16 @@ export function joinClassNames(...classes: string[]): string {
 
 export function sleep(ms: number) {
     return new Promise(res => setTimeout(res, ms));
-}
+}
+
+/**
+ * Finds the SP window, since it is a render target as of {10-19-2022}'s beta
+ */
+export function findSP(): Window {
+    // old (SP as host)
+    if (document.title == 'SP') return window;
+    // new (SP as popup)
+    return FocusNavController.m_ActiveContext.m_rgGamepadNavigationTrees.find((x: any) => x.m_ID == 'root_1_').Root
+      .Element.ownerDocument.defaultView;
+  }
+