From 8fe121951b43a0b84dc69d31e8121efd9321b34b Mon Sep 17 00:00:00 2001
From: Matthew Ellison <m_ellison@ymail.com>
Date: Mon, 16 Mar 2026 23:36:38 -0400
Subject: [PATCH] Update package layout

---
 lib/component/input/index.ts                  |   1 +
 lib/component/input/text/TextArea.tsx         |   6 +-
 lib/component/input/text/TextInput.tsx        |   6 +-
 lib/component/nav/DarkModeSwitch.tsx          |   2 +-
 lib/component/theme/index.ts                  |   1 -
 lib/component/toaster/index.ts                |   1 -
 lib/index.ts                                  |   5 +-
 lib/provider/axios/AxiosProvider.tsx          |  93 +++++++++++++
 lib/provider/axios/axios.d.ts                 |   8 ++
 lib/provider/axios/index.ts                   |   1 +
 .../theme/ThemeProvider.tsx                   |   0
 lib/provider/theme/index.ts                   |   1 +
 .../toaster/ToasterProvider.tsx               |   0
 lib/provider/toaster/index.ts                 |   1 +
 lib/provider/token/TokenProvider.tsx          |  77 +++++++++++
 lib/provider/token/TokenUtils.ts              |  52 ++++++++
 lib/provider/token/index.ts                   |   1 +
 lib/types/InputTypes.ts                       |  14 +-
 package-lock.json                             | 125 +++++++++++++++---
 package.json                                  |   9 ++
 src/main.tsx                                  |   4 +-
 src/routes/modal/index.tsx                    |   2 +-
 src/util/InputUtils.tsx                       |   6 +-
 vite.config.ts                                |   6 +-
 24 files changed, 383 insertions(+), 39 deletions(-)
 delete mode 100644 lib/component/theme/index.ts
 create mode 100644 lib/provider/axios/AxiosProvider.tsx
 create mode 100644 lib/provider/axios/axios.d.ts
 create mode 100644 lib/provider/axios/index.ts
 rename lib/{providers => provider}/theme/ThemeProvider.tsx (100%)
 create mode 100644 lib/provider/theme/index.ts
 rename lib/{providers => provider}/toaster/ToasterProvider.tsx (100%)
 create mode 100644 lib/provider/toaster/index.ts
 create mode 100644 lib/provider/token/TokenProvider.tsx
 create mode 100644 lib/provider/token/TokenUtils.ts
 create mode 100644 lib/provider/token/index.ts

diff --git a/lib/component/input/index.ts b/lib/component/input/index.ts
index 9524ca3..98a95f5 100644
--- a/lib/component/input/index.ts
+++ b/lib/component/input/index.ts
@@ -47,6 +47,7 @@ export { default as DragAndDropFileInput } from "./file/DragAndDropFileInput";
 export { default as FileInput } from "./file/FileInput";
 export { default as NumberInput } from "./number/NumberInput";
 export { default as OptionInput } from "./text/OptionInput";
+export { default as PhoneInput } from "./text/PhoneInput";
 export { default as SelectInput } from "./text/SelectInput";
 export { default as TextArea } from "./text/TextArea";
 export { default as TextInput } from "./text/TextInput";
