@amityco/react-native-social-uikit 4.1.1-b58e7e9.0 → 4.1.1-bcb7944e.0

package/lib/commonjs/core/stores/slices/localVideoThumbnailSlice.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_toolkit","require","initialState","postId","videos","localVideoThumbnailSlice","createSlice","name","reducers","setLocalVideoThumbnails","state","action","payload","filter","fileId","thumbnailUrl","clearLocalVideoThumbnails","_default","exports","default"],"sourceRoot":"../../../../../src","sources":["core/stores/slices/localVideoThumbnailSlice.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAaA,MAAMC,YAAsC,GAAG;EAC7CC,MAAM,EAAE,IAAI;EACZC,MAAM,EAAE;AACV,CAAC;AAED,MAAMC,wBAAwB,GAAG,IAAAC,oBAAW,EAAC;EAC3CC,IAAI,EAAE,qBAAqB;EAC3BL,YAAY;EACZM,QAAQ,EAAE;IACRC,uBAAuB,EAAEA,CACvBC,KAAK,EACLC,MAGE,KACC;MACHD,KAAK,CAACP,MAAM,GAAGQ,MAAM,CAACC,OAAO,CAACT,MAAM;MACpCO,KAAK,CAACN,MAAM,GAAGO,MAAM,CAACC,OAAO,CAACR,MAAM,CAACS,MAAM,CACzC,CAAC;QAAEC,MAAM;QAAEC;MAAa,CAAC,KAAK,CAAC,CAACD,MAAM,IAAI,CAAC,CAACC,YAC9C,CAAC;IACH,CAAC;IACDC,yBAAyB,EAAGN,KAAK,IAAK;MACpCA,KAAK,CAACP,MAAM,GAAG,IAAI;MACnBO,KAAK,CAACN,MAAM,GAAG,EAAE;IACnB;EACF;AACF,CAAC,CAAC;AAAC,IAAAa,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEYd,wBAAwB","ignoreList":[]}

package/lib/commonjs/core/stores/slices/uiSlice.js

