@planningcenter/chat-react-native 3.33.1 → 3.33.2-qa-664.1

package/src/hooks/use_api.ts

@@ -6,6 +6,7 @@ import {
 } from '@tanstack/react-query'
 import { ApiCollection, ApiResource, FailedResponse, ResourceObject } from '../types'
 import { GetRequest, RequestData } from '../utils/client'
+import { getNextPageParamFromMeta } from './paginator_meta'
 import { App, useApiClient } from './use_api_client'
 import { getRequestQueryKey, RequestQueryKey } from './use_suspense_api'
 
@@ -31,11 +32,6 @@ export const useApiGet = <T extends ResourceObject | ResourceObject[]>(args: Api
   return { ...data, ...query }
 }
 
-type NextMeta = Partial<{
-  offset: string
-  idLt: string
-}>
-
 export type PaginatorOptions = Omit<
   AnyUseSuspenseInfiniteQueryOptions,
   'getNextPageParam' | 'initialPageParam' | 'queryFn' | 'queryKey'
@@ -68,15 +64,7 @@ export const useApiPaginator = <T extends ResourceObject>(
       })
     },
     initialPageParam: {} as Partial<RequestData>,
-    getNextPageParam: lastPage => {
-      const next: NextMeta = lastPage.meta?.next || {}
-      const { offset, idLt } = next
-
-      if (idLt) return { where: { id_lt: idLt } }
-      if (offset) return { offset: Number(offset) }
-
-      return undefined
-    },
+    getNextPageParam: lastPage => getNextPageParamFromMeta(lastPage.meta?.next),
     enabled: args.enabled,
     ...(opts || {}),
   })

package/src/hooks/use_chat_configuration.ts

@@ -7,6 +7,7 @@ import {
 } from '../utils/request/get_chat_configuration'
 import {
   FALLBACK_ALLOWED_FILE_EXTENSIONS,
+  FALLBACK_ALLOWED_MIME_TYPES,
   FALLBACK_MAX_ATTACHMENTS_PER_MESSAGE,
   FALLBACK_MAX_FILE_SIZE_IN_BYTES,
 } from './attachments/fallback_chat_configuration'
@@ -34,6 +35,13 @@ export function useChatConfiguration() {
 
   return {
     allowedFileExtensions: attrs.allowedFileExtensions,
+    // During the server-side rollout the API may omit allowedMimeTypes.
+    // The static fallback covers the same set of file kinds as the server's
+    // hardcoded ALLOWED_FILE_EXTENSIONS, so the picker filter and the
+    // post-pick extension validator agree. Once the server always returns
+    // allowedMimeTypes, the resource type can tighten from optional to
+    // required and this nullish-coalesce becomes pure defense-in-depth.
+    allowedMimeTypes: attrs.allowedMimeTypes ?? FALLBACK_ALLOWED_MIME_TYPES,
     maxFileSizeInBytes: attrs.maxFileSizeInBytes,
     maxAttachmentsPerMessage: attrs.maxAttachmentsPerMessage,
   }
@@ -46,6 +54,7 @@ const stableFallbackConfiguration: ApiResource<ChatConfigurationResource> = {
     type: 'ChatConfiguration',
     id: 'current',
     allowedFileExtensions: FALLBACK_ALLOWED_FILE_EXTENSIONS,
+    allowedMimeTypes: FALLBACK_ALLOWED_MIME_TYPES,
     maxFileSizeInBytes: FALLBACK_MAX_FILE_SIZE_IN_BYTES,
     maxAttachmentsPerMessage: FALLBACK_MAX_ATTACHMENTS_PER_MESSAGE,
   },

package/src/hooks/use_suspense_api.ts

@@ -10,6 +10,7 @@ import { FailedResponse } from '../types/api_primitives'
 import { Log } from '../utils'
 import { GetRequest, RequestData } from '../utils/client'
 import { ResponseError } from '../utils/response_error'
+import { getNextPageParamFromMeta } from './paginator_meta'
 import { App, useApiClient } from './use_api_client'
 
 interface SuspenseGetOptions extends GetRequest {
@@ -43,11 +44,6 @@ export const useSuspenseGet = <T extends ResourceObject | ResourceObject[]>(
   return { ...data, ...query }
 }
 
-type NextMeta = Partial<{
-  offset: string
-  idLt: string
-}>
-
 export type SuspensePaginatorOptions = Omit<
   AnyUseSuspenseInfiniteQueryOptions,
   'getNextPageParam' | 'initialPageParam' | 'queryFn' | 'queryKey'
@@ -84,15 +80,7 @@ export const useSuspensePaginator = <T extends ResourceObject>(
         .catch(throwResponseError)
     },
     initialPageParam: {} as Partial<RequestData>,
-    getNextPageParam: lastPage => {
-      const next: NextMeta = lastPage.meta?.next || {}
-      const { offset, idLt } = next
-
-      if (idLt) return { where: { id_lt: idLt } }
-      if (offset) return { offset: Number(offset) }
-
-      return undefined
-    },
+    getNextPageParam: lastPage => getNextPageParamFromMeta(lastPage.meta?.next),
     ...(opts || {}),
   })
 

