@planningcenter/chat-react-native 4.4.1-qa-staging.10 → 4.4.1-qa-staging.11

package/build/hooks/use_mark_latest_message_read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use_mark_latest_message_read.d.ts","sourceRoot":"","sources":["../../src/hooks/use_mark_latest_message_read.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAIhE,UAAU,KAAK;IACb,YAAY,EAAE,oBAAoB,CAAA;IAClC,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,wBAAwB,CAAC,EAAE,YAAY,EAAE,OAAc,EAAE,EAAE,KAAK,QAqB/E"}
+{"version":3,"file":"use_mark_latest_message_read.d.ts","sourceRoot":"","sources":["../../src/hooks/use_mark_latest_message_read.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAIhE,UAAU,KAAK;IACb,YAAY,EAAE,oBAAoB,CAAA;IAClC,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,wBAAwB,CAAC,EAAE,YAAY,EAAE,OAAc,EAAE,EAAE,KAAK,QAsB/E"}

package/build/hooks/use_mark_latest_message_read.js

@@ -18,13 +18,13 @@ export function useMarkLatestMessageRead({
   }), [markRead]);
   const unreadCount = conversation.unreadCount;
   const unreadReaction = conversation.unreadReaction;
-  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReaction || !firedOnce.current);
+  const shouldMarkRead = !firedOnce.current || enabled && Boolean(unreadCount >= 1 || unreadReaction);
   const appState = useAppState();
   const isActive = appState === 'active';
   useEffect(() => {
-    if (!enabled || !isActive || !shouldMarkRead) return;
+    if (!isActive || !shouldMarkRead) return;
     firedOnce.current = true;
     debouncedMarkRead(true);
-  }, [debouncedMarkRead, enabled, isActive, shouldMarkRead, unreadReaction]);
+  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReaction]);
 }
 //# sourceMappingURL=use_mark_latest_message_read.js.map

package/build/hooks/use_mark_latest_message_read.js.map

