refactor: move common types to types.ts

jamsubu · May 21, 2024 · 4cc5eca · 4cc5eca
1 parent deec3ea
commit 4cc5eca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/packages/headlessui-react-native/package.json b/packages/headlessui-react-native/package.json
@@ -2,7 +2,7 @@
   "name": "headlessui-react-native",
   "title": "HeadlessUI React Native",
   "description": "This is an unstyled, accessible headless UI library for React Native.",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "homepage": "https://headlessui-react-native.vercel.app",

diff --git a/packages/headlessui-react-native/src/disclosure.tsx b/packages/headlessui-react-native/src/disclosure.tsx
@@ -1,11 +1,8 @@
 import React, { useState } from "react";
 import { View, ViewProps, PressableProps, Pressable } from "react-native";
-import {
-  RenderPropsCallableComponent,
-  UIContext,
-  useUIContext,
-} from "./useUIContext";
+import { UIContext, useUIContext } from "./useUIContext";
 import { CallableChildren } from "./callableChildren";
+import { RenderPropsCallableComponent } from "./types";
 
 export type DisclosureProps = {
   defaultOpen?: boolean;

diff --git a/packages/headlessui-react-native/src/modal.tsx b/packages/headlessui-react-native/src/modal.tsx
@@ -9,12 +9,9 @@ import {
   View,
   ViewProps,
 } from "react-native";
-import {
-  RenderPropsCallableComponent,
-  UIContext,
-  useUIContext,
-} from "./useUIContext";
+import { UIContext, useUIContext } from "./useUIContext";
 import { CallableChildren } from "./callableChildren";
+import { RenderPropsCallableComponent } from "./types";
 
 export type ModalProps = {
   onClose: () => void;

diff --git a/packages/headlessui-react-native/src/types.ts b/packages/headlessui-react-native/src/types.ts
@@ -0,0 +1,10 @@
+import { ReactNode } from "react";
+import { ViewProps, PressableProps } from "react-native";
+
+export type RenderPropsCallableComponent<
+  T extends ViewProps | PressableProps,
+  /* props to return */
+  U extends unknown
+> = {
+  children: ReactNode | ((props: U) => ReactNode);
+} & Omit<T, "children">;
diff --git a/packages/headlessui-react-native/src/useUIContext.ts b/packages/headlessui-react-native/src/useUIContext.ts
@@ -1,5 +1,4 @@
-import { ReactNode, createContext, useContext } from "react";
-import { ViewProps, PressableProps } from "react-native";
+import { createContext, useContext } from "react";
 
 type UIContextValue = {
   onClose: () => void;
@@ -13,15 +12,7 @@ export const UIContext = createContext<UIContextValue | undefined>(undefined);
 export const useUIContext = () => {
   const context = useContext(UIContext);
   if (!context) {
-    throw new Error("useModal must be used within a Provider");
+    throw new Error("useUIContext must be used within a Provider");
   }
   return context;
 };
-
-export type RenderPropsCallableComponent<
-  T extends ViewProps | PressableProps,
-  /* props to return */
-  U extends unknown
-> = {
-  children: ReactNode | ((props: U) => ReactNode);
-} & Omit<T, "children">;