mirror of
https://github.com/SteamDeckHomebrew/decky-frontend-lib.git
synced 2026-05-22 02:48:48 +02:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ec60edf4d | ||
|
|
2c3a9f81de | ||
|
|
00079a71cc | ||
|
|
c04f024b34 | ||
|
|
5dae77b003 | ||
|
|
6b8c28e69c | ||
|
|
3ef9648355 | ||
|
|
0da85355c2 | ||
|
|
dcdbb2d6c7 |
6
.github/workflows/docs.yaml
vendored
6
.github/workflows/docs.yaml
vendored
@@ -12,19 +12,19 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Setup | Checkout
|
- name: Setup | Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
path: lib
|
path: lib
|
||||||
- name: Setup | Checkout wiki
|
- name: Setup | Checkout wiki
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: SteamDeckHomebrew/wiki
|
repository: SteamDeckHomebrew/wiki
|
||||||
path: wiki
|
path: wiki
|
||||||
ssh-key: ${{ secrets.SSH_DEPLOY_KEY }}
|
ssh-key: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||||
persist-credentials: true
|
persist-credentials: true
|
||||||
- name: Setup | Node.js
|
- name: Setup | Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18
|
node-version: 18
|
||||||
- name: Setup | Dependencies
|
- name: Setup | Dependencies
|
||||||
|
|||||||
4
.github/workflows/release.yaml
vendored
4
.github/workflows/release.yaml
vendored
@@ -12,11 +12,11 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Setup | Checkout
|
- name: Setup | Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Setup | Node.js
|
- name: Setup | Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
- name: Setup | Dependencies
|
- name: Setup | Dependencies
|
||||||
|
|||||||
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,3 +1,31 @@
|
|||||||
|
# [4.3.0](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.2.2...v4.3.0) (2024-07-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **utils:** react tree patching api ([2c3a9f8](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/2c3a9f81de0b63364bb31f4a4dd8e559784ece16))
|
||||||
|
|
||||||
|
## [4.2.2](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.2.1...v4.2.2) (2024-07-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **SteamSpinner:** add background option ([c04f024](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/c04f024b34b1148c965850965127f9fd44204157))
|
||||||
|
|
||||||
|
## [4.2.1](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.2.0...v4.2.1) (2024-06-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **errorboundary:** work around broken react types ([3ef9648](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/3ef96483550020cecf656b94a73d2bb9313bda07))
|
||||||
|
|
||||||
|
# [4.2.0](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.1.1...v4.2.0) (2024-06-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **components:** add ErrorBoundary ([dcdbb2d](https://github.com/SteamDeckHomebrew/decky-frontend-lib/commit/dcdbb2d6c7c0b72197f04153d7c3e73e9e71ea5c))
|
||||||
|
|
||||||
## [4.1.1](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.1.0...v4.1.1) (2024-06-27)
|
## [4.1.1](https://github.com/SteamDeckHomebrew/decky-frontend-lib/compare/v4.1.0...v4.1.1) (2024-06-27)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@decky/ui",
|
"name": "@decky/ui",
|
||||||
"version": "4.1.1",
|
"version": "4.3.0",
|
||||||
"description": "A library for interacting with the Steam frontend in Decky plugins and elsewhere.",
|
"description": "A library for interacting with the Steam frontend in Decky plugins and elsewhere.",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
@@ -85,5 +85,9 @@
|
|||||||
"style": "module",
|
"style": "module",
|
||||||
"parser": "typescript"
|
"parser": "typescript"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"publishConfig": {
|
||||||
|
"registry": "https://registry.npmjs.org/",
|
||||||
|
"tag": "latest"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
7701
pnpm-lock.yaml
generated
7701
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
6
src/components/ErrorBoundary.ts
Normal file
6
src/components/ErrorBoundary.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { FC, PropsWithChildren } from "react";
|
||||||
|
import { findModuleExport } from "../webpack";
|
||||||
|
|
||||||
|
export const ErrorBoundary = findModuleExport(
|
||||||
|
(e) => e.InstallErrorReportingStore && e?.prototype?.Reset && e?.prototype?.componentDidCatch,
|
||||||
|
) as FC<PropsWithChildren>; // Actually a class but @types/react is broken lol
|
||||||
@@ -1,7 +1,12 @@
|
|||||||
import { FC, SVGAttributes } from 'react';
|
import { FC, ReactNode, SVGAttributes } from 'react';
|
||||||
|
|
||||||
import { Export, findModuleExport } from '../webpack';
|
import { Export, findModuleExport } from '../webpack';
|
||||||
|
|
||||||
|
interface SteamSpinnerProps {
|
||||||
|
children?: ReactNode;
|
||||||
|
background?: "transparent"; // defaults to black seemingly, but only "transparent" is checked against
|
||||||
|
}
|
||||||
|
|
||||||
export const SteamSpinner = findModuleExport(
|
export const SteamSpinner = findModuleExport(
|
||||||
(e: Export) => e?.toString?.()?.includes('Steam Spinner') && e?.toString?.()?.includes('src'),
|
(e: Export) => e?.toString?.()?.includes('Steam Spinner') && e?.toString?.()?.includes('src'),
|
||||||
) as FC<SVGAttributes<SVGElement>>;
|
) as FC<SVGAttributes<SVGElement> & SteamSpinnerProps>;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ export * from './ControlsList';
|
|||||||
export * from './Dialog';
|
export * from './Dialog';
|
||||||
export * from './DialogCheckbox';
|
export * from './DialogCheckbox';
|
||||||
export * from './Dropdown';
|
export * from './Dropdown';
|
||||||
|
export * from './ErrorBoundary';
|
||||||
export * from './Field';
|
export * from './Field';
|
||||||
export * from './Focusable';
|
export * from './Focusable';
|
||||||
export * from './FocusRing';
|
export * from './FocusRing';
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
export * from './patcher';
|
export * from './patcher';
|
||||||
export * from './react';
|
export * from './react';
|
||||||
|
export * from './react-patching';
|
||||||
export * from './static-classes';
|
export * from './static-classes';
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ export interface PatchOptions {
|
|||||||
singleShot?: boolean;
|
singleShot?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
type GenericPatchHandler = (args: any[], ret?: any) => any;
|
export type GenericPatchHandler = (args: any[], ret?: any) => any;
|
||||||
|
|
||||||
export interface Patch {
|
export interface Patch {
|
||||||
original: Function;
|
original: Function;
|
||||||
|
|||||||
100
src/utils/react-patching.ts
Normal file
100
src/utils/react-patching.ts
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
import Logger from '../logger';
|
||||||
|
import { GenericPatchHandler, afterPatch } from './patcher';
|
||||||
|
import { wrapReactClass, wrapReactType } from './react';
|
||||||
|
|
||||||
|
// TODO max size limit? could implement as a class extending map perhaps
|
||||||
|
type PatchedComponentCache = Map<any, any>;
|
||||||
|
export type GenericNodeStep = (node: any) => any;
|
||||||
|
// to patch a specific method of a class component other than render. TODO implement
|
||||||
|
// export type ClassNodeStep = [finder: GenericNodeStep, method: string];
|
||||||
|
// export type NodeStep = GenericNodeStep | ClassNodeStep;
|
||||||
|
export type NodeStep = GenericNodeStep;
|
||||||
|
export type ReactPatchHandler = GenericPatchHandler;
|
||||||
|
|
||||||
|
// These will get *very* spammy.
|
||||||
|
let loggingEnabled = false;
|
||||||
|
let perfLoggingEnabled = false;
|
||||||
|
|
||||||
|
export function setReactPatcherLoggingEnabled(value: boolean = true) { loggingEnabled = value };
|
||||||
|
export function setReactPatcherPerformanceLoggingEnabled(value: boolean = true) { perfLoggingEnabled = value };
|
||||||
|
|
||||||
|
function patchComponent(node: any, handler: GenericPatchHandler, steps: NodeStep[], step: number, caches: PatchedComponentCache[], logger: Logger, prop: string = 'type') {
|
||||||
|
loggingEnabled && logger.group('Patching node:', node);
|
||||||
|
// We need to take extra care to not mutate the original node.type
|
||||||
|
switch (typeof node?.[prop]) {
|
||||||
|
case 'function':
|
||||||
|
// Function component
|
||||||
|
const patch = afterPatch(node, prop, steps[step + 1] ? createStepHandler(handler, steps, step + 1, caches, logger) : handler);
|
||||||
|
loggingEnabled && logger.debug('Patched a function component', patch);
|
||||||
|
break;
|
||||||
|
case 'object':
|
||||||
|
if (node[prop]?.prototype?.render) {
|
||||||
|
// Class component
|
||||||
|
// TODO handle patching custom methods
|
||||||
|
wrapReactClass(node);
|
||||||
|
const patch = afterPatch(node[prop].prototype, 'render', steps[step + 1] ? createStepHandler(handler, steps, step + 1, caches, logger) : handler);
|
||||||
|
loggingEnabled && logger.debug('Patched class component', patch);
|
||||||
|
} else {
|
||||||
|
loggingEnabled && logger.debug('Patching forwardref/memo');
|
||||||
|
wrapReactType(node, prop);
|
||||||
|
// Step down the object
|
||||||
|
patchComponent(node[prop], handler, steps, step, caches, logger, node[prop]?.render ? 'render' : 'type');
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
logger.error('Unhandled component type', node);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
loggingEnabled && logger.groupEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleStep(tree: any, handler: GenericPatchHandler, steps: NodeStep[], step: number, caches: PatchedComponentCache[], logger: Logger): any {
|
||||||
|
const startTime = (loggingEnabled || perfLoggingEnabled) ? performance.now() : 0;
|
||||||
|
const stepHandler = steps[step];
|
||||||
|
const cache = caches[step] || (caches[step] = new Map());
|
||||||
|
loggingEnabled && logger.debug(`Patch step ${step} running`, { tree, stepHandler, step, caches });
|
||||||
|
|
||||||
|
const node = stepHandler(tree);
|
||||||
|
if (node && node.type) {
|
||||||
|
loggingEnabled && logger.debug('Found node', node);
|
||||||
|
} else if (node) {
|
||||||
|
loggingEnabled && logger.error('Found node without type. Something is probably wrong.', node);
|
||||||
|
return tree;
|
||||||
|
} else {
|
||||||
|
loggingEnabled && logger.warn('Found no node. Depending on your usecase, this might be fine.', node);
|
||||||
|
return tree;
|
||||||
|
}
|
||||||
|
|
||||||
|
let cachedType;
|
||||||
|
if (cachedType = cache.get(node.type)) {
|
||||||
|
loggingEnabled && logger.debug('Found cached patched component', node);
|
||||||
|
node.type = cachedType;
|
||||||
|
(loggingEnabled || perfLoggingEnabled) && logger.debug(`Patch step ${step} took ${performance.now() - startTime}ms with cache`);
|
||||||
|
return tree;
|
||||||
|
}
|
||||||
|
|
||||||
|
const originalType = node.type;
|
||||||
|
|
||||||
|
patchComponent(node, handler, steps, step, caches, logger);
|
||||||
|
|
||||||
|
cache.set(originalType, node.type);
|
||||||
|
|
||||||
|
(loggingEnabled || perfLoggingEnabled) && logger.debug(`Patch step ${step} took ${performance.now() - startTime}ms`);
|
||||||
|
return tree;
|
||||||
|
};
|
||||||
|
|
||||||
|
function createStepHandler(handler: GenericPatchHandler, steps: NodeStep[], step: number, caches: PatchedComponentCache[], logger: Logger) {
|
||||||
|
loggingEnabled && logger.debug(`Creating handler for step ${step}`);
|
||||||
|
return (_: any, tree: any) => handleStep(tree, handler, steps, step, caches, logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO handle createReactTreePatcher inside handler and cache it (or warn)
|
||||||
|
export function createReactTreePatcher(steps: NodeStep[], handler: GenericPatchHandler, debugName: string = 'ReactPatch'): GenericPatchHandler {
|
||||||
|
const caches: PatchedComponentCache[] = [];
|
||||||
|
|
||||||
|
const logger = new Logger(`ReactTreePatcher -> ${debugName}`);
|
||||||
|
|
||||||
|
loggingEnabled && logger.debug('Init with options:', steps, debugName);
|
||||||
|
|
||||||
|
return createStepHandler(handler, steps, 0, caches, logger);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user