split react-textarea into react-ui component

ataibarkai · ataibarkai · commit 4010c99c7ee6 · 2023-08-22T22:50:57.000-07:00
diff --git a/examples/next-openai/src/app/components/vacation-notes.tsx b/examples/next-openai/src/app/components/vacation-notes.tsx
@@ -1,4 +1,4 @@
-import { CopilotTextarea } from "@copilotkit/react-textarea";
+import { CopilotTextarea } from "@copilotkit/react-ui";
 import { useState } from "react";
 
 export function VacationNotes(): JSX.Element {
diff --git a/examples/next-openai/src/app/copilot-textarea/page.tsx b/examples/next-openai/src/app/copilot-textarea/page.tsx
@@ -4,11 +4,8 @@ import {
   CopilotProvider,
   useMakeCopilotReadable,
 } from "@copilotkit/react-core";
-import {
-  CopilotTextarea,
-  MinimalChatGPTMessage,
-} from "@copilotkit/react-textarea";
-import { MakeSystemPrompt } from "@copilotkit/react-textarea/dist/types/autosuggestions-config";
+import { CopilotTextarea, MinimalChatGPTMessage } from "@copilotkit/react-ui";
+import { MakeSystemPrompt } from "@copilotkit/react-ui";
 import { useState } from "react";
 
 export default function CopilotTextareaDemo(): JSX.Element {
diff --git a/packages/react-textarea/package.json b/packages/react-textarea/package.json
@@ -38,7 +38,6 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@copilotkit/react-core": "workspace:*",
     "ai": "^2.1.22",
     "class-variance-authority": "^0.6.1",
     "clsx": "^1.2.1",
diff --git a/packages/react-textarea/src/components/copilot-textarea/base-copilot-textarea/base-copilot-textarea.tsx b/packages/react-textarea/src/components/copilot-textarea/base-copilot-textarea/base-copilot-textarea.tsx
@@ -9,10 +9,8 @@ import {
 import { Descendant, Editor } from "slate";
 import { Editable, Slate } from "slate-react";
 import { twMerge } from "tailwind-merge";
-import {
-  AutosuggestionsBareFunction,
-  useAutosuggestions,
-} from "../../../hooks/use-autosuggestions";
+import { useAutosuggestions } from "../../../hooks/use-autosuggestions";
+import { AutosuggestionsBareFunction } from "../../../types/autosuggestions-bare-function";
 import { useCopilotTextareaEditor } from "../../../hooks/use-copilot-textarea-editor";
 import {
   getFullEditorTextWithNewlines,
diff --git a/packages/react-textarea/src/components/index.ts b/packages/react-textarea/src/components/index.ts
@@ -1,2 +1,2 @@
 export { BaseCopilotTextarea } from "./copilot-textarea/base-copilot-textarea/base-copilot-textarea";
-export { CopilotTextarea } from "./copilot-textarea/copilot-textarea";
+export type { BaseCopilotTextareaProps } from "./copilot-textarea/base-copilot-textarea/base-copilot-textarea";
diff --git a/packages/react-textarea/src/hooks/index.ts b/packages/react-textarea/src/hooks/index.ts
@@ -1 +1 @@
-export { useMakeAutosuggestionFunction } from "./make-autosuggestions-function/use-make-standard-autosuggestions-function";
+export {};
diff --git a/packages/react-textarea/src/hooks/use-autosuggestions.ts b/packages/react-textarea/src/hooks/use-autosuggestions.ts
@@ -6,19 +6,14 @@ import {
   EditorAutocompleteState,
   areEqual_autocompleteState,
 } from "../types/editor-autocomplete-state";
+import { AutosuggestionsBareFunction } from "../types/autosuggestions-bare-function";
 
 export interface UseAutosuggestionsResult {
   currentAutocompleteSuggestion: AutosuggestionState | null;
   onChangeHandler: (newEditorState: EditorAutocompleteState | null) => void;
   onKeyDownHandler: (event: React.KeyboardEvent<HTMLDivElement>) => void;
 }
 
-export type AutosuggestionsBareFunction = (
-  textBefore: string,
-  textAfter: string,
-  abortSignal: AbortSignal
-) => Promise<string>;
-
 export function useAutosuggestions(
   debounceTime: number,
   acceptAutosuggestionKey: string,
diff --git a/packages/react-textarea/src/types/autosuggestions-bare-function.ts b/packages/react-textarea/src/types/autosuggestions-bare-function.ts
@@ -0,0 +1,5 @@
+export type AutosuggestionsBareFunction = (
+  textBefore: string,
+  textAfter: string,
+  abortSignal: AbortSignal
+) => Promise<string>;
diff --git a/packages/react-textarea/src/types/index.ts b/packages/react-textarea/src/types/index.ts
@@ -1,6 +1,4 @@
-export type {
-  AutosuggestionsConfig,
-  MakeSystemPrompt as MakeSystemMessage,
-} from "./autosuggestions-config";
+export { defaultBaseAutosuggestionsConfig } from "./base-autosuggestions-config";
 
-export type { MinimalChatGPTMessage } from "./MinimalChatGPTMessage";
+export type { BaseAutosuggestionsConfig } from "./base-autosuggestions-config";
+export type { AutosuggestionsBareFunction } from "./autosuggestions-bare-function";
diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@copilotkit/react-core": "workspace:*",
+    "@copilotkit/react-textarea": "workspace:*",
     "@heroicons/react": "^2.0.18",
     "@radix-ui/react-alert-dialog": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.4",
diff --git a/packages/react-ui/src/components/copilot-textarea/copilot-textarea.tsx b/packages/react-ui/src/components/copilot-textarea/copilot-textarea.tsx
@@ -1,13 +1,13 @@
 // This example is for an Editor with `ReactEditor` and `HistoryEditor`
-import { useMakeAutosuggestionFunction as useMakeStandardAutosuggestionFunction } from "../../hooks";
+import { useMakeStandardAutosuggestionFunction } from "../../hooks/make-autosuggestions-function/use-make-standard-autosuggestions-function";
 import {
   AutosuggestionsConfig,
   defaultAutosuggestionsConfig,
 } from "../../types/autosuggestions-config";
 import {
   BaseCopilotTextarea,
   BaseCopilotTextareaProps,
-} from "./base-copilot-textarea/base-copilot-textarea";
+} from "@copilotkit/react-textarea";
 
 export interface CopilotTextareaProps extends BaseCopilotTextareaProps {
   autosuggestionsConfig: Partial<AutosuggestionsConfig> & {
diff --git a/packages/react-ui/src/components/index.ts b/packages/react-ui/src/components/index.ts
@@ -5,3 +5,6 @@ export { CopilotSidebarUIProvider } from "./sidebar/copilot-sidebar-ui-provider"
 export { CopilotSidebar } from "./sidebar/copilot-sidebar";
 export { CopilotSidebarContext } from "./sidebar/sidebar-context";
 export type { CopilotSidebarContextType } from "./sidebar/sidebar-context";
+
+export { CopilotTextarea } from "./copilot-textarea/copilot-textarea";
+export type { CopilotTextareaProps } from "./copilot-textarea/copilot-textarea";
diff --git a/packages/react-ui/src/hooks/make-autosuggestions-function/use-make-standard-autosuggestions-function.tsx b/packages/react-ui/src/hooks/make-autosuggestions-function/use-make-standard-autosuggestions-function.tsx
@@ -1,8 +1,8 @@
 import { CopilotContext } from "@copilotkit/react-core";
 import { useCallback, useContext } from "react";
-import { MakeSystemMessage } from "../../types";
-import { MinimalChatGPTMessage } from "../../types/MinimalChatGPTMessage";
-import { AutosuggestionsBareFunction } from "../use-autosuggestions";
+import { MakeSystemPrompt } from "../../types";
+import { MinimalChatGPTMessage } from "../../types/minimal-chatgpt-message";
+import { AutosuggestionsBareFunction } from "@copilotkit/react-textarea";
 
 /**
  * Returns a memoized function that sends a request to the specified API endpoint to get an autosuggestion for the user's input.
@@ -17,10 +17,10 @@ import { AutosuggestionsBareFunction } from "../use-autosuggestions";
  * @param contextCategories - The categories of context strings we want to include. By default, we include the (default) "global" context category.
  * @returns A memoized function that sends a request to the specified API endpoint to get an autosuggestion for the user's input.
  */
-export function useMakeAutosuggestionFunction(
+export function useMakeStandardAutosuggestionFunction(
   purposePrompt: string,
   apiEndpoint: string,
-  makeSystemMessage: MakeSystemMessage,
+  makeSystemPrompt: MakeSystemPrompt,
   fewShotMessages: MinimalChatGPTMessage[],
   contextCategories: string[] | undefined,
   forwardedProps?: { [key: string]: any }
@@ -37,7 +37,7 @@ export function useMakeAutosuggestionFunction(
             messages: [
               {
                 role: "system",
-                content: makeSystemMessage(
+                content: makeSystemPrompt(
                   purposePrompt,
                   getContextString(contextCategories)
                 ),
@@ -66,7 +66,7 @@ export function useMakeAutosuggestionFunction(
     },
     [
       apiEndpoint,
-      makeSystemMessage,
+      makeSystemPrompt,
       fewShotMessages,
       getContextString,
       contextCategories,
diff --git a/packages/react-ui/src/types/autosuggestions-config.tsx b/packages/react-ui/src/types/autosuggestions-config.tsx
@@ -1,8 +1,8 @@
 import {
   BaseAutosuggestionsConfig,
   defaultBaseAutosuggestionsConfig,
-} from "./base-autosuggestions-config";
-import { MinimalChatGPTMessage } from "./MinimalChatGPTMessage";
+} from "@copilotkit/react-textarea";
+import { MinimalChatGPTMessage } from "./minimal-chatgpt-message";
 
 export type MakeSystemPrompt = (
   purposePrompt: string,
diff --git a/packages/react-ui/src/types/index.ts b/packages/react-ui/src/types/index.ts
@@ -1 +1,10 @@
-export {};
+export type { MinimalChatGPTMessage } from "./minimal-chatgpt-message";
+export type {
+  MakeSystemPrompt,
+  AutosuggestionsConfig,
+} from "./autosuggestions-config";
+export {
+  defaultAutosuggestionsConfig,
+  defaultMakeSystemPrompt,
+  defaultFewShotMessages,
+} from "./autosuggestions-config";
diff --git a/packages/react-ui/src/types/minimal-chatgpt-message.tsx b/packages/react-ui/src/types/minimal-chatgpt-message.tsx
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CopilotTextarea } from "@copilotkit/react-textarea";`
	`1`	`+import { CopilotTextarea } from "@copilotkit/react-ui";`
`2`	`2`	`import { useState } from "react";`
`3`	`3`
`4`	`4`	`export function VacationNotes(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`export { BaseCopilotTextarea } from "./copilot-textarea/base-copilot-textarea/base-copilot-textarea";`
`2`		`-export { CopilotTextarea } from "./copilot-textarea/copilot-textarea";`
	`2`	`+export type { BaseCopilotTextareaProps } from "./copilot-textarea/base-copilot-textarea/base-copilot-textarea";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { useMakeAutosuggestionFunction } from "./make-autosuggestions-function/use-make-standard-autosuggestions-function";`
	`1`	`+export {};`