@edifice.io/react 2.6.3-develop-pedago.20260908113442 → 2.6.3-develop-pedago.20260909111933

package/dist/hooks/useUploadFiles/index.d.ts

@@ -1 +1,2 @@
 export { default as useUploadFiles } from './useUploadFiles';
+export type { UploadSourceFileInfo } from './useUploadFiles';

package/dist/hooks/useUploadFiles/useUploadFiles.d.ts

@@ -1,6 +1,16 @@
 import { WorkspaceElement, WorkspaceVisibility } from '@edifice.io/client';
+/**
+ * Snapshot of a source file taken at upload time, so the upload result can be
+ * re-ordered later on against the original file metadata.
+ */
+export interface UploadSourceFileInfo {
+    /** Original file name. */
+    name: string;
+    /** `File.lastModified` of the source file (ms since epoch). */
+    lastModified: number;
+}
 declare const useUploadFiles: ({ handleOnChange, visibility, application, }: {
-    handleOnChange: (uploadedFiles: WorkspaceElement[], sourceFiles: File[]) => void;
+    handleOnChange: (uploadedFiles: WorkspaceElement[], sourceFilesInfo: Record<string, UploadSourceFileInfo>) => void;
     visibility?: WorkspaceVisibility;
     application?: string;
 }) => {

package/dist/hooks/useUploadFiles/useUploadFiles.js

@@ -1,4 +1,4 @@
-import { useState, useCallback, useEffect } from "react";
+import { useState, useRef, useCallback, useEffect } from "react";
 import { ImageResizer, addTimestampToImageUrl } from "@edifice.io/utilities";
 import { useDropzoneContext } from "../../components/Dropzone/DropzoneContext.js";
 import useWorkspaceFile from "../useWorkspaceFile/useWorkspaceFile.js";
@@ -8,7 +8,7 @@ const useUploadFiles = ({
   visibility,
   application
 }) => {
-  const [uploadedFiles, setUploadedFiles] = useState([]), [editingImage, setEditingImage] = useState(void 0), {
+  const [uploadedFiles, setUploadedFiles] = useState([]), sourceFilesInfoRef = useRef({}), [editingImage, setEditingImage] = useState(void 0), {
     files,
     deleteFile,
     replaceFileAt,
@@ -34,7 +34,10 @@ const useUploadFiles = ({
         } catch (err) {
           console.error(err);
         }
-      !resource && !replacement && (resource = await uploadFile(file)), resource ? setUploadedFiles((prevFiles) => [...prevFiles, resource]) : resetInputValue();
+      !resource && !replacement && (resource = await uploadFile(file)), resource ? (resource._id && (sourceFilesInfoRef.current[resource._id] = {
+        name: file.name,
+        lastModified: file.lastModified
+      }), setUploadedFiles((prevFiles) => [...prevFiles, resource])) : resetInputValue();
     });
   }, [uploadAlternateFile, uploadFile, replaceFileAt]);
   useEffect(() => {
@@ -47,15 +50,17 @@ const useUploadFiles = ({
     newFiles.forEach((file) => file && setUploadStatus(file, "idle")), tryUploading(newFiles);
   }, [files, uploadedFiles, getUploadStatus, setUploadStatus, tryUploading]), useEffect(() => {
     const sortedUploadedFiles = sortUploadedFiles(files, uploadedFiles);
-    handleOnChange(sortedUploadedFiles, files);
+    handleOnChange(sortedUploadedFiles, {
+      ...sourceFilesInfoRef.current
+    });
   }, [uploadedFiles]);
   const sortUploadedFiles = (filesArray, uploadedFilesArray) => {
-    const orderMap = filesArray.reduce((acc, item, index) => (acc[item.name] = index, acc), {});
-    return uploadedFilesArray.sort((a, b) => orderMap[a.name] - orderMap[b.name]);
+    const orderMap = filesArray.reduce((acc, item, index) => (item.name in acc || (acc[item.name] = index), acc), {});
+    return [...uploadedFilesArray].sort((a, b) => (orderMap[a.name] ?? Number.MAX_SAFE_INTEGER) - (orderMap[b.name] ?? Number.MAX_SAFE_INTEGER));
   };
   async function removeFile(file) {
     const resource = uploadedFiles.find((uploadedFile) => uploadedFile.name === file.name);
-    resource && (await remove(resource), clearUploadStatus(file), setUploadedFiles((prevFiles) => prevFiles.filter((prevFile) => prevFile.name !== (resource == null ? void 0 : resource.name)))), deleteFile(file), resetInputValue();
+    resource && (await remove(resource), clearUploadStatus(file), resource._id && delete sourceFilesInfoRef.current[resource._id], setUploadedFiles((prevFiles) => prevFiles.filter((prevFile) => prevFile.name !== (resource == null ? void 0 : resource.name)))), deleteFile(file), resetInputValue();
   }
   async function updateImage({
     blob,

package/dist/modules/multimedia/MediaLibrary/innertabs/Upload.js

@@ -20,13 +20,17 @@ const acceptedTypes = (type) => {
       break;
   }
   return acceptedTypes2;
-}, orderUploadedFiles = (uploadedFiles, sourceFiles, byAlpha) => {
-  if (byAlpha)
-    return [...uploadedFiles].sort((a, b) => a.name.localeCompare(b.name, void 0, {
-      numeric: !0
-    }));
-  const lastModifiedByName = new Map(sourceFiles.map((file) => [file.name, file.lastModified]));
-  return [...uploadedFiles].sort((a, b) => (lastModifiedByName.get(b.name) ?? 0) - (lastModifiedByName.get(a.name) ?? 0));
+}, orderUploadedFiles = (uploadedFiles, sourceFilesInfo, byAlpha) => {
+  const infoOf = (element) => element._id ? sourceFilesInfo[element._id] : void 0, nameOf = (element) => {
+    var _a;
+    return ((_a = infoOf(element)) == null ? void 0 : _a.name) ?? element.name;
+  }, lastModifiedOf = (element) => {
+    var _a;
+    return ((_a = infoOf(element)) == null ? void 0 : _a.lastModified) ?? 0;
+  };
+  return byAlpha ? [...uploadedFiles].sort((a, b) => nameOf(a).localeCompare(nameOf(b), void 0, {
+    numeric: !0
+  })) : [...uploadedFiles].sort((a, b) => lastModifiedOf(b) - lastModifiedOf(a)).reverse();
 }, Upload = () => {
   const {
     t
@@ -38,15 +42,15 @@ const acceptedTypes = (type) => {
     setResultCounter,
     setCancellable,
     setPreSuccess
-  } = useMediaLibraryContext(), [sortByAlpha, setSortByAlpha] = useState(!0), [uploadedFiles, setUploadedFiles] = useState([]), sourceFilesRef = useRef([]), handleOnFilesChange = (uploadedFiles2, sourceFiles) => {
-    sourceFilesRef.current = sourceFiles, setUploadedFiles(uploadedFiles2), uploadedFiles2.length ? (setCancellable(uploadedFiles2), setResultCounter(uploadedFiles2.length), setResult(uploadedFiles2)) : (setCancellable([]), setResultCounter(void 0), setResult(void 0));
+  } = useMediaLibraryContext(), [sortByAlpha, setSortByAlpha] = useState(!0), [uploadedFiles, setUploadedFiles] = useState([]), sourceFilesInfoRef = useRef({}), handleOnFilesChange = (uploadedFiles2, sourceFilesInfo) => {
+    sourceFilesInfoRef.current = sourceFilesInfo, setUploadedFiles(uploadedFiles2), uploadedFiles2.length ? (setCancellable(uploadedFiles2), setResultCounter(uploadedFiles2.length), setResult(uploadedFiles2)) : (setCancellable([]), setResultCounter(void 0), setResult(void 0));
   };
   return useEffect(() => {
     if (!multiple || !uploadedFiles.length) {
       setPreSuccess(void 0);
       return;
     }
-    setPreSuccess(() => () => Promise.resolve(orderUploadedFiles(uploadedFiles, sourceFilesRef.current, sortByAlpha)));
+    setPreSuccess(() => () => Promise.resolve(orderUploadedFiles(uploadedFiles, sourceFilesInfoRef.current, sortByAlpha)));
   }, [multiple, uploadedFiles, sortByAlpha, setPreSuccess]), /* @__PURE__ */ jsxs("div", { className: "flex-grow-1", children: [
     multiple && /* @__PURE__ */ jsxs(Flex, { className: "mb-16 ms-8", align: "start", direction: "column", gap: "8", children: [
       /* @__PURE__ */ jsxs("div", { children: [

package/dist/modules/multimedia/UploadFiles/UploadFiles.d.ts

@@ -1,7 +1,8 @@
 import { WorkspaceElement, WorkspaceVisibility } from '@edifice.io/client';
+import { UploadSourceFileInfo } from '../../../hooks';
 declare const UploadFiles: {
     ({ onFilesChange, visibility, }: {
-        onFilesChange: (uploadedFiles: WorkspaceElement[], sourceFiles: File[]) => void;
+        onFilesChange: (uploadedFiles: WorkspaceElement[], sourceFilesInfo: Record<string, UploadSourceFileInfo>) => void;
         visibility?: WorkspaceVisibility;
     }): import("react/jsx-runtime").JSX.Element;
     displayName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edifice.io/react",
-  "version": "2.6.3-develop-pedago.20260908113442",
+  "version": "2.6.3-develop-pedago.20260909111933",
   "description": "Edifice React Library",
   "keywords": [
     "react",
@@ -140,9 +140,9 @@
     "swiper": "10.1.0",
     "ua-parser-js": "1.0.36",
     "zustand": "4.5.7",
-    "@edifice.io/tiptap-extensions": "2.6.3-develop-pedago.20260908113442",
-    "@edifice.io/utilities": "2.6.3-develop-pedago.20260908113442",
-    "@edifice.io/bootstrap": "2.6.3-develop-pedago.20260908113442"
+    "@edifice.io/tiptap-extensions": "2.6.3-develop-pedago.20260909111933",
+    "@edifice.io/utilities": "2.6.3-develop-pedago.20260909111933",
+    "@edifice.io/bootstrap": "2.6.3-develop-pedago.20260909111933"
   },
   "devDependencies": {
     "@babel/plugin-transform-react-pure-annotations": "7.27.1",
@@ -173,8 +173,8 @@
     "vite": "5.4.14",
     "vite-plugin-dts": "4.5.4",
     "vite-tsconfig-paths": "5.1.4",
-    "@edifice.io/client": "2.6.3-develop-pedago.20260908113442",
-    "@edifice.io/config": "2.6.3-develop-pedago.20260908113442"
+    "@edifice.io/client": "2.6.3-develop-pedago.20260909111933",
+    "@edifice.io/config": "2.6.3-develop-pedago.20260909111933"
   },
   "peerDependencies": {
     "@react-spring/web": "9.7.5",