fix: more merge conflicts

Author: Swiftwork

packages/browser-sdk/src/feedback/ui/FeedbackDialog.tsx

@@ -41,6 +41,14 @@ export const FeedbackDialog: FunctionComponent<FeedbackDialogProps> = ({
     "idle" | "submitting" | "submitted"
   >("idle");
 
+  const { isOpen, close } = useDialog({ onClose, initialValue: true });
+
+  const autoClose = useTimer({
+    enabled: position.type === "DIALOG",
+    initialDuration: INACTIVE_DURATION_MS,
+    onEnd: close,
+  });
+
   const submit = useCallback(
     async (data: Omit<FeedbackSubmission, "feedbackId">) => {
       await onSubmit({ ...data, feedbackId });
@@ -61,15 +69,6 @@ export const FeedbackDialog: FunctionComponent<FeedbackDialogProps> = ({
     },
     [feedbackId, onScoreSubmit],
   );
-
-  const { isOpen, close } = useDialog({ onClose, initialValue: true });
-
-  const autoClose = useTimer({
-    enabled: position.type === "DIALOG",
-    initialDuration: INACTIVE_DURATION_MS,
-    onEnd: close,
-  });
-
   const dismiss = useCallback(() => {
     autoClose.stop();
     close();

packages/browser-sdk/src/ui/Dialog.tsx

@@ -47,21 +47,26 @@ export function useDialog({
   initialValue?: boolean;
 } = {}) {
   const [isOpen, setIsOpen] = useState<boolean>(initialValue);
+
+  const open = useCallback(() => {
+    setIsOpen(true);
+    onOpen?.();
+  }, [onOpen]);
+  const close = useCallback(() => {
+    setIsOpen(false);
+    onClose?.();
+  }, [onClose]);
+  const toggle = useCallback(() => {
+    if (isOpen) onClose?.();
+    else onOpen?.();
+    setIsOpen((prev) => !prev);
+  }, [isOpen, onClose, onOpen]);
+
   return {
     isOpen,
-    open: () => {
-      setIsOpen(true);
-      onOpen?.();
-    },
-    close: () => {
-      setIsOpen(false);
-      onClose?.();
-    },
-    toggle: () => {
-      if (isOpen) onClose?.();
-      else onOpen?.();
-      setIsOpen((prev) => !prev);
-    },
+    open,
+    close,
+    toggle,
   };
 }
 

packages/browser-sdk/test/client.test.ts

@@ -105,11 +105,11 @@ describe("BucketClient", () => {
       await client["company"]();
       expect(companyHook).toHaveBeenCalledWith(client["context"].company);
 
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getters triggering events
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getter triggering event
       client.getFeature("featureA").isEnabled;
       expect(checkHookIsEnabled).toHaveBeenCalled();
 
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getters triggering events
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getter triggering event
       client.getFeature("featureA").config;
       expect(checkHookConfig).toHaveBeenCalled();
 
@@ -137,9 +137,9 @@ describe("BucketClient", () => {
       await client.track("test-event");
       await client["user"]();
       await client["company"]();
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getters triggering events
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getter triggering event
       client.getFeature("featureA").isEnabled;
-      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getters triggering events
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions -- special getter triggering event
       client.getFeature("featureA").config;
       await client.updateOtherContext({ key: "value" });