stream-chat-react-native-core 10.0.0-rc.1 → 10.0.0-rc.2

package/src/components/Notifications/NotificationTargetContext.tsx

@@ -22,10 +22,20 @@ export const NotificationTargetProvider = ({
   );
 };
 
-/** Returns the nearest notification target, if the caller is rendered inside a target provider. */
+/**
+ * Returns the nearest notification target, if the caller is rendered inside a target provider.
+ *
+ * @returns The target, or `undefined` outside a provider.
+ */
 export const useNotificationTargetContext = () => useContext(NotificationTargetContext);
 
-/** Resolves an explicit target or falls back to the nearest compatible target provider. */
+/**
+ * Resolves an explicit target or falls back to the nearest compatible target provider.
+ *
+ * @param params.hostId Exact host ID. Resolves only together with `panel`.
+ * @param params.panel Target panel. Without `hostId`, resolves only to the context target of it.
+ * @returns The resolved target, or `undefined` when none matches.
+ */
 export const useResolvedNotificationTarget = ({
   hostId,
   panel,

package/src/components/Notifications/hooks/useNotificationApi.ts

@@ -16,7 +16,12 @@ import { useNotificationTargetContext } from '../NotificationTargetContext';
 
 export const SYSTEM_NOTIFICATION_TAG = 'system' as const;
 
-/** Returns whether a notification is reserved for system-level consumers instead of snackbars. */
+/**
+ * Returns whether a notification is reserved for system-level consumers instead of snackbars.
+ *
+ * @param notification The notification to test.
+ * @returns True when it carries the system tag.
+ */
 export const hasSystemNotificationTag = (notification: Notification) =>
   notification.tags?.includes(SYSTEM_NOTIFICATION_TAG) ?? false;
 
@@ -35,7 +40,7 @@ export type NotificationIncidentDescriptor = {
 export type AddNotificationOptions = {
   /** Incident metadata used to derive `options.type` when the payload does not provide one. */
   incident?: NotificationIncidentDescriptor;
-  /** Exact host target for this notification. Defaults to the nearest notification target provider. */
+  /** Exact host target for this notification. Defaults to the nearest target provider. */
   target?: NotificationTarget;
   /** Broad panel targets. Use for notifications that should appear in every host of a panel. */
   targetPanels?: NotificationTargetPanel[];
@@ -53,7 +58,7 @@ export type AddSystemNotification = (
   payload: AddNotificationPayload,
   options?: AddSystemNotificationOptions,
 ) => string;
-/** Removes a notification by id. */
+/** Removes a notification by ID. */
 export type RemoveNotification = (id: string) => void;
 /** Removes non-system notifications that belong to the current target provider. */
 export type RemoveNotificationsForCurrentPanel = () => void;
@@ -129,7 +134,11 @@ const mergeNotificationOptions = (
   };
 };
 
-/** Returns imperative helpers for dispatching, targeting and dismissing client notifications. */
+/**
+ * Returns imperative helpers for dispatching, targeting and dismissing client notifications.
+ *
+ * @returns The notification helpers.
+ */
 export const useNotificationApi = (): NotificationApi => {
   const { client } = useChatContext();
   const contextTarget = useNotificationTargetContext();

package/src/components/Notifications/hooks/useNotifications.ts

@@ -17,7 +17,14 @@ export type UseNotificationsOptions = {
   target?: NotificationTarget;
 };
 
-/** Subscribes to the client notification store and returns matching non-system notifications. */
+/**
+ * Subscribes to the client notification store and returns matching non-system notifications.
+ *
+ * @param options.filter Additional filter applied after optional target filtering.
+ * @param options.requireTarget When true, returns an empty list unless `target` is provided.
+ * @param options.target Exact target used to select notifications for one host.
+ * @returns The matching notifications.
+ */
 export const useNotifications = (options?: UseNotificationsOptions): Notification[] => {
   const { client } = useChatContext();
   const selector = useCallback(

package/src/components/Notifications/hooks/useSystemNotifications.ts

@@ -14,7 +14,12 @@ export type UseSystemNotificationsOptions = {
   filter?: UseSystemNotificationsFilter;
 };
 
-/** Subscribes to notifications tagged as system notifications. */
+/**
+ * Subscribes to notifications tagged as system notifications.
+ *
+ * @param options.filter Additional filter applied to system-tagged notifications.
+ * @returns The matching notifications.
+ */
 export const useSystemNotifications = (options?: UseSystemNotificationsOptions): Notification[] => {
   const { client } = useChatContext();
   const selector = useCallback(

package/src/components/Notifications/notificationFilters.ts

@@ -4,23 +4,21 @@ import type { NotificationListFilter } from './NotificationList';
 
 const ATTACHMENT_UPLOAD_FAILED_TYPE = 'api:attachment:upload:failed';
 
-/**
- * A cancelled upload surfaces as an `api:attachment:upload:failed` notification
- * whose original error is an `AbortError` (fetch) or `CanceledError` (axios).
- * This is what happens when the user removes an attachment before its upload
- * has finished - the inflight request is aborted, not genuinely failed.
- */
+// Removing an attachment before its upload finishes aborts the request. That surfaces as an
+// `api:attachment:upload:failed` notification whose original error is an `AbortError` (fetch) or
+// `CanceledError` (axios).
 const isCanceledAttachmentUpload = (notification: Notification) =>
   notification.type === ATTACHMENT_UPLOAD_FAILED_TYPE &&
   (notification.originalError?.name === 'CanceledError' ||
     notification.originalError?.name === 'AbortError');
 
 /**
- * Notification list filter that keeps every notification except the spurious
- * "upload failed" one produced when a user removes an attachment mid-upload
- * (a filter returns `true` to keep a notification). Genuine upload failures
- * (network, server) are kept because their error is neither aborted nor
- * cancelled.
+ * Notification list filter that hides the "upload failed" notification produced when a user removes
+ * an attachment mid-upload. Genuine upload failures (network, server) stay, as their error is
+ * neither an abort nor a cancellation.
+ *
+ * @param notification The notification to test.
+ * @returns `false` for a canceled upload, `true` otherwise.
  */
 export const excludeCanceledUploadNotifications: NotificationListFilter = (notification) =>
   !isCanceledAttachmentUpload(notification);

package/src/components/Notifications/notificationTarget.ts

@@ -15,7 +15,7 @@ export type BuiltInNotificationTargetPanel = (typeof NOTIFICATION_TARGET_PANELS)
 export type NotificationTargetPanel = BuiltInNotificationTargetPanel | (string & {});
 /** Exact notification host within a panel. */
 export type NotificationTarget = {
-  /** Stable id for a mounted notification host, for example a channel cid-derived id. */
+  /** Stable ID of a mounted notification host, such as one derived from a channel `cid`. */
   hostId: string;
   /** Surface that owns the host. */
   panel: NotificationTargetPanel;
@@ -42,21 +42,44 @@ const actionNotificationTargets = new WeakMap<
   NotificationTargetStackItem[]
 >();
 
-/** Returns whether a value can be encoded as a notification target panel segment. */
+/**
+ * Returns whether a value can be encoded as a notification target panel segment.
+ *
+ * @param value The value to test.
+ * @returns True for a non-empty string without `:`.
+ */
 export const isNotificationTargetPanel = (value: unknown): value is NotificationTargetPanel =>
   typeof value === 'string' && value.length > 0 && !value.includes(':');
 
-/** Returns whether a value is one of the SDK's built-in notification panels. */
+/**
+ * Returns whether a value is one of the SDK's built-in notification panels.
+ *
+ * @param value The value to test.
+ * @returns True for a built-in panel.
+ */
 export const isBuiltInNotificationTargetPanel = (
   value: unknown,
 ): value is BuiltInNotificationTargetPanel =>
   typeof value === 'string' && (NOTIFICATION_TARGET_PANELS as readonly string[]).includes(value);
 
-/** Builds a notification target tag. Without `hostId`, the tag targets every host in the panel. */
+/**
+ * Builds a notification target tag. Without `hostId`, the tag targets every host in the panel.
+ *
+ * @param panel The target panel.
+ * @param hostId The exact host within the panel.
+ * @returns The tag.
+ */
 export const getNotificationTargetTag = (panel: NotificationTargetPanel, hostId?: string) =>
   `${NOTIFICATION_TARGET_TAG_PREFIX}${panel}${hostId ? `:${hostId}` : ''}`;
 
-/** Adds a broad or exact target tag to a notification tag list without duplicating tags. */
+/**
+ * Adds a broad or exact target tag to a notification tag list without duplicating tags.
+ *
+ * @param panel The target panel. Without it the tags are returned unchanged.
+ * @param tags The existing tags.
+ * @param hostId The exact host within the panel. Omit to target the whole panel.
+ * @returns The tags, with the target tag first.
+ */
 export const addNotificationTargetTag = (
   panel: NotificationTargetPanel | undefined,
   tags?: string[],
@@ -67,17 +90,39 @@ export const addNotificationTargetTag = (
   return Array.from(new Set([getNotificationTargetTag(panel, hostId), ...(tags ?? [])]));
 };
 
-/** Adds an exact panel and host target tag to a notification tag list. */
+/**
+ * Adds an exact panel and host target tag to a notification tag list.
+ *
+ * @param target The exact target.
+ * @param tags The existing tags.
+ * @returns The tags, with the target tag first.
+ */
 export const addExactNotificationTargetTag = (target: NotificationTarget, tags?: string[]) =>
   addNotificationTargetTag(target.panel, tags, target.hostId);
 
-/** Host id helper for channel notification targets. */
+/**
+ * Builds the host ID of a channel notification target.
+ *
+ * @param cid The channel `cid`.
+ * @returns The host ID.
+ */
 export const getChannelNotificationHostId = (cid: string) => `channel:${cid}` as const;
 
-/** Host id helper for thread notification targets. */
+/**
+ * Builds the host ID of a thread notification target.
+ *
+ * @param threadId The thread ID.
+ * @returns The host ID.
+ */
 export const getThreadNotificationHostId = (threadId: string) => `thread:${threadId}` as const;
 
-/** Compares notification targets by panel and host id. */
+/**
+ * Compares notification targets by panel and host ID.
+ *
+ * @param left The first target.
+ * @param right The second target.
+ * @returns True when both are defined and match.
+ */
 export const isNotificationTargetEqual = (
   left: NotificationTarget | undefined,
   right: NotificationTarget | undefined,
@@ -107,7 +152,12 @@ const getNotificationTargetTags = (notification: Notification) =>
     .map(parseNotificationTargetTag)
     .filter((target): target is ParsedNotificationTargetTag => !!target);
 
-/** Returns whether a tag list already contains a notification target tag. */
+/**
+ * Returns whether a tag list already contains a notification target tag.
+ *
+ * @param tags The tags to search.
+ * @returns True when any tag is a target tag.
+ */
 export const hasNotificationTargetTag = (tags: string[] | undefined) =>
   tags?.some((tag) => !!parseNotificationTargetTag(tag)) ?? false;
 
@@ -138,7 +188,12 @@ const getNotificationTargetFromComposer = (
   return cid ? { hostId: getChannelNotificationHostId(cid), panel: 'channel' } : undefined;
 };
 
-/** Resolves an exact notification target from tags or composer origin metadata. */
+/**
+ * Resolves an exact notification target from tags or composer origin metadata.
+ *
+ * @param notification The notification to resolve.
+ * @returns The target, or `undefined` when none resolves.
+ */
 export const getNotificationTarget = (notification: Notification): NotificationTarget | undefined =>
   getNotificationTargetFromTags(notification) ?? getNotificationTargetFromComposer(notification);
 
@@ -155,7 +210,12 @@ const getExplicitNotificationTargetPanels = (
   return isNotificationTargetPanel(panel) ? [panel] : [];
 };
 
-/** Resolves the first target panel declared or inferred for a notification. */
+/**
+ * Resolves the first target panel declared or inferred for a notification.
+ *
+ * @param notification The notification to resolve.
+ * @returns The panel, or `undefined` when none resolves.
+ */
 export const getNotificationTargetPanel = (
   notification: Notification,
 ): NotificationTargetPanel | undefined => {
@@ -165,7 +225,12 @@ export const getNotificationTargetPanel = (
   return getNotificationTarget(notification)?.panel;
 };
 
-/** Resolves all target panels declared or inferred for a notification. */
+/**
+ * Resolves all target panels declared or inferred for a notification.
+ *
+ * @param notification The notification to resolve.
+ * @returns The panels, empty when none resolve.
+ */
 export const getNotificationTargetPanels = (
   notification: Notification,
 ): NotificationTargetPanel[] => {
@@ -218,23 +283,45 @@ const getLastNotificationTarget = (
   return stack?.[stack.length - 1]?.target;
 };
 
-/** Registers a mounted notification host as the latest active fallback target. */
+/**
+ * Registers a mounted notification host as the latest active fallback target.
+ *
+ * @param owner The notification manager the target belongs to.
+ * @param target The host to register.
+ * @returns A function that unregisters the target.
+ */
 export const registerActiveNotificationTarget = (
   owner: NotificationTargetOwner,
   target: NotificationTarget,
 ) => registerNotificationTarget(activeNotificationTargets, owner, target);
 
-/** Registers the target for notifications emitted while an action is running. */
+/**
+ * Registers the target for notifications emitted while an action is running.
+ *
+ * @param owner The notification manager the target belongs to.
+ * @param target The target to register.
+ * @returns A function that unregisters the target.
+ */
 export const registerNotificationActionTarget = (
   owner: NotificationTargetOwner,
   target: NotificationTarget,
 ) => registerNotificationTarget(actionNotificationTargets, owner, target);
 
-/** Returns the latest mounted fallback target for a notification manager owner. */
+/**
+ * Returns the latest mounted fallback target for a notification manager owner.
+ *
+ * @param owner The notification manager.
+ * @returns The target, or `undefined` when none is registered.
+ */
 export const getActiveNotificationTarget = (owner: NotificationTargetOwner) =>
   getLastNotificationTarget(activeNotificationTargets, owner);
 
-/** Returns the latest action-scoped target for a notification manager owner. */
+/**
+ * Returns the latest action-scoped target for a notification manager owner.
+ *
+ * @param owner The notification manager.
+ * @returns The target, or `undefined` when none is registered.
+ */
 export const getNotificationActionTarget = (owner: NotificationTargetOwner) =>
   getLastNotificationTarget(actionNotificationTargets, owner);
 
@@ -248,7 +335,14 @@ const setNotificationTargetTag = (notification: Notification, target: Notificati
   notification.tags = addExactNotificationTargetTag(target, notification.tags);
 };
 
-/** Mutates an unscoped notification by adding the best available exact target tag. */
+/**
+ * Mutates an unscoped notification by adding the best available exact target tag. The target comes
+ * from the composer origin, then the running action, then the active host.
+ *
+ * @param owner The notification manager.
+ * @param notification The notification to tag.
+ * @returns True when a tag was added.
+ */
 export const resolveNotificationTargetTagIfNeeded = (
   owner: NotificationTargetOwner,
   notification: Notification,
@@ -277,7 +371,13 @@ export const resolveNotificationTargetTagIfNeeded = (
   return false;
 };
 
-/** Returns whether a notification should be consumed by an exact target host. */
+/**
+ * Returns whether a notification should be consumed by an exact target host.
+ *
+ * @param notification The notification to test.
+ * @param target The host.
+ * @returns True when the host should show it.
+ */
 export const isNotificationForTarget = (notification: Notification, target: NotificationTarget) => {
   const exactTargets = getExactNotificationTargetTags(notification);
   if (exactTargets.length > 0) {
@@ -297,7 +397,13 @@ export const isNotificationForTarget = (notification: Notification, target: Noti
   return false;
 };
 
-/** Returns whether a notification should be consumed by any host in a panel. */
+/**
+ * Returns whether a notification should be consumed by any host in a panel.
+ *
+ * @param notification The notification to test.
+ * @param panel The panel.
+ * @returns True when the panel should show it.
+ */
 export const isNotificationForPanel = (
   notification: Notification,
   panel: NotificationTargetPanel,

package/src/components/Notifications/notificationTranslations.ts

@@ -128,15 +128,11 @@ const translateCommandDisabled = ({
 /**
  * A translator for every notification `stream-chat` itself emits.
  *
- * `Record<CoreNotificationType, …>` is the point: a new identifier in core fails to compile here until
- * it is mapped, and an entry for one that no longer exists is rejected. Before core exported the union,
- * this table and the React SDK's equivalent were hand-maintained copies of each other, and both had
- * drifted — carrying entries nothing emits while missing identifiers that fell through to untranslated
- * English.
+ * `Record<CoreNotificationType, ...>` makes a new core identifier fail to compile until it is
+ * mapped, and rejects an entry for one that does not exist.
  *
- * The key *names* stay this SDK's own. They have shipped, integrators' dictionaries are keyed on them,
- * and `build-translations` reads the literal string at the call site — a key resolved from a map would
- * be invisible to the generator and so would never reach the catalog.
+ * The translation keys are literal strings at the call site: integrators' dictionaries use them,
+ * and `build-translations` cannot see a key resolved from a map.
  */
 const coreNotificationTranslators: Record<CoreNotificationType, NotificationTranslator> = {
   [CORE_NOTIFICATION_TYPE.attachmentFileMissing]: ({ t }) =>
@@ -148,7 +144,6 @@ const coreNotificationTranslators: Record<CoreNotificationType, NotificationTran
   [CORE_NOTIFICATION_TYPE.attachmentUploadInProgress]: ({ t }) =>
     t('notifications.attachmentUploadInProgress.error', 'Wait until all attachments have uploaded'),
   [CORE_NOTIFICATION_TYPE.commandDisabled]: translateCommandDisabled,
-  // The three below were unmapped, so they rendered untranslated English from `notification.message`.
   [CORE_NOTIFICATION_TYPE.commandNotReady]: ({ t }) =>
     t('notifications.commandNotReady.error', 'Command not ready to be sent'),
   [CORE_NOTIFICATION_TYPE.locationCreateFailed]: ({ t }) =>
@@ -157,7 +152,7 @@ const coreNotificationTranslators: Record<CoreNotificationType, NotificationTran
     t('notifications.messageJumpFailed.error', 'Failed to jump to the message'),
   [CORE_NOTIFICATION_TYPE.messageJumpToLatestFailed]: ({ t }) =>
     t('notifications.messageJumpToLatestFailed.error', 'Failed to jump to the latest message'),
-  // The composer's send and update failures, which the SDK used to report itself with this copy.
+  // The composer's send and update failures.
   [CORE_NOTIFICATION_TYPE.messageSendFailed]: ({ t }) =>
     t('common.sendMessageFailed.error', 'Send message request failed'),
   [CORE_NOTIFICATION_TYPE.messageUpdateFailed]: ({ t }) =>
@@ -171,12 +166,10 @@ const coreNotificationTranslators: Record<CoreNotificationType, NotificationTran
 };
 
 /**
- * Translators for notifications this SDK emits itself, which core knows nothing about.
+ * Translators for notifications this SDK emits itself, which core does not know about.
  *
- * Deliberately not exhaustiveness-checked — there is no union to check against — so keep it to
- * identifiers that are actually emitted. `api:reply:search:failed`, `api:location:share:failed` and
- * `browser:location:get:failed` were removed: all three were copied over from the React SDK and none is
- * emitted here.
+ * Not exhaustiveness-checked, as there is no union to check against, so keep it to identifiers that
+ * are actually emitted.
  */
 const sdkNotificationTranslators: Record<string, NotificationTranslator> = {
   'api:poll:end:failed': translatePollEndFailed,
@@ -205,8 +198,6 @@ export const getNotificationDisplayMessage = ({
     : undefined;
 
   // An unrecognized identifier renders `message` verbatim. It is untranslated English, but a newer
-  // core — or an integrator emitting its own identifier — must not produce an empty toast. This used
-  // to run the message through a table of English sentences, which is the mechanism core's `type`
-  // replaced: matching on prose went stale silently on every core upgrade.
+  // core or an integrator's own identifier must not produce an empty toast.
   return translator ? translator({ notification, t }) : notification.message;
 };

package/src/components/Poll/CreatePollContent.tsx

@@ -53,7 +53,7 @@ export const CreatePollContent = () => {
   const optionsRef = useRef(options);
   optionsRef.current = options;
 
-  // positions and index lookup map
+  // Option positions and the index lookup map.
   // TODO: Please rethink the structure of this, bidirectional data flow is not great
   const currentOptionPositions = useSharedValue<CurrentOptionPositionsCache>({
     inverseIndexCache: {},
@@ -81,8 +81,8 @@ export const CreatePollContent = () => {
           currentPositions.positionCache[option.id] !== undefined,
       );
 
-    // Avoid overwriting freshly measured heights/tops from CreatePollOptions onLayout.
-    // We only need this effect when options ids/order introduced missing cache entries.
+    // Skip when the cache matches the options, so heights and tops measured by the `onLayout` of
+    // `CreatePollOptions` are kept.
     if (isCacheAlignedWithOptions) {
       return;
     }
@@ -121,7 +121,9 @@ export const CreatePollContent = () => {
     async (value: boolean) => {
       setIsAnonymousPoll(value);
       await pollComposer.updateFields({
-        voting_visibility: value ? 'anonymous' : 'public',
+        data: {
+          voting_visibility: value ? 'anonymous' : 'public',
+        },
       });
     },
     [pollComposer],
@@ -130,7 +132,7 @@ export const CreatePollContent = () => {
   const onAllowUserSuggestedOptionsChangeHandler = useCallback(
     async (value: boolean) => {
       setAllowUserSuggestedOptions(value);
-      await pollComposer.updateFields({ allow_user_suggested_options: value });
+      await pollComposer.updateFields({ data: { allow_user_suggested_options: value } });
     },
     [pollComposer],
   );
@@ -138,7 +140,7 @@ export const CreatePollContent = () => {
   const onAllowAnswersChangeHandler = useCallback(
     async (value: boolean) => {
       setAllowAnswers(value);
-      await pollComposer.updateFields({ allow_answers: value });
+      await pollComposer.updateFields({ data: { allow_answers: value } });
     },
     [pollComposer],
   );
@@ -239,7 +241,7 @@ export const CreatePoll = ({
       return;
     }
 
-    // Let the modal render once with exit animations disabled before we dismiss it.
+    // Let the modal render once with exit animations disabled before it is dismissed.
     modalStateStore.partialNext({ isClosing: true });
     closeFrameRef.current = requestAnimationFrame(() => {
       closeFrameRef.current = null;

package/src/components/Poll/components/Button.tsx

@@ -11,8 +11,8 @@ export type PollButtonProps = {
 
 export type PollVoteButtonProps = {
   /**
-   * Render with the incoming chat tokens regardless of poll ownership. Set on
-   * surfaces that are not a message bubble, such as the full-options list.
+   * Renders with the incoming chat tokens regardless of poll ownership. Set it outside a message
+   * bubble, such as in the full-options list.
    */
   forceIncoming?: boolean;
   option: PollOptionResponseData;

package/src/components/Poll/components/CreatePollHeader.tsx

@@ -10,15 +10,9 @@ import { Button } from '../../ui';
 import { useCanCreatePoll } from '../hooks/useCanCreatePoll';
 
 export type CreatePollHeaderProps = {
-  /**
-   * Handler for back button press
-   * @returns void
-   */
+  /** Called when the back button is pressed. */
   onBackPressHandler: () => void;
-  /**
-   * Handler for create poll button press
-   * @returns void
-   */
+  /** Called when the create poll button is pressed. */
   onCreatePollPressHandler: () => void;
 };
 

package/src/components/Poll/components/CreatePollOptions.tsx

@@ -60,9 +60,9 @@ export type CreatePollOptionType = {
   optionId: string;
   onOptionLayout: (optionId: string, height: number) => void;
   /**
+   * Called after a reorder.
    *
-   * @param newOrder The inverse index object of the new options position after re-ordering.
-   * @returns
+   * @param newOrder The new inverse index cache (position to option ID).
    */
   onNewOrder: (newOrder: CurrentOptionPositionsCache['inverseIndexCache']) => void;
   onRemoveOption: (optionId: string) => void;
@@ -290,9 +290,8 @@ export const CreatePollOption = ({
   const { icons } = useComponentsContext();
   const { createPollOptionGap = 8 } = useCreatePollContentContext();
 
-  // Keyed on `stream-chat`'s stable validation code. This used to match on the English sentence the
-  // composer returned, which meant a reworded message in a `stream-chat` patch silently stopped
-  // translating. `error.message` remains the fallback so an unrecognized code renders readable text.
+  // Keyed on `stream-chat`'s stable validation code; `error.message` is the fallback for an
+  // unrecognized code.
   const knownValidationErrors = useMemo<Partial<Record<PollComposerValidationCode, string>>>(
     () => ({
       [POLL_COMPOSER_VALIDATION_CODE.optionDuplicate]: t(
@@ -340,13 +339,10 @@ export const CreatePollOption = ({
     () => currentOptionPositions.value,
   );
 
-  // Target index computed during drag.
   const newIndex = useSharedValue<number | null>(null);
 
-  // Current dragged item's index in the live reorder cache.
   const currentIndex = useSharedValue<number | null>(null);
 
-  // Keep drag translation anchored to drag-start top.
   const dragStartTop = useSharedValue(0);
   const previousDragTop = useSharedValue(0);
 
@@ -366,13 +362,10 @@ export const CreatePollOption = ({
         return;
       }
 
-      // start dragging
       isDragging.value = withSpring(1);
 
-      // keep track of dragged item
       draggedItemId.value = optionId;
 
-      // capture drag start position/index
       currentIndex.value = currentPosition.updatedIndex;
       dragStartTop.value = currentPosition.updatedTop;
       previousDragTop.value = currentPosition.updatedTop;
@@ -393,14 +386,12 @@ export const CreatePollOption = ({
       const frameDeltaY = newTop - previousDragTop.value;
       previousDragTop.value = newTop;
 
-      // we add a small leeway to account for sharp animations which tend to bug out otherwise
+      // A small leeway past the bounds avoids glitches in sharp animations.
       if (newTop < -10 || newTop > maxBound + 10) {
-        // out of bounds, exit out of the animation early
         return;
       }
       top.value = newTop;
 
-      // calculate the new index where drag is headed to
       const draggedTop = newTop;
       const draggedBottom = newTop + draggedItemPosition.updatedHeight;
       newIndex.value = findTargetIndex(
@@ -449,7 +440,6 @@ export const CreatePollOption = ({
           : undefined;
       top.value = withSpring(currentDragTop ?? top.value);
 
-      // stop dragging
       isDragging.value = withDelay(200, withSpring(0));
       draggedItemId.value = null;
       currentIndex.value = null;
@@ -585,7 +575,9 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
   const updateOption = useCallback(
     (newText: string, index: number) => {
       pollComposer.updateFields({
-        options: { index, text: newText },
+        data: {
+          options: { index, text: newText },
+        },
       });
     },
     [pollComposer],
@@ -595,13 +587,12 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
     pollComposer.handleFieldBlur('options');
   }, [pollComposer]);
 
-  // used to know if drag is happening or not
+  // 1 while an option is being dragged.
   const isDragging = useSharedValue<0 | 1>(0);
 
-  // this will hold id for item which user started dragging
+  // ID of the option being dragged.
   const draggedItemId = useSharedValue<string | null>(null);
 
-  // holds the animated height of the option container
   const animatedOptionsContainerHeight = useSharedValue(currentOptionPositions.value.totalHeight);
 
   useAnimatedReaction(
@@ -651,7 +642,9 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
       }
 
       await pollComposer.updateFields({
-        options: reorderedPollOptions,
+        data: {
+          options: reorderedPollOptions,
+        },
       });
     },
     [pollComposer],
@@ -664,7 +657,9 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
         return;
       }
       pollComposer.updateFields({
-        options: latestOptions.filter((option) => option.id !== optionId),
+        data: {
+          options: latestOptions.filter((option) => option.id !== optionId),
+        },
       });
     },
     [pollComposer],