diff --git a/lib/component/input/text/TextArea.tsx b/lib/component/input/text/TextArea.tsx
index 05cc6f0..7b6f05e 100644
--- a/lib/component/input/text/TextArea.tsx
+++ b/lib/component/input/text/TextArea.tsx
@@ -16,6 +16,7 @@ export default function TextArea({
 	placeholder,
 	value,
 	onChange,
+	onKeyDown,
 	disabled
 }: Readonly<TextAreaProps>){
 	const componentId = useId();
@@ -44,14 +45,15 @@ export default function TextArea({
 					rows={rows}
 					cols={cols}
 					value={value}
-					onChange={onChange}
+					onChange={(e) => onChange?.(e.target.value)}
+					onKeyDown={onKeyDown}
 					disabled={disabled}
 					spellCheck={spellCheck}
 				/>
 				<label
 					className={clsx(
 						"absolute ml-2 -top-3 left-0 text-sm rounded-md px-1 select-none cursor-default",
-						"peer-placeholder-shown:top-0 peer-placeholder-shown:-left-1 peer-placeholder-shown:text-inherit peer-placeholder-shown:text-base peer-placeholder-shown:bg-transparent peer-placeholder-shown:cursor-text peer-placeholder-shown:w-[99%]",
+						"peer-placeholder-shown:top-0 peer-placeholder-shown:-left-1 peer-placeholder-shown:text-inherit peer-placeholder-shown:text-base peer-placeholder-shown:cursor-text peer-placeholder-shown:w-[99%]",
 						"peer-focus:-top-3 peer-focus:left-0 peer-focus:text-sm peer-focus:w-auto peer-focus:h-auto",
 						"flex items-center",
 						labelClassName
diff --git a/lib/component/input/text/TextInput.tsx b/lib/component/input/text/TextInput.tsx
index 461b680..a486bf6 100644
--- a/lib/component/input/text/TextInput.tsx
+++ b/lib/component/input/text/TextInput.tsx
@@ -14,6 +14,7 @@ export default function TextInput({
 	placeholder,
 	value,
 	onChange,
+	onKeyDown,
 	disabled
 }: Readonly<TextInputProps>){
 	const componentId = useId();
@@ -41,14 +42,15 @@ export default function TextInput({
 					placeholder={placeholder}
 					maxLength={maxLength}
 					value={value}
-					onChange={onChange}
+					onChange={(e) => onChange?.(e.target.value)}
 					disabled={disabled}
 					spellCheck={spellCheck}
+					onKeyDown={onKeyDown}
 				/>
 				<label
 					className={clsx(
 						"absolute ml-2 -top-3 left-0 text-sm rounded-md px-1 select-none cursor-default",
-						"peer-placeholder-shown:top-0 peer-placeholder-shown:-left-1 peer-placeholder-shown:text-inherit peer-placeholder-shown:text-base peer-placeholder-shown:bg-transparent peer-placeholder-shown:h-full peer-placeholder-shown:cursor-text peer-placeholder-shown:w-[99%]",
+						"peer-placeholder-shown:top-0 peer-placeholder-shown:-left-1 peer-placeholder-shown:text-inherit peer-placeholder-shown:text-base peer-placeholder-shown:h-full peer-placeholder-shown:cursor-text peer-placeholder-shown:w-[99%]",
 						"peer-focus:-top-3 peer-focus:left-0 peer-focus:text-sm peer-focus:w-auto peer-focus:h-auto",
 						"flex items-center",
 						labelClassName
diff --git a/lib/component/nav/DarkModeSwitch.tsx b/lib/component/nav/DarkModeSwitch.tsx
index c2ab836..1e265b3 100644
--- a/lib/component/nav/DarkModeSwitch.tsx
+++ b/lib/component/nav/DarkModeSwitch.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from "$/providers/theme/ThemeProvider";
+import { useTheme } from "$/provider/theme/ThemeProvider";
 import { BsLightbulb, BsLightbulbFill } from "react-icons/bs";
 
 
diff --git a/lib/component/theme/index.ts b/lib/component/theme/index.ts
deleted file mode 100644
index c00eecf..0000000
--- a/lib/component/theme/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ThemeProvider, useTheme } from "$/providers/theme/ThemeProvider";
diff --git a/lib/component/toaster/index.ts b/lib/component/toaster/index.ts
index f80661c..988e269 100644
--- a/lib/component/toaster/index.ts
+++ b/lib/component/toaster/index.ts
@@ -1,3 +1,2 @@
-export { default as ToasterProvider, useToaster } from "$/providers/toaster/ToasterProvider";
 export { default as Toaster } from "./Toaster";
 
diff --git a/lib/index.ts b/lib/index.ts
index 322bf1e..b9f5867 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -6,6 +6,9 @@ export * from "$/component/modal";
 export * from "$/component/nav";
 export * from "$/component/progress";
 export * from "$/component/tab";
-export * from "$/component/theme";
 export * from "$/component/toaster";
+export * from "$/provider/axios";
+export * from "$/provider/theme";
+export * from "$/provider/toaster";
+export * from "$/provider/token";
 
diff --git a/lib/provider/axios/AxiosProvider.tsx b/lib/provider/axios/AxiosProvider.tsx
new file mode 100644
index 0000000..2f9fb5b
--- /dev/null
+++ b/lib/provider/axios/AxiosProvider.tsx
@@ -0,0 +1,93 @@
+import type { AxiosError, AxiosInstance } from "axios";
+import axios from "axios";
+import { createContext, useContext, useMemo } from "react";
+import { useToken } from "../token";
+
+
+export interface AxiosState {
+	publicApi: AxiosInstance;
+	authorizedApi: AxiosInstance;
+}
+
+const initialState: AxiosState = {
+	publicApi: {} as AxiosInstance,
+	authorizedApi: {} as AxiosInstance
+}
+
+const AxiosContext = createContext<AxiosState>(initialState);
+
+
+export default function AxiosProvider({
+	apiUrl,
+	children
+}: Readonly<{
+	apiUrl: string;
+	children: React.ReactNode;
+}>){
+	const { getToken } = useToken();
+
+	const publicApi = useMemo(() => {
+		const api = axios.create({
+			baseURL: apiUrl
+		});
+		return api;
+	}, [apiUrl]);
+	const authorizedApi = useMemo(() => {
+		const api = axios.create({
+			baseURL: apiUrl
+		});
+		api.interceptors.request.use(async (config) => {
+			try{
+				const token = await getToken();
+				if(token){
+					config.headers.Authorization = `Bearer ${token}`;
+				}
+				return config;
+			}
+			catch(error){
+				return Promise.reject(error as Error);
+			}
+		});
+		api.interceptors.response.use(r => r, async (error: AxiosError) => {
+			const original = error.config;
+			if(!original){
+				return Promise.reject(error);
+			}
+			if(error.response?.status === 401 && !original._retry){
+				original._retry = true;
+				try{
+					const newToken = await getToken();
+					original.headers.Authorization = `Bearer ${newToken}`;
+					return api(original);
+				}
+				catch(refreshError){
+					return Promise.reject(refreshError as Error);
+				}
+			}
+		});
+		return api;
+	}, [apiUrl, getToken]);
+
+	const value = useMemo(() => ({
+		publicApi,
+		authorizedApi
+	}), [authorizedApi, publicApi]);
+
+	return (
+		<AxiosContext.Provider value={value}>
+			{children}
+		</AxiosContext.Provider>
+	);
+}
+
+
+// eslint-disable-next-line react-refresh/only-export-components
+export function useAxios(){
+	const context = useContext(AxiosContext);
+
+	if(!context){
+		throw new Error("useAxios must be called inside an AxiosProvider");
+	}
+
+	return context;
+}
diff --git a/lib/provider/axios/axios.d.ts b/lib/provider/axios/axios.d.ts
new file mode 100644
index 0000000..4f2fe3c
--- /dev/null
+++ b/lib/provider/axios/axios.d.ts
@@ -0,0 +1,8 @@
+import "axios";
+
+
+declare module "axios" {
+	interface InternalAxiosRequestConfig {
+		_retry?: boolean;
+	}
+}
diff --git a/lib/provider/axios/index.ts b/lib/provider/axios/index.ts
new file mode 100644
index 0000000..bea40b2
--- /dev/null
+++ b/lib/provider/axios/index.ts
@@ -0,0 +1 @@
+export { default as AxiosProvider, useAxios } from "./AxiosProvider";
diff --git a/lib/providers/theme/ThemeProvider.tsx b/lib/provider/theme/ThemeProvider.tsx
similarity index 100%
rename from lib/providers/theme/ThemeProvider.tsx
rename to lib/provider/theme/ThemeProvider.tsx
diff --git a/lib/provider/theme/index.ts b/lib/provider/theme/index.ts
new file mode 100644
index 0000000..f6e8a48
--- /dev/null
+++ b/lib/provider/theme/index.ts
@@ -0,0 +1 @@
+export { default as ThemeProvider, useTheme } from "./ThemeProvider";
diff --git a/lib/providers/toaster/ToasterProvider.tsx b/lib/provider/toaster/ToasterProvider.tsx
similarity index 100%
rename from lib/providers/toaster/ToasterProvider.tsx
rename to lib/provider/toaster/ToasterProvider.tsx
diff --git a/lib/provider/toaster/index.ts b/lib/provider/toaster/index.ts
new file mode 100644
index 0000000..8c84c9a
--- /dev/null
+++ b/lib/provider/toaster/index.ts
@@ -0,0 +1 @@
+export { default as ToasterProvider, useToaster } from "./ToasterProvider";
diff --git a/lib/provider/token/TokenProvider.tsx b/lib/provider/token/TokenProvider.tsx
new file mode 100644
index 0000000..cf6591b
--- /dev/null
+++ b/lib/provider/token/TokenProvider.tsx
@@ -0,0 +1,77 @@
+import { createContext, useCallback, useContext, useMemo, useRef } from "react";
+import { defaultTokenData, fetchToken, parseToken, type TokenData } from "./TokenUtils";
+
+export interface TokenState {
+	getToken: () => Promise<string | null | undefined>;
+}
+
+const initialState: TokenState = {
+	getToken: () => new Promise(() => {})
+}
+
+const TokenContext = createContext<TokenState>(initialState);
+
+
+export default function TokenProvider({
+	apiUrl,
+	children
+}: Readonly<{
+	apiUrl: string;
+	children: React.ReactNode;
+}>){
+	const tokenRef = useRef<TokenData>(defaultTokenData);
+	const refreshPromise = useRef<Promise<string | null | undefined>>(null);
+
+	const getToken = useCallback(async () => {
+		if(refreshPromise.current){
+			return refreshPromise.current;
+		}
+
+		const { accessToken, expires } = tokenRef.current;
+
+		const isExpired = Date.now() > (expires - 5000);	//Give a 5 second buffer
+
+		if(!accessToken || isExpired){
+			refreshPromise.current = (async () => {
+				try {
+					const rawToken = (await fetchToken(apiUrl)).token;
+					const parsedToken = parseToken(rawToken);
+					tokenRef.current = parsedToken;
+					return rawToken;
+				}
+				catch(error){
+					tokenRef.current = defaultTokenData;
+					throw error;
+				}
+				finally {
+					refreshPromise.current = null;
+				}
+			})();
+			return refreshPromise.current;
+		}
+
+		return accessToken;
+	}, [apiUrl]);
+
+	const value: TokenState = useMemo(() => ({
+		getToken
+	}), [getToken]);
+
+	return (
+		<TokenContext.Provider value={value}>
+			{children}
+		</TokenContext.Provider>
+	);
+}
+
+
+// eslint-disable-next-line react-refresh/only-export-components
+export function useToken(){
+	const context = useContext(TokenContext);
+
+	if(!context){
+		throw new Error("useTOken must be called inside a TokenProvider");
+	}
+
+	return context;
+}
diff --git a/lib/provider/token/TokenUtils.ts b/lib/provider/token/TokenUtils.ts
new file mode 100644
index 0000000..e772906
--- /dev/null
+++ b/lib/provider/token/TokenUtils.ts
@@ -0,0 +1,52 @@
+interface TokenResponse {
+	token: string | null | undefined;
+}
+
+interface TokenBody {
+	token: string;
+	iat: number;
+	exp: number;
+}
+
+export interface LoginBody {
+	login: string;
+	password: string;
+}
+
+export interface TokenData {
+	accessToken: string | null | undefined;
+	issued: number;
+	expires: number;
+}
+
+export const defaultTokenData: TokenData = {
+	accessToken: "",
+	issued: 0,
+	expires: 0
+}
+
+export async function fetchToken(apiUrl: string){
+	const res = await fetch(`${apiUrl}/refresh`);
+	return await res.json() as TokenResponse;
+}
+
+export function parseToken(rawToken: string | null | undefined): TokenData {
+	if(!rawToken){
+		return defaultTokenData;
+	}
+
+	const payloads = rawToken.split(".");
+	if(payloads.length !== 3){
+		return defaultTokenData;
+	}
+
+	const payload = payloads[1];
+
+	const tokenBody = JSON.parse(atob(payload)) as TokenBody;
+
+	return ({
+		accessToken: rawToken,
+		issued: tokenBody.iat * 1000,
+		expires: tokenBody.exp * 1000
+	});
+}
diff --git a/lib/provider/token/index.ts b/lib/provider/token/index.ts
new file mode 100644
index 0000000..771c236
--- /dev/null
+++ b/lib/provider/token/index.ts
@@ -0,0 +1 @@
+export { default as TokenProvider, useToken } from "./TokenProvider";
diff --git a/lib/types/InputTypes.ts b/lib/types/InputTypes.ts
index ef45601..6b9f007 100644
--- a/lib/types/InputTypes.ts
+++ b/lib/types/InputTypes.ts
@@ -1,5 +1,5 @@
 import type React from "react";
-import type { ChangeEventHandler, ComponentProps } from "react";
+import type { ComponentProps, KeyboardEventHandler } from "react";
 
 
 export interface TextInputProps {
@@ -11,8 +11,9 @@ export interface TextInputProps {
 	maxLength?: number;
 	spellCheck?: boolean;
 	placeholder?: string;
-	value?: string;
-	onChange?: ChangeEventHandler<HTMLInputElement>;
+	value: string;
+	onChange?: (newValue: string) => void;
+	onKeyDown?: KeyboardEventHandler<HTMLInputElement>;
 	disabled?: boolean;
 }
 
@@ -25,11 +26,12 @@ export interface TextAreaProps {
 	maxLength?: number;
 	spellCheck?: boolean;
 	placeholder?: string;
-	value?: string;
-	disabled?: boolean;
+	value: string;
 	rows?: number;
 	cols?: number;
-	onChange?: ChangeEventHandler<HTMLTextAreaElement>;
+	onChange?: (newValue: string) => void;
+	onKeyDown?: KeyboardEventHandler<HTMLTextAreaElement>;
+	disabled?: boolean;
 }
 
 export interface SelectInputProps {
diff --git a/package-lock.json b/package-lock.json
index 107cbe0..009e914 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,11 @@
 		"": {
 			"name": "mattrixwv-components",
 			"version": "0.0.9",
+			"dependencies": {
+				"axios": "^1.13.6",
+				"clsx": "^2.1.1",
+				"react-icons": "^5.5.0"
+			},
 			"devDependencies": {
 				"@eslint/js": "^9.39.2",
 				"@tailwindcss/vite": "^4.1.18",
@@ -39,10 +44,8 @@
 			},
 			"peerDependencies": {
 				"@headlessui/react": "^2.2.9",
-				"clsx": "^2.1.1",
 				"react": "^19.2.3",
-				"react-dom": "^19.2.3",
-				"react-icons": "^5.5.0"
+				"react-dom": "^19.2.3"
 			}
 		},
 		"node_modules/@acemir/cssom": {
@@ -4076,6 +4079,12 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"license": "MIT"
+		},
 		"node_modules/available-typed-arrays": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -4092,6 +4101,17 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/axios": {
+			"version": "1.13.6",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
+			"integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
+			"license": "MIT",
+			"dependencies": {
+				"follow-redirects": "^1.15.11",
+				"form-data": "^4.0.5",
+				"proxy-from-env": "^1.1.0"
+			}
+		},
 		"node_modules/babel-dead-code-elimination": {
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/babel-dead-code-elimination/-/babel-dead-code-elimination-1.0.10.tgz",
@@ -4215,7 +4235,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
 			"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"es-errors": "^1.3.0",
@@ -4367,6 +4386,18 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"license": "MIT",
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/compare-versions": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
@@ -4603,6 +4634,15 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
 		"node_modules/dequal": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -4658,7 +4698,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
 			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"call-bind-apply-helpers": "^1.0.1",
@@ -4776,7 +4815,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
 			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -4786,7 +4824,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
 			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -4831,7 +4868,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
 			"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"es-errors": "^1.3.0"
@@ -4844,7 +4880,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
 			"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"es-errors": "^1.3.0",
@@ -5329,6 +5364,26 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/follow-redirects": {
+			"version": "1.15.11",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+			"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/RubenVerborgh"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=4.0"
+			},
+			"peerDependenciesMeta": {
+				"debug": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/for-each": {
 			"version": "0.3.5",
 			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
@@ -5345,6 +5400,22 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/form-data": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+			"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+			"license": "MIT",
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"es-set-tostringtag": "^2.1.0",
+				"hasown": "^2.0.2",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/fs-extra": {
 			"version": "11.3.0",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
@@ -5379,7 +5450,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
 			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-			"dev": true,
 			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5430,7 +5500,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
 			"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"call-bind-apply-helpers": "^1.0.2",
@@ -5455,7 +5524,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
 			"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"dunder-proto": "^1.0.1",
@@ -5553,7 +5621,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
 			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -5625,7 +5692,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
 			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -5638,7 +5704,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
 			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"has-symbols": "^1.0.3"
@@ -5654,7 +5719,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
 			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"function-bind": "^1.1.2"
@@ -6912,7 +6976,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
 			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -6925,6 +6988,27 @@
 			"dev": true,
 			"license": "CC0-1.0"
 		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"license": "MIT",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/min-indent": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -7464,6 +7548,12 @@
 				"react-is": "^16.13.1"
 			}
 		},
+		"node_modules/proxy-from-env": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+			"license": "MIT"
+		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -7519,7 +7609,6 @@
 			"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
 			"integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
 			"license": "MIT",
-			"peer": true,
 			"peerDependencies": {
 				"react": "*"
 			}
diff --git a/package.json b/package.json
index 4623dde..c874f61 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
 		"react-icons": "^5.5.0"
 	},
 	"peerDependencies": {
+		"axios": "^1.13.6",
 		"@headlessui/react": "^2.2.9",
 		"react": "^19.2.3",
 		"react-dom": "^19.2.3"
@@ -108,6 +109,10 @@
 			"types": "./dist/tab.d.ts",
 			"import": "./dist/tab.js"
 		},
+		"./axios": {
+			"types": "./dist/axios.d.ts",
+			"import": "./dist/axios.js"
+		},
 		"./theme": {
 			"types": "./dist/theme.d.ts",
 			"import": "./dist/theme.js"
@@ -115,6 +120,10 @@
 		"./toaster": {
 			"types": "./dist/toaster.d.ts",
 			"import": "./dist/toaster.js"
+		},
+		"./token": {
+			"types": "./dist/token.d.ts",
+			"import": "./dist/token.js"
 		}
 	},
 	"files": [
diff --git a/src/main.tsx b/src/main.tsx
index defa005..6323f3d 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,5 +1,5 @@
-import ThemeProvider from "$/providers/theme/ThemeProvider";
-import ToasterProvider from "$/providers/toaster/ToasterProvider";
+import ThemeProvider from "$/provider/theme/ThemeProvider";
+import ToasterProvider from "$/provider/toaster/ToasterProvider";
 import { RouterProvider, createRouter } from "@tanstack/react-router";
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
diff --git a/src/routes/modal/index.tsx b/src/routes/modal/index.tsx
index 32dc29f..595d821 100644
--- a/src/routes/modal/index.tsx
+++ b/src/routes/modal/index.tsx
@@ -1,7 +1,7 @@
 import { DangerButton, PrimaryButton, SuccessButton, WarningButton } from "$/component/button";
 import { PrimaryMessageBlock } from "$/component/message";
 import { Modal } from "$/component/modal";
-import { useToaster } from "$/providers/toaster/ToasterProvider";
+import { useToaster } from "$/provider/toaster/ToasterProvider";
 import { createFileRoute } from "@tanstack/react-router";
 import { useState } from "react";
 
diff --git a/src/util/InputUtils.tsx b/src/util/InputUtils.tsx
index a60dcbf..83d2741 100644
--- a/src/util/InputUtils.tsx
+++ b/src/util/InputUtils.tsx
@@ -574,16 +574,18 @@ export function TextContent(){
 
 	const [ selected, setSelected ] = useState(selectOptions[0]);
 	const [ numberValue, setNumberValue ] = useState(0);
+	const [ textValue, setTextValue ] = useState("");
+	const [ secondTextValue, setSecondTextValue ] = useState("");
 
 	return (
 		<div
 			className="flex flex-col items-center justify-center gap-y-8 mt-8 w-full"
 		>
 			<GeneralInputDisplay title="Text Input">
-				<TextInput placeholder="Text Input" labelClassName="bg-(--bg-color) peer-focus:bg-(--bg-color)"/>
+				<TextInput placeholder="Text Input" labelClassName="bg-(--bg-color) peer-focus:bg-(--bg-color)" value={textValue} onChange={setTextValue}/>
 			</GeneralInputDisplay>
 			<GeneralInputDisplay title="Text Area">
-				<TextArea placeholder="Textarea" className="resize" labelClassName="bg-(--bg-color) peer-focus:bg-(--bg-color)"/>
+				<TextArea placeholder="Textarea" className="resize" labelClassName="bg-(--bg-color) peer-focus:bg-(--bg-color)" value={secondTextValue} onChange={setSecondTextValue}/>
 			</GeneralInputDisplay>
 			<GeneralInputDisplay title="Select">
 				<SelectInput placeholder={selected.label} onChange={(newValue) => setSelected(selectOptions.find((option) => option.value === newValue) || selectOptions[0])}>
diff --git a/vite.config.ts b/vite.config.ts
index 6b42b43..26ae800 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,7 +10,8 @@ import { viteStaticCopy } from "vite-plugin-static-copy";
 import { peerDependencies } from "./package.json";
 
 
-const modules = [ "button", "input", "loading", "message", "modal", "nav", "progress", "tab", "theme", "toaster" ];
+const components = [ "button", "input", "loading", "message", "modal", "nav", "progress", "tab", "toaster" ];
+const providers = [ "axios", "theme", "toaster", "token" ];
 
 
 // https://vite.dev/config/
@@ -60,7 +61,8 @@ export default defineConfig({
 		lib: {
 			entry: {
 				"mattrixwv-components": resolve(__dirname, "lib/index.ts"),
-				...Object.fromEntries(modules.map(mod => [mod, resolve(__dirname, `lib/component/${mod}/index.ts`)]))
+				...Object.fromEntries(components.map(mod => [mod, resolve(__dirname, `lib/component/${mod}/index.ts`)])),
+				...Object.fromEntries(providers.map(mod => [mod, resolve(__dirname, `lib/provider/${mod}/index.ts`)]))
 			},
 			formats: [ "es" ],
 			name: "Mattrixwv Component Library"