Merge pull request #330 from VKCOM/pavelnikitin/fix/exportTypes

Add export Blocker and BlockerFunction types

CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.4.1
+-
+- Добавили типы BlockerFunction и Blocker
+
 v1.4.0
 -
 - Избавились от UNSAFE методов библиотеки @remix-run/router

examples/vk-mini-apps-router-example/src/modals/BlockerModal.tsx

@@ -10,9 +10,8 @@ import {
   ModalPageHeader,
 } from '@vkontakte/vkui';
 
-import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
+import { BlockerFunction, useRouteNavigator,  } from '@vkontakte/vk-mini-apps-router';
 import { NavProp } from '../types';
-import { BlockerFunction } from '@remix-run/router';
 
 const PASSWORD = '1234';
 

examples/vk-mini-apps-router-example/src/panels/Blocker.tsx

@@ -7,8 +7,8 @@ import {
   useEnableSwipeBack,
   useBlocker,
   useActiveVkuiLocation,
+  BlockerFunction,
 } from '@vkontakte/vk-mini-apps-router';
-import { Action, BlockerFunction } from '@remix-run/router';
 import { DEFAULT_VIEW_PANELS } from '../routes';
 
 export const Blocker = ({ nav }: NavProp) => {
@@ -17,7 +17,7 @@ export const Blocker = ({ nav }: NavProp) => {
   const routeNavigator = useRouteNavigator();
 
   const blockerFn = useCallback<BlockerFunction>(({ historyAction }) => {
-    return historyAction !== Action.Push;
+    return historyAction !== "PUSH";
   }, []);
 
   const blocker = useBlocker(blockerFn);

src/index.ts

@@ -1,3 +1,4 @@
+export type { BlockerFunction, Blocker } from '@remix-run/router';
 export type { RouteWithoutRoot, RouteWithRoot, RouteLeaf } from './type';
 export type { RouterProviderProps } from './components/RouterProvider';
 export { RouterProvider } from './components/RouterProvider';
@@ -6,11 +7,7 @@ export { createHashRouter } from './utils/createHashRouter';
 export { createHashParamRouter } from './utils/createHashParamRouter';
 export { createBrowserRouter } from './utils/createBrowserRouter';
 
-export {
-  useRouteNavigator,
-  useParams,
-  usePopout,
-} from './hooks/hooks';
+export { useRouteNavigator, useParams, usePopout } from './hooks/hooks';
 export { useGetPanelForView } from './hooks/useGetPanelForView';
 export { useSearchParams } from './hooks/useSearchParams';
 export { useMetaParams } from './hooks/useMetaParams';
@@ -26,4 +23,11 @@ export { withRouter } from './hoc/withRouter';
 export type { RouteNavigator } from './services/RouteNavigator.type';
 export { getInitialLocation } from './services/InitialLocation';
 
-export { RoutesConfig, createView, createRoot, createPanel, createTab, createModal } from './page-types';
+export {
+  RoutesConfig,
+  createView,
+  createRoot,
+  createPanel,
+  createTab,
+  createModal,
+} from './page-types';