From 96fa13aea9526effa2064bfaad5ddf04100fbaed Mon Sep 17 00:00:00 2001 From: Uriel Date: Thu, 21 Nov 2024 20:20:17 +0100 Subject: [PATCH] improve buttons --- gui/package.json | 1 + gui/src/App.tsx | 5 + gui/src/components/commons/Button.tsx | 30 +++-- .../components/onboarding/pages/EnterVR.tsx | 2 +- .../pages/usage-reason/HeadTrackingChoose.tsx | 10 +- .../pages/usage-reason/MocapDataChoose.tsx | 125 ++++++++++++++++++ pnpm-lock.yaml | 22 ++- 7 files changed, 176 insertions(+), 19 deletions(-) create mode 100644 gui/src/components/onboarding/pages/usage-reason/MocapDataChoose.tsx diff --git a/gui/package.json b/gui/package.json index ad39075d7..58c18e652 100644 --- a/gui/package.json +++ b/gui/package.json @@ -77,6 +77,7 @@ "spdx-satisfies": "^5.0.1", "tailwind-gradient-mask-image": "^1.2.0", "tailwindcss": "^3.4.13", + "ts-xor": "^1.3.0", "vite": "^5.4.8" } } diff --git a/gui/src/App.tsx b/gui/src/App.tsx index d7838806c..398a0e202 100644 --- a/gui/src/App.tsx +++ b/gui/src/App.tsx @@ -60,6 +60,7 @@ import { UsageChoose } from './components/onboarding/pages/usage-reason/UsageCho import { VRUsageChoose } from './components/onboarding/pages/usage-reason/VRUsageChoose'; import { StandaloneUsageSetup } from './components/onboarding/pages/usage-reason/StandaloneUsageSetup'; import { HeadTrackingChoose } from './components/onboarding/pages/usage-reason/HeadTrackingChoose'; +import { MocapDataChoose } from './components/onboarding/pages/usage-reason/MocapDataChoose'; export const GH_REPO = 'SlimeVR/SlimeVR-Server'; export const VersionContext = createContext(''); @@ -146,6 +147,10 @@ function Layout() { path="usage/mocap/head-choose" element={} /> + } + /> } /> } /> }> diff --git a/gui/src/components/commons/Button.tsx b/gui/src/components/commons/Button.tsx index eb66eaa7c..18403efe0 100644 --- a/gui/src/components/commons/Button.tsx +++ b/gui/src/components/commons/Button.tsx @@ -2,6 +2,7 @@ import classNames from 'classnames'; import React, { ReactNode, useMemo } from 'react'; import { NavLink } from 'react-router-dom'; import { LoaderIcon, SlimeState } from './icon/LoaderIcon'; +import { XOR } from 'ts-xor'; function ButtonContent({ loading, @@ -36,6 +37,25 @@ function ButtonContent({ ); } +type ButtonBaseParams = { + children?: ReactNode; + icon?: ReactNode; + variant: 'primary' | 'secondary' | 'tertiary' | 'quaternary'; + loading?: boolean; + rounded?: boolean; +} & Omit, 'onClick'>; + +type ButtonNavigateParams = { to: string; state?: any } & ButtonBaseParams; +type ButtonScriptParams = { + onClick?: React.MouseEventHandler; +} & ButtonBaseParams; +type ButtonSubmitParams = { type: 'submit' } & ButtonBaseParams; +type ButtonParams = XOR< + ButtonNavigateParams, + ButtonScriptParams, + ButtonSubmitParams +>; + export function Button({ children, variant, @@ -46,15 +66,7 @@ export function Button({ icon, rounded = false, ...props -}: { - children?: ReactNode; - icon?: ReactNode; - variant: 'primary' | 'secondary' | 'tertiary' | 'quaternary'; - to?: string; - loading?: boolean; - rounded?: boolean; - state?: any; -} & React.ButtonHTMLAttributes) { +}: ButtonParams) { const classes = useMemo(() => { const variantsMap = { primary: classNames({ diff --git a/gui/src/components/onboarding/pages/EnterVR.tsx b/gui/src/components/onboarding/pages/EnterVR.tsx index 7dec77410..b29599b22 100644 --- a/gui/src/components/onboarding/pages/EnterVR.tsx +++ b/gui/src/components/onboarding/pages/EnterVR.tsx @@ -33,7 +33,7 @@ export function EnterVRPage() {
-
diff --git a/gui/src/components/onboarding/pages/usage-reason/HeadTrackingChoose.tsx b/gui/src/components/onboarding/pages/usage-reason/HeadTrackingChoose.tsx index 589d91898..451cd290d 100644 --- a/gui/src/components/onboarding/pages/usage-reason/HeadTrackingChoose.tsx +++ b/gui/src/components/onboarding/pages/usage-reason/HeadTrackingChoose.tsx @@ -8,6 +8,7 @@ import { useStatusContext } from '@/hooks/status-system'; import { Localized, useLocalization } from '@fluent/react'; import classNames from 'classnames'; import { useMemo, useState } from 'react'; +import { useNavigate } from 'react-router-dom'; import { StatusData, StatusSteamVRDisconnectedT } from 'solarxr-protocol'; export function HeadTrackingChoose() { @@ -15,6 +16,7 @@ export function HeadTrackingChoose() { const { applyProgress, state } = useOnboarding(); const { statuses } = useStatusContext(); const [animated, setAnimated] = useState(false); + const navigate = useNavigate(); const missingSteamVr = useMemo( () => @@ -80,9 +82,13 @@ export function HeadTrackingChoose() {
+ + + +
+ +
+ + + + ); +} + +function checkIfUsageReason(val: any): val is UsageReason { + return typeof val === 'number'; +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91e8dc5e7..76ca90d8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -164,7 +164,7 @@ importers: version: 8.57.1 eslint-config-airbnb: specifier: ^19.0.4 - version: 19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1) + version: 19.0.4(eslint-plugin-import@2.31.0)(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1) eslint-import-resolver-typescript: specifier: ^3.6.3 version: 3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-plugin-import@2.31.0)(eslint@8.57.1) @@ -198,6 +198,9 @@ importers: tailwindcss: specifier: ^3.4.13 version: 3.4.13(ts-node@9.1.1(typescript@5.6.3)) + ts-xor: + specifier: ^1.3.0 + version: 1.3.0 vite: specifier: ^5.4.8 version: 5.4.8(@types/node@20.14.2)(sass@1.79.4)(terser@5.31.1) @@ -2922,6 +2925,9 @@ packages: ts-pattern@5.4.0: resolution: {integrity: sha512-hgfOMfjlrARCnYtGD/xEAkFHDXuSyuqjzFSltyQCbN689uNvoQL20TVN2XFcLMjfNuwSsQGU+xtH6MrjIwhwUg==} + ts-xor@1.3.0: + resolution: {integrity: sha512-RLXVjliCzc1gfKQFLRpfeD0rrWmjnSTgj7+RFhoq3KRkUYa8LE/TIidYOzM5h+IdFBDSjjSgk9Lto9sdMfDFEA==} + tsconfig-paths@3.15.0: resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} @@ -4488,7 +4494,7 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1): + eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.31.0)(eslint@8.57.1): dependencies: confusing-browser-globals: 1.0.11 eslint: 8.57.1 @@ -4497,10 +4503,10 @@ snapshots: object.entries: 1.1.8 semver: 6.3.1 - eslint-config-airbnb@19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1): + eslint-config-airbnb@19.0.4(eslint-plugin-import@2.31.0)(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1): dependencies: eslint: 8.57.1 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1) + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.31.0)(eslint@8.57.1) eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1) eslint-plugin-react: 7.37.1(eslint@8.57.1) @@ -4522,7 +4528,7 @@ snapshots: debug: 4.3.7 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 @@ -4535,7 +4541,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -4557,7 +4563,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -6099,6 +6105,8 @@ snapshots: ts-pattern@5.4.0: {} + ts-xor@1.3.0: {} + tsconfig-paths@3.15.0: dependencies: '@types/json5': 0.0.29