Accept spaces in data urls in image urls #267
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HackbrettXXX
requested changes
Aug 9, 2023
src/nodes/image.ts
Outdated
| @@ -10,8 +10,7 @@ import { Matrix } from 'jspdf' | |||
| import { Viewport } from '../context/viewport' | |||
|
|
|||
| // groups: 1: mime-type (+ charset), 2: mime-type (w/o charset), 3: charset, 4: base64?, 5: body | |||
| export const dataUriRegex = /^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,(.*\s*)$/i | |||
|
|
|||
| export const dataUriRegex = /^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,((.|\s)*)$/i | |||
There was a problem hiding this comment.
Use a non-capturing group for (.|\s).
src/nodes/image.ts
Outdated
| @@ -118,6 +117,7 @@ export class ImageNode extends GraphicsNode { | |||
| format = mimeTypeParts[1] | |||
|
|
|||
| data = match[5] | |||
| data = data.replace(/\s/g, '') | |||
There was a problem hiding this comment.
Do this only in the base64 case. For other data urls, spaces might be desired.
test/common/tests.js
Outdated
Comment on lines
58
to
59
| 'test-AL-picture', | ||
| 'test-AL-arrows', |
There was a problem hiding this comment.
- I think one test case suffices
- give it a meaningful name like "image-data-urls-base64-spaces"
- use a smaller image. This is a 1x1 red pixel image:
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==
added 2 commits
August 9, 2023 14:27
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.