Merge branch 'master' of https://github.com/alibaba/hooks

Author: crazylxr

packages/hooks/src/useSet/index.ts

@@ -5,25 +5,27 @@ function useSet<K>(initialValue?: Iterable<K>) {
   const getInitValue = () => new Set(initialValue);
   const [set, setSet] = useState<Set<K>>(getInitValue);
 
+  const updateSet = (updater: (set: Set<K>) => Set<K>) => {
+    setSet((prevSet) => updater(new Set(prevSet)));
+  };
+
   const add = (key: K) => {
     if (set.has(key)) {
       return;
     }
-    setSet((prevSet) => {
-      const temp = new Set(prevSet);
-      temp.add(key);
-      return temp;
+    updateSet((newSet) => {
+      newSet.add(key);
+      return newSet;
     });
   };
 
   const remove = (key: K) => {
     if (!set.has(key)) {
       return;
     }
-    setSet((prevSet) => {
-      const temp = new Set(prevSet);
-      temp.delete(key);
-      return temp;
+    updateSet((newSet) => {
+      newSet.delete(key);
+      return newSet;
     });
   };
 

packages/hooks/src/useWebSocket/index.ts

@@ -43,20 +43,20 @@ function useWebSocket(socketUrl: string, options: Options = {}): Result {
     protocols,
   } = options;
 
+  const [latestMessage, setLatestMessage] = useState<WebSocketEventMap['message']>();
+  const [readyState, setReadyState] = useState<ReadyState>(ReadyState.Closed);
+
   const onOpenRef = useLatest(onOpen);
   const onCloseRef = useLatest(onClose);
   const onMessageRef = useLatest(onMessage);
   const onErrorRef = useLatest(onError);
+  const readyStateRef = useLatest(readyState);
 
   const reconnectTimesRef = useRef(0);
   const reconnectTimerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
 
   const websocketRef = useRef<WebSocket>(undefined);
 
-  const [latestMessage, setLatestMessage] = useState<MessageEvent>();
-
-  const [readyState, setReadyState] = useState<ReadyState>(ReadyState.Closed);
-
   const reconnect = () => {
     if (
       reconnectTimesRef.current < reconnectLimit &&
@@ -125,7 +125,7 @@ function useWebSocket(socketUrl: string, options: Options = {}): Result {
   };
 
   const sendMessage: WebSocket['send'] = (message) => {
-    if (readyState === ReadyState.Open) {
+    if (readyStateRef.current === ReadyState.Open) {
       websocketRef.current?.send(message);
     } else {
       throw new Error('WebSocket disconnected');