Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prioritize pasting files over pasting HTML content #1148

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Prioritize pasting files over pasting HTML content #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39d059b
Prioritize pasting files over pasting HTML content
afcapel May 1, 2024
2651ea1
Prevent duplicate file pastes
afcapel May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/test/system/level_2_input_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,14 @@ testGroup("Level 2 Input", testOptions, () => {
test("pasting text from MS Word", async () => {
const file = await createFile()
const dataTransfer = createDataTransfer({
"text/html": "<span class=\"MsoNormal\">abc</span>",
"text/html": `<html xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word"
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
xmlns="http://www.w3.org/TR/REC-html40">
<body>
<span class="MsoNormal">abc</span>
</body>
</html>`,
"text/plain": "abc",
Files: [ file ],
})
Expand Down
35 changes: 22 additions & 13 deletions src/trix/controllers/level_2_input_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getAllAttributeNames, squishBreakableWhitespace } from "trix/core/helpe
import InputController from "trix/controllers/input_controller"
import * as config from "trix/config"

import { dataTransferIsPlainText, keyEventIsKeyboardCommand, objectsAreEqual } from "trix/core/helpers"
import { dataTransferIsMsOfficePaste, dataTransferIsPlainText, keyEventIsKeyboardCommand, objectsAreEqual } from "trix/core/helpers"

import { selectionChangeObserver } from "trix/observers/selection_change_observer"

Expand Down Expand Up @@ -360,6 +360,7 @@ export default class Level2InputController extends InputController {
insertFromPaste() {
const { dataTransfer } = this.event
const paste = { dataTransfer }

const href = dataTransfer.getData("URL")
const html = dataTransfer.getData("text/html")

Expand All @@ -378,7 +379,6 @@ export default class Level2InputController extends InputController {
this.withTargetDOMRange(function() {
return this.responder?.insertHTML(paste.html)
})

this.afterRender = () => {
return this.delegate?.inputControllerDidPaste(paste)
}
Expand All @@ -393,26 +393,25 @@ export default class Level2InputController extends InputController {
this.afterRender = () => {
return this.delegate?.inputControllerDidPaste(paste)
}
} else if (html) {
this.event.preventDefault()
paste.type = "text/html"
paste.html = html
} else if (processableFilePaste(this.event)) {
paste.type = "File"
paste.file = dataTransfer.files[0]
this.delegate?.inputControllerWillPaste(paste)
this.withTargetDOMRange(function() {
return this.responder?.insertHTML(paste.html)
return this.responder?.insertFile(paste.file)
})

this.afterRender = () => {
return this.delegate?.inputControllerDidPaste(paste)
}
} else if (dataTransfer.files?.length) {
paste.type = "File"
paste.file = dataTransfer.files[0]
} else if (html) {
this.event.preventDefault()
paste.type = "text/html"
paste.html = html
this.delegate?.inputControllerWillPaste(paste)
this.withTargetDOMRange(function() {
return this.responder?.insertFile(paste.file)
return this.responder?.insertHTML(paste.html)
})

this.afterRender = () => {
return this.delegate?.inputControllerDidPaste(paste)
}
Expand Down Expand Up @@ -582,10 +581,20 @@ const staticRangeToRange = function(staticRange) {

const dragEventHasFiles = (event) => Array.from(event.dataTransfer?.types || []).includes("Files")

const processableFilePaste = (event) => {
// Paste events that only have files are handled by the paste event handler,
// to work around Safari not supporting beforeinput.insertFromPaste for files.

// MS Office text pastes include a file with a screenshot of the text, but we should
// handle them as text pastes.
return event.dataTransfer.files?.[0] && !pasteEventHasFilesOnly(event) && !dataTransferIsMsOfficePaste(event)
}

const pasteEventHasFilesOnly = function(event) {
const clipboard = event.clipboardData
if (clipboard) {
return clipboard.types.includes("Files") && clipboard.types.length === 1 && clipboard.files.length >= 1
const fileTypes = Array.from(clipboard.types).filter((type) => type.match(/file/i)) // "Files", "application/x-moz-file"
return fileTypes.length === clipboard.types.length && clipboard.files.length >= 1
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/trix/core/helpers/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ export const dataTransferIsPlainText = function(dataTransfer) {
}
}

export const dataTransferIsMsOfficePaste = ({ dataTransfer }) => {
return dataTransfer.types.includes("Files") &&
dataTransfer.types.includes("text/html") &&
dataTransfer.getData("text/html").includes("urn:schemas-microsoft-com:office:office")
}

export const dataTransferIsWritable = function(dataTransfer) {
if (!dataTransfer?.setData) return false

Expand Down
Loading