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

Add a check that allows inline toolboxes to work with nested editorsjs #2581

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
+11 −3
Open

Add a check that allows inline toolboxes to work with nested editorsjs #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c335f8
Add a check that allows inline toolboxes to work with nested editorsjs
loucass003 Jan 4, 2024
310cadf
Add prepare
loucass003 Jan 9, 2024
94a3b74
Merge branch 'next' into next
loucass003 Jan 15, 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
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please, remove unrelated changes

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"tools:update": "yarn _tools:checkout && yarn _tools:pull && yarn _tools:make",
"test:e2e": "yarn build:test && cypress run",
"test:e2e:open": "yarn build:test && cypress open",
"devserver:start": "yarn build && node ./devserver.js"
"devserver:start": "yarn build && node ./devserver.js",
"prepare": "npm run build"
},
"author": "CodeX",
"license": "Apache-2.0",
Expand Down Expand Up @@ -75,5 +76,8 @@
"collective": {
"type": "opencollective",
"url": "https://opencollective.com/editorjs"
},
"dependencies": {
"yarn": "^1.22.21"
}
}
8 changes: 6 additions & 2 deletions src/components/modules/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,9 +820,13 @@ export default class UI extends Module<UINodes> {

/**
* Event can be fired on clicks at non-block-content elements,
* for example, at the Inline Toolbar or some Block Tune element
* for example, at the Inline Toolbar or some Block Tune element.
* We also make sure that the closest block belongs to the current editor and not a parent
*/
const clickedOutsideBlockContent = focusedElement.closest(`.${Block.CSS.content}`) === null;
const closestBlock = focusedElement.closest(`.${Block.CSS.content}`);
const clickedOutsideBlockContent =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add corresponding test case

closestBlock === null
|| (closestBlock.closest(`.${Selection.CSS.editorWrapper}`) !== this.nodes.wrapper);

if (clickedOutsideBlockContent) {
/**
Expand Down