Skip to content

Commit

Permalink
Fix TS and account screen bugs, update all deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
retrixe committed Jan 2, 2023
1 parent fb02fc9 commit 955b8e9
Show file tree
Hide file tree
Showing 9 changed files with 6,144 additions and 20,750 deletions.
25,277 changes: 5,366 additions & 19,911 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
"@babel/core": "^7.13.10",
"@babel/runtime": "^7.13.10",
"@react-native-community/eslint-config": "^3.2.0",
"@types/jest": "^25.2.3",
"@tsconfig/react-native": "^2.0.3",
"@types/jest": "^29.2.5",
"@types/node": "^18.11.18",
"@types/promise.allsettled": "^1.0.3",
"@types/react-native": "^0.63.66",
"@types/react-native-vector-icons": "^6.4.6",
Expand Down
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import AccountScreen from './screens/AccountScreen'
import SettingScreen from './screens/SettingScreen'
import globalStyle from './globalStyle'

const Stacks = createNativeStackNavigator()
const Tabs = createMaterialTopTabNavigator() // createBottomTabNavigator()
const Stacks = createNativeStackNavigator<RootStackParamList>()
const Tabs = createMaterialTopTabNavigator<RootStackParamList>() // createBottomTabNavigator()

export interface RootStackParamList {
[index: string]: any
Expand Down
2 changes: 2 additions & 0 deletions src/components/accounts/AddAccountDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const AddAccountDialog = ({
}
if (password === null) {
setAccounts({
...accounts,
[newUser]: {
username: newUser,
active: Object.keys(accounts).length === 0
Expand All @@ -65,6 +66,7 @@ const AddAccountDialog = ({
authenticate(newUser, password, true)
.then(({ clientToken, accessToken, selectedProfile: { name, id } }) => {
setAccounts({
...accounts,
[id]: {
active: Object.keys(accounts).length === 0,
username: name,
Expand Down
7 changes: 5 additions & 2 deletions src/components/settings/DarkModeSetting.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import React, { useState } from 'react'
import { View, Pressable, StyleSheet, ViewProps } from 'react-native'
import { View, Pressable, StyleSheet, StyleProp, ViewStyle } from 'react-native'

import Text from '../../components/Text'
import Dialog, { dialogStyles } from '../../components/Dialog'
import globalStyle from '../../globalStyle'
import useDarkMode from '../../context/useDarkMode'

const RadioButton = (props: { style?: ViewProps; selected: boolean }) => {
const RadioButton = (props: {
style?: StyleProp<ViewStyle>
selected: boolean
}) => {
const darkMode = useDarkMode()
return (
<View
Expand Down
8 changes: 2 additions & 6 deletions src/screens/ServerScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Ionicons from 'react-native-vector-icons/Ionicons'
import { NativeStackScreenProps } from '@react-navigation/native-stack'
import allSettled from 'promise.allsettled'

import { RootStackParamList } from '../App'
import EditServerDialog from '../components/servers/EditServerDialog'
import ServerDisplay from '../components/servers/ServerDisplay'
import globalStyle from '../globalStyle'
Expand All @@ -19,12 +20,7 @@ import ServersContext from '../context/serversContext'
import ConnectionContext from '../context/connectionContext'
import { parseIp, protocolMap } from '../minecraft/utils'

interface RootStackParamList {
[index: string]: any
Home: undefined
Chat: { serverName: string; version: number }
}
type Props = NativeStackScreenProps<RootStackParamList, 'Chat'>
type Props = NativeStackScreenProps<RootStackParamList, 'Servers'>

const ServerScreen = (props: Props) => {
const darkMode = useDarkMode()
Expand Down
5 changes: 3 additions & 2 deletions src/screens/chat/ChatScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
ActivityIndicator,
Platform,
Linking,
Clipboard
Clipboard,
ListRenderItem
} from 'react-native'
import Ionicons from 'react-native-vector-icons/Ionicons'
import { NativeStackScreenProps } from '@react-navigation/native-stack'
Expand Down Expand Up @@ -85,7 +86,7 @@ const ChatMessageList = (props: {
// If colorMap/clickEventHandler changes, this will change and cause a re-render.
// If messages changes, FlatList will execute this function for all messages, and
// ItemRendererMemo will check if props have changed instead of this useCallback.
const renderItem = useCallback(
const renderItem = useCallback<ListRenderItem<Message>>(
({ item }) => (
<ItemRendererMemo
item={item}
Expand Down
67 changes: 7 additions & 60 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,10 @@
{
"extends": "@tsconfig/react-native/tsconfig.json",
"compilerOptions": {
/* Basic Options */
"target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
"lib": ["es6", "es2019.array"], /* Specify library files to be included in the compilation. */
"allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
"jsx": "react-native", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "removeComments": true, /* Do not emit comments to output. */
"noEmit": true, /* Do not emit outputs. */
// "incremental": true, /* Enable incremental compilation */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
"isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
"resolveJsonModule": true,

/* Source Map Options */
// "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
"skipLibCheck": true
},
"exclude": [
"node_modules", "babel.config.js", "metro.config.js", "jest.config.js"
]
"types": [
"react-native",
"jest",
"node"
],
}
}
Loading

0 comments on commit 955b8e9

Please sign in to comment.