@@ -13,7 +13,8 @@ const initialState = {
   targetName: '',
   postSetting: null,
   needApprovalOnPostCreation: true,
-  isPublic: false
+  isPublic: false,
+  feedReloadToken: 0
 };
 const uiSlice = (0, _toolkit.createSlice)({
   name: 'ui',
@@ -45,6 +46,9 @@ const uiSlice = (0, _toolkit.createSlice)({
       state.isLoadingToast = action.payload.isLoadingToast;
       state.isSuccessToast = action.payload.isSuccessToast;
     },
+    markFeedReloaded: state => {
+      state.feedReloadToken += 1;
+    },
     hideToastMessage: state => {
       state.showToastMessage = false;
       state.toastMessage = '';

package/lib/commonjs/core/stores/slices/uiSlice.js.map

@@ -1 +1 @@
-{"version":3,"names":["_toolkit","require","initialState","showPostTypeChoiceModal","userId","targetId","targetType","targetName","postSetting","needApprovalOnPostCreation","isPublic","uiSlice","createSlice","name","reducers","openPostTypeChoiceModal","state","action","payload","closePostTypeChoiceModal","showToastMessage","toastMessage","isLoadingToast","isSuccessToast","hideToastMessage","_default","exports","default"],"sourceRoot":"../../../../../src","sources":["core/stores/slices/uiSlice.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAuBA,MAAMC,YAAqB,GAAG;EAC5BC,uBAAuB,EAAE,KAAK;EAC9BC,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,IAAI;EACdC,UAAU,EAAE,EAAE;EACdC,UAAU,EAAE,EAAE;EACdC,WAAW,EAAE,IAAI;EACjBC,0BAA0B,EAAE,IAAI;EAChCC,QAAQ,EAAE;AACZ,CAAC;AAED,MAAMC,OAAO,GAAG,IAAAC,oBAAW,EAAC;EAC1BC,IAAI,EAAE,IAAI;EACVX,YAAY;EACZY,QAAQ,EAAE;IACRC,uBAAuB,EAAEA,CACvBC,KAAK,EACLC,MAcE,KACC;MACHD,KAAK,CAACb,uBAAuB,GAAG,IAAI;MACpCa,KAAK,CAACZ,MAAM,GAAGa,MAAM,CAACC,OAAO,CAACd,MAAM;MACpCY,KAAK,CAACX,QAAQ,GAAGY,MAAM,CAACC,OAAO,CAACb,QAAQ,IAAI,IAAI;MAChDW,KAAK,CAACT,UAAU,GAAGU,MAAM,CAACC,OAAO,CAACX,UAAU,IAAI,EAAE;MAClDS,KAAK,CAACV,UAAU,GAAGW,MAAM,CAACC,OAAO,CAACZ,UAAU,IAAI,EAAE;MAClDU,KAAK,CAACR,WAAW,GAAGS,MAAM,CAACC,OAAO,CAACV,WAAW,IAAI,IAAI;MACtDQ,KAAK,CAACN,QAAQ,GAAGO,MAAM,CAACC,OAAO,CAACR,QAAQ;MACxCM,KAAK,CAACP,0BAA0B,GAC9BQ,MAAM,CAACC,OAAO,CAACT,0BAA0B;IAC7C,CAAC;IACDU,wBAAwB,EAAGH,KAAK,IAAK;MACnCA,KAAK,CAACb,uBAAuB,GAAG,KAAK;MACrCa,KAAK,CAACZ,MAAM,GAAG,IAAI;MACnBY,KAAK,CAACX,QAAQ,GAAG,IAAI;MACrBW,KAAK,CAACV,UAAU,GAAG,EAAE;MACrBU,KAAK,CAACT,UAAU,GAAG,EAAE;MACrBS,KAAK,CAACR,WAAW,GAAG,IAAI;MACxBQ,KAAK,CAACP,0BAA0B,GAAG,IAAI;MACvCO,KAAK,CAACN,QAAQ,GAAG,KAAK;IACxB,CAAC;IACDU,gBAAgB,EAAEA,CAChBJ,KAAK,EACLC,MAIE,KACC;MACHD,KAAK,CAACI,gBAAgB,GAAG,IAAI;MAC7BJ,KAAK,CAACK,YAAY,GAAGJ,MAAM,CAACC,OAAO,CAACG,YAAY;MAChDL,KAAK,CAACM,cAAc,GAAGL,MAAM,CAACC,OAAO,CAACI,cAAc;MACpDN,KAAK,CAACO,cAAc,GAAGN,MAAM,CAACC,OAAO,CAACK,cAAc;IACtD,CAAC;IACDC,gBAAgB,EAAGR,KAAK,IAAK;MAC3BA,KAAK,CAACI,gBAAgB,GAAG,KAAK;MAC9BJ,KAAK,CAACK,YAAY,GAAG,EAAE;MACvBL,KAAK,CAACM,cAAc,GAAG,KAAK;MAC5BN,KAAK,CAACO,cAAc,GAAG,KAAK;IAC9B;EACF;AACF,CAAC,CAAC;AAAC,IAAAE,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEYhB,OAAO","ignoreList":[]}
+{"version":3,"names":["_toolkit","require","initialState","showPostTypeChoiceModal","userId","targetId","targetType","targetName","postSetting","needApprovalOnPostCreation","isPublic","feedReloadToken","uiSlice","createSlice","name","reducers","openPostTypeChoiceModal","state","action","payload","closePostTypeChoiceModal","showToastMessage","toastMessage","isLoadingToast","isSuccessToast","markFeedReloaded","hideToastMessage","_default","exports","default"],"sourceRoot":"../../../../../src","sources":["core/stores/slices/uiSlice.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AA2BA,MAAMC,YAAqB,GAAG;EAC5BC,uBAAuB,EAAE,KAAK;EAC9BC,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,IAAI;EACdC,UAAU,EAAE,EAAE;EACdC,UAAU,EAAE,EAAE;EACdC,WAAW,EAAE,IAAI;EACjBC,0BAA0B,EAAE,IAAI;EAChCC,QAAQ,EAAE,KAAK;EACfC,eAAe,EAAE;AACnB,CAAC;AAED,MAAMC,OAAO,GAAG,IAAAC,oBAAW,EAAC;EAC1BC,IAAI,EAAE,IAAI;EACVZ,YAAY;EACZa,QAAQ,EAAE;IACRC,uBAAuB,EAAEA,CACvBC,KAAK,EACLC,MAcE,KACC;MACHD,KAAK,CAACd,uBAAuB,GAAG,IAAI;MACpCc,KAAK,CAACb,MAAM,GAAGc,MAAM,CAACC,OAAO,CAACf,MAAM;MACpCa,KAAK,CAACZ,QAAQ,GAAGa,MAAM,CAACC,OAAO,CAACd,QAAQ,IAAI,IAAI;MAChDY,KAAK,CAACV,UAAU,GAAGW,MAAM,CAACC,OAAO,CAACZ,UAAU,IAAI,EAAE;MAClDU,KAAK,CAACX,UAAU,GAAGY,MAAM,CAACC,OAAO,CAACb,UAAU,IAAI,EAAE;MAClDW,KAAK,CAACT,WAAW,GAAGU,MAAM,CAACC,OAAO,CAACX,WAAW,IAAI,IAAI;MACtDS,KAAK,CAACP,QAAQ,GAAGQ,MAAM,CAACC,OAAO,CAACT,QAAQ;MACxCO,KAAK,CAACR,0BAA0B,GAC9BS,MAAM,CAACC,OAAO,CAACV,0BAA0B;IAC7C,CAAC;IACDW,wBAAwB,EAAGH,KAAK,IAAK;MACnCA,KAAK,CAACd,uBAAuB,GAAG,KAAK;MACrCc,KAAK,CAACb,MAAM,GAAG,IAAI;MACnBa,KAAK,CAACZ,QAAQ,GAAG,IAAI;MACrBY,KAAK,CAACX,UAAU,GAAG,EAAE;MACrBW,KAAK,CAACV,UAAU,GAAG,EAAE;MACrBU,KAAK,CAACT,WAAW,GAAG,IAAI;MACxBS,KAAK,CAACR,0BAA0B,GAAG,IAAI;MACvCQ,KAAK,CAACP,QAAQ,GAAG,KAAK;IACxB,CAAC;IACDW,gBAAgB,EAAEA,CAChBJ,KAAK,EACLC,MAIE,KACC;MACHD,KAAK,CAACI,gBAAgB,GAAG,IAAI;MAC7BJ,KAAK,CAACK,YAAY,GAAGJ,MAAM,CAACC,OAAO,CAACG,YAAY;MAChDL,KAAK,CAACM,cAAc,GAAGL,MAAM,CAACC,OAAO,CAACI,cAAc;MACpDN,KAAK,CAACO,cAAc,GAAGN,MAAM,CAACC,OAAO,CAACK,cAAc;IACtD,CAAC;IACDC,gBAAgB,EAAGR,KAAK,IAAK;MAC3BA,KAAK,CAACN,eAAe,IAAI,CAAC;IAC5B,CAAC;IACDe,gBAAgB,EAAGT,KAAK,IAAK;MAC3BA,KAAK,CAACI,gBAAgB,GAAG,KAAK;MAC9BJ,KAAK,CAACK,YAAY,GAAG,EAAE;MACvBL,KAAK,CAACM,cAAc,GAAG,KAAK;MAC5BN,KAAK,CAACO,cAAc,GAAG,KAAK;IAC9B;EACF;AACF,CAAC,CAAC;AAAC,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEYjB,OAAO","ignoreList":[]}

package/lib/commonjs/core/stores/store/index.js

@@ -11,6 +11,7 @@ var _postDetailSlice = _interopRequireDefault(require("../slices/postDetailSlice
 var _uiSlice = _interopRequireDefault(require("../slices/uiSlice"));
 var _bottomSheetSlice = _interopRequireDefault(require("../slices/bottomSheetSlice"));
 var _toastSlice = _interopRequireDefault(require("../slices/toastSlice"));
+var _localVideoThumbnailSlice = _interopRequireDefault(require("../slices/localVideoThumbnailSlice"));
 var _react = require("react");
 var _reactRedux = require("react-redux");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -25,7 +26,8 @@ const store = exports.store = (0, _toolkit.configureStore)({
     feed: _feedSlice.default.reducer,
     ui: _uiSlice.default.reducer,
     bottomSheet: _bottomSheetSlice.default.reducer,
-    toast: _toastSlice.default.reducer
+    toast: _toastSlice.default.reducer,
+    localVideoThumbnail: _localVideoThumbnailSlice.default.reducer
   },
   middleware: getDefaultMiddleware => getDefaultMiddleware({
     serializableCheck: false

package/lib/commonjs/core/stores/store/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_toolkit","require","_globalfeedSlice","_interopRequireDefault","_feedSlice","_postDetailSlice","_uiSlice","_bottomSheetSlice","_toastSlice","_react","_reactRedux","e","__esModule","default","AmityUIKitReduxContext","exports","createContext","useUIKitStore","createStoreHook","useUIKitDispatch","createDispatchHook","useUIKitSelector","createSelectorHook","store","configureStore","reducer","globalFeed","globalFeedSlice","postDetail","postDetailSlice","feed","feedSlice","ui","uiSlice","bottomSheet","bottomSheetSlice","toast","toastSlice","middleware","getDefaultMiddleware","serializableCheck"],"sourceRoot":"../../../../../src","sources":["core/stores/store/index.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,UAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,gBAAA,GAAAF,sBAAA,CAAAF,OAAA;AACA,IAAAK,QAAA,GAAAH,sBAAA,CAAAF,OAAA;AACA,IAAAM,iBAAA,GAAAJ,sBAAA,CAAAF,OAAA;AACA,IAAAO,WAAA,GAAAL,sBAAA,CAAAF,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,WAAA,GAAAT,OAAA;AAKqB,SAAAE,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAGd,MAAMG,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,gBAAG,IAAAE,oBAAa,EAEjD,IAAW,CAAC;AAEP,MAAMC,aAAa,GAAAF,OAAA,CAAAE,aAAA,GAAG,IAAAC,2BAAe,EAACJ,sBAA6B,CAAC;AACpE,MAAMK,gBAAgB,GAAAJ,OAAA,CAAAI,gBAAA,GAAG,IAAAC,8BAAkB,EAChDN,sBACF,CAAC;AACM,MAAMO,gBAAgB,GAAAN,OAAA,CAAAM,gBAAA,GAAG,IAAAC,8BAAkB,EAChDR,sBACF,CAAC;AAEM,MAAMS,KAAY,GAAAR,OAAA,CAAAQ,KAAA,GAAG,IAAAC,uBAAc,EAAC;EACzCC,OAAO,EAAE;IACPC,UAAU,EAAEC,wBAAe,CAACF,OAAO;IACnCG,UAAU,EAAEC,wBAAe,CAACJ,OAAO;IACnCK,IAAI,EAAEC,kBAAS,CAACN,OAAO;IACvBO,EAAE,EAAEC,gBAAO,CAACR,OAAO;IACnBS,WAAW,EAAEC,yBAAgB,CAACV,OAAO;IACrCW,KAAK,EAAEC,mBAAU,CAACZ;EACpB,CAAC;EACDa,UAAU,EAAGC,oBAAoB,IAC/BA,oBAAoB,CAAC;IACnBC,iBAAiB,EAAE;EACrB,CAAC;AACL,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_toolkit","require","_globalfeedSlice","_interopRequireDefault","_feedSlice","_postDetailSlice","_uiSlice","_bottomSheetSlice","_toastSlice","_localVideoThumbnailSlice","_react","_reactRedux","e","__esModule","default","AmityUIKitReduxContext","exports","createContext","useUIKitStore","createStoreHook","useUIKitDispatch","createDispatchHook","useUIKitSelector","createSelectorHook","store","configureStore","reducer","globalFeed","globalFeedSlice","postDetail","postDetailSlice","feed","feedSlice","ui","uiSlice","bottomSheet","bottomSheetSlice","toast","toastSlice","localVideoThumbnail","localVideoThumbnailSlice","middleware","getDefaultMiddleware","serializableCheck"],"sourceRoot":"../../../../../src","sources":["core/stores/store/index.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,UAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,gBAAA,GAAAF,sBAAA,CAAAF,OAAA;AACA,IAAAK,QAAA,GAAAH,sBAAA,CAAAF,OAAA;AACA,IAAAM,iBAAA,GAAAJ,sBAAA,CAAAF,OAAA;AACA,IAAAO,WAAA,GAAAL,sBAAA,CAAAF,OAAA;AACA,IAAAQ,yBAAA,GAAAN,sBAAA,CAAAF,OAAA;AACA,IAAAS,MAAA,GAAAT,OAAA;AACA,IAAAU,WAAA,GAAAV,OAAA;AAKqB,SAAAE,uBAAAS,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAGd,MAAMG,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,gBAAG,IAAAE,oBAAa,EAEjD,IAAW,CAAC;AAEP,MAAMC,aAAa,GAAAF,OAAA,CAAAE,aAAA,GAAG,IAAAC,2BAAe,EAACJ,sBAA6B,CAAC;AACpE,MAAMK,gBAAgB,GAAAJ,OAAA,CAAAI,gBAAA,GAAG,IAAAC,8BAAkB,EAChDN,sBACF,CAAC;AACM,MAAMO,gBAAgB,GAAAN,OAAA,CAAAM,gBAAA,GAAG,IAAAC,8BAAkB,EAChDR,sBACF,CAAC;AAEM,MAAMS,KAAY,GAAAR,OAAA,CAAAQ,KAAA,GAAG,IAAAC,uBAAc,EAAC;EACzCC,OAAO,EAAE;IACPC,UAAU,EAAEC,wBAAe,CAACF,OAAO;IACnCG,UAAU,EAAEC,wBAAe,CAACJ,OAAO;IACnCK,IAAI,EAAEC,kBAAS,CAACN,OAAO;IACvBO,EAAE,EAAEC,gBAAO,CAACR,OAAO;IACnBS,WAAW,EAAEC,yBAAgB,CAACV,OAAO;IACrCW,KAAK,EAAEC,mBAAU,CAACZ,OAAO;IACzBa,mBAAmB,EAAEC,iCAAwB,CAACd;EAChD,CAAC;EACDe,UAAU,EAAGC,oBAAoB,IAC/BA,oBAAoB,CAAC;IACnBC,iBAAiB,EAAE;EACrB,CAAC;AACL,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/social/components/LoadingImage/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("react");
+var _netinfo = _interopRequireDefault(require("@react-native-community/netinfo"));
 var _reactNative = require("react-native");
 var Progress = _interopRequireWildcard(require("react-native-progress"));
 var _reactNativeSvg = require("react-native-svg");
@@ -12,6 +13,7 @@ var _file = require("../../../core/legacy/file");
 var _xml = require("../../../core/assets/icons/xml");
 var _styles = require("./styles");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const LoadingImage = ({
   source,
   onClose,
@@ -19,11 +21,13 @@ const LoadingImage = ({
   onLoadFinish,
   onUploadError,
   isUploaded = false,
+  displayUri,
   fileId = '',
   isEditMode = false,
   fileCount,
   postId,
-  setIsUploading
+  onUploadingChange,
+  carousel = false
 }) => {
   const [loading, setLoading] = (0, _react.useState)(true);
   const [progress, setProgress] = (0, _react.useState)(0);
@@ -32,16 +36,33 @@ const LoadingImage = ({
   const styles = (0, _styles.useStyles)();
   const handleLoadEnd = (0, _react.useCallback)(() => {
     setLoading(false);
-    setIsUploading(false);
-  }, [setIsUploading]);
+    onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(false, source);
+  }, [onUploadingChange, source]);
   (0, _react.useEffect)(() => {
     if (progress === 100) {
       setIsProcess(true);
     }
   }, [progress]);
   const uploadFileToAmity = (0, _react.useCallback)(async () => {
-    setIsUploading(true);
+    onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(true, source);
     setIsUploadError(false);
+    // A retry re-enters this function with `loading` already false — the failed
+    // attempt's `handleLoadEnd` cleared it and nothing ever set it back, so
+    // `setLoading` only ever ran downwards in this component. The frame then
+    // re-uploaded with no spinner at all, which reads as "finished instantly"
+    // while Post stays disabled for the length of the upload.
+    // Progress and the processing flag are stale from the failed attempt too,
+    // so reset the whole visual upload state here rather than only in the
+    // mount effect, which does not re-run on a retry.
+    setLoading(true);
+    setProgress(0);
+    setIsProcess(false);
+    // Clearing the local flag alone left this source inside the parent's
+    // `imageErrors` set, and that set is otherwise only cleared by the
+    // mount effect below — which does not re-run on a retry, since neither
+    // `isUploaded` nor `source` changed. Post stayed disabled even after the
+    // retry uploaded fine, so tell the parent the error is gone up front.
+    onUploadError === null || onUploadError === void 0 || onUploadError(false, source);
     try {
       const file = await (0, _file.uploadImageFile)(source, percent => {
         setProgress(percent);
@@ -52,7 +73,8 @@ const LoadingImage = ({
         handleLoadEnd();
         onLoadFinish && onLoadFinish((_file$ = file[0]) === null || _file$ === void 0 ? void 0 : _file$.fileId, ((_file$2 = file[0]) === null || _file$2 === void 0 ? void 0 : _file$2.fileUrl) + '?size=medium', (_file$3 = file[0]) === null || _file$3 === void 0 ? void 0 : _file$3.attributes.name, index, source);
       } else {
-        setIsUploading(false);
+        // `handleLoadEnd` already reports the upload as finished — the extra
+        // setter call it used to be paired with was redundant.
         handleLoadEnd();
         setIsProcess(false);
         setIsUploadError(true);
@@ -61,11 +83,34 @@ const LoadingImage = ({
     } catch (error) {
       handleLoadEnd();
       setIsProcess(false);
-      setIsUploading(false);
       setIsUploadError(true);
       onUploadError === null || onUploadError === void 0 || onUploadError(true, source);
     }
-  }, [handleLoadEnd, index, onLoadFinish, onUploadError, setIsUploading, source]);
+  }, [handleLoadEnd, index, onLoadFinish, onUploadError, onUploadingChange, source]);
+
+  // The frame is expected to end up uploaded, and Post enabled, once
+  // connectivity returns. Nothing retried on its own —
+  // the error key only cleared on a manual tap on that specific frame, and the
+  // peek carousel can leave a failed frame off-screen entirely, so Post stayed
+  // disabled with no visible cause. Retry when the device regains a
+  // connection, using the same NetInfo listener idiom as post Detail and the
+  // livestream screens.
+  //
+  // Gated on a disconnected -> connected transition, not merely on being
+  // connected: addEventListener fires immediately with the current state, so a
+  // failure that happened while online (a server error, say) would otherwise
+  // re-fire on every resubscribe and spin.
+  const wasDisconnectedRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(() => {
+    const unsubscribe = _netinfo.default.addEventListener(state => {
+      const isConnected = !!state.isConnected;
+      if (isConnected && wasDisconnectedRef.current && isUploadError) {
+        uploadFileToAmity();
+      }
+      wasDisconnectedRef.current = !isConnected;
+    });
+    return () => unsubscribe();
+  }, [isUploadError, uploadFileToAmity]);
   const handleDelete = async () => {
     if (fileId && !isEditMode) {
       await (0, _file.deleteAmityFile)(fileId);
@@ -83,16 +128,27 @@ const LoadingImage = ({
       uploadFileToAmity();
     }
   }, [isUploaded, source]);
+
+  // A frame can be removed (or its source swapped) while its upload is still
+  // in flight, in which case `handleLoadEnd` never runs and the composer would
+  // keep waiting on an entry no mounted child owns any more — leaving Post
+  // disabled forever. Clearing it from this cleanup keeps the
+  // bookkeeping in the same component that added it.
+  (0, _react.useEffect)(() => {
+    return () => {
+      onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(false, source);
+    };
+  }, [onUploadingChange, source]);
   const onRetryUpload = () => {
     uploadFileToAmity();
   };
   return /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: fileCount >= 3 ? styles.image3XContainer : styles.container
+    style: carousel ? styles.carouselContainer : fileCount >= 3 ? styles.image3XContainer : styles.container
   }, /*#__PURE__*/React.createElement(_reactNative.Image, {
     source: {
-      uri: source
+      uri: displayUri ?? source
     },
-    resizeMode: "contain",
+    resizeMode: carousel ? 'cover' : 'contain',
     style: [styles.image, loading ? styles.loadingImage : styles.loadedImage]
   }), loading && /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.overlay
@@ -116,13 +172,19 @@ const LoadingImage = ({
     width: "28",
     height: "28"
   }))), /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
-    style: styles.closeButton,
+    style: styles.closeButton
+    // The button matches web at 28dp, which is still under Apple's 44pt
+    // minimum touch target. Grow the touch area rather than the black
+    // disc, so the visual stays in parity while the frame stays tappable:
+    // 28 + 8 on each side lands exactly on 44.
+    ,
+    hitSlop: 8,
     disabled: (loading || isProcess) && !isUploadError,
     onPress: handleDelete
   }, /*#__PURE__*/React.createElement(_reactNativeSvg.SvgXml, {
-    xml: (0, _xml.closeIcon)('white'),
-    width: "12",
-    height: "12"
+    xml: (0, _xml.mediaRemoveIcon)(),
+    width: "20",
+    height: "20"
   })));
 };
 var _default = exports.default = LoadingImage;

package/lib/commonjs/social/components/LoadingImage/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","Progress","_interopRequireWildcard","_reactNativeSvg","_file","_xml","_styles","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LoadingImage","source","onClose","index","onLoadFinish","onUploadError","isUploaded","fileId","isEditMode","fileCount","postId","setIsUploading","loading","setLoading","useState","progress","setProgress","isProcess","setIsProcess","isUploadError","setIsUploadError","styles","useStyles","handleLoadEnd","useCallback","useEffect","uploadFileToAmity","file","uploadImageFile","percent","_file$","_file$2","_file$3","fileUrl","attributes","name","error","handleDelete","deleteAmityFile","onRetryUpload","React","createElement","View","style","image3XContainer","container","Image","uri","resizeMode","image","loadingImage","loadedImage","overlay","CircleSnail","size","borderColor","thickness","Circle","unfilledColor","failedOverlay","TouchableOpacity","errorOverlay","onPress","SvgXml","xml","toastIcon","width","height","closeButton","disabled","closeIcon","_default","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingImage/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_netinfo","_interopRequireDefault","_reactNative","Progress","_interopRequireWildcard","_reactNativeSvg","_file","_xml","_styles","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LoadingImage","source","onClose","index","onLoadFinish","onUploadError","isUploaded","displayUri","fileId","isEditMode","fileCount","postId","onUploadingChange","carousel","loading","setLoading","useState","progress","setProgress","isProcess","setIsProcess","isUploadError","setIsUploadError","styles","useStyles","handleLoadEnd","useCallback","useEffect","uploadFileToAmity","file","uploadImageFile","percent","_file$","_file$2","_file$3","fileUrl","attributes","name","error","wasDisconnectedRef","useRef","unsubscribe","NetInfo","addEventListener","state","isConnected","current","handleDelete","deleteAmityFile","onRetryUpload","React","createElement","View","style","carouselContainer","image3XContainer","container","Image","uri","resizeMode","image","loadingImage","loadedImage","overlay","CircleSnail","size","borderColor","thickness","Circle","unfilledColor","failedOverlay","TouchableOpacity","errorOverlay","onPress","SvgXml","xml","toastIcon","width","height","closeButton","hitSlop","disabled","mediaRemoveIcon","_default","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingImage/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/social/components/LoadingImage/styles.js

@@ -20,6 +20,10 @@ const useStyles = () => {
       height: width / 3 - 16,
       margin: 3
     },
+    carouselContainer: {
+      width: '100%',
+      height: '100%'
+    },
     image: {
       width: '100%',
       height: '100%',
@@ -58,9 +62,14 @@ const useStyles = () => {
     },
     closeButton: {
       position: 'absolute',
-      top: 7,
-      right: 7,
-      padding: 7,
+      // Matched to the web UIKit's remove button, which is 20px of icon inside
+      // 4px of padding at an 8px offset. The old 12/7 pair came to nearly the
+      // same 26dp outer size but filled only 46% of the circle with the glyph
+      // against web's 71%, so it read as a heavy black disc with a tiny cross
+      // in it.
+      top: 8,
+      right: 8,
+      padding: 4,
       backgroundColor: 'rgba(0, 0, 0, 0.4)',
       borderRadius: 72,
       zIndex: 10

package/lib/commonjs/social/components/LoadingImage/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","useStyles","width","useWindowDimensions","StyleSheet","create","container","flex","height","margin","image3XContainer","image","resizeMode","borderRadius","position","overlay","absoluteFillObject","justifyContent","alignItems","failedOverlay","backgroundColor","errorOverlay","top","left","right","progressBar","marginVertical","loadingImage","opacity","loadedImage","closeButton","padding","zIndex","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingImage/styles.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,SAAS,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACvC,OAAOC,uBAAU,CAACC,MAAM,CAAC;IACvBC,SAAS,EAAE;MACTC,IAAI,EAAE,CAAC;MACPC,MAAM,EAAEN,KAAK,GAAG,EAAE;MAClBO,MAAM,EAAE;IACV,CAAC;IACDC,gBAAgB,EAAE;MAChBR,KAAK,EAAEA,KAAK,GAAG,CAAC,GAAG,EAAE;MACrBM,MAAM,EAAEN,KAAK,GAAG,CAAC,GAAG,EAAE;MACtBO,MAAM,EAAE;IACV,CAAC;IACDE,KAAK,EAAE;MACLT,KAAK,EAAE,MAAM;MACbM,MAAM,EAAE,MAAM;MACdI,UAAU,EAAE,OAAO;MACnBC,YAAY,EAAE,CAAC;MACfC,QAAQ,EAAE;IACZ,CAAC;IACDC,OAAO,EAAE;MACP,GAAGX,uBAAU,CAACY,kBAAkB;MAChCC,cAAc,EAAE,QAAQ;MACxBC,UAAU,EAAE;IACd,CAAC;IACDC,aAAa,EAAE;MACb,GAAGf,uBAAU,CAACY,kBAAkB;MAChCC,cAAc,EAAE,QAAQ;MACxBC,UAAU,EAAE,QAAQ;MACpBE,eAAe,EAAE,oBAAoB;MACrCP,YAAY,EAAE;IAChB,CAAC;IACDQ,YAAY,EAAE;MACZP,QAAQ,EAAE,UAAU;MACpBQ,GAAG,EAAE,KAAK;MACVC,IAAI,EAAE,CAAC;MACPC,KAAK,EAAE,CAAC;MACRN,UAAU,EAAE,QAAQ;MACpBD,cAAc,EAAE;IAClB,CAAC;IACDQ,WAAW,EAAE;MACXC,cAAc,EAAE;IAClB,CAAC;IACDC,YAAY,EAAE;MACZC,OAAO,EAAE;IACX,CAAC;IACDC,WAAW,EAAE;MACXD,OAAO,EAAE;IACX,CAAC;IACDE,WAAW,EAAE;MACXhB,QAAQ,EAAE,UAAU;MACpBQ,GAAG,EAAE,CAAC;MACNE,KAAK,EAAE,CAAC;MACRO,OAAO,EAAE,CAAC;MACVX,eAAe,EAAE,oBAAoB;MACrCP,YAAY,EAAE,EAAE;MAChBmB,MAAM,EAAE;IACV;EACF,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAhC,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","useStyles","width","useWindowDimensions","StyleSheet","create","container","flex","height","margin","image3XContainer","carouselContainer","image","resizeMode","borderRadius","position","overlay","absoluteFillObject","justifyContent","alignItems","failedOverlay","backgroundColor","errorOverlay","top","left","right","progressBar","marginVertical","loadingImage","opacity","loadedImage","closeButton","padding","zIndex","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingImage/styles.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,SAAS,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACvC,OAAOC,uBAAU,CAACC,MAAM,CAAC;IACvBC,SAAS,EAAE;MACTC,IAAI,EAAE,CAAC;MACPC,MAAM,EAAEN,KAAK,GAAG,EAAE;MAClBO,MAAM,EAAE;IACV,CAAC;IACDC,gBAAgB,EAAE;MAChBR,KAAK,EAAEA,KAAK,GAAG,CAAC,GAAG,EAAE;MACrBM,MAAM,EAAEN,KAAK,GAAG,CAAC,GAAG,EAAE;MACtBO,MAAM,EAAE;IACV,CAAC;IACDE,iBAAiB,EAAE;MACjBT,KAAK,EAAE,MAAM;MACbM,MAAM,EAAE;IACV,CAAC;IACDI,KAAK,EAAE;MACLV,KAAK,EAAE,MAAM;MACbM,MAAM,EAAE,MAAM;MACdK,UAAU,EAAE,OAAO;MACnBC,YAAY,EAAE,CAAC;MACfC,QAAQ,EAAE;IACZ,CAAC;IACDC,OAAO,EAAE;MACP,GAAGZ,uBAAU,CAACa,kBAAkB;MAChCC,cAAc,EAAE,QAAQ;MACxBC,UAAU,EAAE;IACd,CAAC;IACDC,aAAa,EAAE;MACb,GAAGhB,uBAAU,CAACa,kBAAkB;MAChCC,cAAc,EAAE,QAAQ;MACxBC,UAAU,EAAE,QAAQ;MACpBE,eAAe,EAAE,oBAAoB;MACrCP,YAAY,EAAE;IAChB,CAAC;IACDQ,YAAY,EAAE;MACZP,QAAQ,EAAE,UAAU;MACpBQ,GAAG,EAAE,KAAK;MACVC,IAAI,EAAE,CAAC;MACPC,KAAK,EAAE,CAAC;MACRN,UAAU,EAAE,QAAQ;MACpBD,cAAc,EAAE;IAClB,CAAC;IACDQ,WAAW,EAAE;MACXC,cAAc,EAAE;IAClB,CAAC;IACDC,YAAY,EAAE;MACZC,OAAO,EAAE;IACX,CAAC;IACDC,WAAW,EAAE;MACXD,OAAO,EAAE;IACX,CAAC;IACDE,WAAW,EAAE;MACXhB,QAAQ,EAAE,UAAU;MACpB;MACA;MACA;MACA;MACA;MACAQ,GAAG,EAAE,CAAC;MACNE,KAAK,EAAE,CAAC;MACRO,OAAO,EAAE,CAAC;MACVX,eAAe,EAAE,oBAAoB;MACrCP,YAAY,EAAE,EAAE;MAChBmB,MAAM,EAAE;IACV;EACF,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAjC,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/commonjs/social/components/LoadingVideo/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("react");
+var _netinfo = _interopRequireDefault(require("@react-native-community/netinfo"));
 var _reactNative = require("react-native");
 var Progress = _interopRequireWildcard(require("react-native-progress"));
 var _reactNativeSvg = require("react-native-svg");
@@ -16,8 +17,8 @@ var _native = require("@react-navigation/native");
 var _uiSlice = _interopRequireDefault(require("../../../core/stores/slices/uiSlice"));
 var _reactNativeCompressor = require("react-native-compressor");
 var _store = require("../../../core/stores/store");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const LoadingVideo = ({
   source,
   onClose,
@@ -25,13 +26,15 @@ const LoadingVideo = ({
   onLoadFinish,
   onUploadError,
   isUploaded = false,
+  displayUri,
   thumbNail,
   onPlay,
   fileId,
   isEditMode = false,
   fileCount,
   postId,
-  setIsUploading
+  onUploadingChange,
+  carousel = false
 }) => {
   const dispatch = (0, _store.useUIKitDispatch)();
   const {
@@ -42,6 +45,10 @@ const LoadingVideo = ({
   const [isProcess, setIsProcess] = (0, _react.useState)(false);
   const [isUploadError, setIsUploadError] = (0, _react.useState)(false);
   const [thumbNailImage, setThumbNailImage] = (0, _react.useState)(thumbNail ?? '');
+  // `uploadFileToAmity` is memoised on [source] only, so reading the state
+  // there would capture the empty first-render value. Mirror it into a ref so
+  // the upload callback always sees the frame that was actually decoded.
+  const thumbNailImageRef = (0, _react.useRef)(thumbNail ?? '');
   const styles = (0, _styles.useStyles)();
   const [playingUri, setPlayingUri] = (0, _react.useState)('');
   const [isPause, setIsPause] = (0, _react.useState)(true);
@@ -62,10 +69,11 @@ const LoadingVideo = ({
   };
   const handleLoadEnd = () => {
     setLoading(false);
-    setIsUploading(false);
+    onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(false, source);
   };
   const processThumbNail = async () => {
-    const generatedThumbNail = await (0, _reactNativeCompressor.createVideoThumbnail)(source);
+    const generatedThumbNail = await (0, _reactNativeCompressor.createVideoThumbnail)(displayUri ?? source);
+    thumbNailImageRef.current = generatedThumbNail.path;
     setThumbNailImage(generatedThumbNail.path);
   };
   (0, _react.useEffect)(() => {
@@ -77,8 +85,25 @@ const LoadingVideo = ({
     }
   }, [progress]);
   const uploadFileToAmity = (0, _react.useCallback)(async () => {
-    setIsUploading(true);
+    onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(true, source);
     setIsUploadError(false);
+    // A retry re-enters this function with `loading` already false — the failed
+    // attempt's `handleLoadEnd` cleared it and nothing ever set it back, so
+    // `setLoading` only ever ran downwards in this component. The frame then
+    // re-uploaded with no spinner at all, which reads as "finished instantly"
+    // while Post stays disabled for the length of the upload.
+    // Progress and the processing flag are stale from the failed attempt too,
+    // so reset the whole visual upload state here rather than only in the
+    // mount effect, which does not re-run on a retry.
+    setLoading(true);
+    setProgress(0);
+    setIsProcess(false);
+    // Clearing the local flag alone left this source inside the parent's
+    // `videoErrors` set, and that set is otherwise only cleared by the
+    // mount effect below — which does not re-run on a retry, since none of
+    // `fileId`/`isUploaded`/`source` changed. Post stayed disabled even after
+    // the retry uploaded fine, so tell the parent the error is gone up front.
+    onUploadError === null || onUploadError === void 0 || onUploadError(false, source);
     try {
       const file = await (0, _file.uploadVideoFile)(source, percent => {
         setProgress(percent);
@@ -87,7 +112,13 @@ const LoadingVideo = ({
         var _file$, _file$2, _file$3;
         setIsProcess(false);
         handleLoadEnd();
-        onLoadFinish && onLoadFinish((_file$ = file[0]) === null || _file$ === void 0 ? void 0 : _file$.fileId, (_file$2 = file[0]) === null || _file$2 === void 0 ? void 0 : _file$2.fileUrl, (_file$3 = file[0]) === null || _file$3 === void 0 ? void 0 : _file$3.attributes.name, index, source, thumbNail);
+        onLoadFinish && onLoadFinish((_file$ = file[0]) === null || _file$ === void 0 ? void 0 : _file$.fileId, (_file$2 = file[0]) === null || _file$2 === void 0 ? void 0 : _file$2.fileUrl, (_file$3 = file[0]) === null || _file$3 === void 0 ? void 0 : _file$3.attributes.name, index, source,
+        // Hand back the frame this component decoded, not the incoming
+        // prop — for a newly picked video that prop is empty, so the
+        // generated thumbnail used to be dropped on the floor. The
+        // composer stores it so the feed can show it while the server is
+        // still transcoding (PDT-4904).
+        thumbNailImageRef.current || thumbNail);
       } else {
         handleLoadEnd();
         dispatch(showToastMessage({
@@ -107,6 +138,30 @@ const LoadingVideo = ({
       onUploadError === null || onUploadError === void 0 || onUploadError(true, source);
     }
   }, [source]);
+
+  // The frame is expected to end up uploaded, and Post enabled, once
+  // connectivity returns. Nothing retried on its own —
+  // the error key only cleared on a manual tap on that specific frame, and the
+  // peek carousel can leave a failed frame off-screen entirely, so Post stayed
+  // disabled with no visible cause. Retry when the device regains a
+  // connection, using the same NetInfo listener idiom as post Detail and the
+  // livestream screens.
+  //
+  // Gated on a disconnected -> connected transition, not merely on being
+  // connected: addEventListener fires immediately with the current state, so a
+  // failure that happened while online (a server error, say) would otherwise
+  // re-fire on every resubscribe and spin.
+  const wasDisconnectedRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(() => {
+    const unsubscribe = _netinfo.default.addEventListener(state => {
+      const isConnected = !!state.isConnected;
+      if (isConnected && wasDisconnectedRef.current && isUploadError) {
+        uploadFileToAmity();
+      }
+      wasDisconnectedRef.current = !isConnected;
+    });
+    return () => unsubscribe();
+  }, [isUploadError, uploadFileToAmity]);
   const handleDelete = async () => {
     if (fileId && !isEditMode) {
       await (0, _file.deleteAmityFile)(fileId);
@@ -125,22 +180,41 @@ const LoadingVideo = ({
     }
   }, [fileId, isUploaded, source]);
   const handleOnPlay = () => {
+    // In carousel mode the parent (onPlay) owns the full-screen media viewer,
+    // so this component never mounts the inline <Video> and never receives a
+    // dismiss callback to unpause with. Leaving `isPause` alone keeps the play
+    // icon rendered, which is what the frame shows once the viewer closes
+    // (PDT-4904); toggling it here hid the icon for the rest of the session.
+    if (onPlay) {
+      onPlay(source);
+      return;
+    }
     setIsPause(!isPause);
     playVideoFullScreen(source);
-    onPlay && onPlay(source);
   };
+
+  // A frame can be removed (or its source swapped) while its upload is still
+  // in flight, in which case `handleLoadEnd` never runs and the composer would
+  // keep waiting on an entry no mounted child owns any more — leaving Post
+  // disabled forever. Clearing it from this cleanup keeps the
+  // bookkeeping in the same component that added it.
+  (0, _react.useEffect)(() => {
+    return () => {
+      onUploadingChange === null || onUploadingChange === void 0 || onUploadingChange(false, source);
+    };
+  }, [onUploadingChange, source]);
   const onRetryUpload = () => {
     uploadFileToAmity();
   };
   return /*#__PURE__*/React.createElement(_reactNative.View, {
-    style: fileCount >= 3 ? styles.image3XContainer : styles.container
+    style: carousel ? styles.carouselContainer : fileCount >= 3 ? styles.image3XContainer : styles.container
   }, !loading && !isUploadError && isPause && /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
     style: styles.playButton,
     onPress: handleOnPlay
   }, /*#__PURE__*/React.createElement(_reactNativeSvg.SvgXml, {
-    xml: _xml.playBtn,
-    width: "50",
-    height: "50"
+    xml: carousel ? _xml.videoControlIcon : _xml.playBtn,
+    width: carousel ? 40 : 50,
+    height: carousel ? 40 : 50
   })), playingUri && !isPause ? /*#__PURE__*/React.createElement(_reactNativeVideo.default, {
     controls: true,
     style: styles.image,
@@ -157,7 +231,7 @@ const LoadingVideo = ({
     style: [styles.image, loading ? styles.loadingImage : styles.loadedImage]
   }) : /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.image
-  }), loading ? /*#__PURE__*/React.createElement(_reactNative.View, {
+  }), loading && /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.overlay
   }, isProcess ? /*#__PURE__*/React.createElement(Progress.CircleSnail, {
     size: 24,
@@ -169,21 +243,27 @@ const LoadingVideo = ({
     borderColor: "transparent",
     unfilledColor: "#ffffff",
     thickness: 2
-  })) : isUploadError ? /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
+  })), !loading && isUploadError && /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
     style: styles.overlay,
     onPress: onRetryUpload
   }, /*#__PURE__*/React.createElement(_reactNativeSvg.SvgXml, {
     xml: (0, _xml.toastIcon)(),
     width: "24",
     height: "24"
-  })) : /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
-    style: styles.closeButton,
+  })), /*#__PURE__*/React.createElement(_reactNative.TouchableOpacity, {
+    style: styles.closeButton
+    // The button matches web at 28dp, which is still under Apple's 44pt
+    // minimum touch target. Grow the touch area rather than the black
+    // disc, so the visual stays in parity while the frame stays tappable:
+    // 28 + 8 on each side lands exactly on 44.
+    ,
+    hitSlop: 8,
     disabled: (loading || isProcess) && !isUploadError,
     onPress: handleDelete
   }, /*#__PURE__*/React.createElement(_reactNativeSvg.SvgXml, {
-    xml: (0, _xml.closeIcon)('white'),
-    width: "12",
-    height: "12"
+    xml: (0, _xml.mediaRemoveIcon)(),
+    width: "20",
+    height: "20"
   })));
 };
 var _default = exports.default = LoadingVideo;

package/lib/commonjs/social/components/LoadingVideo/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","Progress","_interopRequireWildcard","_reactNativeSvg","_file","_xml","_styles","_reactNativeVideo","_interopRequireDefault","_native","_uiSlice","_reactNativeCompressor","_store","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LoadingVideo","source","onClose","index","onLoadFinish","onUploadError","isUploaded","thumbNail","onPlay","fileId","isEditMode","fileCount","postId","setIsUploading","dispatch","useUIKitDispatch","showToastMessage","uiSlice","actions","loading","setLoading","useState","progress","setProgress","isProcess","setIsProcess","isUploadError","setIsUploadError","thumbNailImage","setThumbNailImage","styles","useStyles","playingUri","setPlayingUri","isPause","setIsPause","navigation","useNavigation","playVideoFullScreen","fileUrl","Platform","OS","navigate","onClosePlayer","handleLoadEnd","processThumbNail","generatedThumbNail","createVideoThumbnail","path","useEffect","uploadFileToAmity","useCallback","file","uploadVideoFile","percent","_file$","_file$2","_file$3","attributes","name","toastMessage","error","handleDelete","deleteAmityFile","handleOnPlay","onRetryUpload","React","createElement","View","style","image3XContainer","container","TouchableOpacity","playButton","onPress","SvgXml","xml","playBtn","width","height","controls","image","uri","onFullscreenPlayerWillDismiss","paused","Image","resizeMode","loadingImage","loadedImage","overlay","CircleSnail","size","borderColor","thickness","Circle","unfilledColor","toastIcon","closeButton","disabled","closeIcon","_default","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingVideo/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_netinfo","_interopRequireDefault","_reactNative","Progress","_interopRequireWildcard","_reactNativeSvg","_file","_xml","_styles","_reactNativeVideo","_native","_uiSlice","_reactNativeCompressor","_store","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LoadingVideo","source","onClose","index","onLoadFinish","onUploadError","isUploaded","displayUri","thumbNail","onPlay","fileId","isEditMode","fileCount","postId","onUploadingChange","carousel","dispatch","useUIKitDispatch","showToastMessage","uiSlice","actions","loading","setLoading","useState","progress","setProgress","isProcess","setIsProcess","isUploadError","setIsUploadError","thumbNailImage","setThumbNailImage","thumbNailImageRef","useRef","styles","useStyles","playingUri","setPlayingUri","isPause","setIsPause","navigation","useNavigation","playVideoFullScreen","fileUrl","Platform","OS","navigate","onClosePlayer","handleLoadEnd","processThumbNail","generatedThumbNail","createVideoThumbnail","current","path","useEffect","uploadFileToAmity","useCallback","file","uploadVideoFile","percent","_file$","_file$2","_file$3","attributes","name","toastMessage","error","wasDisconnectedRef","unsubscribe","NetInfo","addEventListener","state","isConnected","handleDelete","deleteAmityFile","handleOnPlay","onRetryUpload","React","createElement","View","style","carouselContainer","image3XContainer","container","TouchableOpacity","playButton","onPress","SvgXml","xml","videoControlIcon","playBtn","width","height","controls","image","uri","onFullscreenPlayerWillDismiss","paused","Image","resizeMode","loadingImage","loadedImage","overlay","CircleSnail","size","borderColor","thickness","Circle","unfilledColor","toastIcon","closeButton","hitSlop","disabled","mediaRemoveIcon","_default","exports"],"sourceRoot":"../../../../../src","sources":["social/components/LoadingVideo/index.tsx"],"mappings":"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","ignoreList":[]}