-
-
Notifications
You must be signed in to change notification settings - Fork 660
chore: Move side menu height setting to FloatingUI #2224
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.
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
Open
matthewlipski
wants to merge
6
commits into
main
Choose a base branch
from
side-menu-height-cleanup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+176
−77
Open
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1918cbf
Moved side menu height setting to FloatingUI
matthewlipski 47c9629
Rename
matthewlipski 785bc45
Made `BlockPopover` more configurable
matthewlipski 37415b6
Merge branch 'main' into side-menu-height-cleanup
matthewlipski fd8a1b5
Changed from hardcoded height values to ones derived from reference e…
matthewlipski ddf257a
Fixed multi column issue
matthewlipski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| import { blockHasType } from "@blocknote/core"; | ||
| import { SideMenuExtension } from "@blocknote/core/extensions"; | ||
| import { size } from "@floating-ui/react"; | ||
| import { FC, useMemo } from "react"; | ||
|
|
||
| import { useBlockNoteEditor } from "../../hooks/useBlockNoteEditor.js"; | ||
| import { useExtensionState } from "../../hooks/useExtension.js"; | ||
| import { BlockPopover } from "../Popovers/BlockPopover.js"; | ||
| import { FloatingUIOptions } from "../Popovers/FloatingUIOptions.js"; | ||
|
|
@@ -11,6 +14,8 @@ export const SideMenuController = (props: { | |
| sideMenu?: FC<SideMenuProps>; | ||
| floatingUIOptions?: Partial<FloatingUIOptions>; | ||
| }) => { | ||
| const editor = useBlockNoteEditor<any, any, any>(); | ||
|
|
||
| const state = useExtensionState(SideMenuExtension, { | ||
| selector: (state) => { | ||
| return state !== undefined | ||
|
|
@@ -29,6 +34,72 @@ export const SideMenuController = (props: { | |
| useFloatingOptions: { | ||
| open: show, | ||
| placement: "left-start", | ||
| middleware: [ | ||
| size({ | ||
| apply({ elements }) { | ||
| // TODO: Need to fetch the block from extension, else it's | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this code is called in |
||
| // always `undefined` for some reason? Shouldn't the `apply` | ||
| // function get recreated with the updated `block` object each | ||
| // time it changes? | ||
| const block = | ||
| editor.getExtension(SideMenuExtension)?.store.state?.block; | ||
| if (block === undefined) { | ||
| return; | ||
| } | ||
|
|
||
| if (block.type === "heading") { | ||
| if (!block.props.level || block.props.level === 1) { | ||
| elements.floating.style.setProperty("height", "78px"); | ||
matthewlipski marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return; | ||
| } | ||
|
|
||
| if (block.props.level === 2) { | ||
| elements.floating.style.setProperty("height", "54px"); | ||
| return; | ||
| } | ||
|
|
||
| if (block.props.level === 2) { | ||
| elements.floating.style.setProperty("height", "37px"); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| if ( | ||
| editor.schema.blockSpecs[block.type].implementation.meta | ||
| ?.fileBlockAccept | ||
| ) { | ||
| if ( | ||
| blockHasType(block, editor, block.type, { | ||
| url: "string", | ||
| }) && | ||
| block.props.url === "" | ||
| ) { | ||
| elements.floating.style.setProperty("height", "54px"); | ||
| return; | ||
| } | ||
|
|
||
| if ( | ||
| block.type === "file" || | ||
| (blockHasType(block, editor, block.type, { | ||
| showPreview: "boolean", | ||
| }) && | ||
| !block.props.showPreview) | ||
| ) { | ||
| elements.floating.style.setProperty("height", "38px"); | ||
| return; | ||
| } | ||
|
|
||
| if (block.type === "audio") { | ||
| elements.floating.style.setProperty("height", "60px"); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| elements.floating.style.setProperty("height", "30px"); | ||
| elements.floating.style.height = "30px"; | ||
| }, | ||
| }), | ||
| ], | ||
| }, | ||
| useDismissProps: { | ||
| enabled: false, | ||
|
|
@@ -40,13 +111,17 @@ export const SideMenuController = (props: { | |
| }, | ||
| ...props.floatingUIOptions, | ||
| }), | ||
| [props.floatingUIOptions, show], | ||
| [editor, props.floatingUIOptions, show], | ||
| ); | ||
|
|
||
| const Component = props.sideMenu || SideMenu; | ||
|
|
||
| return ( | ||
| <BlockPopover blockId={show ? block?.id : undefined} {...floatingUIOptions}> | ||
| <BlockPopover | ||
| blockId={show ? block?.id : undefined} | ||
| spanEditorWidth={true} | ||
| {...floatingUIOptions} | ||
| > | ||
| {block?.id && <Component />} | ||
| </BlockPopover> | ||
| ); | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I like the use of
firstElementChild. It assumes a specific dom structure to get the dom element - which is not typesafe / futureproof.Better approach would be to use the methods we have like getblockinfo to get the content block, and then call getdomatpos for it
(example; the current approach would probably break for column blocks which don't have blockContent)