@@ -1 +1 @@
-{"version":3,"file":"use_mark_latest_message_read.js","names":["debounce","useEffect","useMemo","useRef","useAppState","useConversationsMarkRead","useMarkLatestMessageRead","conversation","enabled","firedOnce","markRead","debouncedMarkRead","leading","trailing","unreadCount","unreadReaction","shouldMarkRead","Boolean","current","appState","isActive"],"sources":["../../src/hooks/use_mark_latest_message_read.ts"],"sourcesContent":["import { debounce } from 'lodash'\nimport { useEffect, useMemo, useRef } from 'react'\nimport { ConversationResource, MessageResource } from '../types'\nimport { useAppState } from './use_app_state'\nimport { useConversationsMarkRead } from './use_conversations_actions'\n\ninterface Props {\n  conversation: ConversationResource\n  messages: MessageResource[]\n  enabled?: boolean\n}\n\nexport function useMarkLatestMessageRead({ conversation, enabled = true }: Props) {\n  const firedOnce = useRef<boolean>(false)\n  const { markRead } = useConversationsMarkRead({ conversation })\n  const debouncedMarkRead = useMemo(\n    () => debounce(markRead, 1000, { leading: true, trailing: true }),\n    [markRead]\n  )\n  const unreadCount = conversation.unreadCount\n  const unreadReaction = conversation.unreadReaction\n\n  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReaction || !firedOnce.current)\n  const appState = useAppState()\n  const isActive = appState === 'active'\n\n  useEffect(() => {\n    if (!enabled || !isActive || !shouldMarkRead) return\n\n    firedOnce.current = true\n\n    debouncedMarkRead(true)\n  }, [debouncedMarkRead, enabled, isActive, shouldMarkRead, unreadReaction])\n}\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,QAAQ;AACjC,SAASC,SAAS,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AAElD,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,wBAAwB,QAAQ,6BAA6B;AAQtE,OAAO,SAASC,wBAAwBA,CAAC;EAAEC,YAAY;EAAEC,OAAO,GAAG;AAAY,CAAC,EAAE;EAChF,MAAMC,SAAS,GAAGN,MAAM,CAAU,KAAK,CAAC;EACxC,MAAM;IAAEO;EAAS,CAAC,GAAGL,wBAAwB,CAAC;IAAEE;EAAa,CAAC,CAAC;EAC/D,MAAMI,iBAAiB,GAAGT,OAAO,CAC/B,MAAMF,QAAQ,CAACU,QAAQ,EAAE,IAAI,EAAE;IAAEE,OAAO,EAAE,IAAI;IAAEC,QAAQ,EAAE;EAAK,CAAC,CAAC,EACjE,CAACH,QAAQ,CACX,CAAC;EACD,MAAMI,WAAW,GAAGP,YAAY,CAACO,WAAW;EAC5C,MAAMC,cAAc,GAAGR,YAAY,CAACQ,cAAc;EAElD,MAAMC,cAAc,GAAGC,OAAO,CAACH,WAAW,IAAI,CAAC,IAAIC,cAAc,IAAI,CAACN,SAAS,CAACS,OAAO,CAAC;EACxF,MAAMC,QAAQ,GAAGf,WAAW,CAAC,CAAC;EAC9B,MAAMgB,QAAQ,GAAGD,QAAQ,KAAK,QAAQ;EAEtClB,SAAS,CAAC,MAAM;IACd,IAAI,CAACO,OAAO,IAAI,CAACY,QAAQ,IAAI,CAACJ,cAAc,EAAE;IAE9CP,SAAS,CAACS,OAAO,GAAG,IAAI;IAExBP,iBAAiB,CAAC,IAAI,CAAC;EACzB,CAAC,EAAE,CAACA,iBAAiB,EAAEH,OAAO,EAAEY,QAAQ,EAAEJ,cAAc,EAAED,cAAc,CAAC,CAAC;AAC5E","ignoreList":[]}
+{"version":3,"file":"use_mark_latest_message_read.js","names":["debounce","useEffect","useMemo","useRef","useAppState","useConversationsMarkRead","useMarkLatestMessageRead","conversation","enabled","firedOnce","markRead","debouncedMarkRead","leading","trailing","unreadCount","unreadReaction","shouldMarkRead","current","Boolean","appState","isActive"],"sources":["../../src/hooks/use_mark_latest_message_read.ts"],"sourcesContent":["import { debounce } from 'lodash'\nimport { useEffect, useMemo, useRef } from 'react'\nimport { ConversationResource, MessageResource } from '../types'\nimport { useAppState } from './use_app_state'\nimport { useConversationsMarkRead } from './use_conversations_actions'\n\ninterface Props {\n  conversation: ConversationResource\n  messages: MessageResource[]\n  enabled?: boolean\n}\n\nexport function useMarkLatestMessageRead({ conversation, enabled = true }: Props) {\n  const firedOnce = useRef<boolean>(false)\n  const { markRead } = useConversationsMarkRead({ conversation })\n  const debouncedMarkRead = useMemo(\n    () => debounce(markRead, 1000, { leading: true, trailing: true }),\n    [markRead]\n  )\n  const unreadCount = conversation.unreadCount\n  const unreadReaction = conversation.unreadReaction\n\n  const shouldMarkRead =\n    !firedOnce.current || (enabled && Boolean(unreadCount >= 1 || unreadReaction))\n  const appState = useAppState()\n  const isActive = appState === 'active'\n\n  useEffect(() => {\n    if (!isActive || !shouldMarkRead) return\n\n    firedOnce.current = true\n\n    debouncedMarkRead(true)\n  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReaction])\n}\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,QAAQ;AACjC,SAASC,SAAS,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AAElD,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,wBAAwB,QAAQ,6BAA6B;AAQtE,OAAO,SAASC,wBAAwBA,CAAC;EAAEC,YAAY;EAAEC,OAAO,GAAG;AAAY,CAAC,EAAE;EAChF,MAAMC,SAAS,GAAGN,MAAM,CAAU,KAAK,CAAC;EACxC,MAAM;IAAEO;EAAS,CAAC,GAAGL,wBAAwB,CAAC;IAAEE;EAAa,CAAC,CAAC;EAC/D,MAAMI,iBAAiB,GAAGT,OAAO,CAC/B,MAAMF,QAAQ,CAACU,QAAQ,EAAE,IAAI,EAAE;IAAEE,OAAO,EAAE,IAAI;IAAEC,QAAQ,EAAE;EAAK,CAAC,CAAC,EACjE,CAACH,QAAQ,CACX,CAAC;EACD,MAAMI,WAAW,GAAGP,YAAY,CAACO,WAAW;EAC5C,MAAMC,cAAc,GAAGR,YAAY,CAACQ,cAAc;EAElD,MAAMC,cAAc,GAClB,CAACP,SAAS,CAACQ,OAAO,IAAKT,OAAO,IAAIU,OAAO,CAACJ,WAAW,IAAI,CAAC,IAAIC,cAAc,CAAE;EAChF,MAAMI,QAAQ,GAAGf,WAAW,CAAC,CAAC;EAC9B,MAAMgB,QAAQ,GAAGD,QAAQ,KAAK,QAAQ;EAEtClB,SAAS,CAAC,MAAM;IACd,IAAI,CAACmB,QAAQ,IAAI,CAACJ,cAAc,EAAE;IAElCP,SAAS,CAACQ,OAAO,GAAG,IAAI;IAExBN,iBAAiB,CAAC,IAAI,CAAC;EACzB,CAAC,EAAE,CAACA,iBAAiB,EAAES,QAAQ,EAAEJ,cAAc,EAAED,cAAc,CAAC,CAAC;AACnE","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "4.4.1-qa-staging.10",
+  "version": "4.4.1-qa-staging.11",
   "description": "",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^7.2.0",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@planningcenter/emoji-keyboard": "4.4.1-qa-staging.10",
+    "@planningcenter/emoji-keyboard": "4.4.1-qa-staging.11",
     "lodash-inflection": "^1.5.0"
   },
   "peerDependencies": {
@@ -84,5 +84,5 @@
     "sf-symbols-typescript": "^2.2.0",
     "typescript": "~6.0.3"
   },
-  "gitHead": "1e3d2b7deafd780d4651c8da8adc7083ff348c3d"
+  "gitHead": "f32cabf4c0fcc893fd82b53d6b780bf1371a930b"
 }

package/src/hooks/__tests__/use_mark_latest_message_read.test.tsx

@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-native'
+import { act, renderHook } from '@testing-library/react-native'
 import type { ConversationResource } from '../../types'
 import { useMarkLatestMessageRead } from '../use_mark_latest_message_read'
 
@@ -19,15 +19,29 @@ describe('useMarkLatestMessageRead', () => {
     expect(mockMarkRead).toHaveBeenCalledTimes(1)
   })
 
-  it('waits while disabled and marks read once enabled', () => {
-    const { rerender } = renderHook<void, { enabled: boolean }>(
-      ({ enabled }) => useMarkLatestMessageRead({ conversation, messages: [], enabled }),
-      { initialProps: { enabled: false } }
+  it('marks read once on mount even while disabled', () => {
+    renderHook(() => useMarkLatestMessageRead({ conversation, messages: [], enabled: false }))
+
+    expect(mockMarkRead).toHaveBeenCalledTimes(1)
+  })
+
+  it('ignores unread bumps while disabled and marks read once enabled', () => {
+    jest.useFakeTimers()
+    const { rerender } = renderHook<void, { conversation: ConversationResource; enabled: boolean }>(
+      props => useMarkLatestMessageRead({ ...props, messages: [] }),
+      { initialProps: { conversation: { ...conversation, unreadCount: 0 }, enabled: false } }
     )
-    expect(mockMarkRead).not.toHaveBeenCalled()
+    expect(mockMarkRead).toHaveBeenCalledTimes(1)
 
-    rerender({ enabled: true })
+    rerender({ conversation: { ...conversation, unreadCount: 2 }, enabled: false })
+    act(() => jest.advanceTimersByTime(1000))
 
     expect(mockMarkRead).toHaveBeenCalledTimes(1)
+
+    rerender({ conversation: { ...conversation, unreadCount: 2 }, enabled: true })
+    act(() => jest.advanceTimersByTime(1000))
+
+    expect(mockMarkRead).toHaveBeenCalledTimes(2)
+    jest.useRealTimers()
   })
 })

package/src/hooks/use_mark_latest_message_read.ts

@@ -20,15 +20,16 @@ export function useMarkLatestMessageRead({ conversation, enabled = true }: Props
   const unreadCount = conversation.unreadCount
   const unreadReaction = conversation.unreadReaction
 
-  const shouldMarkRead = Boolean(unreadCount >= 1 || unreadReaction || !firedOnce.current)
+  const shouldMarkRead =
+    !firedOnce.current || (enabled && Boolean(unreadCount >= 1 || unreadReaction))
   const appState = useAppState()
   const isActive = appState === 'active'
 
   useEffect(() => {
-    if (!enabled || !isActive || !shouldMarkRead) return
+    if (!isActive || !shouldMarkRead) return
 
     firedOnce.current = true
 
     debouncedMarkRead(true)
-  }, [debouncedMarkRead, enabled, isActive, shouldMarkRead, unreadReaction])
+  }, [debouncedMarkRead, isActive, shouldMarkRead, unreadReaction])
 }