package/src/index.tsx

@@ -12,5 +12,6 @@ export * from './types'
 export { platformFontWeightBold, Session, TemporaryDefaultColorsType, Uri } from './utils'
 export * from './utils/client'
 export * from './utils/native_adapters'
+export { ResponseError } from './utils/response_error'
 export { default as Event } from './polyfills/events/Event'
 export { CustomEvent } from './polyfills/events/CustomEvent'

package/src/screens/avatar_picker/emoji_tab.tsx

@@ -1,8 +1,19 @@
 import React, { useCallback } from 'react'
 import { StyleSheet, View } from 'react-native'
-import { EmojiKeyboard, type EmojiType } from 'rn-emoji-keyboard'
+import { EmojiKeyboard, type EmojiType, type EmojisByCategory } from 'rn-emoji-keyboard'
+// rn-emoji-keyboard exposes no public exclusion API, so we reach into its
+// internal src/ tree for the emoji JSON. Version is pinned in package.json
+// — verify this path still resolves before bumping rn-emoji-keyboard.
+import emojiData from 'rn-emoji-keyboard/src/assets/emojis.json'
 import { useTheme } from '../../hooks'
 
+const BLOCKED_EMOJIS = new Set(['🖕'])
+
+const filteredEmojis = (emojiData as EmojisByCategory[]).map(category => ({
+  ...category,
+  data: category.data.filter(e => !BLOCKED_EMOJIS.has(e.emoji)),
+}))
+
 interface EmojiTabProps {
   onEmojiSelect: (emoji: string) => void
 }
@@ -44,6 +55,7 @@ export function EmojiTab({ onEmojiSelect }: EmojiTabProps) {
     <View style={styles.container}>
       <EmojiKeyboard
         categoryPosition="top"
+        emojisByCategory={filteredEmojis}
         onEmojiSelected={handleEmojiSelected}
         enableSearchBar
         enableRecentlyUsed

package/src/types/api_primitives.ts

@@ -27,10 +27,18 @@ export interface FailedResponse extends Response {
   errors: ErrorObject[]
 }
 
+export interface NextPageCursor {
+  offset?: string
+  idLt?: string
+  idLte?: string
+  idGt?: string
+  idGte?: string
+}
+
 export interface CollectionMeta {
   count: number
   totalCount: number
-  next?: Record<string, unknown>
+  next?: NextPageCursor
   parent?: ResourceObject
   [attributeName: string]: unknown
 }

package/src/types/resources/chat_configuration_resource.ts

@@ -6,6 +6,10 @@ export interface ChatConfigurationResource {
   type: 'ChatConfiguration'
   id: string
   allowedFileExtensions: string[]
+  // Optional during server-side rollout. Once the server always returns it,
+  // tighten to `string[]`. Until then, useChatConfiguration falls back to
+  // FALLBACK_ALLOWED_MIME_TYPES.
+  allowedMimeTypes?: string[]
   maxFileSizeInBytes: number
   maxAttachmentsPerMessage: number
 }

package/src/utils/__tests__/attachment_kind.test.ts

@@ -0,0 +1,37 @@
+import { pickAttachmentPreviewKind } from '../attachment_kind'
+
+describe('pickAttachmentPreviewKind', () => {
+  describe('with a usable MIME type', () => {
+    it.each([
+      ['image/png', 'image'],
+      ['image/jpeg', 'image'],
+      ['video/mp4', 'video'],
+      ['video/quicktime', 'video'],
+      ['application/pdf', 'file'],
+      ['text/plain', 'file'],
+      ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'file'],
+      ['', 'file'],
+      [undefined, 'file'],
+    ])('classifies %p as %p', (input, expected) => {
+      expect(pickAttachmentPreviewKind(input)).toBe(expected)
+    })
+  })
+
+  // Document picker providers sometimes drop the MIME type. Without an
+  // extension-based fallback, octet-stream-typed images and videos would
+  // render as generic file tiles even though the bytes are decodable.
+  describe('with an unhelpful MIME type', () => {
+    it.each([
+      ['application/octet-stream', 'IMG_1234.HEIC', 'image'],
+      ['application/octet-stream', 'photo.jpg', 'image'],
+      ['application/octet-stream', 'clip.mov', 'video'],
+      ['application/octet-stream', 'movie.MP4', 'video'],
+      ['application/octet-stream', 'spreadsheet.xlsx', 'file'],
+      [undefined, 'photo.png', 'image'],
+      ['application/octet-stream', undefined, 'file'],
+      ['application/octet-stream', 'no_extension', 'file'],
+    ])('with type %p and name %p classifies as %p', (type, name, expected) => {
+      expect(pickAttachmentPreviewKind(type, name)).toBe(expected)
+    })
+  })
+})

