@yorkie-js/react 0.6.6 → 0.6.7-rc

package/dist/yorkie-js-react.d.ts

@@ -1,3 +1,4 @@
+import { ClientOptions } from '@yorkie-js/sdk';
 import { default as default_2 } from 'react';
 import { Indexable } from '@yorkie-js/sdk';
 import { JSONArray } from '@yorkie-js/sdk';
@@ -68,10 +69,9 @@ export declare const useRoot: () => {
  * @param docKey
  * @returns
  */
-export declare function useYorkieDoc<R, P extends Indexable>(apiKey: string, docKey: string, options?: {
+export declare function useYorkieDoc<R, P extends Indexable = Indexable>(apiKey: string, docKey: string, opts?: Omit<ClientOptions, 'apiKey'> & {
     initialRoot?: R;
     initialPresence?: P;
-    rpcAddr?: string;
 }): {
     root: R;
     presences: Array<{
@@ -88,14 +88,6 @@ export declare function useYorkieDoc<R, P extends Indexable>(apiKey: string, doc
  * `YorkieProvider` is a component that provides the Yorkie client to its children.
  * It initializes the Yorkie client with the given API key and RPC address.
  */
-export declare const YorkieProvider: React.FC<PropsWithChildren<YorkieProviderProps>>;
-
-/**
- * `YorkieProviderProps` is a set of properties for `YorkieProvider`.
- */
-declare interface YorkieProviderProps {
-    apiKey: string;
-    rpcAddr?: string;
-}
+export declare const YorkieProvider: React.FC<PropsWithChildren<ClientOptions>>;
 
 export { }

package/dist/yorkie-js-react.es.js

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a, _b, _c, _d, _e, _f, _g, _h, _i;
 import { jsx } from "react/jsx-runtime";
-import { createContext, useState, useEffect, useContext, useCallback } from "react";
+import { createContext, useMemo, useState, useEffect, useContext, useCallback } from "react";
 var Code$1;
 (function(Code2) {
   Code2[Code2["Canceled"] = 1] = "Canceled";
@@ -3699,9 +3699,6 @@ function createClient(service, transport) {
     }
   });
 }
-function createPromiseClient(service, transport) {
-  return createClient(service, transport);
-}
 function createUnaryFn(transport, service, method) {
   return async function(input, options) {
     var _a2, _b2;
@@ -20267,6 +20264,7 @@ var SyncMode = /* @__PURE__ */ ((SyncMode2) => {
   return SyncMode2;
 })(SyncMode || {});
 const DefaultClientOptions = {
+  rpcAddr: "https://api.yorkie.dev",
   syncLoopDuration: 50,
   retrySyncLoopDelay: 1e3,
   reconnectStreamDelay: 1e3
@@ -20281,7 +20279,7 @@ class Client {
    * @param rpcAddr - the address of the RPC server.
    * @param opts - the options of the client.
    */
-  constructor(rpcAddr, opts) {
+  constructor(opts) {
     __publicField(this, "id");
     __publicField(this, "key");
     __publicField(this, "metadata");
@@ -20299,7 +20297,8 @@ class Client {
     __publicField(this, "processing", false);
     __publicField(this, "keepalive", false);
     opts = opts || DefaultClientOptions;
-    this.key = opts.key ? opts.key : uuid();
+    const rpcAddr = opts.rpcAddr || DefaultClientOptions.rpcAddr;
+    this.key = opts.key || uuid();
     this.metadata = opts.metadata || {};
     this.status = "deactivated";
     this.attachmentMap = /* @__PURE__ */ new Map();
@@ -20320,7 +20319,7 @@ class Client {
     this.retrySyncLoopDelay = opts.retrySyncLoopDelay ?? DefaultClientOptions.retrySyncLoopDelay;
     const { authInterceptor, setToken } = createAuthInterceptor(this.apiKey);
     this.setAuthToken = setToken;
-    this.rpcClient = createPromiseClient(
+    this.rpcClient = createClient(
       YorkieService,
       createGrpcWebTransport({
         baseUrl: rpcAddr,
@@ -21087,7 +21086,7 @@ const YorkieContext = createContext({
   loading: true,
   error: void 0
 });
-function useYorkieClient(apiKey, rpcAddr) {
+function useYorkieClient(opts) {
   const [client, setClient] = useState(void 0);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(void 0);
@@ -21103,9 +21102,7 @@ function useYorkieClient(apiKey, rpcAddr) {
         return;
       }
       try {
-        const newClient = new Client(rpcAddr, {
-          apiKey
-        });
+        const newClient = new Client(opts);
         await newClient.activate();
         setClient(newClient);
       } catch (e) {
@@ -21122,11 +21119,21 @@ function useYorkieClient(apiKey, rpcAddr) {
         client.deactivate({ keepalive: true });
       }
     };
-  }, [apiKey, rpcAddr, didMount]);
+  }, [opts.apiKey, opts.rpcAddr, didMount]);
   return { client, loading, error };
 }
-const YorkieProvider = ({ apiKey, rpcAddr = "https://api.yorkie.dev", children }) => {
-  const { client, loading, error } = useYorkieClient(apiKey, rpcAddr);
+const YorkieProvider = ({
+  children,
+  ...rest
+}) => {
+  const opts = useMemo(
+    () => ({
+      apiKey: rest.apiKey,
+      rpcAddr: rest.rpcAddr
+    }),
+    [rest.apiKey, rest.rpcAddr]
+  );
+  const { client, loading, error } = useYorkieClient(opts);
   return /* @__PURE__ */ jsx(YorkieContext.Provider, { value: { client, loading, error }, children });
 };
 const useYorkie = () => {
@@ -21289,22 +21296,25 @@ const useConnection = () => {
   }
   return context.connection;
 };
-function useYorkieDoc(apiKey, docKey, options) {
-  const rpcAddr = (options == null ? void 0 : options.rpcAddr) || "https://api.yorkie.dev";
-  const initialRoot = (options == null ? void 0 : options.initialRoot) || {};
-  const initialPresence = (options == null ? void 0 : options.initialPresence) || {};
+function useYorkieDoc(apiKey, docKey, opts) {
+  const clientOpts = useMemo(() => {
+    return {
+      apiKey,
+      ...opts
+    };
+  }, [apiKey, docKey]);
   const {
     client,
     loading: clientLoading,
     error: clientError
-  } = useYorkieClient(apiKey, rpcAddr);
+  } = useYorkieClient(clientOpts);
   const { root, presences, connection, update, loading, error } = useYorkieDocument(
     client,
     clientLoading,
     clientError,
     docKey,
-    initialRoot,
-    initialPresence
+    opts == null ? void 0 : opts.initialRoot,
+    opts == null ? void 0 : opts.initialPresence
   );
   return {
     root,