Fix shortcut conflicts - #5499
Merged
Merged
Conversation
BoDonkey
approved these changes
Jul 2, 2026
| props.editor.commands.deleteSelection(); | ||
| } | ||
| } | ||
| removeEditorSlash(props.editor); |
Contributor
There was a problem hiding this comment.
Just curious - why move this to a new file?
Contributor
Author
There was a problem hiding this comment.
Shared between multiple scripts. DRY.
You might not find it because the second import is named removeSlash.
boutell
added a commit
that referenced
this pull request
Jul 8, 2026
* Fix asset URLs when a site prefix is configured (#5448) * fix: treat col as a self-closing tag (#5447) * fix: treat col as a self-closing tag * Make dateTime field responsive (css) (#5481) * Fix/from rich text adds metatype (#5488) * fromRichText adds metatype to new widget * change * nodemailer major bump (#5485) * Harden and centralize the cache invalidation (#5493) * fix(sanitize-html): emit transformTags text on empty tags when textFilter is set (#5494) When a transformTags handler adds text to an allowed tag that originally had no text content, the injected text was silently dropped if any textFilter was configured. The onopentag branch that emits frame.innerText was guarded by !options.textFilter, deferring emission to ontext so the filter could run there. For an empty element htmlparser2 never fires ontext, so the text was emitted by neither branch. Emit frame.innerText through options.textFilter here when present (mirroring the discard path), so the transformTags text contract holds for empty tags regardless of whether a textFilter is set. * changeset crediting spokodev for sanitize-html fix (#5498) * Fix shortcut conflicts (#5499) * Fix backspace after slash deleting a rich-text widget * Fix copy/paste widget/text conflicts * Fix astro redirects (#5500) * Merge commit from fork * Merge commit from fork * Merge commit from fork * Merge commit from fork * fix path traversal in import/export * correct credits * additional guards * Merge commit from fork * fix for </textarea/> vulnerability (#5501) * wip * fix for math/svg vulnerabilities --------- Co-authored-by: Jinka Manohar <145598597+Manohar2503@users.noreply.github.com> Co-authored-by: Vansh Parmar <vanshparmar8742@gmail.com> Co-authored-by: Miro Yovchev <2827783+myovchev@users.noreply.github.com> Co-authored-by: Stuart Romanek <stuart@apostrophecms.com> Co-authored-by: spokodev <spoko.dev@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Please indicate which branch this PR should merge into:
Check one
Summary
Closes PRO-9644, PRO-9587
No shortcut conflicts when copy/paste selected page text or widget. Copying a widget and pasting in non-apostrophe app now yields text
apos-widget: <id>.Deleting the last content in a rich-text widget now is not deleting the entire widget.
What kind of change does this PR introduce?
(Check at least one)
Make sure the PR fulfills these requirements:
If adding a new feature without an already open issue, it's best to open a feature request issue first and wait for approval before working on it.
Other information: