react-native-attachment-kit 1.1.2 → 1.2.2

package/CHANGELOG.md

@@ -1,7 +1,30 @@
 # Changelog
 
-## Unreleased
+## 1.2.2 — 2026-11-14
 
+- **Viewer: a video opened with the UI hidden no longer flashes the centre button while it starts (iOS + Android)**. Opening a remote video with `startWithUiHidden: true` (e.g. from a feed card, with `startTime`) showed the 64 pt glass button for about half a second before playback began, as the loading circle with ⏸ showing through it.
+  - iOS: while seeking to `startTime` the player is still paused, so the "stopped → show the button" rule showed it at once. Now, from the moment the viewer starts the video with the UI hidden until it actually plays (seeking to the start position included), the button stays hidden; only if loading takes longer than **1.5 s** (instead of 0.4 s) does the loading circle appear, without the ⏸/▶ icon. It ends as soon as the video plays, stops, ends, fails, or the user taps to show the UI — after that everything works as before (buffering mid-playback still shows the circle after 0.4 s). Also applies to a video page reached by swiping while the UI is hidden.
+  - iOS: `ViewerPlayButton` — changing the icon (`setPause`) reset the icon's alpha, so ⏸/▶ showed through the loading circle whenever the icon changed during loading (also with the UI visible). The button now keeps the icon hidden while loading.
+  - Android (`ViewerVideoController`): the ⏸ flash did not happen (the player starts with `playWhenReady`), but a slow stream showed the loading circle after 0.4 s; with the UI hidden the first start now uses the same 1.5 s threshold.
+  - Checked on the iOS simulator (harness `-viewerResumeTest -resumeHiddenUI -resumeLogButton`, local server with a throttled 12 s mp4, button opacity logged every 0.05 s): `startTime` 7.5 s on a fast link — before: button visible 0.45 → 1.45 s with circle + ⏸; after: never visible. Slow link (start takes ~2 s): only the circle appears at 1.5 s after loading began, fades out when playback starts, no ⏸. From the beginning without `startTime`: no button on the fast link. UI shown: unchanged (circle while loading, ⏸ once playing — the icon no longer shows through the circle). Android: compiled only, not run on a device (harness gained `--ez resumeHiddenUI true`).
+
+## 1.2.1 — 2026-11-14
+
+- **Viewer: `ViewerVideo.startTime` — open a video page at a given position, and `onViewerWillClose` tells where each video stopped (iOS + Android `useOverlayViewer`)**. For a feed that autoplays a muted preview in the card and opens the full video in the viewer: pass the card's position as `startTime` (seconds) and the viewer continues from there; on close, `onViewerWillClose({ currentIndex, videoPositions })` gives the last position of every video page played (keys are page indexes), so the card can continue from there. Without `startTime` nothing changes, and code that calls `onViewerWillClose` without reading the argument keeps working.
+  - Only the first time the page is shown; swiping away and back starts from the beginning as before. 0, negative, or ≥ the length (the given `duration`, or the real length once loaded) = from the start. The progress pill starts at that position.
+  - iOS: the player waits for `readyToPlay`, seeks exactly (zero tolerance), then plays; until then the page shows the poster (`ViewerVideoItemView.startHeld`) and the centre button shows loading, so neither the first frames nor the first sound come through. `ViewerVideoItem.startTime`, `RemoteImageViewerViewController.willCloseEventBody()` (the event body, also usable from native screens).
+  - Android: `ExoPlayer.setMediaItem / setMediaSource(…, startPositionMs)` — the first rendered frame is already the start position (the poster hides on the first frame as before). `ViewerVideoSource.startTimeMs` / `durationMs`, bundle keys `videoStartTimes` / `videoDurations`; `VIEWER_WILL_CLOSE` carries `currentIndex` and a `videoPositions` bundle.
+  - JS: `onViewerWillClose` now runs once per close (on Android the event can arrive through both emitters).
+  - Checked on the iOS simulator and an Android emulator with a 12 s test video that shows its own time in every frame, recorded on screen: start 7.5 s streaming (download into `cacheFile` still running, 1 MB/s) and from the cached file — the first video frame on screen is 07.50 on both platforms, no earlier frame shows; positions reported on close match the last frame on screen within 0.05 s; no `startTime` starts at 00.00 as before; `startTime: 20` on the 12 s video starts at 00.00.
+
+## 1.2.0 — 2026-11-14
+
+- **Video: `video.preview` — a small silent preview mp4 next to the video you send (iOS + Android)**. For feeds that autoplay videos in a list: `preview: true` or `{ height, bitrate, maxFps, maxDurationSec, codec }` (defaults 360 short side, 450 000 bps, 24 fps, full length, h264). The preview is encoded **from the finished send file** (so trim, crop, rotation, drawing and mute are already in it; a remuxed send file works too), video only, keyframe every second, moov before mdat. Result fields `previewUri`, `previewWidth`, `previewHeight`, `previewDuration`, `previewFileSize`, `previewBitrate`; `previewSkipped: "SOURCE_SMALL"` when the send file is already as small (short side ≤ `height`, or its file ≤ the expected preview size); `previewError: "ENCODE_FAILED"` when only the preview failed (the send file is returned as usual). Also in `onImageProcessed`. Progress stays one value per video (send file 0–0.9, preview 0.9–1) and the HUD closes after the preview; cancelling (`cancelVideoProcessing`, HUD cancel) deletes the send file, poster and preview. File `<baseName>.preview.mp4` in the same folder. Without `preview` nothing changes.
+  - iOS: `VideoPreviewOptions` / `VideoPreviewResult` / `VideoExporter.makePreview(from:options:to:progress:)` (AVAssetReader + Writer, `shouldOptimizeForNetworkUse`), `previewWorthMaking`; `AttachmentResult.preview*`.
+  - Android: same names in `VideoExporter.kt` (`makePreview` with media3 Transformer — `setRemoveAudio`, `Presentation`, `setiFrameIntervalSeconds(1)`, CBR bitrate mode with a VBR retry when the encoder has no CBR; `maxFps` is not applied — media3 1.4.1's `FrameDropEffect` did not drop frames in Transformer; portrait previews carry a 90° rotation tag like the Android send file), and `Mp4FastStart` moves the moov box to the front (MediaMuxer writes it at the end); `AttachmentProcessor.Result.preview*`. The existing transcode now shares `runTransformer` with the preview (same settings as before).
+  - `createVideoPreview(fileUri)` (stand-alone, step 2 of the request) is not included.
+
+- **Gallery / editor: the "video too long" message says seconds when the limit is under a minute or not whole minutes (iOS + Android)**. The message was always built as minutes, rounded and at least 1, so a 15 s limit said "up to 1 minute". New string `video_too_long_seconds` (`turbo_video_too_long_seconds` on Android) in all 59 languages; the choice lives in one helper per platform, `VideoExporter.tooLongText` (seconds if the limit is under 60 s or not a multiple of 60, otherwise minutes as before). Used by the gallery's too-long alert / toast and the editor's trim-bar warning and send-issue text.
 - **Viewer (iOS): a video page with no poster image now shows the video**. The player layer sits inside the page's image view, and that view only got a size from a loaded image, so with an empty poster URL or a failed poster download the layer stayed 0×0: the video played (sound, position moving) on an empty page. `ViewerVideoItemView` now sizes the area from `presentationSize` (rotation metadata included), or the page size until that is known. Once a poster arrives its size is used, as before.
   - Checked on the iOS simulator (test harness): empty poster and 404 poster with local / remote / download-to-`cacheFile` videos, landscape, portrait and 90°-rotation-metadata files. Poster pages have the same frames as before; a poster arriving late, swiping away and back, pinch zoom, and the zoom close from the current frame all work.
 

package/README.md

@@ -8,6 +8,7 @@ A fully native attachment toolkit for React Native chat apps: a Telegram-style p
 
 - **Pure native UI** (Swift / Kotlin) — smooth on both platforms, New Architecture (Turbo Modules) and old architecture supported.
 - **Photo picker** — bottom-sheet gallery, single or multi selection, albums, camera cell, optional editor step, profile (1:1) crop mode.
+  - In-app camera: tap the shutter for a photo, **hold it to record a video** (when `mediaType` is `'all'` / `'video'`); a ratio pill (Full / 9:16 / 3:4 / 1:1) sets the framing for both, and a resolution pill sets the video quality (HD / FHD default / 4K when supported). The screen stays portrait; holding the phone sideways captures a landscape photo or video (only the controls rotate). A timer (3s/10s), tap-to-focus with an exposure handle, and a ⚙ menu (grid, level, stabilization, selfie mirror, 30/60 fps) are built in; the front camera uses the screen as a flash. Captures go to the photo library and are inserted at the top of the grid, selected.
 - **Attach menu** — Gallery / **Location** / **File** tabs under the gallery (Telegram style).
   - Location: map with a center pin, "send my current location", place search, "Share my location" switch, map snapshot image.
   - File: system file picker, files copied into the app's temp folder.
@@ -65,6 +66,9 @@ Rebuild the app after installing or updating (the module ships compiled native c
 ```xml
 <key>NSCameraUsageDescription</key>
 <string>We need access to your camera to take photos.</string>
+<!-- In-app camera: hold the shutter to record a video with sound (without this key the recording has no audio) -->
+<key>NSMicrophoneUsageDescription</key>
+<string>We need the microphone to record sound in videos.</string>
 <key>NSPhotoLibraryUsageDescription</key>
 <string>We need access to your photo library to select images.</string>
 <key>NSPhotoLibraryAddUsageDescription</key>
@@ -72,8 +76,18 @@ Rebuild the app after installing or updating (the module ships compiled native c
 <!-- Attach menu → Location ("send my current location", my-location dot) -->
 <key>NSLocationWhenInUseUsageDescription</key>
 <string>We use your location to share it in a chat.</string>
+<!-- Map viewer → Directions: lets it tell whether each map app is installed -->
+<key>LSApplicationQueriesSchemes</key>
+<array>
+  <string>comgooglemaps</string>
+  <string>kakaomap</string>
+  <string>nmap</string>
+  <string>tmap</string>
+</array>
 ```
 
+The Directions menu shows Apple Maps and Google Maps, plus Kakao Map, Naver Map and TMAP when `languageCode` is Korean. Without the schemes above it still works: an app that isn't installed falls back to the web map (TMAP: App Store), and cancelling the system "Open in …?" prompt opens nothing.
+
 ### Android — Google Maps key
 
 The Location tab, the map viewer and `renderLocationThumbnail` use Google Maps. The library ships **no key**; add your own to the app's `AndroidManifest.xml`:
@@ -155,7 +169,7 @@ Opens the gallery bottom sheet. Resolves with the picked images (`[]` when the u
 | `onProcessingStart` | `(e: ProcessingStartEvent) => void` | — | Once, right after Send, before any processing. |
 | `onImageProcessed` | `(e) => void` | — | Per item `{ index, total, image }` as soon as it is ready. |
 | `mediaType` | `'photo' \| 'all' \| 'video'` | `'photo'` | `'all'` mixes photos and videos. |
-| `video` | `VideoOptions` | — | `maxDurationSec`, `maxFileSizeMB`, `qualities`, `defaultQuality`, `codec`, `onProgress`, `showProgressHUD`. |
+| `video` | `VideoOptions` | — | `maxDurationSec`, `maxFileSizeMB`, `qualities`, `defaultQuality`, `codec`, `posterFormat`, `preview`, `onProgress`, `showProgressHUD`. |
 | `openDuration` / `closeDuration` | `number` (ms) | native | Animation durations. |
 | `showAttachMenu` … | | | Attach menu options — see [Attach menu](#attach-menu-location--file). |
 
@@ -175,6 +189,25 @@ Opens the gallery bottom sheet. Resolves with the picked images (`[]` when the u
 | `fileName?` / `fileExtension?` / `fileSize?` | | Output file info (bytes). |
 | `thumbnailUri?` / `thumbnailWidth?` / `thumbnailHeight?` | | Photo: the thumbnail when the `thumbnail` option is set. Video: the poster (always, see `video.posterFormat`). |
 | `thumbnailFileSize?` | `number` | Photo thumbnail file size (bytes). |
+| `previewUri?` / `previewWidth?` / `previewHeight?` / `previewDuration?` / `previewFileSize?` / `previewBitrate?` | | Video with `video.preview`: the small silent preview mp4. |
+| `previewError?` / `previewSkipped?` | `string` | Preview failed (`"ENCODE_FAILED"`, the video itself is fine) / not made (`"SOURCE_SMALL"`). |
+
+#### Video previews (`video.preview`, 1.2.0)
+
+For feeds that autoplay videos silently in a list, ask for a small preview file next to the one you send:
+
+```ts
+const items = await AttachmentKit.openGallery({ mediaType: 'all', video: { preview: true } })
+// or tune it: video: { preview: { height: 360, bitrate: 450_000, maxFps: 24, maxDurationSec: 0, codec: 'h264' } }
+// items[i].previewUri → file://….preview.mp4 (no audio, 360p, ~450 kbps, moov first, keyframe every second)
+```
+
+- Made **from the video you send** after it is ready, so trims, crops, drawings and mute are all in it.
+- `height` is the short side (default 360), `bitrate` default 450 000 bps, `maxFps` default 24 (iOS only — on Android media3 1.4.1 keeps the source frame rate; the size is still set by `bitrate`), `maxDurationSec` 0 = full length, `codec` default `h264`.
+- Not made when the sent video is already as small (short side ≤ `height`, or its file ≤ the expected preview size): `previewSkipped: "SOURCE_SMALL"` — use the sent file.
+- A failed preview never fails the video: `uri` is returned and `previewError: "ENCODE_FAILED"` is set.
+- Progress stays one 0 → 1 value per video (send file 0–0.9, preview 0.9–1); the progress HUD closes after the preview. Cancelling removes the sent file, poster and preview.
+- Saved next to the sent file as `<name>.preview.mp4`.
 
 #### Photo thumbnails
 
@@ -210,7 +243,7 @@ Selection events outside `openGallery`; returns an unsubscribe function.
 
 A chat can show every sent item at once and fill it in as it finishes (photos are resized, videos are encoded), the same way for photos and videos:
 
-1. **`onProcessingStart`** `{ total, items }`: once, right after Send. Each item has `index`, `mediaType` (`'image' | 'video'`), `originalUri`, and the expected output `width` / `height` (for the aspect ratio). Videos also have `duration` (seconds, after trim) and `thumbnailUri` / `thumbnailWidth` / `thumbnailHeight` (a poster jpg with crop and drawing applied). Create the placeholders here.
+1. **`onProcessingStart`** `{ total, items }`: once, right after Send. Each item has `index`, `mediaType` (`'image' | 'video'`), `originalUri`, and the expected output `width` / `height` (for the aspect ratio). Videos also have `duration` (seconds, after trim) and `thumbnailUri` / `thumbnailWidth` / `thumbnailHeight` (a poster image with crop and drawing applied — **webp** by default; set `video.posterFormat: 'jpg'` for jpg). Create the placeholders here.
 2. **`onVideoProgress`** `{ index, total, progress }`: video encoding 0…1 (at most every 1% / 0.1 s). Draw a progress ring on that placeholder.
 3. **`onImageProcessed`** `{ index, total, image }`: the item is ready. Replace the placeholder with `image.uri`. A video the app cancelled comes as `{ error: 'CANCELLED', cancelled: true }`; a failed one has `error`.
 
@@ -332,6 +365,24 @@ ref.current?.measure((x, y, width, height, pageX, pageY) => {
 | `animationType` / `closeAnimationType` | `'zoom' \| 'fade' \| 'slide'` | `zoom` with `sourceRect`, else `slide` | Open / close animation. |
 | `openDuration` / `closeDuration` | `number` (ms) | native | Animation durations. |
 
+**Videos** — iOS viewer and Android `useOverlayViewer: true` only (the other Android viewers show the poster)
+
+| Option | Type | Description |
+|---|---|---|
+| `videos` | `(ViewerVideo \| null)[]` | Same order as `images`. A non-null entry makes that page a video; `images[i]` is then its **poster** (shown until the first frame, and for the open animation). `ViewerVideo = { uri, duration?, cacheFile?, startTime? }` — `uri` is `https://` (mp4/mov, or an HLS `.m3u8` stream) or a local file; `cacheFile` works like `cacheFiles`: if the file exists it is played without network, otherwise the video streams and is downloaded there in the background for next time. `startTime` (seconds, 1.2.1): the first time that page is shown, play from there instead of the start — the poster stays until the player has moved to that point, so the opening frames never flash; 0, negative or ≥ the length = from the start; leaving the page and coming back starts from the beginning as before. Streaming and cached files both. |
+
+```ts
+AttachmentKit.openViewer({
+  images: [photoUrl, videoPosterUrl],
+  videos: [null, { uri: videoUrl, duration: 12.4, cacheFile: `${cacheDir}/v_123.mp4`, startTime: card.position }],
+  useOverlayViewer: true,
+  // where the user stopped watching (seconds), e.g. to continue the card's preview from there
+  onViewerWillClose: (e) => { const t = e?.videoPositions?.[1]; if (t != null) card.seek(t) },
+})
+```
+
+On a video page: autoplay from the start (leaving the page pauses, no loop — at the end it pauses and shows ▶), a centre ▶/❚❚ button (spinner while buffering), a progress pill `0:03 ━━●── 0:12` (drag to seek), ⚙ playback speed (`0.5x` / Normal / `1.5x` / `2x`, kept while the viewer is open) and ⛶ full screen for landscape videos (the app's orientation is never changed — the video and its controls are rotated 90° to fill the screen; stand the phone up or tap ⛶ / Android back to leave). Tap toggles the controls (auto-hide after 3 s while playing); no pinch zoom; pull-to-dismiss moves only the video and closes on the current frame. Save / share handle videos as files: saved to the photo library as a video, shared as an mp4 (a remote video is downloaded first, with a small progress label; HLS streams cannot be saved). The sound follows the silent switch on iOS (default audio session).
+
 **Sticky transition**
 
 | Option | Type | Description |
@@ -360,7 +411,7 @@ ref.current?.measure((x, y, width, height, pageX, pageY) => {
 | Option | Platform | Description |
 |---|---|---|
 | `onPageSelected(index)` | both | Page changed. |
-| `onViewerWillClose()` | both | Close animation starts. |
+| `onViewerWillClose(e?)` | both | Close animation starts. 1.2.1: `e = { currentIndex, videoPositions? }` — `videoPositions` maps each video page played in this viewer to its last position in seconds (the length if it played to the end); pages never played are absent. Old code that ignores the argument still works. On Android only the `useOverlayViewer` viewer sends `e` (the other Android viewers call it with no argument). |
 | `onViewerOpened()` | Android | Open animation finished (safe moment for background scroll corrections). |
 
 **Android viewer modes**
@@ -483,7 +534,7 @@ A native grid built for thousands of photos. It opens like the picker (same bott
 
 - **Native data source (recommended)**: implement `MediaGalleryDataSource` in your app's native code and register it with `MediaGalleryRegistry.register("name", source)` (iOS Swift / Android Kotlin). Pass `dataSource: "name"` and `dataSourceParams`. Pages are loaded natively, no JS round trip. Built-in demo: `dataSource: "turboDemo", dataSourceParams: { count: 10000 }`.
 - **JS data source**: pass `initialItems`, `hasMore`, `nextCursor`; answer `onNeedPage` with `appendGalleryItems({ galleryId, items, nextCursor, hasMore })`.
-- `MediaGalleryItem`: `{ id, groupId?, timestamp?, thumbUri? (file:// only — no base64), imageUri, cacheFile?, isMine?, width?, height? }`.
+- `MediaGalleryItem`: `{ id, groupId?, timestamp?, thumbUri? (file:// only — no base64), imageUri, cacheFile?, isMine?, width?, height?, mediaType?, videoUri?, videoCacheFile?, duration? }`. A video item has `mediaType: 'video'` and `videoUri` (`imageUri` / `thumbUri` are its poster); the grid shows a "▶ 0:12" badge (from `duration`, seconds) and the viewer plays it (see `openViewer` → Videos).
 - `title` (required), `gridSize: '3x3' | '4x4' | '5x5'` (default until the user picks one; the user's choice is saved on the device and wins), `spacing`, `theme`, `appearance`, `languageCode`, `emptyTitle`, `emptySubtitle`, `countFormat`.
 - `viewer`: `{ themeColor, deleteOptionsForMine, deleteOptionsForOthers, titleFormat: 'date' | 'none', …openViewer text options }`.
 - Events: `onItemDeleted({ galleryId, id, groupId, option })` (the module already removed that group from the screen — delete it in the app), `onNeedPage`, `onGridSizeChanged`, `onClosed`.
@@ -596,6 +647,26 @@ app.post('/ai/generate', auth, express.json({ limit: '20mb' }), async (req, res)
 | Photo thumbnails (`thumbnail` option) | `Library/Caches/RNAttachmentKit/turbo_picker_thumb_*` | `cache/turbo_picker_thumb_*` | Deleted after 24 h (next gallery open). |
 | Location thumbnails | `Library/Caches/RNAttachmentKit/LocationThumbs/` | `cache/RNAttachmentKitLocationThumbs/` | 300 max → 250, least recently used. `clearLocationThumbnailCache()`. |
 | Reverse-geocode results | `Library/Caches/RNAttachmentKit/Geocode/` | `cache/RNAttachmentKitGeocode/` | 1000 max → 800, least recently used. `clearReverseGeocodeCache()`. |
+| Viewer videos downloaded for save/share (no `cacheFile` given) | `Library/Caches/RNAttachmentKit/viewer_video/` | `cache/RNAttachmentKit/viewer_video/` | Reused for playback next time; the OS may purge. With `cacheFile` the file goes there instead (app-owned). |
+| Viewer share copies (Android) | — | `<external files>/Pictures/viewer_share/` | Overwritten names per share; same folder as shared photos. |
+
+---
+
+## 🔧 Maintainers (source project)
+
+This folder is the **source** project. Apps use the compiled distribution `../RNAttachmentKit-Dist` (published to npm as `react-native-attachment-kit`), where Kotlin/Swift are shipped as `.aar` / `.xcframework`.
+
+- **Edit code only here.** After changing native code or `src/*.ts`, rebuild the distribution — apps see nothing until then:
+  ```bash
+  cd .. && bash -l ./run_deploy.command      # make_framework.rb + deploy.rb, log in ../deploy_last.log
+  cd RNAttachmentKit/ios && ruby restore_app.rb   # back to app mode for the iOS harness
+  ```
+  Hand-edit in Dist only `package.json`, the podspec, `react-native.config.js` and `README.md`. Keep this README and the Dist README in sync (same content; this section is source-only).
+- **Native test apps**: iOS — `ios/RNAttachmentKit.xcodeproj` in app mode (`ruby restore_app.rb`; `ruby make_framework.rb` before building the framework). Android — open `android/` and run `app` (its Maps key lives in git-ignored `android/local.properties`, for the test app only). RN example app: `../RNAttachmentKitApp` (`portal:` to Dist).
+- **Translations**: all strings live in `scripts/i18n/strings.json` (every language must have every key). Run `python3 scripts/i18n/generate.py` to regenerate `ios/RNAttachmentKit/Localizer.swift` and Android `res/values*/strings*.xml`.
+- **Editor icons**: single source `scripts/editor_icons/icons.py` (Android vectors + iOS `ToolbarIcons` webp).
+- **Docs**: version history in `CHANGELOG.md`; location-message integration notes in `docs/location-api.md`; old diagnostics in `docs/history/` (not authoritative).
+- **Publishing**: bump `version` in both `package.json` files, rebuild Dist, then run `../publish_npm.sh` from a terminal (npm login + OTP).
 
 ---
 

package/android/src/newarch/java/com/rnattachmentkit/RNAttachmentKitModule.kt

@@ -89,12 +89,24 @@ class RNAttachmentKitModule(reactContext: ReactApplicationContext) :
     // 채로 다음 이미지를 열면, 두 구독이 동시에 반응해서 "이전 이미지의 위치 정보"로
     // updateSourceRect()가 잘못 호출되어 닫기 애니메이션이 엉뚱한(이전) 위치로 돌아가는
     // 버그의 원인이었습니다.
+    /** 1.2.1: VIEWER_WILL_CLOSE 의 currentIndex·videoPositions → JS 본문 (오버레이 뷰어만 보냄, 다른 뷰어는 빈 본문) */
+    private fun viewerWillCloseBody(intent: android.content.Intent): com.facebook.react.bridge.WritableMap {
+        val body = com.facebook.react.bridge.Arguments.createMap()
+        if (intent.hasExtra("currentIndex")) body.putInt("currentIndex", intent.getIntExtra("currentIndex", 0))
+        intent.getBundleExtra("videoPositions")?.let { b ->
+            val m = com.facebook.react.bridge.Arguments.createMap()
+            for (k in b.keySet()) m.putDouble(k, b.getDouble(k))
+            body.putMap("videoPositions", m)
+        }
+        return body
+    }
+
     private val viewerWillCloseReceiver = object : android.content.BroadcastReceiver() {
         override fun onReceive(context: android.content.Context?, intent: android.content.Intent?) {
             if (intent?.action == "com.rnattachmentkit.VIEWER_WILL_CLOSE") {
                 reactApplicationContext
                     .getJSModule(com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("onViewerWillClose", Arguments.createMap())
+                    .emit("onViewerWillClose", viewerWillCloseBody(intent))
             }
         }
     }
@@ -715,13 +727,21 @@ class RNAttachmentKitModule(reactContext: ReactApplicationContext) :
                         if (videoArray != null) {
                             val uris = ArrayList<String>()
                             val caches = ArrayList<String>()
+                            val starts = DoubleArray(videoArray.size())
+                            val durations = DoubleArray(videoArray.size())
+                            fun num(m: com.facebook.react.bridge.ReadableMap?, key: String): Double =
+                                if (m != null && m.hasKey(key) && m.getType(key) == com.facebook.react.bridge.ReadableType.Number) m.getDouble(key) else 0.0
                             for (i in 0 until videoArray.size()) {
                                 val m = if (videoArray.getType(i) == com.facebook.react.bridge.ReadableType.Map) videoArray.getMap(i) else null
                                 uris.add(if (m != null && m.hasKey("uri") && !m.isNull("uri")) m.getString("uri") ?: "" else "")
                                 caches.add(if (m != null && m.hasKey("cacheFile") && !m.isNull("cacheFile")) m.getString("cacheFile") ?: "" else "")
+                                starts[i] = num(m, "startTime")
+                                durations[i] = num(m, "duration")
                             }
                             putStringArrayList(com.rnattachmentkit.ViewerVideoSource.ARG_URIS, uris)
                             putStringArrayList(com.rnattachmentkit.ViewerVideoSource.ARG_CACHE_FILES, caches)
+                            putDoubleArray(com.rnattachmentkit.ViewerVideoSource.ARG_START_TIMES, starts)
+                            putDoubleArray(com.rnattachmentkit.ViewerVideoSource.ARG_DURATIONS, durations)
                         }
                     }
                     // 상단바 저장/공유/삭제 버튼과 그 문구들 (iOS와 동일한 옵션 키). 문구를 안 넘기면

package/android/src/oldarch/java/com/rnattachmentkit/RNAttachmentKitModule.kt

@@ -78,12 +78,24 @@ class RNAttachmentKitModule(reactContext: ReactApplicationContext) :
         // Keep: Required for RN built in Event Emitter Calls.
     }
 
+    /** 1.2.1: VIEWER_WILL_CLOSE 의 currentIndex·videoPositions → JS 본문 (오버레이 뷰어만 보냄, 다른 뷰어는 빈 본문) */
+    private fun viewerWillCloseBody(intent: android.content.Intent): com.facebook.react.bridge.WritableMap {
+        val body = com.facebook.react.bridge.Arguments.createMap()
+        if (intent.hasExtra("currentIndex")) body.putInt("currentIndex", intent.getIntExtra("currentIndex", 0))
+        intent.getBundleExtra("videoPositions")?.let { b ->
+            val m = com.facebook.react.bridge.Arguments.createMap()
+            for (k in b.keySet()) m.putDouble(k, b.getDouble(k))
+            body.putMap("videoPositions", m)
+        }
+        return body
+    }
+
     private val viewerWillCloseReceiver = object : android.content.BroadcastReceiver() {
         override fun onReceive(context: android.content.Context?, intent: android.content.Intent?) {
             if (intent?.action == "com.rnattachmentkit.VIEWER_WILL_CLOSE") {
                 reactApplicationContext
                     .getJSModule(com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("onViewerWillClose", com.facebook.react.bridge.Arguments.createMap())
+                    .emit("onViewerWillClose", viewerWillCloseBody(intent))
             }
         }
     }
@@ -724,13 +736,21 @@ class RNAttachmentKitModule(reactContext: ReactApplicationContext) :
                         if (videoArray != null) {
                             val uris = ArrayList<String>()
                             val caches = ArrayList<String>()
+                            val starts = DoubleArray(videoArray.size())
+                            val durations = DoubleArray(videoArray.size())
+                            fun num(m: com.facebook.react.bridge.ReadableMap?, key: String): Double =
+                                if (m != null && m.hasKey(key) && m.getType(key) == com.facebook.react.bridge.ReadableType.Number) m.getDouble(key) else 0.0
                             for (i in 0 until videoArray.size()) {
                                 val m = if (videoArray.getType(i) == com.facebook.react.bridge.ReadableType.Map) videoArray.getMap(i) else null
                                 uris.add(if (m != null && m.hasKey("uri") && !m.isNull("uri")) m.getString("uri") ?: "" else "")
                                 caches.add(if (m != null && m.hasKey("cacheFile") && !m.isNull("cacheFile")) m.getString("cacheFile") ?: "" else "")
+                                starts[i] = num(m, "startTime")
+                                durations[i] = num(m, "duration")
                             }
                             putStringArrayList(com.rnattachmentkit.ViewerVideoSource.ARG_URIS, uris)
                             putStringArrayList(com.rnattachmentkit.ViewerVideoSource.ARG_CACHE_FILES, caches)
+                            putDoubleArray(com.rnattachmentkit.ViewerVideoSource.ARG_START_TIMES, starts)
+                            putDoubleArray(com.rnattachmentkit.ViewerVideoSource.ARG_DURATIONS, durations)
                         }
                     }
                     // 상단바 저장/공유/삭제 버튼과 그 문구들 (iOS와 동일한 옵션 키). 문구를 안 넘기면

package/ios/RNAttachmentKit.swift

@@ -612,8 +612,9 @@ class RNAttachmentKit: RCTEventEmitter {
             // 공유된 zoomAnimator.sourceRect를 덮어써버렸습니다 - "스와이프 후 닫으면 전혀
             // 다른 그룹 이미지 위치로 애니메이션되는" 버그의 근본 원인이었습니다. 이제 실제로
             // 뷰어가 닫히기 시작할 때 이벤트를 보내서 JS가 제때 구독을 정리하도록 합니다.
-            viewerVC.onViewerWillClose = { [weak self] () -> Void in
-                self?.sendEvent(withName: "onViewerWillClose", body: nil)
+            // 1.2.1: { currentIndex, videoPositions } — 앱은 인자를 무시해도 됨
+            viewerVC.onViewerWillClose = { [weak self, weak viewerVC] () -> Void in
+                self?.sendEvent(withName: "onViewerWillClose", body: viewerVC?.willCloseEventBody())
             }
             viewerVC.onImageDeleted = { [weak self] (index: Int, url: String, option: String?) -> Void in
                 guard let self = self else { return }
@@ -1122,7 +1123,7 @@ class RNAttachmentKit: RCTEventEmitter {
                         self.processingJobs[processingId] = nil
                         if aborted {
                             // 변환 취소: 이미 만든 파일은 버림
-                            results.compactMap { $0.path }.forEach { try? FileManager.default.removeItem(atPath: $0) }
+                            results.flatMap { [$0.path, $0.previewPath].compactMap { $0 } }.forEach { try? FileManager.default.removeItem(atPath: $0) }
                             reject("CANCELLED", "User cancelled video conversion", nil)
                         } else {
                             resolve(results.map { $0.dictionary })