Refactoring...

kuchta · kuchta · commit 4265a154022a · 2026-04-26T17:04:22.000+02:00
diff --git a/.github/workflows/deploy-deno.yml b/.github/workflows/deploy-deno.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Runtime
         uses: denoland/setup-deno@v2
diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Runtime
         uses: denoland/setup-deno@v2
diff --git a/.github/workflows/publish-jsr.yml b/.github/workflows/publish-jsr.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Runtime
         uses: denoland/setup-deno@v2
diff --git a/.oxlintrc.json b/.oxlintrc.json
@@ -54,6 +54,7 @@
 				"eslint/max-statements": [ "warn", 50 ],
 				"eslint/no-bitwise": "off",
 				"eslint/no-console": "off",
+				"no-empty-function": "off",
 				"eslint/no-inline-comments": "off",
 				"eslint/no-magic-numbers": "off",
 				"eslint/no-negated-condition": "off",
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,8 +9,11 @@
 	},
 	"oxc.enable": true,
 	"typescript.tsdk": "node_modules/typescript/lib",
-	"typescript.tsserver.experimental.enableProjectDiagnostics": false,
+	"typescript.tsserver.experimental.enableProjectDiagnostics": true,
 	"[jsonc]": {
 		"editor.defaultFormatter": "oxc.oxc-vscode"
 	},
+	"[svg]": {
+		"editor.defaultFormatter": "jock.svg"
+	},
 }
