diff --git a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
index 989b3c69..f5502769 100644
--- a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
@@ -23,8 +23,8 @@ export class AppWindow {
// tslint:disable-next-line: variable-name
private _rendererReadyTime: number | null = null;
- private minWidth = 700;
- private minHeight = 600;
+ private minWidth = 1160;
+ private minHeight = 800;
public constructor(private appIconPath: string) {
const savedWindowState = windowStateKeeper({
@@ -165,7 +165,11 @@ export class AppWindow {
} else {
this.window.loadURL(
url.format({
- pathname: path.join(__dirname, '..', 'ucap-webmessenger-app/index.html'),
+ pathname: path.join(
+ __dirname,
+ '..',
+ 'ucap-webmessenger-app/index.html'
+ ),
protocol: 'file:',
slashes: true
})
diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts
index 6187ec73..b8d3935b 100644
--- a/electron-projects/ucap-webmessenger-electron/src/index.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/index.ts
@@ -6,7 +6,8 @@ import {
Menu,
shell,
dialog,
- BrowserWindow
+ BrowserWindow,
+ clipboard
} from 'electron';
import path from 'path';
import fse from 'fs-extra';
@@ -29,7 +30,8 @@ import {
ChatChannel,
MessengerChannel,
MessageChannel,
- AppChannel
+ AppChannel,
+ ClipboardChannel
} from '@ucap-webmessenger/native-electron';
import { ElectronNotificationService } from '@ucap-webmessenger/electron-notification';
import { ElectronUpdateWindowService } from '@ucap-webmessenger/electron-update-window';
@@ -729,6 +731,25 @@ ipcMain.on(
}
);
+ipcMain.on(ClipboardChannel.Read, (event: IpcMainEvent, ...args: any[]) => {
+ try {
+ const text = clipboard.readText('clipboard');
+ const rtf = clipboard.readRTF('clipboard');
+ const html = clipboard.readHTML('clipboard');
+ const image = clipboard.readImage('clipboard');
+
+ event.returnValue = {
+ text,
+ rtf,
+ html,
+ image: !image.isEmpty() ? image.toBitmap() : undefined,
+ imageDataUrl: !image.isEmpty() ? image.toDataURL() : undefined
+ };
+ } catch (error) {
+ event.returnValue = {};
+ }
+});
+
ipcMain.on(AppChannel.Exit, (event: IpcMainEvent, ...args: any[]) => {
appExit();
});
diff --git a/projects/ucap-webmessenger-api/src/lib/models/file-upload-item.ts b/projects/ucap-webmessenger-api/src/lib/models/file-upload-item.ts
index 72e09741..786eae35 100644
--- a/projects/ucap-webmessenger-api/src/lib/models/file-upload-item.ts
+++ b/projects/ucap-webmessenger-api/src/lib/models/file-upload-item.ts
@@ -1,5 +1,6 @@
import { Observable, Subject } from 'rxjs';
import { share } from 'rxjs/operators';
+import { FileUtil } from '@ucap-webmessenger/core';
export class FileUploadItem {
file: File;
@@ -24,6 +25,24 @@ export class FileUploadItem {
return fileItems;
}
+ static fromDataUrls(
+ fileNameAppend: string,
+ ...dataUrls: string[]
+ ): FileUploadItem[] {
+ const fileItems: FileUploadItem[] = [];
+
+ // tslint:disable-next-line: prefer-for-of
+ for (let i = 0; i < dataUrls.length; i++) {
+ fileItems.push(
+ new FileUploadItem(
+ FileUtil.fromDataUrlToFile(fileNameAppend, dataUrls[i])
+ )
+ );
+ }
+
+ return fileItems;
+ }
+
static from(): FileUploadItem {
return new FileUploadItem();
}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
index 95247198..fa08118b 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
@@ -327,6 +327,7 @@
(clearView)="clearView()"
(toggleStickerSelector)="onShowToggleStickerSelector($event)"
(toggleTranslation)="onShowToggleTranslation($event)"
+ (clipboardPaste)="onClipboardPaste()"
>
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
index 62a655ef..1c92a9b5 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
@@ -8,7 +8,8 @@ import {
EventEmitter,
Inject,
ChangeDetectorRef,
- ChangeDetectionStrategy
+ ChangeDetectionStrategy,
+ ElementRef
} from '@angular/core';
import {
ucapAnimations,
@@ -130,6 +131,11 @@ import { TranslateService } from '@ngx-translate/core';
import { TranslatePipe } from 'projects/ucap-webmessenger-ui/src/lib/pipes/translate.pipe';
import { TranslateService as UiTranslateService } from '@ucap-webmessenger/ui';
import { FileProtocolService } from '@ucap-webmessenger/protocol-file';
+import {
+ ClipboardDialogComponent,
+ ClipboardDialogData,
+ ClipboardDialogResult
+} from '../dialogs/chat/clipboard.dialog.component';
@Component({
selector: 'app-layout-messenger-messages',
@@ -1958,4 +1964,47 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
this.isTranslationProcess = false;
this.translationPreviewInfo = null;
}
+
+ onClipboardPaste() {
+ this.nativeService.readFromClipboard().then(async data => {
+ if (!!data.image && !!data.text) {
+ const result = await this.dialogService.open<
+ ClipboardDialogComponent,
+ ClipboardDialogData,
+ ClipboardDialogResult
+ >(ClipboardDialogComponent, {
+ width: '800px',
+ maxWidth: '800px',
+ height: '800px',
+ minHeight: '800px',
+ disableClose: false,
+ data: {
+ content: data
+ }
+ });
+
+ if (result.selected.text) {
+ this.onSendMessage(data.text);
+ }
+
+ if (result.selected.image) {
+ const fileUploadItems = FileUploadItem.fromDataUrls(
+ 'clipboard',
+ data.imageDataUrl
+ );
+
+ this.onFileSelected(fileUploadItems);
+ }
+ } else if (!!data.image && !data.text) {
+ const fileUploadItems = FileUploadItem.fromDataUrls(
+ 'clipboard',
+ data.imageDataUrl
+ );
+
+ this.onFileSelected(fileUploadItems);
+ } else {
+ this.chatForm.replyInput.nativeElement.value = `${this.chatForm.replyInput.nativeElement.value}${data.text}`;
+ }
+ });
+ }
}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
new file mode 100644
index 00000000..59713d3e
--- /dev/null
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
@@ -0,0 +1,79 @@
+
+
+ {{ 'settings.label' | translate }}
+
+
+
+
+
+
+
+
+ {{
+ 'common.file.clipboardType.text' | translate
+ }}
+
+
+ {{ data.content.text }}
+
+
+
+
+
+
+
+ {{
+ 'common.file.clipboardType.image' | translate
+ }}
+
+
+
+
+
![]()
+
+