@edifice.io/react 2.6.3-develop-pedago.20260826173028 → 2.6.3-develop-pedago.20260908113442
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WorkspaceElement, WorkspaceVisibility } from '@edifice.io/client';
|
|
2
2
|
declare const useUploadFiles: ({ handleOnChange, visibility, application, }: {
|
|
3
|
-
handleOnChange: (uploadedFiles: WorkspaceElement[]) => void;
|
|
3
|
+
handleOnChange: (uploadedFiles: WorkspaceElement[], sourceFiles: File[]) => void;
|
|
4
4
|
visibility?: WorkspaceVisibility;
|
|
5
5
|
application?: string;
|
|
6
6
|
}) => {
|
|
@@ -47,7 +47,7 @@ const useUploadFiles = ({
|
|
|
47
47
|
newFiles.forEach((file) => file && setUploadStatus(file, "idle")), tryUploading(newFiles);
|
|
48
48
|
}, [files, uploadedFiles, getUploadStatus, setUploadStatus, tryUploading]), useEffect(() => {
|
|
49
49
|
const sortedUploadedFiles = sortUploadedFiles(files, uploadedFiles);
|
|
50
|
-
handleOnChange(sortedUploadedFiles);
|
|
50
|
+
handleOnChange(sortedUploadedFiles, files);
|
|
51
51
|
}, [uploadedFiles]);
|
|
52
52
|
const sortUploadedFiles = (filesArray, uploadedFilesArray) => {
|
|
53
53
|
const orderMap = filesArray.reduce((acc, item, index) => (acc[item.name] = index, acc), {});
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { jsxs, jsx } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { useState, useRef, useEffect } from "react";
|
|
3
3
|
import { useTranslation } from "react-i18next";
|
|
4
|
-
import
|
|
4
|
+
import { useMediaLibraryContext } from "../MediaLibraryContext.js";
|
|
5
|
+
import Flex from "../../../../components/Flex/Flex.js";
|
|
6
|
+
import Radio from "../../../../components/Radio/Radio.js";
|
|
5
7
|
import Dropzone from "../../../../components/Dropzone/Dropzone.js";
|
|
6
8
|
import UploadFiles from "../../UploadFiles/UploadFiles.js";
|
|
7
9
|
const acceptedTypes = (type) => {
|
|
@@ -18,6 +20,13 @@ const acceptedTypes = (type) => {
|
|
|
18
20
|
break;
|
|
19
21
|
}
|
|
20
22
|
return acceptedTypes2;
|
|
23
|
+
}, orderUploadedFiles = (uploadedFiles, sourceFiles, byAlpha) => {
|
|
24
|
+
if (byAlpha)
|
|
25
|
+
return [...uploadedFiles].sort((a, b) => a.name.localeCompare(b.name, void 0, {
|
|
26
|
+
numeric: !0
|
|
27
|
+
}));
|
|
28
|
+
const lastModifiedByName = new Map(sourceFiles.map((file) => [file.name, file.lastModified]));
|
|
29
|
+
return [...uploadedFiles].sort((a, b) => (lastModifiedByName.get(b.name) ?? 0) - (lastModifiedByName.get(a.name) ?? 0));
|
|
21
30
|
}, Upload = () => {
|
|
22
31
|
const {
|
|
23
32
|
t
|
|
@@ -27,12 +36,26 @@ const acceptedTypes = (type) => {
|
|
|
27
36
|
multiple,
|
|
28
37
|
setResult,
|
|
29
38
|
setResultCounter,
|
|
30
|
-
setCancellable
|
|
31
|
-
|
|
32
|
-
|
|
39
|
+
setCancellable,
|
|
40
|
+
setPreSuccess
|
|
41
|
+
} = useMediaLibraryContext(), [sortByAlpha, setSortByAlpha] = useState(!0), [uploadedFiles, setUploadedFiles] = useState([]), sourceFilesRef = useRef([]), handleOnFilesChange = (uploadedFiles2, sourceFiles) => {
|
|
42
|
+
sourceFilesRef.current = sourceFiles, setUploadedFiles(uploadedFiles2), uploadedFiles2.length ? (setCancellable(uploadedFiles2), setResultCounter(uploadedFiles2.length), setResult(uploadedFiles2)) : (setCancellable([]), setResultCounter(void 0), setResult(void 0));
|
|
33
43
|
};
|
|
34
|
-
return
|
|
35
|
-
|
|
44
|
+
return useEffect(() => {
|
|
45
|
+
if (!multiple || !uploadedFiles.length) {
|
|
46
|
+
setPreSuccess(void 0);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
setPreSuccess(() => () => Promise.resolve(orderUploadedFiles(uploadedFiles, sourceFilesRef.current, sortByAlpha)));
|
|
50
|
+
}, [multiple, uploadedFiles, sortByAlpha, setPreSuccess]), /* @__PURE__ */ jsxs("div", { className: "flex-grow-1", children: [
|
|
51
|
+
multiple && /* @__PURE__ */ jsxs(Flex, { className: "mb-16 ms-8", align: "start", direction: "column", gap: "8", children: [
|
|
52
|
+
/* @__PURE__ */ jsxs("div", { children: [
|
|
53
|
+
t("bbm.upload.sort.title"),
|
|
54
|
+
" :"
|
|
55
|
+
] }),
|
|
56
|
+
/* @__PURE__ */ jsx(Radio, { label: t("bbm.upload.sort.alpha"), name: "media-library-upload-sort", value: "alpha", model: sortByAlpha ? "alpha" : "date", checked: sortByAlpha, onChange: () => setSortByAlpha(!0), "data-testid": "media-library-upload-sort-alpha" }),
|
|
57
|
+
/* @__PURE__ */ jsx(Radio, { label: t("bbm.upload.sort.date"), name: "media-library-upload-sort", value: "date", model: sortByAlpha ? "alpha" : "date", checked: !sortByAlpha, onChange: () => setSortByAlpha(!1), "data-testid": "media-library-upload-sort-date" })
|
|
58
|
+
] }),
|
|
36
59
|
/* @__PURE__ */ jsx(Dropzone, { multiple, accept: acceptedTypes(type ?? "embedder"), children: /* @__PURE__ */ jsx(UploadFiles, { onFilesChange: handleOnFilesChange, visibility }) })
|
|
37
60
|
] });
|
|
38
61
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { WorkspaceElement, WorkspaceVisibility } from '@edifice.io/client';
|
|
2
2
|
declare const UploadFiles: {
|
|
3
3
|
({ onFilesChange, visibility, }: {
|
|
4
|
-
onFilesChange: (uploadedFiles: WorkspaceElement[]) => void;
|
|
4
|
+
onFilesChange: (uploadedFiles: WorkspaceElement[], sourceFiles: File[]) => void;
|
|
5
5
|
visibility?: WorkspaceVisibility;
|
|
6
6
|
}): import("react/jsx-runtime").JSX.Element;
|
|
7
7
|
displayName: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@edifice.io/react",
|
|
3
|
-
"version": "2.6.3-develop-pedago.
|
|
3
|
+
"version": "2.6.3-develop-pedago.20260908113442",
|
|
4
4
|
"description": "Edifice React Library",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -140,9 +140,9 @@
|
|
|
140
140
|
"swiper": "10.1.0",
|
|
141
141
|
"ua-parser-js": "1.0.36",
|
|
142
142
|
"zustand": "4.5.7",
|
|
143
|
-
"@edifice.io/
|
|
144
|
-
"@edifice.io/
|
|
145
|
-
"@edifice.io/
|
|
143
|
+
"@edifice.io/tiptap-extensions": "2.6.3-develop-pedago.20260908113442",
|
|
144
|
+
"@edifice.io/utilities": "2.6.3-develop-pedago.20260908113442",
|
|
145
|
+
"@edifice.io/bootstrap": "2.6.3-develop-pedago.20260908113442"
|
|
146
146
|
},
|
|
147
147
|
"devDependencies": {
|
|
148
148
|
"@babel/plugin-transform-react-pure-annotations": "7.27.1",
|
|
@@ -173,8 +173,8 @@
|
|
|
173
173
|
"vite": "5.4.14",
|
|
174
174
|
"vite-plugin-dts": "4.5.4",
|
|
175
175
|
"vite-tsconfig-paths": "5.1.4",
|
|
176
|
-
"@edifice.io/client": "2.6.3-develop-pedago.
|
|
177
|
-
"@edifice.io/config": "2.6.3-develop-pedago.
|
|
176
|
+
"@edifice.io/client": "2.6.3-develop-pedago.20260908113442",
|
|
177
|
+
"@edifice.io/config": "2.6.3-develop-pedago.20260908113442"
|
|
178
178
|
},
|
|
179
179
|
"peerDependencies": {
|
|
180
180
|
"@react-spring/web": "9.7.5",
|