diff --git a/deno.jsonc b/deno.jsonc
@@ -1,6 +1,8 @@
 {
 	"name": "@kuchta/radixverse",
-	"version": "0.1.0",
+	"version": "0.2.0",
+	"repository": "kuchta/radixverse",
+	"homepage": "https://kuchta.github.io/radixverse",
 	"exports": "./src/radixes.ts",
 	"nodeModulesDir": "auto",
 	"exclude": [ ".history" ],
diff --git a/deno.lock b/deno.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "radixverse",
-	"version": "0.1.0",
+	"version": "0.2.0",
 	"license": "MIT",
 	"repository": "kuchta/radixverse",
 	"homepage": "https://kuchta.github.io/radixverse",
@@ -28,35 +28,35 @@
 	"devDependencies": {
 		"@eslint/css": "^1.1.0",
 		"@eslint/js": "^10.0.1",
-		"@rolldown/plugin-babel": "^0.2.2",
+		"@rolldown/plugin-babel": "^0.2.3",
 		"@stylistic/eslint-plugin": "^5.10.0",
-		"@tailwindcss/vite": "^4.2.2",
+		"@tailwindcss/vite": "4.2.2",
 		"@types/node": "^25.6.0",
 		"@types/react": "^19.2.14",
 		"@types/react-dom": "^19.2.3",
 		"@vitejs/plugin-react": "^6.0.1",
 		"babel-plugin-react-compiler": "^1.0.0",
 		"daisyui": "^5.5.19",
-		"eslint": "^9.39.4",
+		"eslint": "^10.2.1",
 		"eslint-plugin-import": "^2.32.0",
 		"eslint-plugin-react": "^7.37.5",
 		"eslint-plugin-react-compiler": "^19.1.0-rc.2",
 		"eslint-plugin-react-hooks": "7.0.0",
-		"globals": "^17.4.0",
-		"oxfmt": "^0.44.0",
-		"oxlint": "^1.59.0",
-		"oxlint-tsgolint": "^0.20.0",
+		"globals": "^17.5.0",
+		"oxfmt": "^0.46.0",
+		"oxlint": "^1.61.0",
+		"oxlint-tsgolint": "^0.22.0",
 		"react": "^19.2.5",
 		"react-dom": "^19.2.5",
 		"react-error-boundary": "^6.1.1",
 		"react-icons": "^5.6.0",
-		"react-router-dom": "^7.14.0",
+		"react-router-dom": "^7.14.2",
 		"react-textarea-autosize": "^8.5.9",
 		"tailwind-csstree": "^0.3.1",
-		"tailwindcss": "^4.2.2",
-		"typescript": "6.0.2",
-		"typescript-eslint": "^8.58.1",
-		"vite": "^8.0.8",
+		"tailwindcss": "^4.2.4",
+		"typescript": "^6.0.3",
+		"typescript-eslint": "^8.59.0",
+		"vite": "^8.0.10",
 		"vite-plugin-pwa": "^1.2.0",
 		"zod": "^4.3.6"
 	}
diff --git a/src/app.css b/src/app.css
@@ -1,7 +1,7 @@
 @import 'tailwindcss';
 
 @plugin "daisyui" {
-	themes: all;
+	/* themes: all; */
 }
 
 /* @plugin "flyonui" {
diff --git a/src/app.tsx b/src/app.tsx
@@ -105,13 +105,19 @@ function useStore(updateError: (error: unknown) => void) {
 
 	useEffect(() => {
 		if (searchParams.has('clear-settings')) localStorage.clear()
+
 		if (searchParams.has('r')) {
 			const searchRadixes = searchParams.getAll('r')
 			radixes.forEach(r => { r.enabled = searchRadixes.includes(r.name) })
 			updateRadixes(radixes)
 			setEnabledRadixes(radixes.filter(r => r.enabled))
+		} else {
+			enabledRadixes.forEach(r => { searchParams.append('r', r.name) })
+			setSearchParams(searchParams)
 		}
+
 		let r: Radix | undefined = radix
+
 		const sRadix = searchParams.get('radix')
 		if (sRadix) {
 			r = radixes.find(r => r.name === sRadix)
@@ -121,6 +127,7 @@ function useStore(updateError: (error: unknown) => void) {
 			}
 			setRadix(r)
 		}
+
 		const sValue = searchParams.get('value')
 		if (sValue) {
 			const [ value, rest ] = sanitizeInput(sValue, r)
diff --git a/src/components/add.tsx b/src/components/add.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react"
+import { useMemo } from "react"
 
 import type { Radix } from '#/radixes.ts'
 import Table, { Tables } from './table.tsx'
@@ -12,24 +12,20 @@ export default function Add({ radixes }: { radixes: Radix[] }) {
 }
 
 function AddTable({ radix }: { radix: Radix }) {
-	const [ props, setProps ] = useState(computeProps(radix))
-
-	useEffect(() => { setProps(computeProps(radix)) }, [ radix ])
-
-	return <Table radix={radix} {...props}/>
-}
-
-function computeProps(radix: Radix) {
-	let { low, high } = radix
-	if (high + low > 0) low = 1
-	if (low >= 0 && high < 3) high = 2
-	const lowest = low >= 0 ? low : low + low
-	const highest = high + high
-	const arr = [ NaN, ...Array.from(Array(high - (low - 1)), (_, i) => i + low) ]
-	const numbers = arr.map(row => arr.map(col => {
-		if (isNaN(row) && isNaN(col)) return NaN
-		return isNaN(row) || isNaN(col) ? isNaN(row) ? col : row : row + col
-	}))
-
-	return { numbers, low: lowest, high: highest }
+	const { numbers, low, high } = useMemo(() => {
+		let { low, high } = radix
+		if (high + low > 0) low = 1
+		if (low >= 0 && high < 3) high = 2
+		const lowest = low >= 0 ? low : low + low
+		const highest = high + high
+		const arr = [ NaN, ...Array.from(Array(high - (low - 1)), (_, i) => i + low) ]
+		const numbers = arr.map(row => arr.map(col => {
+			if (isNaN(row) && isNaN(col)) return NaN
+			return isNaN(row) || isNaN(col) ? isNaN(row) ? col : row : row + col
+		}))
+
+		return { numbers, low: lowest, high: highest }
+	}, [ radix ])
+
+	return <Table radix={radix} numbers={numbers} low={low} high={high}/>
 }
diff --git a/src/components/convert.tsx b/src/components/convert.tsx
@@ -136,7 +136,6 @@ function NumberLine({ value, radix, radixIndex, numRadixes, updateValue }: Compo
 
 		const position = getCaretPosition()
 		const range = getSelection()?.getRangeAt(0)
-
 		const newV = range?.startContainer === ref.current ? input : Array.from(strVal).toSpliced(position, range ? range.endOffset - range.startOffset : 0, input).join('')
 
 		try {
diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -1,4 +1,4 @@
-import { type ReactEventHandler, type ChangeEventHandler, type KeyboardEventHandler, useContext, useState, useMemo, useRef, /* useEffectEvent, useEffect */ } from 'react'
+import { type ReactEventHandler, type ChangeEventHandler, type KeyboardEventHandler, useContext, useState, useRef, useMemo } from 'react'
 import { getErrorMessage } from 'react-error-boundary'
 import TextareaAutosize from 'react-textarea-autosize'
 import themeObject from 'daisyui/theme/object.js'
