refactor: abstract to interface

wanjas · Dec 8, 2023 · 475e4c1 · 475e4c1
1 parent e685d4b
commit 475e4c1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -13,7 +13,10 @@
     "hooks",
     "url",
     "state",
-    "url-state"
+    "url-state",
+    "search",
+    "params",
+    "query"
   ],
   "description": "React hook for managing state in the URL",
   "dependencies": {},

diff --git a/packages/core/src/handlers.ts b/packages/core/src/handlers.ts
@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from 'react';
+import { MutableRefObject, useCallback, useMemo } from 'react';
 import { UrlStateRouter } from './router';
 import { DefaultSchema, UrlState, UrlStateMethods } from './types';
 import { serializeObjectToUrlParams } from './utils';
@@ -16,7 +16,7 @@ export function usePush(router: UrlStateRouter): Push {
 
 export function useHandlers<T extends DefaultSchema>(
   push: Push,
-  stateRef: React.MutableRefObject<UrlState<T>>,
+  stateRef: MutableRefObject<UrlState<T>>,
 ) {
   const setState = useCallback<UrlStateMethods<T>['setState']>(
     (state) => {

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useHandlers, usePush } from './handlers';
-import { GenericRouter, getGenericRouter, UrlStateRouter } from './router';
+import { getGenericRouter, UrlStateRouter } from './router';
 import {
   DefaultSchema,
   UrlState,

diff --git a/packages/core/src/router.ts b/packages/core/src/router.ts
@@ -1,10 +1,10 @@
 export type Callback = (newSearchParams: string) => void;
 
-export abstract class UrlStateRouter {
-  push(href: string): void {}
+export interface UrlStateRouter {
+  push(href: string): void;
 
-  subscribe(fn: Callback): void {}
-  unsubscribe(fn: Callback): void {}
+  subscribe(fn: Callback): void;
+  unsubscribe(fn: Callback): void;
 }
 
 export type GenericRouterOptions = {
@@ -14,28 +14,27 @@ export type GenericRouterOptions = {
 const subscribers = new Map<Callback, Callback>();
 
 let genericRouterCurrentStateString = '';
-export class GenericRouter extends UrlStateRouter {
+export class GenericRouter implements UrlStateRouter {
   private interval: number = 0;
 
   constructor(private options: GenericRouterOptions) {
-    super();
     this.options = { poolingIntervalMs: 100, ...options };
   }
 
-  override push(href: string): void {
+  push(href: string): void {
     window.history.pushState({}, '', href);
     this.onSearchParamsChange();
   }
 
-  override subscribe(fn: Callback): void {
+  subscribe(fn: Callback): void {
     subscribers.set(fn, fn);
 
     if (!this.interval) {
       this.startPolling();
     }
   }
 
-  override unsubscribe(fn: Callback): void {
+  unsubscribe(fn: Callback): void {
     subscribers.delete(fn);
 
     if (subscribers.size === 0) {

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -1,5 +1,4 @@
 import { useRef } from 'react';
-import { DefaultSchema } from './types';
 
 function isNil(value: unknown): value is null | undefined {
   return value === null || value === undefined;