fixup! [Clipboard API] Clipboard Custom Formats implementation Part 2.

electron · Jul 5, 2021 · 3a1dbc6 · 3a1dbc6
1 parent 6e3dd54
commit 3a1dbc6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/docs/api/clipboard.md b/docs/api/clipboard.md
@@ -199,7 +199,7 @@ const { clipboard } = require('electron')
 
 const hasFormat = clipboard.has('<p>selection</p>')
 console.log(hasFormat)
-// 'true' or 'false
+// 'true' or 'false'
 ```
 
 ### `clipboard.read(format)` _Experimental_
@@ -208,6 +208,10 @@ console.log(hasFormat)
 
 Returns `String` - Reads `format` type from the clipboard.
 
+`format` should contain valid ASCII characters and have `/` separator.
+`a/c`, `a/bc` are valid formats while `/abc`, `abc/`, `a/`, `/a`, `a`
+are not valid.
+
 ### `clipboard.readBuffer(format)` _Experimental_
 
 * `format` String
@@ -218,9 +222,9 @@ Returns `Buffer` - Reads `format` type from the clipboard.
 const { clipboard } = require('electron')
 
 const buffer = Buffer.from('this is binary', 'utf8')
-clipboard.writeBuffer('public.utf8-plain-text', buffer)
+clipboard.writeBuffer('public/utf8-plain-text', buffer)
 
-const ret = clipboard.readBuffer('public.utf8-plain-text')
+const ret = clipboard.readBuffer('public/utf8-plain-text')
 
 console.log(buffer.equals(out))
 // true
@@ -238,7 +242,7 @@ Writes the `buffer` into the clipboard as `format`.
 const { clipboard } = require('electron')
 
 const buffer = Buffer.from('writeBuffer', 'utf8')
-clipboard.writeBuffer('public.utf8-plain-text', buffer)
+clipboard.writeBuffer('public/utf8-plain-text', buffer)
 ```
 
 ### `clipboard.write(data[, type])`

diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc
@@ -39,7 +39,9 @@ bool Clipboard::Has(const std::string& format_string,
                     gin_helper::Arguments* args) {
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   ui::ClipboardFormatType format(
-      ui::ClipboardFormatType::GetCustomPlatformType(format_string));
+      ui::ClipboardFormatType::GetType(format_string));
+  if (format.GetName().empty())
+    format = ui::ClipboardFormatType::GetCustomPlatformType(format_string);
   return clipboard->IsFormatAvailable(format, GetClipboardBuffer(args),
                                       /* data_dst = */ nullptr);
 }

diff --git a/spec/api-clipboard-spec.js b/spec/api-clipboard-spec.js
@@ -7,13 +7,6 @@ const { clipboard, nativeImage } = require('electron');
 describe('clipboard module', () => {
   const fixtures = path.resolve(__dirname, 'fixtures');
 
-  // FIXME(zcbenz): Clipboard tests are failing on WOA.
-  beforeEach(function () {
-    if (process.platform === 'win32' && process.arch === 'arm64') {
-      this.skip();
-    }
-  });
-
   describe('clipboard.readImage()', () => {
     it('returns NativeImage instance', () => {
       const p = path.join(fixtures, 'assets', 'logo.png');
@@ -115,13 +108,13 @@ describe('clipboard module', () => {
   describe('clipboard.readBuffer(format)', () => {
     it('writes a Buffer for the specified format', function () {
       const buffer = Buffer.from('writeBuffer', 'utf8');
-      clipboard.writeBuffer('public.utf8-plain-text', buffer);
-      expect(buffer.equals(clipboard.readBuffer('public.utf8-plain-text'))).to.equal(true);
+      clipboard.writeBuffer('public/utf8-plain-text', buffer);
+      expect(buffer.equals(clipboard.readBuffer('public/utf8-plain-text'))).to.equal(true);
     });
 
     it('throws an error when a non-Buffer is specified', () => {
       expect(() => {
-        clipboard.writeBuffer('public.utf8-plain-text', 'hello');
+        clipboard.writeBuffer('public/utf8-plain-text', 'hello');
       }).to.throw(/buffer must be a node Buffer/);
     });
   });