diff --git a/src/components/multiply.tsx b/src/components/multiply.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react"
+import { useMemo } from 'react'
 
 import type { Radix } from '#/radixes.ts'
 import Table, { Tables } from './table.tsx'
@@ -12,26 +12,22 @@ export default function Multiply({ radixes }: { radixes: Radix[] }) {
 }
 
 function MultiplyTable({ radix }: { radix: Radix }) {
-	const [ props, setProps ] = useState(computeProps(radix))
-
-	useEffect(() => { setProps(computeProps(radix)) }, [ radix ])
-
-	return <Table radix={radix} {...props}/>
-}
-
-function computeProps(radix: Radix) {
-	let { low, high } = radix
-	if (low >= 0) {
-		low = 2
-		if (high < 3) high = 3
-	}
-	const lowest = low >= 0 ? low : low * high
-	const highest = high * high
-	const arr = [ NaN, ...Array.from(Array(high - (low - 1)), (_, i) => i + low) ]
-	const numbers = arr.map(row => arr.map(col => {
-		if (isNaN(row) && isNaN(col)) return NaN
-		return isNaN(row) || isNaN(col) ? isNaN(row) ? col : row : row * col
-	}))
-
-	return { numbers, low: lowest, high: highest }
+	const { numbers, low, high } = useMemo(() => {
+		let { low, high } = radix
+		if (low >= 0) {
+			low = 2
+			if (high < 3) high = 3
+		}
+		const lowest = low >= 0 ? low : low * high
+		const highest = high * high
+		const arr = [ NaN, ...Array.from(Array(high - (low - 1)), (_, i) => i + low) ]
+		const numbers = arr.map(row => arr.map(col => {
+			if (isNaN(row) && isNaN(col)) return NaN
+			return isNaN(row) || isNaN(col) ? isNaN(row) ? col : row : row * col
+		}))
+
+		return { numbers, low: lowest, high: highest }
+	}, [ radix ])
+
+	return <Table radix={radix} numbers={numbers} low={low} high={high}/>
 }
diff --git a/src/radixes.ts b/src/radixes.ts
@@ -1,17 +1,23 @@
 const zero = '0'
 const base9 = '123456789'
-const baseMinus9 = '➒➑➐➏➎➍➌➋➊'
+const baseMinus9 = '➊➋➌➍➎➏➐➑➒'
 // const baseMinus9 = '⑨⑧⑦⑥⑤④③②①'
 const base26 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-const baseMinus26 = '🅩🅨🅧🅦🅥🅤🅣🅢🅡🅠🅟🅞🅝🅜🅛🅚🅙🅘🅗🅖🅕🅔🅓🅒🅑🅐'
-// const baseMinus26 = 'ⓏⓎⓍⓌⓋⓊⓉⓈⓇⓆⓅⓄⓃⓂⓁⓀⒿⒾⒽⒼⒻⒺⒹⒸⒷⒶ'
-const baseBal71 = baseMinus26 + baseMinus9 + zero + base9 + base26
+const baseMinus26 = '🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩'
+// const baseMinus26 = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏ'
 // const base32cz = 'ABCČDĎEFGHIJKLMNŇOPQRŘSŠTŤUVXYZŽ'
 // const base36cz = 'AÁBCČDĎEÉFGHIÍJKLMNŇOÓPQRŘSŠTŤUÚVXZŽ'
 // const base42 = [ 'A', 'Á', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'Ě', 'F', 'G', 'H', 'Ch', 'I', 'Í', 'J', 'K', 'L', 'M', 'N', 'Ň', 'O', 'Ó', 'P', 'Q', 'R', 'Ř', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'Ů', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž' ]
 
-export const defaultChars = baseBal71
-const defaultCharsArray = Array.from(defaultChars)
+const defaultCharsArray: string[] = [
+	...Array.from(baseMinus26).reverse(),
+	...Array.from(baseMinus9).reverse(),
+	zero,
+	...Array.from(base9),
+	...Array.from(base26)
+]
+
+export const defaultChars: string = defaultCharsArray.join('')
 
 export type Radix = {
 	name: string

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@import 'tailwindcss';`
`2`	`2`
`3`	`3`	`@plugin "daisyui" {`
`4`		`- themes: all;`
	`4`	`+ /* themes: all; */`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`/* @plugin "flyonui" {`