package/src/utils/attachment_kind.ts

@@ -0,0 +1,47 @@
+import { IconString } from '../components/display/icon'
+
+export type AttachmentPreviewKind = 'image' | 'video' | 'file'
+
+// Document picker providers sometimes hand back assets without a usable
+// MIME type (Android `MediaStore` content URIs, some cloud-storage
+// providers). The asset's `type` then arrives as `application/octet-stream`
+// or undefined even though the file is genuinely an image or video. Fall
+// back to extension-based classification in that case so the preview
+// matches the actual content.
+const IMAGE_EXTENSIONS = new Set(['bmp', 'gif', 'heic', 'heif', 'jpeg', 'jpg', 'png', 'webp'])
+
+const VIDEO_EXTENSIONS = new Set([
+  '3gp',
+  'avi',
+  'h263',
+  'h264',
+  'm4v',
+  'mkv',
+  'mov',
+  'mp4',
+  'mpeg',
+  'mpeg4',
+  'mpg',
+  'webm',
+  'wmv',
+])
+
+export function pickAttachmentPreviewKind(
+  type: string | undefined,
+  name?: string
+): AttachmentPreviewKind {
+  if (type?.startsWith('image/')) return 'image'
+  if (type?.startsWith('video/')) return 'video'
+  const ext = name?.split('.').pop()?.toLowerCase()
+  if (ext && IMAGE_EXTENSIONS.has(ext)) return 'image'
+  if (ext && VIDEO_EXTENSIONS.has(ext)) return 'video'
+  return 'file'
+}
+
+export function getAttachmentIconName(type: string | undefined): IconString {
+  if (type?.startsWith('image/')) return 'general.outlinedImageFile'
+  if (type?.startsWith('video/')) return 'general.outlinedVideoFile'
+  if (type?.startsWith('audio/')) return 'general.outlinedMusicFile'
+  if (type === 'application/pdf') return 'general.outlinedPdfFile'
+  return 'general.outlinedGenericFile'
+}

package/src/utils/index.ts

@@ -10,4 +10,5 @@ export * from './reaction_constants'
 export * from './destructure_chat_group_graph_id'
 export * from './convert_attachments_for_create'
 export * from './assert_keys_are_numbers'
+export * from './attachment_kind'
 export * from './system_messages'

package/src/utils/native_adapters/document_picker.ts

@@ -17,12 +17,19 @@ type DocumentPickerCanceledResult = {
 
 export type DocumentPickerResult = DocumentPickerSuccessResult | DocumentPickerCanceledResult
 
+export interface DocumentPickerOpenOptions {
+  // MIME types the picker should restrict to. Hosts forward to the
+  // underlying picker's `type` argument. Omitted/empty means no
+  // restriction (the picker behaves as before).
+  mimeTypes?: string[]
+}
+
 interface DocumentPicker {
-  openAsync: () => Promise<DocumentPickerResult>
+  openAsync: (options?: DocumentPickerOpenOptions) => Promise<DocumentPickerResult>
 }
 
 export class DocumentPickerAdapter {
-  openAsync: () => Promise<DocumentPickerResult>
+  openAsync: (options?: DocumentPickerOpenOptions) => Promise<DocumentPickerResult>
   configured: boolean
 
   constructor(methods?: DocumentPicker) {