@social-mail/social-mail-client 1.0.48 → 1.0.49

package/src/web/page/files/FolderPage.tsx

@@ -11,6 +11,8 @@ import CloudFileService from "./service/CloudFileService";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import styled from "@web-atoms/core/dist/style/styled";
 import { toFileSize } from "../../../common/NumberFormats";
+import { FilesDragDrop } from "../../../common/controls/drag-drop/FilesDragDrop";
+import PopupButton, { MenuItem } from "@web-atoms/web-controls/dist/basic/PopupButton";
 
 const css = styled.css `
     display: grid;
@@ -74,20 +76,26 @@ export default class FolderPage extends ContentPage {
 
             <div text={Bind.oneWay(() => this.selectedFolder.name)}/>
 
-            <i
-                class="fas fa-upload"
+            <PopupButton
+                icon="fas fa-upload"
+                label="Upload"
+                data-layout="accent-icon-button"
                 data-extra={Bind.oneWay(() => JSON.stringify({ parentID: this.selectedFolder.appFileID }))}
-                title="Upload"
-                { ... UploadEvent.AttachUploadAction({
-                    accept: acceptDocumentAndMedia
-                })}
-                />
-            <span
-                text="Upload"
-                data-extra={Bind.oneWay(() => JSON.stringify({ parentID: this.selectedFolder.appFileID }))}
-                { ... UploadEvent.AttachUploadAction({
-                    accept: acceptDocumentAndMedia
-                })}
+                popup={() => <div>
+                    <MenuItem
+                        icon="fas fa-upload"
+                        { ... UploadEvent.AttachUploadAction({
+                            multiple: true,
+                            accept: acceptDocumentAndMedia
+                        })} label="Files"/>
+                    {/* <MenuItem
+                        icon="fas fa-upload"
+                        { ... UploadEvent.AttachUploadAction({
+                            multiple: true,
+                            folder: true,
+                            accept: acceptDocumentAndMedia
+                        })} label="Folder"/> */}
+                </div>}
                 />
 
             <span text="|"/>
@@ -108,7 +116,12 @@ export default class FolderPage extends ContentPage {
                 root={this.root}
                 selectedItem={Bind.twoWaysImmediate(() => this.selectedFolder)}
                 />
-            <div class="file-list">
+            <div
+                class="file-list"
+                // { ... FilesDragDrop({
+
+                // })}
+                >
                 <AtomRepeater
                     for="table"
                     items={Bind.oneWayAsync((c, e, cancelToken) =>

package/src/web/page/files/service/CloudFileService.ts

@@ -76,6 +76,7 @@ export default class CloudFileService {
             const fx = folder.children.find((f) => f.appFileID === iterator.appFileID);
             if(fx) {
                 results.push(fx);
+                fx.fileSize = iterator.fileSize;
                 continue;
             }
             iterator.children ??= [];